shopify-cli 2.8.0 → 2.9.0

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module ShopifyCLI
+  module Theme
+    module DevServer
+      class ReloadMode
+        MODES = [:"hot-reload", :"full-page", :off]
+
+        class << self
+          def default
+            :"hot-reload"
+          end
+
+          def get!(mode)
+            MODES.find { |m| m == mode.to_sym } || raise_error(mode)
+          end
+
+          private
+
+          def raise_error(invalid_mode)
+            error_message = ShopifyCLI::Context.message("theme.serve.reload_mode_is_not_valid", invalid_mode)
+            help_message = ShopifyCLI::Context.message("theme.serve.try_a_valid_reload_mode", valid_modes)
+
+            ShopifyCLI::Context.abort(error_message, help_message)
+          end
+
+          def valid_modes
+            MODES.map { |v| "`#{v}`" }.join(", ")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/theme/dev_server.rb

@@ -6,6 +6,7 @@ require_relative "syncer"
 require_relative "dev_server/cdn_fonts"
 require_relative "dev_server/hot_reload"
 require_relative "dev_server/header_hash"
+require_relative "dev_server/reload_mode"
 require_relative "dev_server/local_assets"
 require_relative "dev_server/proxy"
 require_relative "dev_server/sse"
@@ -25,7 +26,7 @@ module ShopifyCLI
       class << self
         attr_accessor :ctx
 
-        def start(ctx, root, host: "127.0.0.1", port: 9292, poll: false)
+        def start(ctx, root, host: "127.0.0.1", port: 9292, poll: false, mode: ReloadMode.default)
           @ctx = ctx
           theme = DevelopmentTheme.new(ctx, root: root)
           ignore_filter = IgnoreFilter.from_path(root)
@@ -36,7 +37,7 @@ module ShopifyCLI
           @app = Proxy.new(ctx, theme: theme, syncer: @syncer)
           @app = CdnFonts.new(@app, theme: theme)
           @app = LocalAssets.new(ctx, @app, theme: theme)
-          @app = HotReload.new(ctx, @app, theme: theme, watcher: watcher, ignore_filter: ignore_filter)
+          @app = HotReload.new(ctx, @app, theme: theme, watcher: watcher, mode: mode, ignore_filter: ignore_filter)
           stopped = false
           address = "http://#{host}:#{port}"
 
@@ -83,7 +84,9 @@ module ShopifyCLI
                ShopifyCLI::API::APIRequestUnauthorizedError
           raise ShopifyCLI::Abort, @ctx.message("theme.serve.ensure_user", theme.shop)
         rescue Errno::EADDRINUSE
-          abort_address_already_in_use(address)
+          error_message = @ctx.message("theme.serve.address_already_in_use", address)
+          help_message = @ctx.message("theme.serve.try_port_option")
+          @ctx.abort(error_message, help_message)
         rescue Errno::EADDRNOTAVAIL
           raise AddressBindingError, "Error binding to the address #{host}."
         end
@@ -94,24 +97,6 @@ module ShopifyCLI
           @syncer.shutdown
           WebServer.shutdown
         end
-
-        private
-
-        def abort_address_already_in_use(address)
-          open_frame(@ctx.message("theme.serve.already_in_use_error"), color: :red) do
-            @ctx.puts(@ctx.message("theme.serve.address_already_in_use", address))
-          end
-
-          open_frame(@ctx.message("theme.serve.try_this"), color: :green) do
-            @ctx.puts(@ctx.message("theme.serve.try_port_option"))
-          end
-
-          raise ShopifyCLI::AbortSilent
-        end
-
-        def open_frame(title, color:, &block)
-          CLI::UI::Frame.open(title, color: CLI::UI.resolve_color(color), timing: false, &block)
-        end
       end
     end
   end

data/lib/shopify_cli/theme/theme.rb

@@ -173,15 +173,37 @@ module ShopifyCLI
         end
 
         def live(ctx, root: nil)
-          _status, body = fetch_themes(ctx)
+          find(ctx, root) { |attrs| attrs["role"] == "main" }
+        end
 
-          body["themes"]
-            .find { |theme_attrs| theme_attrs["role"] == "main" }
-            .tap { |theme_attrs| break new(ctx, root: root, **allowed_attrs(theme_attrs)) }
+        def development(ctx, root: nil)
+          find(ctx, root) { |attrs| attrs["role"] == "development" }
+        end
+
+        # Finds a Theme by its identifier
+        #
+        # #### Parameters
+        # * `ctx` - current running context of your command
+        # * `root` - theme root
+        # * `identifier` - theme ID or theme name
+        def find_by_identifier(ctx, root: nil, identifier:)
+          find(ctx, root) do |attrs|
+            attrs.slice("name", "id").values.map(&:to_s).include?(identifier)
+          end
         end
 
         private
 
+        def find(ctx, root, &block)
+          _status, body = fetch_themes(ctx)
+
+          body["themes"]
+            .find(&block)
+            .tap do |attrs|
+              break new(ctx, root: root, **allowed_attrs(attrs)) if attrs
+            end
+        end
+
         def allowed_attrs(attrs)
           attrs.slice("id", "name", "role").transform_keys(&:to_sym)
         end

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.8.0"
+  VERSION = "2.9.0"
 end

data/lib/shopify_cli.rb

@@ -139,6 +139,10 @@ module ShopifyCLI
   require "shopify_cli/messages/messages"
   Context.load_messages(ShopifyCLI::Messages::MESSAGES)
 
+  # cli-ui utilities for capturing the output close the stream while capturing.
+  # By setting the value here we persist the tty value for the whole lifetime of the process.
+  Environment.interactive = $stdin.tty?
+
   def self.cache_dir
     cache_dir = if Environment.test?
       TEMP_DIR

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -322,6 +322,8 @@ files:
 - lib/project_types/script/layers/infrastructure/script_service.rb
 - lib/project_types/script/layers/infrastructure/script_uploader.rb
 - lib/project_types/script/layers/infrastructure/service_locator.rb
+- lib/project_types/script/loaders/project.rb
+- lib/project_types/script/loaders/specification_handler.rb
 - lib/project_types/script/messages/messages.rb
 - lib/project_types/script/ui/error_handler.rb
 - lib/project_types/script/ui/printing_spinner.rb
@@ -464,6 +466,7 @@ files:
 - 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
+- lib/shopify_cli/theme/dev_server/reload_mode.rb
 - lib/shopify_cli/theme/dev_server/sse.rb
 - lib/shopify_cli/theme/dev_server/watcher.rb
 - lib/shopify_cli/theme/dev_server/web_server.rb