Add vanity url support for embedded URLs

Shopify · Apr 27, 2023 · 809b697 · 809b697
1 parent cc5e617
commit 809b697
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/packages/cli-kit/assets/cli-ruby/lib/shopify_cli/theme/dev_server/local_assets.rb b/packages/cli-kit/assets/cli-ruby/lib/shopify_cli/theme/dev_server/local_assets.rb
@@ -5,6 +5,7 @@ module Theme
     class DevServer
       class LocalAssets
         THEME_REGEX = %r{//cdn\.shopify\.com/s/.+?/(assets/.+?\.(?:css|js))}
+        VANITY_THEME_REGEX = %r{//cdn/shop/.+?/(assets/.+?\.(?:css|js))}
 
         class FileBody
           def initialize(path)
@@ -44,12 +45,11 @@ def call(env)
         private
 
         def replace_asset_urls(body)
-          replaced_body = body.join.gsub(THEME_REGEX) do |match|
-            path = Regexp.last_match[1]
-            if @target.static_asset_paths.include?(path)
-              "/#{path}"
-            else
-              match
+          replaced_body = body.join
+          [THEME_REGEX, VANITY_THEME_REGEX].each do |regex|
+            replaced_body = replaced_body.gsub(regex) do |match|
+              path = Regexp.last_match[1]
+              @target.static_asset_paths.include?(path) ? "/#{path}" : match
             end
           end
 

diff --git a/packages/cli-kit/assets/cli-ruby/test/shopify-cli/theme/dev_server/local_assets_test.rb b/packages/cli-kit/assets/cli-ruby/test/shopify-cli/theme/dev_server/local_assets_test.rb
@@ -44,6 +44,24 @@ def test_replace_local_assets_on_same_line
           assert_equal(expected_html, serve(original_html).body)
         end
 
+        def test_replace_local_assets_in_reponse_body_with_vanity_url
+          original_html = <<~HTML
+            <html>
+              <head>
+                <link rel="stylesheet" href="//cdn/shop/t/2/assets/footer.css" />
+              </head>
+            </html>
+          HTML
+          expected_html = <<~HTML
+            <html>
+              <head>
+                <link rel="stylesheet" href="/assets/footer.css" />
+              </head>
+            </html>
+          HTML
+          assert_equal(expected_html, serve(original_html).body)
+        end
+
         def test_dont_replace_other_assets
           original_html = <<~HTML
             <html>