shopify-cli 2.6.5 → 2.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e55157b78cbbd9cd86e3d2e8c542241d7064de3fc4e37768f207dc8ee124f4c
-  data.tar.gz: 7b5aa9ae10f96a7724d4a0b0dd79712254ce3f99273a88c7e9198ec03f17ba7c
+  metadata.gz: bb41d18df964832b9ebc6be79e80006c4750c8d416c9550cbcc625d190bf26b9
+  data.tar.gz: d5c6b523faf27c0a6b3c53ccaadd1c4f47e932d7e0c2520e7f0bfcb2f7f7b820
 SHA512:
-  metadata.gz: b526446476543316cdd68a40cc5e28af1a0bd0d823757b53901c39b9e2f510a8fb9e9edd52f7fc967df44603d17d9092e95b375e12618f86f6261f45217b4802
-  data.tar.gz: 7ee68c03b039974c59d0cbc50ad866faf52ec436fe66b17c1a79e801c4ed1854ddf13fb82274e79e2917c5d63c0066b048d1255d4a3019349dd559b402d12cd8
+  metadata.gz: 396c3c47f510e78d67775fc6b6a091849ce8c3955d2c91ec516659ef4377df44a00a3faaa70facdd0649763b2a3b69f96ab4f859a003b23becd6baf3202d4b64
+  data.tar.gz: 1514e2a4c8f1841e8714a30f4e05450c5116863cc2c14cf5655143a43a49e1b5f6f2da1b8ffc2af6acd683359ea970920090ba55c6f82213e91de1cd4aeb7b87

data/CHANGELOG.md

@@ -1,6 +1,19 @@
 From version 2.6.0, the sections in this file adhere to the [keep a changelog](https://keepachangelog.com/en/1.0.0/) specification.
 ## [Unreleased]
 
+## Version 2.6.6
+### Added
+* [#1609](https://github.com/Shopify/shopify-cli/pull/1609): Add `--bind=HOST` option to `shopify theme serve`.
+
+### Fixed
+* [#1678](https://github.com/Shopify/shopify-cli/pull/1678): Fix migrator's incompatibility with Ruby 2.5.
+* [#1690](https://github.com/Shopify/shopify-cli/pull/1690): Fix `extension push` command for `PRODUCT_SUBSCRIPTION` extensions
+  
+### Changed
+* [#1678](https://github.com/Shopify/shopify-cli/pull/1678): Change the `@shopify/scripts-checkout-apis-temp` package name to `@shopify/scripts-discount-apis`.
+
+### Removed
+* [#1664](https://github.com/Shopify/shopify-cli/pull/1664): Remove ruby-locking extension
 ## Version 2.6.5
 ### Fixed
 * [#1661](https://github.com/Shopify/shopify-cli/pull/1661): Handle npm list non-zero exit status when pushing scripts
@@ -24,7 +37,7 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## Version 2.6.2
 * Fix broken installation due to a missing variable in `extconf.rb`
-  
+
 ## Version 2.6.1
 * [#1608](https://github.com/Shopify/shopify-cli/pull/1608): Fix errors not being reported.
 ## Version 2.6.0

data/CONTRIBUTING.md

@@ -13,7 +13,7 @@ Most of the internal components the project uses have unit tests to thoroughly t
 
 Acceptance tests run the built `shopify` command line against a wide range of fixtures and verify its output and results. They are the slowest to run however provide the most coverage. The idea is to test a few complete scenarios for each major feature.
 
-Those are written in [Cucumber](https://cucumber.io/) and Ruby and can be found in the [`features/`](/features) directory. They can be executed by running
+Those are written in [Cucumber](https://cucumber.io/) and Ruby and can be found in the [`features/`](/features) directory. They can be executed by running:
 
 ```bash
 bundle exec cucumber
@@ -21,3 +21,11 @@ bundle exec cucumber features/theme.feature:3 # A specific test
 ```
 
 > **Note** that we currently don't have an approach for stubbing the interactions with the GraphQL APIs and that therefore we can't write acceptance tests for commands that interact with APIs.
+
+#### Debugging acceptance tests
+When developing acceptance tests, it can be helpful to see the outputs of running commands.
+To see outputs, append `--verbose` when running an acceptance test. Example:
+
+```sh
+bundle exec cucumber features/theme.feature --verbose
+```

data/Dockerfile

@@ -6,8 +6,7 @@ FROM cimg/ruby:2.7.1
 RUN git config --global user.email "development-lifecycle@shopify.com"
 RUN git config --global user.name "Development Lifecycle"
 
-# throw errors if Gemfile has been modified since Gemfile.lock
-RUN bundle config --global frozen 1
+RUN gem update bundler
 
 WORKDIR /usr/src/app
 
@@ -24,4 +23,13 @@ RUN sudo apt-get install git -y
 # Install the latest version of NodeJS
 RUN sudo apt-get install ca-certificates -y
 RUN curl -fsSL https://deb.nodesource.com/setup_current.x | sudo -E bash -
-RUN sudo apt-get install -y nodejs
+RUN sudo apt-get install -y nodejs
+
+# Install the latest version of Yarn
+RUN sudo npm install --global yarn
+
+# Python is necessary to compile NPM packages with native extensions through node-gyp
+RUN sudo apt install python-minimal -y
+
+# Install sqlite3
+RUN sudo apt-get install libsqlite3-dev -y

data/Gemfile

@@ -14,6 +14,7 @@ group :development, :test do
   gem "rubocop-minitest", require: false
   gem "rubocop-rake", require: false
   gem "iniparse", "~> 1.5"
+  gem "colorize", "~> 0.8.1"
 end
 
 group :test do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.6.5)
+    shopify-cli (2.6.6)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
       theme-check (~> 1.7.2)
@@ -18,6 +18,7 @@ GEM
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
+    colorize (0.8.1)
     concurrent-ruby (1.1.9)
     crack (0.4.5)
       rexml
@@ -135,6 +136,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.2.2)
   byebug
+  colorize (~> 0.8.1)
   cucumber (~> 7.0)
   fakefs (>= 1.0)
   iniparse (~> 1.5)

data/lib/project_types/extension/cli.rb

@@ -43,6 +43,7 @@ module Extension
     autoload :GetProduct, Project.project_filepath("tasks/get_product")
     autoload :RunExtensionCommand, Project.project_filepath("tasks/run_extension_command")
     autoload :LoadServerConfig, Project.project_filepath("tasks/load_server_config")
+    autoload :FindPackageFromJson, Project.project_filepath("tasks/find_package_from_json.rb")
 
     module Converters
       autoload :RegistrationConverter, Project.project_filepath("tasks/converters/registration_converter")

data/lib/project_types/extension/commands/create.rb

@@ -11,6 +11,7 @@ module Extension
 
       options do |parser, flags|
         parser.on("--name=NAME") { |name| flags[:name] = name }
+        parser.on("--template=TEMPLATE") { |template| flags[:template] = template }
         parser.on("--type=TYPE") { |type| flags[:type] = type.upcase }
         parser.on("--api-key=KEY") { |key| flags[:api_key] = key.downcase }
         parser.on("--getting-started") { flags[:getting_started] = true }

data/lib/project_types/extension/features/argo.rb

@@ -48,14 +48,7 @@ module Extension
       end
 
       def renderer_package(context)
-        js_system = ShopifyCLI::JsSystem.new(ctx: context)
-        Tasks::FindNpmPackages
-          .exactly_one_of(renderer_package_name, js_system: js_system, production_only: true)
-          .unwrap { |err| raise err }
-      rescue Extension::PackageResolutionFailed
-        context.abort(
-          context.message("features.argo.dependencies.argo_missing_renderer_package_error")
-        )
+        Tasks::FindPackageFromJson.call(renderer_package_name, context: context)
       end
 
       private

data/lib/project_types/extension/features/argo_serve.rb

@@ -63,7 +63,7 @@ module Extension
         ShopifyCLI::Tasks::EnsureDevStore.call(context) if required_fields.include?(:shop)
 
         project = ExtensionProject.current
-        ensure_resource_resource_url! if specification_handler.supplies_resource_url?
+        ensure_resource_resource_url! if specification_handler.supplies_resource_url? && !supports_development_server?
 
         return if required_fields.all? do |field|
           value = project.env.public_send(field)

data/lib/project_types/extension/forms/create.rb

@@ -24,7 +24,7 @@ module Extension
         ShopifyCLI::Result.wrap(ExtensionProjectDetails.new)
           .then(&Questions::AskApp.new(ctx: ctx, api_key: api_key))
           .then(&Questions::AskType.new(ctx: ctx, type: type))
-          .then(&Questions::AskTemplate.new(ctx: ctx))
+          .then(&Questions::AskTemplate.new(ctx: ctx, template: template))
           .then(&Questions::AskName.new(ctx: ctx, name: name))
           .unwrap { |e| raise e }
           .tap do |project_details|

data/lib/project_types/extension/forms/questions/ask_template.rb

@@ -9,13 +9,14 @@ module Extension
         ]
 
         property! :ctx
+        property :template, accepts: Models::ServerConfig::Development::VALID_TEMPLATES
         property :prompt,
           accepts: ->(prompt) { prompt.respond_to?(:call) },
           default: -> { CLI::UI::Prompt.method(:ask) }
 
         def call(project_details)
           return project_details unless template_required?(project_details)
-          project_details.template = choose_interactively
+          project_details.template = template || choose_interactively
           project_details
         end
 

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

@@ -175,6 +175,7 @@ module Extension
       errors: {
         unknown_type: "Unknown extension type %s",
         package_not_found: "`%s` package not found.",
+        module_not_found: "Unable to find module %s. Ensure your dependencies are up-to-date and try again.",
       },
       warnings: {
         resource_url_auto_generation_failed: "{{*}} {{yellow:Warning:}} Unable to auto generate " \

data/lib/project_types/extension/models/server_config/extension.rb

@@ -5,10 +5,12 @@ module Extension
     module ServerConfig
       class Extension < Base
         include SmartProperties
+
         property! :uuid, accepts: String
         property! :type, accepts: String
         property! :user, accepts: ServerConfig::User
         property! :development, accepts: ServerConfig::Development
+        property :extension_points, accepts: Array
 
         def self.build(uuid: "", template:, type:, root_dir:)
           renderer = ServerConfig::DevelopmentRenderer.find(type)

data/lib/project_types/extension/tasks/converters/server_config_converter.rb

@@ -5,13 +5,11 @@ module Extension
   module Tasks
     module Converters
       module ServerConfigConverter
-        def self.from_hash(hash, type)
+        def self.from_hash(hash:, type:, registration_uuid:)
           context.abort(context.message("tasks.errors.parse_error")) if hash.nil?
 
-          project = ExtensionProject.current
-
           extension = Models::ServerConfig::Extension.new(
-            uuid: project.registration_uuid,
+            uuid: registration_uuid,
             type: type.upcase,
             user: Models::ServerConfig::User.new,
             development: Models::ServerConfig::Development.new(
@@ -20,7 +18,8 @@ module Extension
               entries: Models::ServerConfig::DevelopmentEntries.new(
                 main: hash.dig("development", "entries", "main")
               )
-            )
+            ),
+            extension_points: hash.dig("extension_points")
           )
 
           Models::ServerConfig::Root.new(extensions: [extension])

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+require "json"
+
+module Extension
+  module Tasks
+    class FindPackageFromJson < ShopifyCLI::Task
+      include SmartProperties
+
+      property! :context, accepts: ShopifyCLI::Context
+
+      def self.call(package_name, **config)
+        new(**config).call(package_name)
+      end
+
+      def call(package_name)
+        ShopifyCLI::Result.success(resolve_package_json(package_name))
+          .then { |file| File.read(file) }
+          .then { |file| JSON.parse(file) }
+          .then { |file| file.dig("version") }
+          .then { |version| return Models::NpmPackage.new(name: package_name, version: version) }
+          .unwrap do |error|
+            context.debug(error)
+            context.abort(context.message("errors.module_not_found", package_name))
+          end
+      end
+
+      private
+
+      def resolve_package_json(package_name)
+        path = "path.join(require.resolve('#{package_name}'), '../package.json')"
+        package_json, error, _ = CLI::Kit::System.capture3("node", "-p", path)
+        return error unless !error.nil?
+        package_json.chomp
+      end
+    end
+  end
+end

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

@@ -10,7 +10,12 @@ module Extension
       class << self
         def call(file_name:, type:)
           config = YAML.load_file(file_name)
-          Tasks::Converters::ServerConfigConverter.from_hash(config, type)
+          project = ExtensionProject.current
+          Tasks::Converters::ServerConfigConverter.from_hash(
+            hash: config,
+            type: type,
+            registration_uuid: project.registration_uuid
+          )
         rescue Psych::SyntaxError => e
           raise(
             ShopifyCLI::Abort,

data/lib/project_types/rails/commands/create.rb

@@ -2,7 +2,9 @@
 module Rails
   class Command
     class Create < ShopifyCLI::SubCommand
-      prerequisite_task :ensure_authenticated
+      unless ShopifyCLI::Environment.acceptance_test?
+        prerequisite_task :ensure_authenticated
+      end
 
       USER_AGENT_CODE = <<~USERAGENT
         module ShopifyAPI
@@ -31,8 +33,8 @@ module Rails
       end
 
       def call(args, _name)
-        form = Forms::Create.ask(@ctx, args, options.flags)
-        return @ctx.puts(self.class.help) if form.nil?
+        form_data = self.form_data(args)
+        return @ctx.puts(self.class.help) if form_data.nil?
 
         ruby_version = Ruby.version(@ctx)
         @ctx.abort(@ctx.message("rails.create.error.invalid_ruby_version")) unless
@@ -41,34 +43,61 @@ module Rails
         check_node
         check_yarn
 
-        build(form.name, form.db)
+        build(form_data.name, form_data.db)
+
         set_custom_ua
         ShopifyCLI::Project.write(
           @ctx,
           project_type: "rails",
-          organization_id: form.organization_id,
+          organization_id: form_data.organization_id,
         )
 
-        api_client = ShopifyCLI::Tasks::CreateApiClient.call(
-          @ctx,
-          org_id: form.organization_id,
-          title: form.title,
-          type: form.type,
-        )
+        api_client = if ShopifyCLI::Environment.acceptance_test?
+          {
+            "apiKey" => "public_api_key",
+            "apiSecretKeys" => [
+              {
+                "secret" => "api_secret_key",
+              },
+            ],
+          }
+        else
+          ShopifyCLI::Tasks::CreateApiClient.call(
+            @ctx,
+            org_id: form_data.organization_id,
+            title: form_data.title,
+            type: form_data.type,
+          )
+        end
 
         ShopifyCLI::Resources::EnvFile.new(
           api_key: api_client["apiKey"],
           secret: api_client["apiSecretKeys"].first["secret"],
-          shop: form.shop_domain,
+          shop: form_data.shop_domain,
           scopes: "write_products,write_customers,write_draft_orders",
         ).write(@ctx)
 
-        partners_url = ShopifyCLI::PartnersAPI.partners_url_for(form.organization_id, api_client["id"])
+        partners_url = ShopifyCLI::PartnersAPI.partners_url_for(form_data.organization_id, api_client["id"])
 
-        @ctx.puts(@ctx.message("apps.create.info.created", form.title, partners_url))
-        @ctx.puts(@ctx.message("apps.create.info.serve", form.name, ShopifyCLI::TOOL_NAME, "rails"))
+        @ctx.puts(@ctx.message("apps.create.info.created", form_data.title, partners_url))
+        @ctx.puts(@ctx.message("apps.create.info.serve", form_data.name, ShopifyCLI::TOOL_NAME, "rails"))
         unless ShopifyCLI::Shopifolk.acting_as_shopify_organization?
-          @ctx.puts(@ctx.message("apps.create.info.install", partners_url, form.title))
+          @ctx.puts(@ctx.message("apps.create.info.install", partners_url, form_data.title))
+        end
+      end
+
+      def form_data(args)
+        if ShopifyCLI::Environment.acceptance_test?
+          Struct.new(:title, :name, :organization_id, :type, :shop_domain, :db, keyword_init: true).new(
+            title: options.flags[:title],
+            name: options.flags[:title],
+            organization_id: "123",
+            shop_domain: "test.shopify.io",
+            type: "public",
+            db: options.flags[:db]
+          )
+        else
+          Forms::Create.ask(@ctx, args, options.flags)
         end
       end
 

data/lib/project_types/rails/forms/create.rb

@@ -8,7 +8,6 @@ module Rails
       VALID_DB_TYPES = ["sqlite3",
                         "mysql",
                         "postgresql",
-                        "sqlite3",
                         "oracle",
                         "frontbase",
                         "ibm_db",

data/lib/project_types/script/commands/create.rb

@@ -9,11 +9,9 @@ module Script
 
       options do |parser, flags|
         parser.on("--name=NAME") { |name| flags[:name] = name }
-        parser.on("--extension_point=EP_NAME") { |ep_name| flags[:extension_point] = ep_name }
-        parser.on("--extension-point=EP_NAME") { |ep_name| flags[:extension_point] = ep_name }
+        parser.on("--api=API_NAME") { |ep_name| flags[:extension_point] = ep_name }
         parser.on("--language=LANGUAGE") { |language| flags[:language] = language }
         parser.on("--branch=BRANCH") { |branch| flags[:branch] = branch }
-        parser.on("--no-config-ui") { |no_config_ui| flags[:no_config_ui] = no_config_ui }
       end
 
       def call(args, _name)
@@ -30,7 +28,6 @@ module Script
           sparse_checkout_branch: options.flags[:branch] || "master",
           script_name: form.name,
           extension_point_type: form.extension_point,
-          no_config_ui: options.flags.key?(:no_config_ui)
         )
         @ctx.puts(@ctx.message("script.create.change_directory_notice", project.script_name))
       rescue StandardError => e

data/lib/project_types/script/config/extension_points.yml

@@ -32,6 +32,7 @@ payment_methods:
       package: "@shopify/scripts-checkout-apis"
     typescript:
       beta: true
+      package: "@shopify/scripts-checkout-apis-temp"
       repo: "https://github.com/Shopify/scripts-apis-examples"
 shipping_methods:
   domain: 'checkout'
@@ -41,6 +42,7 @@ shipping_methods:
       package: "@shopify/scripts-checkout-apis"
     typescript:
       beta: true
+      package: "@shopify/scripts-checkout-apis-temp"
       repo: "https://github.com/Shopify/scripts-apis-examples"
 discount_types:
   beta: true
@@ -48,4 +50,5 @@ discount_types:
   libraries:
     typescript:
       beta: true
+      package: "@shopify/scripts-discount-apis"
       repo: "https://github.com/Shopify/scripts-apis-examples"

data/lib/project_types/script/errors.rb

@@ -6,23 +6,5 @@ module Script
 
     class NoExistingAppsError < ScriptProjectError; end
     class NoExistingOrganizationsError < ScriptProjectError; end
-
-    class NoExistingStoresError < ScriptProjectError
-      attr_reader :organization_id
-      def initialize(organization_id)
-        super()
-        @organization_id = organization_id
-      end
-    end
-
-    class InvalidConfigProps < ScriptProjectError; end
-
-    class InvalidConfigYAMLError < ScriptProjectError
-      attr_reader :config_file
-      def initialize(config_file)
-        super()
-        @config_file = config_file
-      end
-    end
   end
 end

data/lib/project_types/script/layers/application/create_script.rb

@@ -7,7 +7,7 @@ module Script
     module Application
       class CreateScript
         class << self
-          def call(ctx:, language:, sparse_checkout_branch:, script_name:, extension_point_type:, no_config_ui:)
+          def call(ctx:, language:, sparse_checkout_branch:, script_name:, extension_point_type:)
             raise Infrastructure::Errors::ScriptProjectAlreadyExistsError, script_name if ctx.dir_exist?(script_name)
 
             in_new_directory_context(ctx, script_name) do
@@ -36,7 +36,7 @@ module Script
               )
 
               install_dependencies(ctx, language, script_name, project_creator)
-              script_project_repo.update_or_create_script_json(title: script_name, configuration_ui: !no_config_ui)
+              script_project_repo.update_or_create_script_json(title: script_name)
               project
             end
           end

data/lib/project_types/script/layers/domain/script_json.rb

@@ -15,7 +15,7 @@ module Script
           @version = @content["version"].to_s
           @title = @content["title"]
           @description = @content["description"]
-          @configuration_ui = @content["configurationUi"]
+          @configuration_ui = @content.fetch("configurationUi", true)
           @configuration = @content["configuration"]
         end
 

data/lib/project_types/script/layers/infrastructure/api_clients/partners_proxy_api_client.rb

@@ -27,10 +27,6 @@ module Script
             case error_code(response["errors"])
             when "forbidden"
               raise Errors::ForbiddenError
-            when "forbidden_on_shop"
-              raise Errors::ShopAuthenticationError
-            when "app_not_installed_on_shop"
-              raise Errors::AppNotInstalledError
             else
               raise Errors::GraphqlError, response["errors"]
             end

data/lib/project_types/script/layers/infrastructure/errors.rb

@@ -4,7 +4,6 @@ module Script
   module Layers
     module Infrastructure
       module Errors
-        class AppNotInstalledError < ScriptProjectError; end
         class BuildError < ScriptProjectError; end
         class ScriptJsonSyntaxError < ScriptProjectError; end
 
@@ -101,7 +100,6 @@ module Script
         end
 
         class ScriptProjectAlreadyExistsError < ScriptProjectError; end
-        class ShopAuthenticationError < ScriptProjectError; end
         class TaskRunnerNotFoundError < ScriptProjectError; end
         class BuildScriptNotFoundError < ScriptProjectError; end
         class InvalidBuildScriptError < ScriptProjectError; end

data/lib/project_types/script/layers/infrastructure/languages/assemblyscript_task_runner.rb

@@ -48,7 +48,7 @@ module Script
           end
 
           def library_version(library_name)
-            output = JSON.parse(CommandRunner.new(ctx: ctx).call("npm list --json"))
+            output = JSON.parse(CommandRunner.new(ctx: ctx).call("npm -s list --json"))
             library_version_from_npm_list(output, library_name)
           rescue Errors::SystemCallFailureError => error
             library_version_from_npm_list_error_output(error, library_name)

data/lib/project_types/script/layers/infrastructure/languages/typescript_task_runner.rb

@@ -48,8 +48,33 @@ module Script
             Domain::Metadata.create_from_json(@ctx, raw_contents)
           end
 
+          def library_version(library_name)
+            output = JSON.parse(CommandRunner.new(ctx: ctx).call("npm -s list --json"))
+            library_version_from_npm_list(output, library_name)
+          rescue Errors::SystemCallFailureError => error
+            library_version_from_npm_list_error_output(error, library_name)
+          end
+
           private
 
+          def library_version_from_npm_list_error_output(error, library_name)
+            # npm list can return a failure status code, even when returning the correct data.
+            # This causes the CommandRunner to throw a SystemCallFailure error that contains the data.
+            # In here, we check that the output contains `npm list`'s structure and extract the version.
+            output = JSON.parse(error.out)
+            raise error unless output.key?("dependencies")
+
+            library_version_from_npm_list(output, library_name)
+          rescue JSON::ParserError
+            raise error
+          end
+
+          def library_version_from_npm_list(output, library_name)
+            output.dig("dependencies", library_name, "version").tap do |version|
+              raise Errors::APILibraryNotFoundError, library_name unless version
+            end
+          end
+
           def check_node_version!
             output, status = @ctx.capture2e("node", "--version")
             raise Errors::DependencyInstallError, output unless status.success?

data/lib/project_types/script/layers/infrastructure/script_project_repository.rb

@@ -81,10 +81,10 @@ module Script
           )
         end
 
-        def update_or_create_script_json(title:, configuration_ui: false)
+        def update_or_create_script_json(title:)
           script_json = ScriptJsonRepository
             .new(ctx: ctx)
-            .update_or_create(title: title, configuration_ui: configuration_ui)
+            .update_or_create(title: title)
 
           Domain::ScriptProject.new(
             id: ctx.root,
@@ -148,11 +148,10 @@ module Script
             current_script_json || raise(Domain::Errors::NoScriptJsonFile)
           end
 
-          def update_or_create(title:, configuration_ui:)
+          def update_or_create(title:)
             json = current_script_json&.content || {}
             json["version"] ||= "1"
             json["title"] = title
-            json["configurationUi"] = !!configuration_ui
 
             ctx.write(SCRIPT_JSON_FILENAME, JSON.pretty_generate(json))
 

data/lib/project_types/script/layers/infrastructure/script_service.rb

@@ -46,7 +46,7 @@ module Script
 
           if user_errors.any? { |e| e["tag"] == "already_exists_error" }
             raise Errors::ScriptRepushError, uuid
-          elsif (e = user_errors.any? { |err| err["tag"] == "configuration_syntax_error" })
+          elsif (e = user_errors.any? { |err| err["tag"] == "configuration_definition_syntax_error" })
             raise Errors::ScriptJsonSyntaxError
           elsif (e = user_errors.find { |err| err["tag"] == "configuration_definition_missing_keys_error" })
             raise Errors::ScriptJsonMissingKeysError, e["message"]

data/lib/project_types/script/messages/messages.rb

@@ -27,10 +27,6 @@ module Script
                                  "extension_point_type or script_name.",
           invalid_context_help: "Add these values and try again.",
 
-          invalid_config_props_cause: "{{command:--config-props}} is formatted incorrectly.",
-          invalid_config_props_help: "Try again using this format: "\
-                                     "{{cyan:--config-props='name1:value1, name2:value2'}}",
-
           invalid_script_name_cause: "Invalid script name.",
           invalid_script_name_help: "Replace or remove unsupported characters. Valid characters "\
                                     "are numbers, letters, hyphens, or underscores.",
@@ -42,9 +38,6 @@ module Script
           no_existing_orgs_cause: "You don't have any partner organizations.",
           no_existing_orgs_help: "Visit https://partners.shopify.com/ to create a partners account.",
 
-          no_existing_stores_cause: "You don't have any stores in your Partner Dashboard.",
-          no_existing_stores_help: "Visit https://partners.shopify.com/%{organization_id}/stores/ to create one.",
-
           project_exists_cause: "A directory with this same name already exists.",
           project_exists_help: "Try again and enter a different name for the script.",
 
@@ -54,9 +47,6 @@ module Script
           invalid_language_cause: "Invalid language %s.",
           invalid_language_help: "Allowed values: %s.",
 
-          invalid_config: "Can't change the configuration values because %1$s is missing or "\
-                          "it isn't formatted properly.",
-
           missing_script_json_field_cause: "The script.json file is missing the required %s field.",
           missing_script_json_field_help: "Add the field and try again.",
 
@@ -91,8 +81,8 @@ module Script
           system_call_failure_cause: "An error was returned while running {{command:%{cmd}}}.",
           system_call_failure_help: "Review the following error and try again.\n{{red:%{out}}}",
 
-          metadata_validation_cause: "Invalid Script API metadata.",
-          metadata_validation_help: "Ensure the 'shopify/scripts-toolchain-as' package is up to date.",
+          metadata_validation_cause: "The Script API metadata is incorrect.",
+          metadata_validation_help: "The 'schemaVersions.major' field contains an unsupported version.",
 
           metadata_schema_versions_missing: "Invalid Script metadata:" \
                                             " 'schemaVersions' field is missing",
@@ -107,7 +97,6 @@ module Script
           metadata_not_found_help: "Ensure the 'shopify/scripts-toolchain-as' package is up to date and " \
                                      "'package.json' contains a 'scripts/build' entry with a " \
                                      "'--metadata build/metadata.json' argument",
-          app_not_installed_cause: "App not installed on store.",
 
           build_error_cause: "Something went wrong while building the script.",
           build_error_help: "Correct the errors and try again.",
@@ -126,9 +115,6 @@ module Script
           script_repush_cause: "A version of this script already exists on the app.",
           script_repush_help: "Use {{cyan:--force}} to replace the existing script.",
 
-          shop_auth_cause: "Unable to authenticate with the store.",
-          shop_auth_help: "Try again.",
-
           invalid_build_script: "The root package.json contains an invalid build command that " \
                                 "is needed to compile your script to WebAssembly.",
           build_script_not_found: "The root package.json is missing the build command that " \
@@ -162,8 +148,7 @@ module Script
               Usage: {{command:%1$s script create}}
               Options:
                 {{command:--name=NAME}} Script project name. Use any string.
-                {{command:--extension-point=TYPE}} Script API name. Allowed values: %2$s.
-                {{command:--no-config-ui}} Specify this option when you don’t want your script to render an interface in Shopify admin.
+                {{command:--api=TYPE}} Script API name. Allowed values: %2$s.
           HELP
 
           error: {

data/lib/project_types/script/ui/error_handler.rb

@@ -44,15 +44,6 @@ module Script
             cause_of_error: ShopifyCLI::Context.message("script.error.invalid_context_cause"),
             help_suggestion: ShopifyCLI::Context.message("script.error.invalid_context_help"),
           }
-        when Errors::InvalidConfigProps
-          {
-            cause_of_error: ShopifyCLI::Context.message("script.error.invalid_config_props_cause"),
-            help_suggestion: ShopifyCLI::Context.message("script.error.invalid_config_props_help"),
-          }
-        when Errors::InvalidConfigYAMLError
-          {
-            cause_of_error: ShopifyCLI::Context.message("script.error.invalid_config", e.config_file),
-          }
         when Layers::Infrastructure::Errors::InvalidLanguageError
           {
             cause_of_error: ShopifyCLI::Context.message("script.error.invalid_language_cause", e.language),
@@ -76,14 +67,6 @@ module Script
             cause_of_error: ShopifyCLI::Context.message("script.error.no_existing_orgs_cause"),
             help_suggestion: ShopifyCLI::Context.message("script.error.no_existing_orgs_help"),
           }
-        when Errors::NoExistingStoresError
-          {
-            cause_of_error: ShopifyCLI::Context.message("script.error.no_existing_stores_cause"),
-            help_suggestion: ShopifyCLI::Context.message(
-              "script.error.no_existing_stores_help",
-              organization_id: e.organization_id
-            ),
-          }
         when Layers::Infrastructure::Errors::ScriptProjectAlreadyExistsError
           {
             cause_of_error: ShopifyCLI::Context.message("script.error.project_exists_cause"),
@@ -135,10 +118,6 @@ module Script
             cause_of_error: ShopifyCLI::Context.message("script.error.no_script_json_file_cause"),
             help_suggestion: ShopifyCLI::Context.message("script.error.no_script_json_file_help"),
           }
-        when Layers::Infrastructure::Errors::AppNotInstalledError
-          {
-            cause_of_error: ShopifyCLI::Context.message("script.error.app_not_installed_cause"),
-          }
         when Layers::Infrastructure::Errors::BuildError
           {
             cause_of_error: ShopifyCLI::Context.message("script.error.build_error_cause"),
@@ -217,11 +196,6 @@ module Script
             cause_of_error: ShopifyCLI::Context.message("script.error.script_repush_cause"),
             help_suggestion: ShopifyCLI::Context.message("script.error.script_repush_help"),
           }
-        when Layers::Infrastructure::Errors::ShopAuthenticationError
-          {
-            cause_of_error: ShopifyCLI::Context.message("script.error.shop_auth_cause"),
-            help_suggestion: ShopifyCLI::Context.message("script.error.shop_auth_help"),
-          }
         when Layers::Infrastructure::Errors::BuildScriptNotFoundError
           {
             cause_of_error: ShopifyCLI::Context.message("script.error.build_script_not_found"),

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

@@ -5,6 +5,7 @@ module Theme
   class Command
     class Serve < ShopifyCLI::SubCommand
       options do |parser, flags|
+        parser.on("--bind=HOST") { |bind| flags[:bind] = bind.to_s }
         parser.on("--port=PORT") { |port| flags[:port] = port.to_i }
         parser.on("--poll") { flags[:poll] = true }
       end

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

@@ -94,6 +94,7 @@ module Theme
             Options:
               {{command:--port=PORT}} Local port to serve theme preview from
               {{command:--poll}}      Force polling to detect file changes
+              {{command:--bind=HOST}} Set which network interface the web server listens on
           HELP
           serve: "Viewing theme…",
           open_fail: "Couldn't open the theme",

data/lib/shopify_cli/exception_reporter.rb

@@ -31,9 +31,12 @@ module ShopifyCLI
         config.auto_capture_sessions = false
       end
 
-      metadata = {}
+      metadata = { rubyPlatform: RUBY_PLATFORM }
       metadata.merge!(custom_metadata)
-      Bugsnag.notify(error, metadata)
+
+      Bugsnag.notify(error) do |event|
+        event.add_metadata(:device, metadata)
+      end
     end
 
     def self.report?(context:)

data/lib/shopify_cli/migrator.rb

@@ -9,23 +9,21 @@ module ShopifyCLI
       migrations_directory: File.expand_path("migrator/migrations", __dir__)
     )
       baseline_date = last_migration_date
-      unless baseline_date.nil?        
-        migrations = migrations(migrations_directory: migrations_directory)
-          .select { |m| 
-            m.date > baseline_date.to_i 
-          }
-          .each { |m| m.run }
+      unless baseline_date.nil?
+        migrations(migrations_directory: migrations_directory)
+          .select do |m|
+            m.date > baseline_date.to_i
+          end
+          .each(&:run)
       end
 
       store_last_migration_date
     end
 
-    private
-
     def self.store_last_migration_date
       ShopifyCLI::DB.set(ShopifyCLI::Constants::StoreKeys::LAST_MIGRATION_DATE => Time.now.to_i)
     end
-    
+
     def self.last_migration_date
       ShopifyCLI::DB.get(ShopifyCLI::Constants::StoreKeys::LAST_MIGRATION_DATE)
     end
@@ -35,7 +33,7 @@ module ShopifyCLI
         file_name = File.basename(file_path).gsub(".rb", "")
         file_name_components = file_name.split("_")
         date_timestamp = file_name_components[0].to_i
-        migration_name = file_name_components[1...].join("_")
+        migration_name = file_name_components.drop(1).join("_")
 
         Migrator::Migration.new(
           name: migration_name,
@@ -45,4 +43,4 @@ module ShopifyCLI
       end
     end
   end
-end
+end

data/lib/shopify_cli/theme/dev_server.rb

@@ -20,7 +20,7 @@ module ShopifyCLI
       class << self
         attr_accessor :ctx
 
-        def start(ctx, root, port: 9292, poll: false)
+        def start(ctx, root, bind: "127.0.0.1", port: 9292, poll: false)
           @ctx = ctx
           theme = DevelopmentTheme.new(ctx, root: root)
           ignore_filter = IgnoreFilter.from_path(root)
@@ -74,6 +74,7 @@ module ShopifyCLI
           watcher.start
           WebServer.run(
             @app,
+            BindAddress: bind,
             Port: port,
             Logger: logger,
             AccessLog: [],

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.6.5"
+  VERSION = "2.6.6"
 end

data/shopify-cli.gemspec

@@ -33,11 +33,7 @@ Gem::Specification.new do |spec|
   end
   spec.bindir = "bin"
   spec.require_paths = ["lib", "vendor"]
-  spec.extensions = ["ext/shopify-cli/extconf.rb"]
-  # Do NOT include `shopify` as a listed executable via `spec.executables`.
-  # `ext/shopify-cli/extconf.rb` will dynamically create a script and soft-link
-  # `/usr/local/bin/shopify` to that script, in order to "lock" the Ruby used to
-  # a single Ruby (useful for debugging in multi-Ruby environments)
+  spec.executables << "shopify"
 
   spec.add_development_dependency("bundler", "~> 2.2.2")
   spec.add_development_dependency("rake", "~> 12.3", ">= 12.3.3")

data/utilities/docker/container.rb

@@ -1,8 +1,10 @@
 require "open3"
+require "colorize"
 
 module Utilities
   module Docker
     class Container
+      SHOPIFY_PATH = "/usr/src/app"
       SHOPIFY_BIN_PATH = "/usr/src/app/bin/shopify"
 
       Error = Class.new(StandardError)
@@ -55,6 +57,10 @@ module Utilities
       end
 
       def exec(*args, relative_dir: nil)
+        if ARGV.include?("--verbose")
+          running_prefix = "Running command: #{args.join(" ")}"
+          STDOUT.puts(running_prefix.colorize(:yellow).bold)
+        end
         command = ["docker", "exec"]
         cwd = if relative_dir.nil?
           @cwd
@@ -68,8 +74,23 @@ module Utilities
         command << @id
         command += args
 
-        out, stat = Open3.capture2e(*command)
-        raise Error, out unless stat.success?
+        docker_prefix = "Docker (#{args.first}):"
+
+        if ARGV.include?("--verbose")
+          stat = Open3.popen3(*command) do |stdin, stdout, stderr, wait_thread|
+            Thread.new do
+              stdout.each { |l| STDOUT.puts("#{docker_prefix.colorize(:cyan).bold} #{l}") }
+              stderr.each { |l| STDERR.puts("#{docker_prefix.colorize(:red).bold} #{l}") }
+            end
+            stdin.close
+
+            wait_thread.value
+          end
+          raise StandardError, "The command #{args.first} failed" unless stat.success?
+        else
+          out, stat = Open3.capture2e(*command)
+          raise Error, out unless stat.success?
+        end
       end
     end
   end

data/utilities/docker.rb

@@ -57,6 +57,7 @@ module Utilities
 
       def build_image_if_needed
         unless image_exists?(image_tag)
+          puts "Rebuilding the Docker image..."
           _, err, stat = Open3.capture3(
             "docker", "build", root_dir, "-t", image_tag
           )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.6.5
+  version: 2.6.6
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-20 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,9 +107,9 @@ description: |
   and webhooks.
 email:
 - dev-tools-education@shopify.com
-executables: []
-extensions:
-- ext/shopify-cli/extconf.rb
+executables:
+- shopify
+extensions: []
 extra_rdoc_files: []
 files:
 - ".github/CODEOWNERS"
@@ -155,7 +155,6 @@ files:
 - docs/getting-started/upgrade/index.md
 - docs/help/start-app/index.md
 - docs/index.md
-- ext/shopify-cli/extconf.rb
 - ext/shopify-extensions/extconf.rb
 - ext/shopify-extensions/shopify_extensions.rb
 - ext/shopify-extensions/version
@@ -250,6 +249,7 @@ files:
 - lib/project_types/extension/tasks/create_extension.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
 - lib/project_types/extension/tasks/get_app.rb
 - lib/project_types/extension/tasks/get_apps.rb
 - lib/project_types/extension/tasks/get_extensions.rb
@@ -300,7 +300,6 @@ files:
 - lib/project_types/script/errors.rb
 - lib/project_types/script/forms/create.rb
 - lib/project_types/script/graphql/app_script_set.graphql
-- lib/project_types/script/graphql/app_script_update_or_create.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

data/ext/shopify-cli/extconf.rb

@@ -1,60 +0,0 @@
-require "rbconfig"
-require "fileutils"
-require "date"
-
-gem = File.expand_path("../../../", __FILE__)
-exe = File.join(gem, "bin", "shopify")
-
-# `--skip-cli-build` will be passed from the brew `shopify-cli.rb` formula, so
-# as to prevent this extension builder doing the script and sym-link creation;
-# the brew install process takes care of these itself - see
-# https://github.com/Shopify/homebrew-shopify/shopify-cli.rb
-if ARGV && ARGV[0]&.match(/skip-cli-build/)
-  makefile_content = <<~MAKEFILE
-    .PHONY: clean
-
-    clean: ;
-
-    install: ;
-  MAKEFILE
-elsif RUBY_PLATFORM.match(/mswin|mingw|cygwin/)
-  bat_path = File.dirname(RbConfig.ruby)
-  bat = "#{bat_path}\\shopify.bat"
-
-  script_content = "#{RbConfig.ruby} -I '#{gem}' '#{exe}' %*"
-
-  FileUtils.mkdir_p(bat_path)
-  makefile_content = <<~MAKEFILE
-    .PHONY: clean install
-
-    clean:
-    \t rm -f "#{bat}"
-
-    install: clean
-    \t echo "@ECHO OFF"> "#{bat}"
-    \t echo "#{script_content}">> "#{bat}"
-  MAKEFILE
-else
-  script = exe + ".sh"
-  symlink = "/usr/local/bin/shopify"
-
-  script_content = <<~SCRIPT
-    #!/usr/bin/env bash
-    #{RbConfig.ruby} -I #{gem} #{exe} $@
-  SCRIPT
-
-  File.write(script, script_content)
-  FileUtils.chmod("+x", script)
-
-  makefile_content = <<~MAKEFILE
-    .PHONY: clean install
-
-    clean:
-    \t@sudo rm -f #{symlink}
-
-    install: clean
-    \t@sudo ln -s #{script} #{symlink}
-  MAKEFILE
-end
-
-File.write("Makefile", makefile_content)