Merge branch 'main' into vite-plugin

Signed-off-by: Youness Id bakkasse <63895927+blanklob@users.noreply.github.com>
odestry · Aug 17, 2024 · 1530097 · 1530097
2 parents 0fee5c6 + e41fe9f
commit 1530097
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 29 deletions.
diff --git a/assets/entry.DJqbQjLU.min.css b/assets/entry.DJqbQjLU.min.css
diff --git a/assets/entry.theme.DAmrlBVT.min.js b/assets/entry.theme.DAmrlBVT.min.js
@@ -0,0 +1 @@
+function o(n){return n+1}console.log(o(1));
diff --git a/config/settings_data.json b/config/settings_data.json
@@ -1,6 +1,16 @@
+/*
+* ------------------------------------------------------------
+* IMPORTANT: The contents of this file are auto-generated.
+*
+* This file may be updated by the Shopify admin theme editor
+* or related systems. Please exercise caution as any changes
+* made to this file may be overwritten.
+* ------------------------------------------------------------
+*/
 {
   "current": "Default",
   "presets": {
-    "Default": {}
+    "Default": {
+    }
   }
 }
diff --git a/layout/theme.liquid b/layout/theme.liquid
@@ -18,7 +18,7 @@
 
     {% render 'typography' %}
 
-    {% render 'entry' with 'theme.entry.js' %}
+    {% render 'entry' with '/entry.theme.js' %}
 
     {{ content_for_header }}
   </head>

diff --git a/locales/en.default.json b/locales/en.default.json
@@ -1,3 +1,12 @@
+/*
+* ------------------------------------------------------------
+* IMPORTANT: The contents of this file are auto-generated.
+*
+* This file may be updated by the Shopify admin language editor
+* or related systems. Please exercise caution as any changes
+* made to this file may be overwritten.
+* ------------------------------------------------------------
+*/
 {
   "gift_cards": {
     "issued": {
@@ -14,4 +23,4 @@
       "print_gift_card": "Print"
     }
   }
-}
+}
diff --git a/snippets/entry.liquid b/snippets/entry.liquid
@@ -2,28 +2,8 @@
   IMPORTANT: This snippet is automatically generated by vite-plugin-shopify.
   Do not attempt to modify this file directly, as any changes will be overwritten by the next build.
 {% endcomment %}
-{% assign path = entry | replace: '~/', '../' | replace: '@/', '../' %}
-{% liquid
-  assign path_prefix = path | slice: 0
-  if path_prefix == '/'
-    assign file_url_prefix = 'http://localhost:5173'
-  else
-    assign file_url_prefix = 'http://localhost:5173/frontend/entrypoints/'
-  endif
-  assign file_url = path | prepend: file_url_prefix
-  assign file_name = path | split: '/' | last
-  if file_name contains '.'
-    assign file_extension = file_name | split: '.' | last
-  endif
-  assign css_extensions = 'css|less|sass|scss|styl|stylus|pcss|postcss' | split: '|'
-  assign is_css = false
-  if css_extensions contains file_extension
-    assign is_css = true
-  endif
-%}
-<script src="http://localhost:5173/@vite/client" type="module"></script>
-{% if is_css == true %}
-  {{ file_url | stylesheet_tag }}
-{% else %}
-  <script src="{{ file_url }}" type="module"></script>
-{% endif %}
+{% assign path = entry | replace: '~/', '../../' | replace: '@/', '../' %}
+{% if path == "/entry.theme.js" or path == "../../entry.theme.js" %}
+  <script src="{{ 'entry.theme.DAmrlBVT.min.js' | asset_url | split: '?' | first }}" type="module" crossorigen="anonymous"></script>
+  {{ 'entry.DJqbQjLU.min.css' | asset_url | split: '?' | first | stylesheet_tag: preload: preload_stylesheet }}
+{% endif %}
diff --git a/templates/gift_card.liquid b/templates/gift_card.liquid
@@ -22,7 +22,7 @@
 
     {% render 'typography' %}
 
-    {{ 'styles.css' | asset_url | stylesheet_tag }}
+    {% render 'entry' with '/entry.theme.js' %}
 
     {{ content_for_header }}
   </head>