shopify-cli 2.7.1 → 2.8.0

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",
     }
@@ -87,7 +88,7 @@ module ShopifyCLI
     #
     def auth(ctx, token)
       install(ctx)
-      ctx.system(ngrok_path, "authtoken", token)
+      ctx.system(ngrok_path(ctx), "authtoken", token)
     end
 
     ##
@@ -150,7 +151,7 @@ module ShopifyCLI
 
     def install(ctx)
       ngrok = "ngrok#{ctx.executable_file_extension}"
-      return if File.exist?(ngrok_path)
+      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
@@ -170,7 +171,7 @@ module ShopifyCLI
       spinner.wait
 
       # final check to see if ngrok is accessible
-      unless File.exist?(ngrok_path)
+      unless File.exist?(ngrok_path(ctx))
         ctx.abort(ctx.message("core.tunnel.error.ngrok", ngrok, ShopifyCLI.cache_dir))
       end
     end
@@ -182,12 +183,9 @@ module ShopifyCLI
       raise e.class, e.message
     end
 
-    def ngrok_path
-      File.join(ShopifyCLI.cache_dir, "ngrok")
-    end
-
-    def ngrok_command(port)
-      "\"#{ngrok_path}\" 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)
@@ -195,7 +193,8 @@ 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)
       [log.url, log.account]
     end

data/lib/shopify_cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.8.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-17 00:00:00.000000000 Z
+date: 2022-01-06 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,17 +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
@@ -289,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
@@ -308,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
@@ -399,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
@@ -440,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
@@ -454,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
-            }
-          }
-        }
-      }
-    }
-  }
-}

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

data/lib/project_types/script/tasks/ensure_env.rb

@@ -1,106 +0,0 @@
-require "shopify_cli"
-
-module Script
-  module Tasks
-    class EnsureEnv < ShopifyCLI::Task
-      attr_accessor :ctx
-
-      def call(ctx)
-        self.ctx = ctx
-
-        script_project_repo = Layers::Infrastructure::ScriptProjectRepository.new(ctx: ctx)
-        script_project = script_project_repo.get
-
-        return false if script_project.api_key && script_project.api_secret && script_project.uuid_defined?
-
-        org = ask_org
-        app = ask_app(org["apps"])
-        uuid = ask_script_uuid(app, script_project.extension_point_type)
-
-        script_project_repo.create_env(
-          api_key: app["apiKey"],
-          secret: app["apiSecretKeys"].first["secret"],
-          uuid: uuid
-        )
-
-        true
-      end
-
-      private
-
-      def ask_org
-        return stubbed_org if partner_proxy_bypass
-
-        if ShopifyCLI::Shopifolk.check && wants_to_run_against_shopify_org?
-          ShopifyCLI::Shopifolk.act_as_shopify_organization
-        end
-
-        orgs = ShopifyCLI::PartnersAPI::Organizations.fetch_with_app(ctx)
-        if orgs.count == 1
-          default = orgs.first
-          ctx.puts(ctx.message("script.application.ensure_env.organization", default["businessName"], default["id"]))
-          default
-        elsif orgs.count > 0
-          CLI::UI::Prompt.ask(ctx.message("script.application.ensure_env.organization_select")) do |handler|
-            orgs.each do |org|
-              handler.option("#{org["businessName"]} (#{org["id"]})") { org }
-            end
-          end
-        else
-          raise Errors::NoExistingOrganizationsError
-        end
-      end
-
-      def stubbed_org
-        {
-          "apps" => [
-            {
-              "appType" => "custom",
-              "apiKey" => "stubbed-api-key",
-              "apiSecretKeys" => [{ "secret" => "stubbed-api-secret" }],
-              "title" => "Fake App (Not connected to Partners)",
-            },
-          ],
-        }
-      end
-
-      def partner_proxy_bypass
-        !ENV["BYPASS_PARTNERS_PROXY"].nil?
-      end
-
-      def ask_app(apps)
-        unless ShopifyCLI::Shopifolk.acting_as_shopify_organization?
-          apps = apps.select { |app| app["appType"] == "custom" }
-        end
-
-        if apps.count == 1
-          default = apps.first
-          ctx.puts(ctx.message("script.application.ensure_env.app", default["title"]))
-          default
-        elsif apps.count > 0
-          CLI::UI::Prompt.ask(ctx.message("script.application.ensure_env.app_select")) do |handler|
-            apps.each do |app|
-              handler.option(app["title"]) { app }
-            end
-          end
-        else
-          raise Errors::NoExistingAppsError
-        end
-      end
-
-      def ask_script_uuid(app, extension_point_type)
-        script_service = Layers::Infrastructure::ServiceLocator.script_service(ctx: ctx, api_key: app["apiKey"])
-        scripts = script_service.get_app_scripts(extension_point_type: extension_point_type)
-
-        return nil unless scripts.count > 0 &&
-          CLI::UI::Prompt.confirm(ctx.message("script.application.ensure_env.ask_connect_to_existing_script"))
-
-        CLI::UI::Prompt.ask(ctx.message("script.application.ensure_env.ask_which_script_to_connect_to")) do |handler|
-          scripts.each do |script|
-            handler.option("#{script["title"]} (#{script["uuid"]})") { script["uuid"] }
-          end
-        end
-      end
-    end
-  end
-end