shopify-cli 2.26.0 → 2.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1947b9e99b60efb4eb548badb8f41ee520f17ed0025a2666ec58a62594964abc
-  data.tar.gz: b7b7714ce470469573282c561c335103cb8471319785fd327a7f7e8442eb71d2
+  metadata.gz: e9563000eff4fb285eefdc448c66f51c45cb40b7119870a17994d87e0c037160
+  data.tar.gz: 6cb8dbe46c0b825679e8a301206869d6cd523c4881235e220d966a753f477d5e
 SHA512:
-  metadata.gz: 82a5eeb29ba45bf1e7eb407371c07922f14c3a7fe8ed0777b555ebbfa952a3dc35b303e0e477abe5c467bd01112e678ce31804051a52b92beb0bea2a323c5264
-  data.tar.gz: e24d863f0a3649d729242bd6104403d5642a6e04c44fc52adb6856d98c55e20c06ff4b13e4ca553ba01299b726ad89193ee97bcd322709deb060f681bbfeae6d
+  metadata.gz: 6f67ca0fc39a81731a425e5e7a8bd848d50f7ed698b31f6529b18af0365ab7ca2a8072cada700b0e98028c0d42b3b3cbfcae7108bc30a038d265f85d18b06ed8
+  data.tar.gz: afc2b9be9d9b59eca388fe71946ed696ed1e7faf28833468217f0933af1f4fac9ea9f08613cf08ec2b379886b06702641703790762323b8f58e5a40fccff1cb1

data/CHANGELOG.md

@@ -2,6 +2,19 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
+## Version 2.28.0 - 2022-10-17
+
+### Fixed
+* [#2646](https://github.com/Shopify/shopify-cli/pull/2646): Demo themes shouldn't appear in the `shopify theme pull/push/list/open` commands
+
+### Changed
+* [#2648](https://github.com/Shopify/shopify-cli/pull/2648): Do not warn users when the CLI 2.x is running as a subprocess
+
+## Version 2.27.0 - 2022-10-10
+
+### Fixed
+* [#2645](https://github.com/Shopify/shopify-cli/pull/2645): Fix issue that prevents the execution of `shopify extension serve` in some scenarios
+
 ## Version 2.26.0 - 2022-10-03
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.26.0)
+    shopify-cli (2.28.0)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
       theme-check (~> 1.11.0)

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

@@ -8,7 +8,7 @@ module Extension
         return Messages::MESSAGES if type_specific_messages.nil?
 
         if type_specific_messages.key?(:overrides)
-          deep_merge(Messages::MESSAGES, type_specific_messages[:overrides])
+          ShopifyCLI::Utilities.deep_merge(Messages::MESSAGES, type_specific_messages[:overrides])
         else
           Messages::MESSAGES
         end
@@ -29,11 +29,6 @@ module Extension
 
         TYPES[type_identifier_symbol]
       end
-
-      def self.deep_merge(first, second)
-        merger = proc { |_key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
-        first.merge(second, &merger)
-      end
     end
   end
 end

data/lib/project_types/extension/models/specification_handlers/default.rb

@@ -52,7 +52,12 @@ module Extension
           argo_runtime(context).supports?(:public_url)
         end
 
-        def serve(context:, port:, tunnel_url:, resource_url:)
+        def serve(**options)
+          context = options[:context]
+          port = options[:port]
+          tunnel_url = options[:tunnel_url]
+          resource_url = options[:resource_url]
+
           Features::ArgoServe.new(
             specification_handler: self,
             argo_runtime: argo_runtime(context),

data/lib/project_types/theme/cli.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 module Theme
   class Project < ShopifyCLI::ProjectType
     require Project.project_filepath("messages/messages")
-    register_messages(Theme::Messages::MESSAGES)
+    register_messages(Theme::Messages.all)
   end
 
   class Command < ShopifyCLI::Command::ProjectCommand

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

@@ -77,7 +77,8 @@ module Theme
       end
 
       def storefront_renderer_token
-        ShopifyCLI::DB.get(:storefront_renderer_production_exchange_token)
+        ShopifyCLI::Environment.storefront_renderer_auth_token ||
+          ShopifyCLI::DB.get(:storefront_renderer_production_exchange_token)
       end
     end
   end

data/lib/project_types/theme/messages/messages.rb

@@ -145,7 +145,7 @@ module Theme
               It looks like you are using credentials that do not work with {{command:%s theme serve}}.
             ERROR_MESSAGE
             help_message: <<~HELP_MESSAGE,
-              Run {{command:%s logout}} and {{command:%s login --password "" --store STORE}} to force the authentication thought your browser.
+              Run {{command:%s logout}} and {{command:%s login --password "" --store STORE}} to authenticate again.
             HELP_MESSAGE
           },
           operation: {
@@ -390,5 +390,31 @@ module Theme
         },
       },
     }.freeze
+
+    def self.all
+      # In order to support theme development inside CLI3, we spawn CLI2 as a
+      # subprocess. Whenever an error happens, we want to show the updated
+      # version of the commands for the user to try.
+      if ShopifyCLI::Environment.run_as_subprocess?
+        ShopifyCLI::Utilities.deep_merge(MESSAGES, {
+          theme: {
+            serve: {
+              auth: {
+                error_message: <<~ERROR_MESSAGE,
+                  It looks like you are using credentials that do not work with {{command:%s theme dev}}.
+                ERROR_MESSAGE
+                help_message: <<~HELP_MESSAGE,
+                  Run {{command:%s auth logout}} and {{command:%s theme dev --store STORE}} to authenticate again.
+                HELP_MESSAGE
+              },
+              binding_error: "Couldn't bind to localhost." \
+                " To serve your theme, set a different address with {{command:%s theme dev --host=<address>}}",
+            },
+          },
+        })
+      else
+        MESSAGES
+      end
+    end
   end
 end

data/lib/project_types/theme/presenters/themes_presenter.rb

@@ -5,7 +5,7 @@ require_relative "theme_presenter"
 module Theme
   module Presenters
     class ThemesPresenter
-      ORDER_BY_ROLE = %w(live unpublished development)
+      SUPPORTED_ROLES = %w(live unpublished development)
 
       def initialize(ctx, root)
         @ctx = ctx
@@ -14,16 +14,13 @@ module Theme
 
       def all
         all_themes
-          .sort_by { |theme| order_by_role(theme) }
+          .select { |theme| SUPPORTED_ROLES.include?(theme.role) }
+          .sort_by { |theme| SUPPORTED_ROLES.index(theme.role) }
           .map { |theme| ThemePresenter.new(theme) }
       end
 
       private
 
-      def order_by_role(theme)
-        ORDER_BY_ROLE.index(theme.role) || ORDER_BY_ROLE.size
-      end
-
       def all_themes
         ShopifyCLI::Theme::Theme.all(@ctx, root: @root)
       end

data/lib/shopify_cli/command.rb

@@ -117,7 +117,7 @@ module ShopifyCLI
       end
 
       def check_version(version, range:, runtime:, context: Context.new)
-        return if Environment.test?
+        return if Environment.test? || Environment.run_as_subprocess?
         return if range.nil?
 
         version_without_pre_nor_build = Utilities.version_dropping_pre_and_build(version)

data/lib/shopify_cli/messages/messages.rb

@@ -498,7 +498,7 @@ module ShopifyCLI
             "{{i}} Authentication required. Login to the URL below with your %s credentials to continue.",
 
           servlet: {
-            success_response: "You've successfuly logged into the Shopify CLI!",
+            success_response: "You've successfully logged into the Shopify CLI!",
             invalid_request_response: "Invalid request: %s",
             invalid_state_response: "The anti-forgery state token does not match the initial request.",
           },

data/lib/shopify_cli/utilities.rb

@@ -12,5 +12,10 @@ module ShopifyCLI
         curr = File.dirname(curr)
       end
     end
+
+    def self.deep_merge(first, second)
+      merger = proc { |_key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+      first.merge(second, &merger)
+    end
   end
 end

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.26.0"
+  VERSION = "2.28.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.26.0
+  version: 2.28.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-03 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler