@shopify/cli-kit 3.46.2 → 3.46.3

package/assets/cli-ruby/lib/shopify_cli/theme/dev_server/cdn_fonts.rb

@@ -6,9 +6,9 @@ module ShopifyCLI
       class CdnFonts
         FONTS_PATH = "/fonts"
         FONTS_CDN = "https://fonts.shopifycdn.com"
-        FONTS_REGEX = %r{#{FONTS_CDN}}
 
-        def initialize(app, theme:)
+        def initialize(ctx, app, theme:)
+          @ctx = ctx
           @app = app
           @theme = theme
         end
@@ -69,7 +69,12 @@ module ShopifyCLI
         end
 
         def replace_font_urls(body)
-          [body.join.gsub(FONTS_REGEX, FONTS_PATH)]
+          fonts_regex = %r{#{FONTS_CDN}|((http:|https:)?//#{shop}/cdn/fonts)}
+          [body.join.gsub(fonts_regex, FONTS_PATH)]
+        end
+
+        def shop
+          @shop ||= ShopifyCLI::Theme::ThemeAdminAPI.new(@ctx).get_shop_or_abort
         end
       end
     end

package/assets/cli-ruby/lib/shopify_cli/theme/dev_server/local_assets.rb

@@ -4,8 +4,9 @@ module ShopifyCLI
   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))}
+        SUPPORTED_EXTENSIONS = [:jpg, :jpeg, :js, :css, :png, :svg].join("|")
+        CDN_REGEX = %r{(//cdn)\.shopify\.com/s/.+?/(assets/.+?\.(?:#{SUPPORTED_EXTENSIONS}))}
+        VANITY_CDN_REGEX = %r{(/cdn)/shop/.+?/(assets/.+?\.(?:#{SUPPORTED_EXTENSIONS}))}
 
         class FileBody
           def initialize(path)
@@ -42,13 +43,17 @@ module ShopifyCLI
           end
         end
 
+        def shop_regex
+          %r{(http:|https:)?//#{shop}/(assets/.+?\.(?:#{SUPPORTED_EXTENSIONS}))}
+        end
+
         private
 
         def replace_asset_urls(body)
           replaced_body = body.join
-          [THEME_REGEX, VANITY_THEME_REGEX].each do |regex|
+          [CDN_REGEX, VANITY_CDN_REGEX, shop_regex].each do |regex|
             replaced_body = replaced_body.gsub(regex) do |match|
-              path = Regexp.last_match[1]
+              path = Regexp.last_match[2]
               @target.static_asset_paths.include?(path) ? "/#{path}" : match
             end
           end
@@ -86,6 +91,10 @@ module ShopifyCLI
             serve_fail(404, "Not found")
           end
         end
+
+        def shop
+          @shop ||= ShopifyCLI::Theme::ThemeAdminAPI.new(@ctx).get_shop_or_abort
+        end
       end
     end
   end

package/assets/cli-ruby/lib/shopify_cli/theme/dev_server.rb

@@ -168,7 +168,7 @@ module ShopifyCLI
 
       def middleware_stack
         @app = Proxy.new(ctx, theme, param_builder)
-        @app = CdnFonts.new(@app, theme: theme)
+        @app = CdnFonts.new(ctx, @app, theme: theme)
         @app = LocalAssets.new(ctx, @app, theme)
         @app = HotReload.new(ctx, @app, broadcast_hooks: broadcast_hooks, watcher: watcher, mode: mode,
           script_injector: script_injector)

package/assets/cli-ruby/lib/shopify_cli/theme/extension/dev_server/local_assets.rb

@@ -7,7 +7,8 @@ module ShopifyCLI
     module Extension
       class DevServer < ShopifyCLI::Theme::DevServer
         class LocalAssets < ShopifyCLI::Theme::DevServer::LocalAssets
-          TAE_ASSET_REGEX = %r{(http:|https:)?//cdn\.shopify\.com/extensions/.+?/(assets/.+?\.(?:css|js))}
+          SUPPORTED_EXTENSIONS = [:jpg, :jpeg, :js, :css, :png, :svg].join("|")
+          TAE_ASSET_REGEX = %r{(http:|https:)?//cdn\.shopify\.com/extensions/.+?/(assets/.+?\.(?:#{SUPPORTED_EXTENSIONS}))}
 
           private
 

package/assets/cli-ruby/lib/shopify_cli/theme/extension/dev_server.rb

@@ -44,7 +44,7 @@ module ShopifyCLI
 
         def middleware_stack
           @app = Proxy.new(ctx, theme, param_builder)
-          @app = CdnFonts.new(@app, theme: theme)
+          @app = CdnFonts.new(ctx, @app, theme: theme)
           @app = LocalAssets.new(ctx, @app, extension)
           @app = HotReload.new(ctx, @app, broadcast_hooks: broadcast_hooks, watcher: watcher, mode: mode,
             script_injector: script_injector)

package/assets/cli-ruby/lib/shopify_cli/theme/repl/auth_dev_server.rb

@@ -57,7 +57,7 @@ module ShopifyCLI
 
         def middleware_stack
           @app = proxy
-          @app = CdnFonts.new(app, theme: theme)
+          @app = CdnFonts.new(ctx, app, theme: theme)
           @app = AuthMiddleware.new(app, proxy, repl) { WebServer.shutdown }
         end
 

package/dist/public/common/version.d.ts

@@ -1 +1 @@
-export declare const CLI_KIT_VERSION = "3.46.2";
+export declare const CLI_KIT_VERSION = "3.46.3";

package/dist/public/common/version.js

@@ -1,2 +1,2 @@
-export const CLI_KIT_VERSION = '3.46.2';
+export const CLI_KIT_VERSION = '3.46.3';
 //# sourceMappingURL=version.js.map

package/dist/public/common/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../src/public/common/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG,QAAQ,CAAA","sourcesContent":["export const CLI_KIT_VERSION = '3.46.2'\n"]}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../src/public/common/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG,QAAQ,CAAA","sourcesContent":["export const CLI_KIT_VERSION = '3.46.3'\n"]}