shopify-cli 2.15.1 → 2.15.4

data/lib/shopify_cli/theme/theme_admin_api.rb

@@ -41,31 +41,46 @@ module ShopifyCLI
         )
       rescue ShopifyCLI::API::APIRequestForbiddenError,
              ShopifyCLI::API::APIRequestUnauthorizedError => error
+
+        ##
         # The Admin API returns 403 Forbidden responses on different
         # scenarios:
         #
         # * when a user doesn't have permissions for a request:
-        #   <APIRequestForbiddenError: 403 {}>
+        #   - <APIRequestForbiddenError: 403 {}>
+        #   - <APIRequestForbiddenError: 403 {"errors":"Unauthorized Access"}>
         #
         # * when an asset operation cannot be performed:
-        #   <APIRequestForbiddenError: 403 {"message":"templates/gift_card.liquid could not be deleted"}>
-        if empty_response_error?(error)
-          return handle_permissions_error
+        #   - <APIRequestForbiddenError: 403 {"message":"templates/gift_card.liquid could not be deleted"}>
+        #
+        if empty_response?(error) || unauthorized_response?(error)
+          return permission_error
         end
 
         raise error
       end
 
-      def handle_permissions_error
+      def permission_error
         ensure_user_error = @ctx.message("theme.ensure_user_error", shop)
         ensure_user_try_this = @ctx.message("theme.ensure_user_try_this")
 
         @ctx.abort(ensure_user_error, ensure_user_try_this)
       end
 
-      def empty_response_error?(error)
-        error_message = error&.response&.body.to_s
-        error_message.empty?
+      def empty_response?(error)
+        response_body(error).empty?
+      end
+
+      def unauthorized_response?(error)
+        parsed_body = JSON.parse(response_body(error))
+        errors = parsed_body["errors"].to_s
+        errors.match?(/Unauthorized Access/)
+      rescue JSON::ParserError
+        false
+      end
+
+      def response_body(error)
+        error&.response&.body.to_s
       end
     end
   end

data/lib/shopify_cli/thread_pool/job.rb

@@ -3,10 +3,14 @@
 module ShopifyCLI
   class ThreadPool
     class Job
-      attr_reader :error
+      attr_reader :error, :interval
+
+      def initialize(interval = 0)
+        @interval = interval
+      end
 
       def perform!
-        raise "`#{self.class.name}#perform!` must be defined"
+        raise "`#{self.class.name}#perform!' must be defined"
       end
 
       def call
@@ -22,6 +26,10 @@ module ShopifyCLI
       def error?
         !!@error
       end
+
+      def recurring?
+        !interval.zero?
+      end
     end
   end
 end

data/lib/shopify_cli/thread_pool.rb

@@ -27,11 +27,23 @@ module ShopifyCLI
     def spawn_thread
       Thread.new do
         catch(:stop_thread) do
-          loop do
-            @jobs.pop.call
-          end
+          loop { perform(@jobs.pop) }
         end
       end
     end
+
+    def perform(job)
+      job.call
+      reschedule(job) if job.recurring?
+    end
+
+    def reschedule(job)
+      wait(job.interval)
+      schedule(job)
+    end
+
+    def wait(seconds)
+      sleep(seconds)
+    end
   end
 end

data/lib/shopify_cli/tunnel.rb

@@ -66,14 +66,9 @@ module ShopifyCLI
     #
     def start(ctx, port: PORT)
       install(ctx)
-      if authenticated?
-        url, account = start_ngrok(ctx, port)
-        ctx.puts(ctx.message("core.tunnel.start_with_account", url, account))
-      else
-        url, _ = restart_ngrok(ctx, port)
-        ctx.puts(ctx.message("core.tunnel.start", url))
-        ctx.puts(ctx.message("core.tunnel.signup_suggestion", ShopifyCLI::TOOL_NAME))
-      end
+      ctx.abort(ctx.message("core.tunnel.error.signup_required", ShopifyCLI::TOOL_NAME)) unless authenticated?
+      url, account = start_ngrok(ctx, port)
+      ctx.puts(ctx.message("core.tunnel.start_with_account", url, account))
       url
     end
 
@@ -208,11 +203,6 @@ module ShopifyCLI
       [log.url, log.account]
     end
 
-    def restart_ngrok(ctx, port)
-      ShopifyCLI::ProcessSupervision.stop(:ngrok)
-      start_ngrok(ctx, port)
-    end
-
     def check_prereq_command(ctx, command)
       cmd_path = ctx.which(command)
       ctx.abort(ctx.message("core.tunnel.error.prereq_command_required", command)) if cmd_path.nil?

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.15.1"
+  VERSION = "2.15.4"
 end

data/vendor/deps/cli-ui/lib/cli/ui/os.rb

@@ -35,6 +35,10 @@ module CLI
           def shift_cursor_on_line_reset?
             false
           end
+
+          def path_separator
+            ":"
+          end
         end
       end
 
@@ -58,6 +62,10 @@ module CLI
           def shift_cursor_on_line_reset?
             true
           end
+
+          def path_separator
+            ";"
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.15.1
+  version: 2.15.4
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-24 00:00:00.000000000 Z
+date: 2022-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -158,15 +158,19 @@ files:
 - ext/javy/hashes/javy-arm-macos-v0.1.0.gz.sha256
 - ext/javy/hashes/javy-arm-macos-v0.2.0.gz.sha256
 - ext/javy/hashes/javy-arm-macos-v0.2.1.gz.sha256
+- ext/javy/hashes/javy-arm-macos-v0.3.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-linux-v0.1.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-linux-v0.2.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-linux-v0.2.1.gz.sha256
+- ext/javy/hashes/javy-x86_64-linux-v0.3.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-macos-v0.1.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-macos-v0.2.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-macos-v0.2.1.gz.sha256
+- ext/javy/hashes/javy-x86_64-macos-v0.3.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-windows-v0.1.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-windows-v0.2.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-windows-v0.2.1.gz.sha256
+- ext/javy/hashes/javy-x86_64-windows-v0.3.0.gz.sha256
 - ext/javy/javy.rb
 - ext/javy/version
 - ext/shopify-extensions/extconf.rb
@@ -247,6 +251,9 @@ files:
 - lib/project_types/extension/models/server_config/root.rb
 - lib/project_types/extension/models/server_config/user.rb
 - lib/project_types/extension/models/specification.rb
+- lib/project_types/extension/models/specification_handlers/beacon_extension.rb
+- lib/project_types/extension/models/specification_handlers/beacon_extension_utils/script_config.rb
+- lib/project_types/extension/models/specification_handlers/beacon_extension_utils/script_config_repository.rb
 - lib/project_types/extension/models/specification_handlers/checkout_post_purchase.rb
 - lib/project_types/extension/models/specification_handlers/checkout_ui_extension.rb
 - lib/project_types/extension/models/specification_handlers/default.rb
@@ -335,6 +342,7 @@ 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/layers/infrastructure/sparse_checkout_details.rb
 - lib/project_types/script/loaders/project.rb
 - lib/project_types/script/loaders/specification_handler.rb
 - lib/project_types/script/messages/messages.rb
@@ -354,6 +362,7 @@ files:
 - lib/project_types/theme/commands/pull.rb
 - lib/project_types/theme/commands/push.rb
 - lib/project_types/theme/commands/serve.rb
+- lib/project_types/theme/commands/share.rb
 - lib/project_types/theme/conversions/base_glob.rb
 - lib/project_types/theme/conversions/ignore_glob.rb
 - lib/project_types/theme/conversions/include_glob.rb
@@ -465,6 +474,7 @@ files:
 - lib/shopify_cli/services/app/serve/node_service.rb
 - lib/shopify_cli/services/app/serve/php_service.rb
 - lib/shopify_cli/services/app/serve/rails_service.rb
+- lib/shopify_cli/services/app/serve/serve_service.rb
 - lib/shopify_cli/services/app/tunnel/auth_service.rb
 - lib/shopify_cli/services/app/tunnel/start_service.rb
 - lib/shopify_cli/services/app/tunnel/stop_service.rb
@@ -490,10 +500,13 @@ files:
 - 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/hot_reload/sections_index.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
 - lib/shopify_cli/theme/dev_server/reload_mode.rb
+- lib/shopify_cli/theme/dev_server/remote_watcher.rb
+- lib/shopify_cli/theme/dev_server/remote_watcher/json_files_update_job.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
@@ -504,7 +517,17 @@ files:
 - lib/shopify_cli/theme/include_filter.rb
 - lib/shopify_cli/theme/mime_type.rb
 - lib/shopify_cli/theme/syncer.rb
+- lib/shopify_cli/theme/syncer/checksums.rb
 - lib/shopify_cli/theme/syncer/error_reporter.rb
+- lib/shopify_cli/theme/syncer/forms/apply_to_all.rb
+- lib/shopify_cli/theme/syncer/forms/apply_to_all_form.rb
+- lib/shopify_cli/theme/syncer/forms/base_strategy_form.rb
+- lib/shopify_cli/theme/syncer/forms/select_delete_strategy.rb
+- lib/shopify_cli/theme/syncer/forms/select_update_strategy.rb
+- lib/shopify_cli/theme/syncer/ignore_helper.rb
+- lib/shopify_cli/theme/syncer/json_delete_handler.rb
+- lib/shopify_cli/theme/syncer/json_update_handler.rb
+- lib/shopify_cli/theme/syncer/merger.rb
 - lib/shopify_cli/theme/syncer/operation.rb
 - lib/shopify_cli/theme/syncer/standard_reporter.rb
 - lib/shopify_cli/theme/theme.rb