shopify-cli 2.11.0 → 2.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9944385de970a522f54fcf4e8feffa5bcab8ad61498095a1794c5abcf5918063
-  data.tar.gz: 62b23eb1ab82cf0783ccab14d77b55c3e71595d87581795fff19227c4bcada57
+  metadata.gz: b4c9bb44a8b7b750acbf3364201705d93dfb39ce9772976ba2af04183cfc5748
+  data.tar.gz: fa32248af15c17d01d80132b4caf42ea224edba35146098954f51b4453db50de
 SHA512:
-  metadata.gz: 72ec8ee4a02bb2b7cd6f9d58c094625bba0e1971a1d2e81d86920e8b326ff8fb52bac73b2a7afec43f7e67991b239bd7ac11c43a2df70790ecd82cf6c4614db2
-  data.tar.gz: e456bb338bfa6102cf8643455b983a147a0fdef6fb820a5ee46dd210e6cbde788de6053727c48ab44057a7ad920a8b765651bfd09a26735b4db8525dc6f247b1
+  metadata.gz: 3446d1a595e343f6566b7ec087c187d31518398ad57be75ff519a394133c75e4f0a5f8670d78913271091632d8ef9fdeef4fb1bb3c1b4ac5cb99d0bc12aef765
+  data.tar.gz: 48ad3c64a367e80facb7aecc393295fb8fa838949a51c7a71310c50a40e6bf2c648b57dbcaf53ade5e15af90ff911593e38865cbb8e2b8dce6b70a8918d83a03

data/CHANGELOG.md

@@ -2,8 +2,14 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
-## Version 2.11.0
+## Version 2.11.1
+### Fixed
+* [#1973](https://github.com/Shopify/shopify-cli/pull/1973): Fix `theme serve` to preview generated files (`*.css.liquid`)
+* [#2034](https://github.com/Shopify/shopify-cli/pull/2034): Fix `theme serve` to accept parameters with multiple values
+* [#2033](https://github.com/Shopify/shopify-cli/pull/2033): Pin Homebrew Ruby to 3.0
+* [#2032](https://github.com/Shopify/shopify-cli/pull/2032): Runtime error checking the Node version if Node is not present in the environment.
 
+## Version 2.11.0
 ### Fixed
 * [#2005](https://github.com/Shopify/shopify-cli/pull/2005): Fix PHP app serve on Windows environments
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.11.0)
+    shopify-cli (2.11.1)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
       theme-check (~> 1.9.0)

data/lib/project_types/extension/commands/push.rb

@@ -27,6 +27,10 @@ module Extension
           api_secret: options.flags[:api_secret],
           registration_id: options.flags[:registration_id]
         )
+        # on ci, registration id must be present
+        registration_id = options.flags[:registration_id]
+        check_registration(registration_id: registration_id, context: @ctx)
+
         specification_handler = Extension::Loaders::SpecificationHandler.load(project: project, context: @ctx)
         register_if_necessary(project: project, args: args, name: name)
 
@@ -43,6 +47,15 @@ module Extension
         end
       end
 
+      def check_registration(registration_id:, context:)
+        if !ShopifyCLI::Environment.interactive? && (!registration_id || registration_id.empty?)
+          message = context.message("errors.missing_push_options_ci", "--registration-id")
+          message += context.message("errors.missing_push_options_ci_solution", ShopifyCLI::TOOL_NAME)
+          raise ShopifyCLI::Abort,
+            message
+        end
+      end
+
       def self.help
         ShopifyCLI::Context.new.message("push.help", ShopifyCLI::TOOL_NAME)
       end

data/lib/project_types/extension/loaders/project.rb

@@ -9,20 +9,40 @@ module Extension
           "SHOPIFY_API_SECRET" => api_secret,
           "EXTENSION_ID" => registration_id,
         }.compact
-        env =
-          begin
-            ShopifyCLI::Resources::EnvFile.read(directory, overrides: env_overrides)
-          rescue Errno::ENOENT
-            ShopifyCLI::Resources::EnvFile.from_hash(env_overrides)
-          end
+        env_file_present = env_file_exists?(directory)
+        env = if env_file_present
+          ShopifyCLI::Resources::EnvFile.read(directory, overrides: env_overrides)
+        else
+          ShopifyCLI::Resources::EnvFile.from_hash(env_overrides)
+        end
         # This is a somewhat uncomfortable hack we use because `Project::at` is
         # a global cache and we can't rely on this class loading the project
         # first. Long-term we should move away from that global cache.
         project = ExtensionProject.at(directory)
         project.env = env
         project
-      rescue SmartProperties::InitializationError, SmartProperties::MissingValueError
-        context.abort(context.message("errors.missing_api_key"))
+      rescue SmartProperties::InitializationError, SmartProperties::MissingValueError => error
+        handle_error(error, context: context)
+      end
+
+      def self.handle_error(error, context:)
+        if ShopifyCLI::Environment.interactive?
+          properties_hash = { api_key: "SHOPIFY_API_KEY", secret: "SHOPIFY_API_SECRET" }
+          missing_env_variables = error.properties.map { |p| properties_hash[p.name] }.compact.join(", ")
+          message = context.message("errors.missing_env_file_variables", missing_env_variables)
+          message += context.message("errors.missing_env_file_variables_solution", ShopifyCLI::TOOL_NAME)
+        else
+          properties_hash = { api_key: "--api-key", secret: "--api-secret" }
+          missing_options = error.properties.map { |p| properties_hash[p.name] }.compact.join(", ")
+          message = context.message("errors.missing_push_options_ci", missing_options)
+          message += context.message("errors.missing_push_options_ci_solution", ShopifyCLI::TOOL_NAME)
+        end
+        raise ShopifyCLI::Abort,
+          message
+      end
+
+      def self.env_file_exists?(directory)
+        File.exist?(ShopifyCLI::Resources::EnvFile.path(directory))
       end
     end
   end

data/lib/project_types/extension/messages/messages.rb

@@ -174,9 +174,17 @@ module Extension
         },
       },
       errors: {
-        unknown_type: "Unknown extension type %s",
+        unknown_type: "Unknown extension type %s. Valid extension types include: CHECKOUT_POST_PURCHASE, " \
+        "CHECKOUT_UI_EXTENSION, THEME_APP_EXTENSION, and PRODUCT_SUBSCRIPTION.",
         package_not_found: "`%s` package not found.",
-        missing_api_key: "Missing api_key.",
+        missing_push_options_ci: "The following are missing: %s. ",
+        missing_push_options_ci_solution: "To add them to a CI environment:\n\t1. Run a connect command " \
+        "({{command:%1$s extension connect}})\n\t2. Navigate to the .env file at the root of your project\n\t" \
+            "3. Copy the missing values and pass them through as arguments in {{command:%1$s extension push}}",
+        missing_env_file_variables: "The following are missing in the .env file: %s. ",
+        missing_env_file_variables_solution: "To add it, connect your extension with " \
+        "{{command:%1$s extension connect}} " \
+        "or run {{command:%1$s extension register}} to register a new extension.",
         module_not_found: "Unable to find module %s. Ensure your dependencies are up-to-date and try again.",
       },
       warnings: {

data/lib/project_types/script/layers/application/create_script.rb

@@ -47,7 +47,7 @@ module Script
           private
 
           def install_dependencies(ctx, language, script_name, project_creator)
-            task_runner = Infrastructure::Languages::TaskRunner.for(ctx, language, script_name)
+            task_runner = Infrastructure::Languages::TaskRunner.for(ctx, language)
             CLI::UI::Frame.open(ctx.message(
               "core.git.pulling_from_to",
               project_creator.sparse_checkout_repo,

data/lib/project_types/script/layers/application/push_script.rb

@@ -10,7 +10,7 @@ module Script
             script_project = script_project_repo.get
             script_project.env = project.env
             task_runner = Infrastructure::Languages::TaskRunner
-              .for(ctx, script_project.language, script_project.script_name)
+              .for(ctx, script_project.language)
 
             extension_point = ExtensionPoints.get(type: script_project.extension_point_type)
 

data/lib/project_types/script/layers/infrastructure/languages/assemblyscript_task_runner.rb

@@ -4,18 +4,11 @@ module Script
   module Layers
     module Infrastructure
       module Languages
-        class AssemblyScriptTaskRunner
+        class AssemblyScriptTaskRunner < TaskRunner
           BYTECODE_FILE = "build/script.wasm"
           METADATA_FILE = "build/metadata.json"
           SCRIPT_SDK_BUILD = "npm run build"
 
-          attr_reader :ctx, :script_name
-
-          def initialize(ctx, script_name)
-            @ctx = ctx
-            @script_name = script_name
-          end
-
           def build
             compile
             bytecode

data/lib/project_types/script/layers/infrastructure/languages/task_runner.rb

@@ -5,15 +5,41 @@ module Script
     module Infrastructure
       module Languages
         class TaskRunner
-          TASK_RUNNERS = {
-            "assemblyscript" => AssemblyScriptTaskRunner,
-            "typescript" => TypeScriptTaskRunner,
-            "wasm" => WasmTaskRunner,
-          }
-
-          def self.for(ctx, language, script_name)
-            raise Errors::TaskRunnerNotFoundError unless TASK_RUNNERS[language]
-            TASK_RUNNERS[language].new(ctx, script_name)
+          attr_reader :ctx
+
+          def self.for(ctx, language)
+            task_runners = {
+              "assemblyscript" => AssemblyScriptTaskRunner,
+              "typescript" => TypeScriptTaskRunner,
+              "wasm" => WasmTaskRunner,
+            }
+
+            raise Errors::TaskRunnerNotFoundError unless task_runners[language]
+            task_runners[language].new(ctx)
+          end
+
+          def initialize(ctx)
+            @ctx = ctx
+          end
+
+          def build
+            raise NotImplementedError
+          end
+
+          def dependencies_installed?
+            raise NotImplementedError
+          end
+
+          def install_dependencies
+            raise NotImplementedError
+          end
+
+          def metadata_file_location
+            raise NotImplementedError
+          end
+
+          def library_version(_library_name)
+            raise NotImplementedError
           end
         end
       end

data/lib/project_types/script/layers/infrastructure/languages/typescript_task_runner.rb

@@ -4,19 +4,12 @@ module Script
   module Layers
     module Infrastructure
       module Languages
-        class TypeScriptTaskRunner
+        class TypeScriptTaskRunner < TaskRunner
           BYTECODE_FILE = "build/index.wasm"
           METADATA_FILE = "build/metadata.json"
           SCRIPT_SDK_BUILD = "npm run build"
           GEN_METADATA = "npm run gen-metadata"
 
-          attr_reader :ctx, :script_name
-
-          def initialize(ctx, script_name)
-            @ctx = ctx
-            @script_name = script_name
-          end
-
           def build
             compile
             bytecode

data/lib/project_types/script/layers/infrastructure/languages/wasm_task_runner.rb

@@ -4,19 +4,15 @@ module Script
   module Layers
     module Infrastructure
       module Languages
-        class WasmTaskRunner
+        class WasmTaskRunner < TaskRunner
           BYTECODE_FILE = "script.wasm"
-          attr_reader :ctx, :script_name
-
-          def initialize(ctx, script_name)
-            @ctx = ctx
-            @script_name = script_name
-          end
 
           def dependencies_installed?
             true
           end
 
+          def install_dependencies; end
+
           def library_version(_library_name)
             nil
           end

data/lib/project_types/script/messages/messages.rb

@@ -149,12 +149,12 @@ module Script
 
           language_library_for_api_not_found_cause: "Script can’t be pushed because the %{language} library for API %{api} is missing.",
           language_library_for_api_not_found_help: "Make sure extension_point.yml contains the correct API library.",
-          no_scripts_found_in_app: "The selected apps have no scripts. Create them first on the partners' dashboard.",
-          missing_env_file_variables: "The following variables are missing in the .env file: %s."\
-            " This can occur when the script hasn't been connected to an app."\
-            " To connect the script to an app, run {{command:%s script connect}}",
-          missing_push_options: "The following options are missing from .env: %s."\
-            " Run {{command:%s script connect}} to connect the script to an app and generate these options.",
+          no_scripts_found_in_app: "The selected apps have no scripts. Please, create them first on the partners' dashboard.",
+          missing_env_file_variables: "The following are missing in the .env file: %s."\
+            " To add it, run {{command:%s script connect}}",
+          missing_push_options: "The following are missing: %s. "\
+            "To add them to a CI environment:\n\t1. Run a connect command {{command:%s script connect}}\n\t2. Navigate to the .env file at the root of your project\n\t"\
+            "3. Copy the missing values, then pass them through as arguments.",
         },
 
         create: {

data/lib/project_types/theme/commands/check.rb

@@ -4,7 +4,6 @@ require "theme_check"
 module Theme
   class Command
     class Check < ShopifyCLI::Command::SubCommand
-      recommend_default_node_range
       recommend_default_ruby_range
 
       class Options < ShopifyCLI::Options

data/lib/project_types/theme/commands/delete.rb

@@ -5,7 +5,6 @@ require "shopify_cli/theme/development_theme"
 module Theme
   class Command
     class Delete < ShopifyCLI::Command::SubCommand
-      recommend_default_node_range
       recommend_default_ruby_range
 
       options do |parser, flags|

data/lib/project_types/theme/commands/init.rb

@@ -3,7 +3,6 @@
 module Theme
   class Command
     class Init < ShopifyCLI::Command::SubCommand
-      recommend_default_node_range
       recommend_default_ruby_range
 
       options do |parser, flags|

data/lib/project_types/theme/commands/language_server.rb

@@ -4,7 +4,6 @@ require "theme_check"
 module Theme
   class Command
     class LanguageServer < ShopifyCLI::Command::SubCommand
-      recommend_default_node_range
       recommend_default_ruby_range
 
       def call(*)

data/lib/project_types/theme/commands/package.rb

@@ -5,7 +5,6 @@ require "json"
 module Theme
   class Command
     class Package < ShopifyCLI::Command::SubCommand
-      recommend_default_node_range
       recommend_default_ruby_range
 
       THEME_DIRECTORIES = %w[

data/lib/project_types/theme/commands/publish.rb

@@ -4,7 +4,6 @@ require "shopify_cli/theme/theme"
 module Theme
   class Command
     class Publish < ShopifyCLI::Command::SubCommand
-      recommend_default_node_range
       recommend_default_ruby_range
 
       options do |parser, flags|

data/lib/project_types/theme/commands/pull.rb

@@ -7,7 +7,6 @@ require "shopify_cli/theme/syncer"
 module Theme
   class Command
     class Pull < ShopifyCLI::Command::SubCommand
-      recommend_default_node_range
       recommend_default_ruby_range
 
       options do |parser, flags|

data/lib/project_types/theme/commands/push.rb

@@ -8,7 +8,6 @@ require "shopify_cli/theme/syncer"
 module Theme
   class Command
     class Push < ShopifyCLI::Command::SubCommand
-      recommend_default_node_range
       recommend_default_ruby_range
 
       options do |parser, flags|

data/lib/project_types/theme/commands/serve.rb

@@ -4,7 +4,6 @@ require "shopify_cli/theme/dev_server"
 module Theme
   class Command
     class Serve < ShopifyCLI::Command::SubCommand
-      recommend_default_node_range
       recommend_default_ruby_range
 
       DEFAULT_HTTP_HOST = "127.0.0.1"

data/lib/shopify_cli/command.rb

@@ -100,14 +100,20 @@ module ShopifyCLI
       end
 
       def check_node_version
+        context = Context.new
+        if @compatible_node_range && context.which("node").nil?
+          raise ShopifyCLI::Abort, context.message("core.errors.missing_node")
+        end
+
         check_version(
           Environment.node_version,
           range: @compatible_node_range,
-          runtime: "Node"
+          runtime: "Node",
+          context: context
         )
       end
 
-      def check_version(version, range:, runtime:)
+      def check_version(version, range:, runtime:, context: Context.new)
         return if Environment.test?
         return if range.nil?
 
@@ -116,7 +122,7 @@ module ShopifyCLI
         is_lower_than_top = version_without_pre_nor_build < Utilities.version_dropping_pre_and_build(range.to)
         return if is_higher_than_bottom && is_lower_than_top
 
-        Context.new.warn("Your environment #{runtime} version, #{version},"\
+        context.warn("Your environment #{runtime} version, #{version},"\
           " is outside of the range supported by the CLI,"\
           " #{range.from}..<#{range.to},"\
           " and might cause incompatibility issues.")

data/lib/shopify_cli/commands/app/create/rails.rb

@@ -5,8 +5,8 @@ module ShopifyCLI
         class Rails < ShopifyCLI::Command::AppSubCommand
           prerequisite_task :ensure_authenticated
 
-          recommend_default_node_range
           recommend_default_ruby_range
+          recommend_default_node_range
 
           options do |parser, flags|
             parser.on("--name=NAME") { |t| flags[:name] = t }

data/lib/shopify_cli/commands/app/create.rb

@@ -6,9 +6,6 @@ module ShopifyCLI
         subcommand :PHP, "php", "shopify_cli/commands/app/create/php"
         subcommand :Node, "node", "shopify_cli/commands/app/create/node"
 
-        recommend_default_node_range
-        recommend_default_ruby_range
-
         def call(_args, _command_name)
           @ctx.puts(self.class.help)
         end

data/lib/shopify_cli/commands/app/deploy.rb

@@ -4,7 +4,6 @@ module ShopifyCLI
       class Deploy < ShopifyCLI::Command::AppSubCommand
         subcommand :Heroku, "heroku", "shopify_cli/commands/app/deploy/heroku"
 
-        recommend_default_node_range
         recommend_default_ruby_range
 
         def call(args, _name)

data/lib/shopify_cli/commands/app/serve.rb

@@ -7,7 +7,6 @@ module ShopifyCLI
         prerequisite_task :ensure_env, :ensure_dev_store
 
         recommend_default_ruby_range
-        recommend_default_node_range
 
         options do |parser, flags|
           parser.on("--host=HOST") do |h|

data/lib/shopify_cli/constants.rb

@@ -38,7 +38,7 @@ module ShopifyCLI
 
       # When true the CLI points to spin instances of services
       SPIN = "SPIN"
-      INFER_SPIN = "INFER_SPIN"
+      SPIN_INSTANCE = "SPIN_INSTANCE"
       SPIN_WORKSPACE = "SPIN_WORKSPACE"
       SPIN_NAMESPACE = "SPIN_NAMESPACE"
       SPIN_HOST = "SPIN_HOST"

data/lib/shopify_cli/environment.rb

@@ -5,6 +5,11 @@ module ShopifyCLI
   # the environment in which the CLI runs
   module Environment
     TRUTHY_ENV_VARIABLE_VALUES = ["1", "true", "TRUE", "yes", "YES"]
+    SPIN_OVERRIDE_ENV_NAMES = [
+      Constants::EnvironmentVariables::SPIN_WORKSPACE,
+      Constants::EnvironmentVariables::SPIN_NAMESPACE,
+      Constants::EnvironmentVariables::SPIN_HOST,
+    ]
 
     def self.ruby_version(context: Context.new)
       out, err, stat = context.capture3('ruby -e "puts RUBY_VERSION"')
@@ -87,6 +92,20 @@ module ShopifyCLI
       end
     end
 
+    def self.spin_url_override(env_variables: ENV)
+      tokens = SPIN_OVERRIDE_ENV_NAMES.map do |name|
+        env_variables[name]
+      end
+
+      return if tokens.all?(&:nil?)
+
+      if tokens.any?(&:nil?)
+        raise "To manually target a spin instance, you must set #{SPIN_OVERRIDE_ENV_NAMES}"
+      else
+        tokens.join(".")
+      end
+    end
+
     def self.use_spin?(env_variables: ENV)
       env_variable_truthy?(
         Constants::EnvironmentVariables::SPIN,
@@ -97,32 +116,29 @@ module ShopifyCLI
       )
     end
 
-    def self.infer_spin?(env_variables: ENV)
-      env_variable_truthy?(
-        Constants::EnvironmentVariables::INFER_SPIN,
-        env_variables: env_variables
-      )
-    end
-
     def self.spin_url(env_variables: ENV)
-      if infer_spin?(env_variables: env_variables)
-        # TODO: Remove version check and delete spin-legacy branch
-        #  once spin2 becomes the installed "spin" binary by default
-        spin_version = %x(spin version 2> /dev/null).strip
-        if spin_version.start_with?("spin-")
-          # spin2
-          raise ShopifyCLI:: Abort, "SPIN_INSTANCE must be specified" unless ENV.key?("SPIN_INSTANCE")
-          %x(spin show -o fqdn 2> /dev/null).strip
-        else
-          # spin-legacy
-          %x(spin info fqdn 2> /dev/null).strip
-        end
+      override = spin_url_override(env_variables: env_variables)
+      return override unless override.nil?
+
+      spin_response = if env_variables.key?(
+        Constants::EnvironmentVariables::SPIN_INSTANCE
+      )
+        spin_show
       else
-        spin_workspace = spin_workspace(env_variables: env_variables)
-        spin_namespace = spin_namespace(env_variables: env_variables)
-        spin_host = spin_host(env_variables: env_variables)
-        "#{spin_workspace}.#{spin_namespace}.#{spin_host}"
+        spin_show(latest: true)
       end
+
+      begin
+        instance = JSON.parse(spin_response)
+        raise "Missing key 'fqdn' from spin show. Actual response: #{instance}" unless instance.include?("fqdn")
+        instance["fqdn"]
+      rescue => e
+        raise "Failed to infer spin environment from spin show response #{spin_response}: #{e}"
+      end
+    end
+
+    def self.spin_show(latest: false)
+      latest ? %x(spin show --latest --json) : %x(spin show --json)
     end
 
     def self.send_monorail_events?(env_variables: ENV)
@@ -139,27 +155,5 @@ module ShopifyCLI
     def self.env_variable_truthy?(variable_name, env_variables: ENV)
       TRUTHY_ENV_VARIABLE_VALUES.include?(env_variables[variable_name.to_s])
     end
-
-    def self.spin_workspace(env_variables: ENV)
-      env_value = env_variables[Constants::EnvironmentVariables::SPIN_WORKSPACE]
-      return env_value unless env_value.nil?
-
-      if env_value.nil?
-        raise "No value set for #{Constants::EnvironmentVariables::SPIN_WORKSPACE}"
-      end
-    end
-
-    def self.spin_namespace(env_variables: ENV)
-      env_value = env_variables[Constants::EnvironmentVariables::SPIN_NAMESPACE]
-      return env_value unless env_value.nil?
-
-      if env_value.nil?
-        raise "No value set for #{Constants::EnvironmentVariables::SPIN_NAMESPACE}"
-      end
-    end
-
-    def self.spin_host(env_variables: ENV)
-      env_variables[Constants::EnvironmentVariables::SPIN_HOST] || "us.spin.dev"
-    end
   end
 end

data/lib/shopify_cli/messages/messages.rb

@@ -15,6 +15,7 @@ module ShopifyCLI
       },
       core: {
         errors: {
+          missing_node: "Node is necessary for this command and was not found in the environment.",
           option_parser: {
             invalid_option: "The option {{command:%s}} is not supported.",
             missing_argument: "The required argument {{command:%s}} is missing.",

data/lib/shopify_cli/theme/dev_server/hot_reload/remote_file_reloader.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module ShopifyCLI
+  module Theme
+    module DevServer
+      class HotReload
+        class RemoteFileReloader
+          def initialize(ctx, theme:, streams:)
+            @ctx = ctx
+            @theme = theme
+            @streams = streams
+          end
+
+          def reload(file)
+            retries = 6
+
+            until retries.zero?
+              retries -= 1
+
+              _status, body = fetch_asset(file)
+              retries = 0 if updated_file?(body, file)
+
+              wait
+            end
+
+            notify(file)
+          end
+
+          private
+
+          def updated_file?(body, file)
+            remote_checksum = body.dig("asset", "checksum")
+            local_checksum = file.checksum
+
+            remote_checksum == local_checksum
+          end
+
+          def notify(file)
+            @streams.broadcast(JSON.generate(modified: [file]))
+            @ctx.debug("[RemoteFileReloader] Modified #{file}")
+          end
+
+          def wait
+            sleep(1)
+          end
+
+          def fetch_asset(file)
+            ShopifyCLI::AdminAPI.rest_request(
+              @ctx,
+              shop: @theme.shop,
+              path: "themes/#{@theme.id}/assets.json",
+              method: "GET",
+              api_version: "unstable",
+              query: URI.encode_www_form("asset[key]" => file.relative_path.to_s),
+            )
+          rescue ShopifyCLI::API::APIRequestNotFoundError
+            [404, {}]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/theme/dev_server/hot_reload.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "hot_reload/remote_file_reloader"
+
 module ShopifyCLI
   module Theme
     module DevServer
@@ -10,6 +12,7 @@ module ShopifyCLI
           @theme = theme
           @mode = mode
           @streams = SSE::Streams.new
+          @remote_file_reloader = RemoteFileReloader.new(ctx, theme: @theme, streams: @streams)
           @watcher = watcher
           @watcher.add_observer(self, :notify_streams_of_file_change)
           @ignore_filter = ignore_filter
@@ -32,17 +35,30 @@ module ShopifyCLI
         end
 
         def notify_streams_of_file_change(modified, added, _removed)
-          files = (modified + added).reject { |file| @ignore_filter&.ignore?(file) }
-            .map { |file| @theme[file].relative_path }
+          files = (modified + added)
+            .reject { |file| @ignore_filter&.ignore?(file) }
+            .map { |file| @theme[file] }
 
-          unless files.empty?
-            @streams.broadcast(JSON.generate(modified: files))
-            @ctx.debug("[HotReload] Modified #{files.join(", ")}")
-          end
+          files -= liquid_css_files = files.select(&:liquid_css?)
+
+          hot_reload(files) unless files.empty?
+          remote_reload(liquid_css_files)
         end
 
         private
 
+        def hot_reload(files)
+          paths = files.map(&:relative_path)
+          @streams.broadcast(JSON.generate(modified: paths))
+          @ctx.debug("[HotReload] Modified #{paths.join(", ")}")
+        end
+
+        def remote_reload(files)
+          files.each do |file|
+            @remote_file_reloader.reload(file)
+          end
+        end
+
         def request_is_html?(headers)
           headers["content-type"]&.start_with?("text/html")
         end

data/lib/shopify_cli/theme/dev_server/proxy.rb

@@ -43,9 +43,8 @@ module ShopifyCLI
           headers["Accept-Encoding"] = "none"
           headers["User-Agent"] = "Shopify CLI"
 
-          query = URI.decode_www_form(env["QUERY_STRING"]).to_h
+          query = URI.decode_www_form(env["QUERY_STRING"])
           replace_templates = build_replace_templates_param(env)
-
           response = if replace_templates.any?
             # Pass to SFR the recently modified templates in `replace_templates` body param
             headers["Authorization"] = "Bearer #{bearer_token}"
@@ -158,7 +157,7 @@ module ShopifyCLI
         def secure_session_id
           if secure_session_id_expired?
             @ctx.debug("Refreshing preview _secure_session_id cookie")
-            response = request("HEAD", "/", query: { preview_theme_id: @theme.id })
+            response = request("HEAD", "/", query: [[:preview_theme_id, @theme.id]])
             @secure_session_id = extract_secure_session_id_from_response_headers(response)
             @last_session_cookie_refresh = Time.now
           end
@@ -189,9 +188,9 @@ module ShopifyCLI
           response_headers
         end
 
-        def request(method, path, headers: nil, query: {}, form_data: nil, body_stream: nil)
+        def request(method, path, headers: nil, query: [], form_data: nil, body_stream: nil)
           uri = URI.join("https://#{@theme.shop}", path)
-          uri.query = URI.encode_www_form(query.merge(_fd: 0, pb: 0))
+          uri.query = URI.encode_www_form(query + [[:_fd, 0], [:pb, 0]])
 
           @ctx.debug("Proxying #{method} #{uri}")
 

data/lib/shopify_cli/theme/file.rb

@@ -53,6 +53,10 @@ module ShopifyCLI
         path.extname == ".liquid"
       end
 
+      def liquid_css?
+        relative_path.to_s.end_with?(".css.liquid")
+      end
+
       def json?
         path.extname == ".json"
       end

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.11.0"
+  VERSION = "2.11.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.11.1
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -469,6 +469,7 @@ files:
 - lib/shopify_cli/theme/dev_server/header_hash.rb
 - lib/shopify_cli/theme/dev_server/hot-reload.js
 - lib/shopify_cli/theme/dev_server/hot_reload.rb
+- lib/shopify_cli/theme/dev_server/hot_reload/remote_file_reloader.rb
 - lib/shopify_cli/theme/dev_server/local_assets.rb
 - lib/shopify_cli/theme/dev_server/proxy.rb
 - lib/shopify_cli/theme/dev_server/proxy/template_param_builder.rb