shopify-cli 2.7.2 → 2.9.0

data/lib/shopify_cli/theme/dev_server.rb

@@ -3,8 +3,10 @@ require_relative "development_theme"
 require_relative "ignore_filter"
 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"
@@ -24,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)
@@ -33,8 +35,9 @@ module ShopifyCLI
 
           # Setup the middleware stack. Mimics Rack::Builder / config.ru, but in reverse order
           @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}"
 
@@ -81,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
@@ -92,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/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

@@ -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",
     }

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.7.2"
+  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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.9.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-30 00:00:00.000000000 Z
+date: 2022-01-17 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,10 @@ 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
@@ -161,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
@@ -174,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
@@ -209,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
@@ -246,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
@@ -254,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
@@ -270,6 +279,7 @@ 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
@@ -294,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
@@ -312,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
@@ -403,6 +415,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
@@ -444,12 +458,15 @@ 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/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
@@ -462,6 +479,8 @@ files:
 - 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
-            }
-          }
-        }
-      }
-    }
-  }
-}

data/lib/project_types/extension/tasks/run_extension_command.rb

@@ -1,82 +0,0 @@
-
-# frozen_string_literal: true
-require "shopify_cli"
-
-module Extension
-  module Tasks
-    class RunExtensionCommand < ShopifyCLI::Task
-      include SmartProperties
-
-      SUPPORTED_COMMANDS = [
-        "create",
-        "build",
-        "serve",
-      ]
-
-      property! :command, accepts: SUPPORTED_COMMANDS
-      property! :type, accepts: Models::DevelopmentServerRequirements::SUPPORTED_EXTENSION_TYPES
-      property! :context, accepts: ShopifyCLI::Context
-      property :config_file_name, accepts: String
-      property :port, accepts: Integer, default: 39351
-      property :resource_url, accepts: String
-      property :root_dir, accepts: String
-      property :template, accepts: Models::ServerConfig::Development::VALID_TEMPLATES
-      property :tunnel_url, accepts: String
-
-      def call
-        ShopifyCLI::Result.success(config_file_exists?)
-          .then(&method(:load_or_build_server_config))
-          .then(&method(:run_command))
-          .unwrap do |error|
-            raise error unless error.nil?
-          end
-      end
-
-      private
-
-      def config_file_exists?
-        return false if config_file_name.nil?
-        project = ExtensionProject.current
-        File.exist?(File.join(project.directory, config_file_name))
-      end
-
-      def load_or_build_server_config(config_file_exists)
-        return merge_server_config if config_file_exists
-        build_server_config
-      end
-
-      def merge_server_config
-        Tasks::MergeServerConfig.call(
-          context: context,
-          file_name: config_file_name,
-          resource_url: resource_url,
-          tunnel_url: tunnel_url,
-          type: type
-        )
-      end
-
-      def build_server_config
-        extension = Models::ServerConfig::Extension.build(
-          template: template,
-          type: type,
-          root_dir: root_dir,
-        )
-
-        Models::ServerConfig::Root.new(port: port, extensions: [extension])
-      end
-
-      def run_command(server_config)
-        case command
-        when "create"
-          Models::DevelopmentServer.new.create(server_config)
-        when "build"
-          Models::DevelopmentServer.new.build(server_config)
-        when "serve"
-          Models::DevelopmentServer.new.serve(context, server_config)
-        else
-          raise NotImplementedError
-        end
-      end
-    end
-  end
-end