shopify-cli 2.7.0 → 2.7.4

data/lib/shopify_cli/theme/syncer.rb

@@ -2,24 +2,31 @@
 require "thread"
 require "json"
 require "base64"
+require "forwardable"
+
+require_relative "syncer/error_reporter"
+require_relative "syncer/standard_reporter"
+require_relative "syncer/operation"
 
 module ShopifyCLI
   module Theme
     class Syncer
-      class Operation < Struct.new(:method, :file)
-        def to_s
-          "#{method} #{file&.relative_path}"
-        end
-      end
+      extend Forwardable
+
       API_VERSION = "unstable"
 
       attr_reader :checksums
       attr_accessor :ignore_filter
 
+      def_delegators :@error_reporter, :has_any_error?
+
       def initialize(ctx, theme:, ignore_filter: nil)
         @ctx = ctx
         @theme = theme
         @ignore_filter = ignore_filter
+        @error_reporter = ErrorReporter.new(ctx)
+        @standard_reporter = StandardReporter.new(ctx)
+        @reporters = [@error_reporter, @standard_reporter]
 
         # Queue of `Operation`s waiting to be picked up from a thread for processing.
         @queue = Queue.new
@@ -30,12 +37,19 @@ module ShopifyCLI
         # Mutex used to pause all threads when backing-off when hitting API rate limits
         @backoff_mutex = Mutex.new
 
-        # Allows delaying log of errors, mainly to not break the progress bar.
-        @delay_errors = false
-        @delayed_errors = []
-
         # Latest theme assets checksums. Updated on each upload.
         @checksums = {}
+
+        # Checksums of assets with errors. 
+        @error_checksums = []
+      end
+
+      def lock_io!
+        @reporters.each { |reporter| reporter.disable! }
+      end
+
+      def unlock_io!
+        @reporters.each { |reporter| reporter.enable! }
       end
 
       def enqueue_updates(files)
@@ -103,25 +117,14 @@ module ShopifyCLI
               break if operation.nil? # shutdown was called
               perform(operation)
             rescue Exception => e
-              report_error(
-                "{{red:ERROR}} {{blue:#{operation}}}: #{e}" +
-                (@ctx.debug? ? "\n\t#{e.backtrace.join("\n\t")}" : "")
-              )
+              error_suffix = ": #{e}"
+              error_suffix += + "\n\t#{e.backtrace.join("\n\t")}" if @ctx.debug?
+              report_error(operation, error_suffix)
             end
           end
         end
       end
 
-      def delay_errors!
-        @delay_errors = true
-      end
-
-      def report_errors!
-        @delay_errors = false
-        @delayed_errors.each { |error| report_error(error) }
-        @delayed_errors.clear
-      end
-
       def upload_theme!(delay_low_priority_files: false, delete: true, &block)
         fetch_checksums!
 
@@ -177,21 +180,27 @@ module ShopifyCLI
 
       private
 
+      def report_error(operation, error_suffix = "")
+        @error_checksums << @checksums[operation.file_path]
+        @error_reporter.report("#{operation.as_error_message}#{error_suffix}")
+      end
+
       def enqueue(method, file)
         raise ArgumentError, "file required" unless file
 
-        operation = Operation.new(method, @theme[file])
+        operation = Operation.new(@ctx, method, @theme[file])
 
         # Already enqueued
         return if @pending.include?(operation)
 
-        if @ignore_filter&.ignore?(operation.file.relative_path)
-          @ctx.debug("ignore #{operation.file.relative_path}")
+        if @ignore_filter&.ignore?(operation.file_path)
+          @ctx.debug("ignore #{operation.file_path}")
           return
         end
 
         if [:update, :get].include?(method) && operation.file.exist? && !file_has_changed?(operation.file)
-          @ctx.debug("skip #{operation}")
+          is_fixed = !!@error_checksums.delete(operation.file.checksum)
+          @standard_reporter.report(operation.as_fix_message) if is_fixed
           return
         end
 
@@ -206,16 +215,16 @@ module ShopifyCLI
 
         response = send(operation.method, operation.file)
 
+        @standard_reporter.report(operation.as_synced_message)
+
         # Check if the API told us we're near the rate limit
         if !backingoff? && (limit = response["x-shopify-shop-api-call-limit"])
           used, total = limit.split("/").map(&:to_i)
           backoff_if_near_limit!(used, total)
         end
       rescue ShopifyCLI::API::APIRequestError => e
-        report_error(
-          "{{red:ERROR}} {{blue:#{operation}}}:\n  " +
-          parse_api_errors(e).join("\n  ")
-        )
+        error_suffix = ":\n  " + parse_api_errors(e).join("\n  ")
+        report_error(operation, error_suffix)
       ensure
         @pending.delete(operation)
       end
@@ -295,14 +304,6 @@ module ShopifyCLI
         file.checksum != @checksums[file.relative_path.to_s]
       end
 
-      def report_error(error)
-        if @delay_errors
-          @delayed_errors << error
-        else
-          @ctx.puts(error)
-        end
-      end
-
       def parse_api_errors(exception)
         parsed_body = JSON.parse(exception&.response&.body)
         message = parsed_body.dig("errors", "asset") || parsed_body["message"] || exception.message

data/lib/shopify_cli/theme/theme.rb

@@ -162,26 +162,38 @@ module ShopifyCLI
         }
       end
 
-      def self.all(ctx, root: nil)
-        _status, body = AdminAPI.rest_request(
-          ctx,
-          shop: AdminAPI.get_shop_or_abort(ctx),
-          path: "themes.json",
-          api_version: "unstable",
-        )
+      class << self
+        def all(ctx, root: nil)
+          _status, body = fetch_themes(ctx)
+
+          body["themes"]
+            .sort_by { |theme_attrs| Time.parse(theme_attrs["updated_at"]) }
+            .reverse
+            .map { |theme_attrs| new(ctx, root: root, **allowed_attrs(theme_attrs)) }
+        end
+
+        def live(ctx, root: nil)
+          _status, body = fetch_themes(ctx)
 
-        body["themes"]
-          .sort_by { |attributes| Time.parse(attributes["updated_at"]) }
-          .reverse
-          .map do |attributes|
-            new(
-              ctx,
-              root: root,
-              id: attributes["id"],
-              name: attributes["name"],
-              role: attributes["role"],
-            )
-          end
+          body["themes"]
+            .find { |theme_attrs| theme_attrs["role"] == "main" }
+            .tap { |theme_attrs| break new(ctx, root: root, **allowed_attrs(theme_attrs)) }
+        end
+
+        private
+
+        def allowed_attrs(attrs)
+          attrs.slice("id", "name", "role").transform_keys(&:to_sym)
+        end
+
+        def fetch_themes(ctx)
+          AdminAPI.rest_request(
+            ctx,
+            shop: AdminAPI.get_shop_or_abort(ctx),
+            path: "themes.json",
+            api_version: "unstable",
+          )
+        end
       end
 
       private

data/lib/shopify_cli/thread_pool/job.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module ShopifyCLI
+  class ThreadPool
+    class Job
+      attr_reader :error
+
+      def perform!
+        raise "`#{self.class.name}#perform!` must be defined"
+      end
+
+      def call
+        perform!
+      rescue StandardError => error
+        @error = error
+      end
+
+      def success?
+        !@error
+      end
+
+      def error?
+        !!@error
+      end
+    end
+  end
+end

data/lib/shopify_cli/thread_pool.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module ShopifyCLI
+  class ThreadPool
+    attr_reader :errors
+
+    def initialize(pool_size: 10)
+      @jobs = Queue.new
+      @pool = Array.new(pool_size) { spawn_thread }
+    end
+
+    def schedule(job)
+      @jobs << job
+    end
+
+    def shutdown
+      @pool.size.times do
+        schedule(-> { throw(:stop_thread) })
+      end
+      @pool.map(&:join)
+    ensure
+      @jobs.close
+    end
+
+    private
+
+    def spawn_thread
+      Thread.new do
+        catch(:stop_thread) do
+          loop do
+            @jobs.pop.call
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/tunnel.rb

@@ -12,7 +12,7 @@ module ShopifyCLI
   class Tunnel
     extend SingleForwardable
 
-    def_delegators :new, :start, :stop, :auth, :stats, :urls, :running_on?
+    def_delegators :new, :start, :stop, :auth, :authenticated?, :stats, :urls, :running_on?
 
     class FetchUrlError < RuntimeError; end
     class NgrokError < RuntimeError; end
@@ -21,6 +21,7 @@ module ShopifyCLI
     # mapping for supported operating systems for where to download ngrok from.
     DOWNLOAD_URLS = {
       mac: "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-darwin-amd64.zip",
+      mac_m1: "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-darwin-arm64.zip",
       linux: "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip",
       windows: "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-windows-amd64.zip",
     }
@@ -65,16 +66,12 @@ module ShopifyCLI
     #
     def start(ctx, port: PORT)
       install(ctx)
-      url, account, seconds_remaining = start_ngrok(ctx, port)
-      if account
+      if authenticated?
+        url, account = start_ngrok(ctx, port)
         ctx.puts(ctx.message("core.tunnel.start_with_account", url, account))
       else
-        if seconds_remaining <= 0
-          ctx.puts(ctx.message("core.tunnel.timed_out"))
-          url, _account, seconds_remaining = restart_ngrok(ctx, port)
-        end
+        url, _ = restart_ngrok(ctx, port)
         ctx.puts(ctx.message("core.tunnel.start", url))
-        ctx.puts(ctx.message("core.tunnel.will_timeout", seconds_to_hm(seconds_remaining)))
         ctx.puts(ctx.message("core.tunnel.signup_suggestion", ShopifyCLI::TOOL_NAME))
       end
       url
@@ -91,7 +88,16 @@ module ShopifyCLI
     #
     def auth(ctx, token)
       install(ctx)
-      ctx.system(File.join(ShopifyCLI.cache_dir, "ngrok"), "authtoken", token)
+      ctx.system(ngrok_path(ctx), "authtoken", token)
+    end
+
+    ##
+    # returns a boolean: if the user has a ngrok token to authenticate
+    #
+    def authenticated?
+      ngrok_config_path = File.join(Dir.home, ".ngrok2/ngrok.yml")
+      return false unless File.exist?(ngrok_config_path)
+      File.read(ngrok_config_path).include?("authtoken")
     end
 
     ##
@@ -145,7 +151,7 @@ module ShopifyCLI
 
     def install(ctx)
       ngrok = "ngrok#{ctx.executable_file_extension}"
-      return if File.exist?(File.join(ShopifyCLI.cache_dir, ngrok))
+      return if File.exist?(ngrok_path(ctx))
       check_prereq_command(ctx, "curl")
       check_prereq_command(ctx, ctx.linux? ? "unzip" : "tar")
       spinner = CLI::UI::SpinGroup.new
@@ -165,7 +171,7 @@ module ShopifyCLI
       spinner.wait
 
       # final check to see if ngrok is accessible
-      unless File.exist?(File.join(ShopifyCLI.cache_dir, ngrok))
+      unless File.exist?(ngrok_path(ctx))
         ctx.abort(ctx.message("core.tunnel.error.ngrok", ngrok, ShopifyCLI.cache_dir))
       end
     end
@@ -177,8 +183,9 @@ module ShopifyCLI
       raise e.class, e.message
     end
 
-    def ngrok_command(port)
-      "\"#{File.join(ShopifyCLI.cache_dir, "ngrok")}\" http -inspect=false -log=stdout -log-level=debug #{port}"
+    def ngrok_path(ctx)
+      ngrok = "ngrok#{ctx.executable_file_extension}"
+      File.join(ShopifyCLI.cache_dir, ngrok)
     end
 
     def seconds_to_hm(seconds)
@@ -186,16 +193,14 @@ module ShopifyCLI
     end
 
     def start_ngrok(ctx, port)
-      process = ShopifyCLI::ProcessSupervision.start(:ngrok, ngrok_command(port))
+      ngrok_command = "\"#{ngrok_path(ctx)}\" http -inspect=false -log=stdout -log-level=debug #{port}"
+      process = ShopifyCLI::ProcessSupervision.start(:ngrok, ngrok_command)
       log = fetch_url(ctx, process.log_path)
-      seconds_remaining = (process.time.to_i + log.timeout) - Time.now.to_i
-      [log.url, log.account, seconds_remaining]
+      [log.url, log.account]
     end
 
     def restart_ngrok(ctx, port)
-      unless ShopifyCLI::ProcessSupervision.stop(:ngrok)
-        ctx.abort(ctx.message("core.tunnel.error.stop"))
-      end
+      ShopifyCLI::ProcessSupervision.stop(:ngrok)
       start_ngrok(ctx, port)
     end
 
@@ -208,7 +213,7 @@ module ShopifyCLI
     class LogParser # :nodoc:
       TIMEOUT = 10
 
-      attr_reader :url, :account, :timeout
+      attr_reader :url, :account
 
       def initialize(log_path)
         @log_path = log_path
@@ -237,9 +242,8 @@ module ShopifyCLI
       end
 
       def parse_account
-        account, timeout, _ = @log.match(/AccountName:(.*)\s+SessionDuration:([\d]+) PlanName/)&.captures
+        account, _ = @log.match(/AccountName:(.*)\s+SessionDuration/)&.captures
         @account = account&.empty? ? nil : account
-        @timeout = timeout&.empty? ? 0 : timeout.to_i
       end
 
       def error

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.7.0"
+  VERSION = "2.7.4"
 end

data/shopify-cli.gemspec

@@ -41,5 +41,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency("bugsnag", "~> 6.22")
   spec.add_dependency("listen", "~> 3.7.0")
-  spec.add_dependency("theme-check", "~> 1.8.0")
+  spec.add_dependency("theme-check", "~> 1.9.0")
 end

data/vendor/deps/cli-kit/lib/cli/kit/error_handler.rb

@@ -114,7 +114,9 @@ module CLI
       end
 
       def print_error_message(e)
-        $stderr.puts(format_error_message(e.message))
+        CLI::UI::Frame.open("Error", color: :red, timing: false) do
+          $stderr.puts(format_error_message(e.message))
+        end
       end
     end
   end

data/vendor/deps/cli-kit/lib/cli/kit/system.rb

@@ -222,7 +222,7 @@ module CLI
         end
 
         def which(cmd, env)
-          exts = os == :windows ? env.fetch('PATHEXT').split(';') : ['']
+          exts = os == :windows ? env.fetch('PATHEXT', ['']).split(';') : ['']
           env.fetch('PATH', '').split(File::PATH_SEPARATOR).each do |path|
             exts.each do |ext|
               exe = File.join(path, "#{cmd}#{ext}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.4
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-15 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
 description: |
   Shopify CLI helps you build Shopify apps faster. It quickly scaffolds Node.js
   and Ruby on Rails embedded apps. It also automates many common tasks in the
@@ -150,6 +150,12 @@ files:
 - docs/contributors/testing.md
 - docs/users/installation.md
 - docs/users/migrate-from-themekit.md
+- ext/javy/hashes/javy-arm-macos-v0.1.0.gz.sha256
+- ext/javy/hashes/javy-x86_64-linux-v0.1.0.gz.sha256
+- ext/javy/hashes/javy-x86_64-macos-v0.1.0.gz.sha256
+- ext/javy/hashes/javy-x86_64-windows-v0.1.0.gz.sha256
+- ext/javy/javy.rb
+- ext/javy/version
 - ext/shopify-extensions/extconf.rb
 - ext/shopify-extensions/shopify_extensions.rb
 - ext/shopify-extensions/version
@@ -159,7 +165,6 @@ files:
 - lib/graphql/admin_introspection.graphql
 - lib/graphql/all_organizations.graphql
 - lib/graphql/all_orgs_with_apps.graphql
-- lib/graphql/all_orgs_with_extensions.graphql
 - lib/graphql/api_versions.graphql
 - lib/graphql/convert_dev_to_test_store.graphql
 - lib/graphql/create_app.graphql
@@ -172,6 +177,7 @@ files:
 - lib/graphql/find_organization.graphql
 - lib/graphql/get_app_by_api_key.graphql
 - lib/graphql/get_app_urls.graphql
+- lib/graphql/get_extension_registrations.graphql
 - lib/graphql/get_variant_id.graphql
 - lib/graphql/update_dashboard_urls.graphql
 - lib/project_types/extension/cli.rb
@@ -207,6 +213,8 @@ files:
 - lib/project_types/extension/forms/questions/ask_registration.rb
 - lib/project_types/extension/forms/questions/ask_template.rb
 - lib/project_types/extension/forms/questions/ask_type.rb
+- lib/project_types/extension/loaders/project.rb
+- lib/project_types/extension/loaders/specification_handler.rb
 - lib/project_types/extension/messages/message_loading.rb
 - lib/project_types/extension/messages/messages.rb
 - lib/project_types/extension/models/app.rb
@@ -244,6 +252,10 @@ files:
 - lib/project_types/extension/tasks/converters/version_converter.rb
 - lib/project_types/extension/tasks/create_extension.rb
 - lib/project_types/extension/tasks/ensure_resource_url.rb
+- lib/project_types/extension/tasks/execute_commands/base.rb
+- lib/project_types/extension/tasks/execute_commands/build.rb
+- lib/project_types/extension/tasks/execute_commands/create.rb
+- lib/project_types/extension/tasks/execute_commands/serve.rb
 - lib/project_types/extension/tasks/fetch_specifications.rb
 - lib/project_types/extension/tasks/find_npm_packages.rb
 - lib/project_types/extension/tasks/find_package_from_json.rb
@@ -252,7 +264,6 @@ files:
 - lib/project_types/extension/tasks/get_extensions.rb
 - lib/project_types/extension/tasks/get_product.rb
 - lib/project_types/extension/tasks/merge_server_config.rb
-- lib/project_types/extension/tasks/run_extension_command.rb
 - lib/project_types/extension/tasks/update_draft.rb
 - lib/project_types/extension/tasks/user_errors.rb
 - lib/project_types/node/cli.rb
@@ -268,16 +279,23 @@ files:
 - lib/project_types/rails/messages/messages.rb
 - lib/project_types/rails/ruby.rb
 - lib/project_types/script/cli.rb
+- lib/project_types/script/commands/connect.rb
 - lib/project_types/script/commands/create.rb
+- lib/project_types/script/commands/javy.rb
 - lib/project_types/script/commands/push.rb
 - lib/project_types/script/config/extension_points.yml
 - lib/project_types/script/errors.rb
+- lib/project_types/script/forms/ask_app.rb
+- lib/project_types/script/forms/ask_org.rb
+- lib/project_types/script/forms/ask_script_uuid.rb
 - lib/project_types/script/forms/create.rb
+- lib/project_types/script/forms/run_against_shopify_org.rb
 - lib/project_types/script/graphql/app_script_set.graphql
 - lib/project_types/script/graphql/get_app_scripts.graphql
 - lib/project_types/script/graphql/module_upload_url_generate.graphql
 - lib/project_types/script/graphql/script_service_proxy.graphql
 - lib/project_types/script/layers/application/build_script.rb
+- lib/project_types/script/layers/application/connect_app.rb
 - lib/project_types/script/layers/application/create_script.rb
 - lib/project_types/script/layers/application/extension_points.rb
 - lib/project_types/script/layers/application/project_dependencies.rb
@@ -286,7 +304,7 @@ files:
 - lib/project_types/script/layers/domain/extension_point.rb
 - lib/project_types/script/layers/domain/metadata.rb
 - lib/project_types/script/layers/domain/push_package.rb
-- lib/project_types/script/layers/domain/script_json.rb
+- lib/project_types/script/layers/domain/script_config.rb
 - lib/project_types/script/layers/domain/script_project.rb
 - lib/project_types/script/layers/infrastructure/api_clients/partners_proxy_api_client.rb
 - lib/project_types/script/layers/infrastructure/api_clients/script_service_api_client.rb
@@ -305,7 +323,6 @@ files:
 - lib/project_types/script/layers/infrastructure/script_uploader.rb
 - lib/project_types/script/layers/infrastructure/service_locator.rb
 - lib/project_types/script/messages/messages.rb
-- lib/project_types/script/tasks/ensure_env.rb
 - lib/project_types/script/ui/error_handler.rb
 - lib/project_types/script/ui/printing_spinner.rb
 - lib/project_types/script/ui/strict_spinner.rb
@@ -396,6 +413,8 @@ files:
 - lib/shopify_cli/options.rb
 - lib/shopify_cli/packager.rb
 - lib/shopify_cli/partners_api.rb
+- lib/shopify_cli/partners_api/app_extensions.rb
+- lib/shopify_cli/partners_api/app_extensions/job.rb
 - lib/shopify_cli/partners_api/organizations.rb
 - lib/shopify_cli/php_deps.rb
 - lib/shopify_cli/process_supervision.rb
@@ -437,12 +456,14 @@ files:
 - lib/shopify_cli/tasks/select_org_and_shop.rb
 - lib/shopify_cli/tasks/update_dashboard_urls.rb
 - lib/shopify_cli/theme/dev_server.rb
+- lib/shopify_cli/theme/dev_server/cdn_fonts.rb
 - lib/shopify_cli/theme/dev_server/certificate_manager.rb
 - 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/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/sse.rb
 - lib/shopify_cli/theme/dev_server/watcher.rb
 - lib/shopify_cli/theme/dev_server/web_server.rb
@@ -451,7 +472,12 @@ files:
 - lib/shopify_cli/theme/ignore_filter.rb
 - lib/shopify_cli/theme/mime_type.rb
 - lib/shopify_cli/theme/syncer.rb
+- lib/shopify_cli/theme/syncer/error_reporter.rb
+- lib/shopify_cli/theme/syncer/operation.rb
+- lib/shopify_cli/theme/syncer/standard_reporter.rb
 - lib/shopify_cli/theme/theme.rb
+- lib/shopify_cli/thread_pool.rb
+- lib/shopify_cli/thread_pool/job.rb
 - lib/shopify_cli/transform_data_structure.rb
 - lib/shopify_cli/tunnel.rb
 - lib/shopify_cli/version.rb

data/lib/graphql/all_orgs_with_extensions.graphql

@@ -1,37 +0,0 @@
-query AllOrgs ($type: String) {
-  organizations {
-    nodes {
-      id
-      businessName
-      website
-      apps(first: 500) {
-        nodes {
-          id
-          title
-          apiKey
-          apiSecretKeys{
-            secret
-          }
-          appType
-          extensionRegistrations(specificationIdentifier: $type) {
-            id
-            type
-            uuid
-            title
-            draftVersion {
-                registrationId
-                context
-                lastUserInteractionAt
-                location
-                validationErrors { field message }
-
-                id
-                uuid
-                versionTag
-            }
-          }
-        }
-      }
-    }
-  }
-}