shopify-cli 2.7.4 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '068a38773a84e132b2b1dd435d4e369a2100d2fca4cccb539699e6033f816fb7'
-  data.tar.gz: d4f356f9f4bf9f0e43733da4f223f7e02917d8c29e4193c90eb276ac80a73c5b
+  metadata.gz: 39a23d6414281b45d36b3508a09f88b629300733e5a3177ce9923905ce26e0ee
+  data.tar.gz: 38483662a8c42d1463f1b157262a2cec3cf8c4fda0cb5ccfa74a207a3687be33
 SHA512:
-  metadata.gz: a163a0878650fbf8c846fa9d510240c3b4f938a621e14558a63788ce56e63a8fe39e6254ef4cc83107cd6b241d2d66e2fe935cd207d47a88c20182ceb7d59d5c
-  data.tar.gz: db35b09603e3ccb0c7a526da096a76663b4ab5f952cb37e1bde4b71fba3509d87c3e8626929e8d20e316a4c04097d3430da98e252b9634d5a0e53586b06ec2a9
+  metadata.gz: 58b6b7aa28665cf1107c83ffa6f553eb4cca1661ff8d66d3ef47c9a4d9a3edb46a73e8f38bb5f0f6976699a4a94b58d408e11c2622718be1a554575048c844c3
+  data.tar.gz: e060cfe1fc4c2917f096b9c0c48f9562f441fb005b6669c1ad93ac8c0a6121ae8c2fac0759fd8f591f4700b0c717f993286b67911cfa133d5cab605a600d69c8

data/CHANGELOG.md

@@ -2,6 +2,39 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
+## Version 2.10.1
+### Fixed
+* [#1985](https://github.com/Shopify/shopify-cli/pull/1985): Revert "Fix CORS (Cross-origin resource sharing) errors (#1952)"
+
+## Version 2.10.0
+### Fixed
+* [#1937](https://github.com/Shopify/shopify-cli/pull/1937): Fix `theme pull` to no longer add empty lines on Windows
+* [#1952](https://github.com/Shopify/shopify-cli/pull/1952): Fix CORS (cross-origin resource sharing) errors
+* [#1965](https://github.com/Shopify/shopify-cli/pull/1965): Revert: Fix partners ability to login to external shops. (#1873)
+
+### Added
+* [#1892](https://github.com/Shopify/shopify-cli/pull/1892): Add `-o`/`--only` parameter to filter files on `theme push`/`theme pull` commands
+
+## Version 2.9.0
+### Fixed
+* [#1922](https://github.com/Shopify/shopify-cli/pull/1922): Respect RUBY_BINDIR from Homebrew for installing gem
+* [#1906](https://github.com/Shopify/shopify-cli/pull/1906): Fix Ngrok incompatibility with some Apple ARM environments
+* [#1873](https://github.com/Shopify/shopify-cli/pull/1873): Fix partners ability to login to external shops.
+* [#1909](https://github.com/Shopify/shopify-cli/pull/1909): Fix `theme serve` on Safari
+
+### Added
+* [#1900](https://github.com/Shopify/shopify-cli/pull/1900): Add `-d`/`--development` flag to Shopify theme pull command
+* [#1891](https://github.com/Shopify/shopify-cli/pull/1891): Allow for additional arguments in `shopify push script` on CI.
+* [#1877](https://github.com/Shopify/shopify-cli/pull/1877): Add theme (`-t`/`--theme=NAME_OR_ID`) parameter to `theme push`/`theme pull` commands
+* [#1871](https://github.com/Shopify/shopify-cli/pull/1871): Add a new `--live-reload` parameter to the `theme serve` command
+
+### Changed
+- [#1929](https://github.com/Shopify/shopify-cli/pull/1929): Rename `--registration-id` to `--extension-id` in `shopify extension push`.
+
+## Version 2.8.0
+### Fixed
+* [#1879](https://github.com/Shopify/shopify-cli/pull/1879): Disambiguate -s as store option
+
 ## Version 2.7.4
 ### Added
 * [#1825](https://github.com/Shopify/shopify-cli/pull/1825): Support passing the connection information through arguments

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.7.4)
+    shopify-cli (2.10.1)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
       theme-check (~> 1.9.0)

data/RELEASING.md

@@ -23,21 +23,22 @@
    ```
 
 9. Open a PR for the branch, get necessary approvals from code owners and merge into main branch. Note that the PR title will be the release note in Shipit, so make sure it mentions the release
-10. Deploy using Shipit
+10. Deploy to RubyGems using [Shipit](https://shipit.shopify.io/shopify/shopify-cli/rubygems)
 11. Update your `main` branch to the latest version
    ```
    $ git checkout main
    $ git pull
    ```
    
-12. On local machine and _AFTER_ gem has been published to https://rubygems.org, run
+12. On local machine and _AFTER_ gem has been published to https://rubygems.org/gems/shopify-cli, run
    ```
    $ rake package
    ```
    This will generate the `.deb`, `.rpm` and brew formula files, which will be located in `packaging/builds/X.Y.Z/`.
 
 13. Clone the `Shopify/homebrew-shopify` repository (if not already cloned), and then
-    * create a branch named `release_X_Y_Z_of_shopify-cli`
+    * update your `master` branch to the latest version: `git checkout master && git pull`
+    * create a new branch: `git checkout -b release_X_Y_Z_of_shopify-cli`
     * update the brew formula in `shopify-cli.rb` with the generated formula in `packaging/builds/X.Y.Z/` in the `Shopify/shopify-cli` repo (from the `rake package` step above)
     * commit the change and create a PR on the [Shopify Homebrew repository](https://github.com/Shopify/homebrew-shopify)
     * when PR is approved, merge into main branch

data/ext/javy/javy.rb

@@ -5,7 +5,7 @@ require "digest/sha2"
 
 module Javy
   ROOT = __dir__
-  BIN_FOLDER = File.join(ROOT, "bin")
+  BIN_FOLDER = File.join(ShopifyCLI.cache_dir, "javy", "bin")
   HASH_FOLDER = File.join(ROOT, "hashes")
   VERSION = File.read(File.join(ROOT, "version")).strip
   TARGET = File.join(BIN_FOLDER, "javy-#{VERSION}")

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

@@ -9,7 +9,7 @@ module Extension
       options do |parser, flags|
         parser.on("--api-key=API_KEY") { |api_key| flags[:api_key] = api_key.gsub('"', "") }
         parser.on("--api-secret=API_SECRET") { |api_secret| flags[:api_secret] = api_secret.gsub('"', "") }
-        parser.on("--registration-id=REGISTRATION_ID") do |registration_id|
+        parser.on("--extension-id=EXTENSION_ID") do |registration_id|
           flags[:registration_id] = registration_id.gsub('"', "")
         end
       end
@@ -35,7 +35,7 @@ module Extension
       end
 
       def register_if_necessary(project:, args:, name:)
-        if @ctx.tty? && !project.registered?
+        if ShopifyCLI::Environment.interactive? && !project.registered?
           Command::Register.new(@ctx).call(args, name)
         end
       end

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

@@ -91,7 +91,7 @@ module Extension
             Usage: {{command:%s extension push}}
             Options:
               {{command:--api-key=API_KEY}} Connect your extension and app by inserting your app's API key (which you can get from your app setup page on shopify.dev).
-              {{command:--registration-id=REGISTRATION_ID}} The id of the extension's registration.
+              {{command:--extension-id=EXTENSION_ID}} The id of the extension's registration.
         HELP
         frame_title: "Pushing your extension to Shopify",
         waiting_text: "Pushing code to Shopify…",

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

@@ -40,7 +40,7 @@ module Extension
 
       def serve(context, server_config)
         CLI::Kit::System.popen3(executable, "serve", "-") do |input, out, err, status|
-          context.puts("Sending configuration data …")
+          context.debug("Sending configuration data to extension development server …")
           input << server_config.to_yaml
           input.close
 
@@ -57,17 +57,15 @@ module Extension
       private
 
       def forward_output_to_user(out, err, ctx)
-        ctx.puts("Starting monitoring threads …")
+        ctx.debug("Starting message processing threads to relay output produced by the extension development server …")
 
         Thread.new do
-          ctx.puts("Ready to process standard output")
           while (line = out.gets)
             ctx.puts(line)
           end
         end
 
         Thread.new do
-          ctx.puts("Ready to process standard error")
           while (error = err.gets)
             ctx.puts(error)
           end

data/lib/project_types/rails/gem.rb

@@ -79,8 +79,7 @@ module Rails
     def install!
       spin = CLI::UI::SpinGroup.new
       spin.add(ctx.message("rails.gem.installing", name)) do |spinner|
-        args = %w(gem install)
-        args.push(name)
+        args = ["#{ENV["RUBY_BINDIR"]}gem", "install", name]
         unless version.nil?
           if ctx.windows? && version.include?("~")
             args.push("-v", "\"#{version}\"")

data/lib/project_types/script/cli.rb

@@ -92,5 +92,10 @@ module Script
 
   autoload :Errors, Project.project_filepath("errors")
 
+  module Loaders
+    autoload :Project, Script::Project.project_filepath("loaders/project")
+    autoload :SpecificationHandler, Script::Project.project_filepath("loaders/specification_handler")
+  end
+
   class ScriptProjectError < StandardError; end
 end

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

@@ -6,7 +6,7 @@ module Script
       prerequisite_task ensure_project_type: :script
 
       def call(_args, _)
-        Layers::Application::ConnectApp.call(ctx: @ctx, force: true, strict: true)
+        Layers::Application::ConnectApp.call(ctx: @ctx, force: true)
       rescue StandardError => e
         UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message("script.connect.error.operation_failed"))
       end

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

@@ -33,8 +33,14 @@ module Script
       end
 
       def self.help
-        allowed_values = Script::Layers::Application::ExtensionPoints.available_types.map { |type| "{{cyan:#{type}}}" }
-        ShopifyCLI::Context.message("script.create.help", ShopifyCLI::TOOL_NAME, allowed_values.join(", "))
+        allowed_apis = Layers::Application::ExtensionPoints.available_types.map { |type| "{{cyan:#{type}}}" }
+        allowed_languages = Layers::Application::ExtensionPoints.all_languages.map { |lang| "{{cyan:#{lang}}}" }
+        ShopifyCLI::Context.message(
+          "script.create.help",
+          ShopifyCLI::TOOL_NAME,
+          allowed_apis.join(", "),
+          allowed_languages.join(", ")
+        )
       end
     end
   end

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

@@ -7,25 +7,48 @@ module Script
 
       options do |parser, flags|
         parser.on("--force") { |t| flags[:force] = t }
+        parser.on("--api-key=API_KEY") { |api_key| flags[:api_key] = api_key.gsub('"', "") }
+        parser.on("--api-secret=API_SECRET") { |api_secret| flags[:api_secret] = api_secret.gsub('"', "") }
+        parser.on("--uuid=UUID") do |uuid|
+          flags[:uuid] = uuid.gsub('""', "")
+        end
       end
 
       def call(_args, _name)
-        fresh_env = Layers::Application::ConnectApp.call(ctx: @ctx)
-
-        force = options.flags.key?(:force) || !!fresh_env
+        connect_to_app
+        project = load_project
+        push(project: project)
+      rescue StandardError => e
+        UI::ErrorHandler.pretty_print_and_raise(e,
+          failed_op: @ctx.message("script.push.error.operation_failed_no_api_key"))
+      end
 
-        api_key = Layers::Infrastructure::ScriptProjectRepository.new(ctx: @ctx).get.api_key
-        return @ctx.puts(self.class.help) unless api_key
+      def push(project:)
+        force = options.flags.key?(:force)
+        api_key = project.env[:api_key]
+        uuid = project.env[:extra]["UUID"]
 
-        Layers::Application::PushScript.call(ctx: @ctx, force: force)
-        @ctx.puts(@ctx.message("script.push.script_pushed", api_key: api_key))
-      rescue StandardError => e
-        msg = if api_key
-          @ctx.message("script.push.error.operation_failed_with_api_key", api_key: api_key)
+        if ShopifyCLI::Environment.interactive? || (uuid && !uuid.empty?)
+          Layers::Application::PushScript.call(ctx: @ctx, force: force, project: project)
+          @ctx.puts(@ctx.message("script.push.script_pushed", api_key: api_key))
         else
-          @ctx.message("script.push.error.operation_failed_no_api_key")
+          raise ShopifyCLI::Abort, @ctx.message("script.push.error.operation_failed_no_uuid")
+        end
+      end
+
+      def load_project
+        Script::Loaders::Project.load(
+          directory: Dir.pwd,
+          api_key: options.flags[:api_key],
+          api_secret: options.flags[:api_secret],
+          uuid: options.flags[:uuid]
+        )
+      end
+
+      def connect_to_app
+        if ShopifyCLI::Environment.interactive?
+          Layers::Application::ConnectApp.call(ctx: @ctx)
         end
-        UI::ErrorHandler.pretty_print_and_raise(e, failed_op: msg)
       end
 
       def self.help

data/lib/project_types/script/graphql/app_script_set.graphql

@@ -11,6 +11,7 @@ mutation AppScriptSet(
   $configurationDefinition: String!,
   $moduleUploadUrl: String!,
   $library: LibraryInput,
+  $inputQuery: String,
 ) {
   appScriptSet(
     uuid: $uuid
@@ -25,6 +26,7 @@ mutation AppScriptSet(
     configurationDefinition: $configurationDefinition,
     moduleUploadUrl: $moduleUploadUrl,
     library: $library,
+    inputQuery: $inputQuery,
 ) {
     userErrors {
       field

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

@@ -12,7 +12,6 @@ module Script
                   Infrastructure::PushPackageRepository.new(ctx: ctx).create_push_package(
                     script_project: script_project,
                     script_content: task_runner.build,
-                    compiled_type: task_runner.compiled_type,
                     metadata: task_runner.metadata,
                     library: library,
                   )

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

@@ -7,7 +7,7 @@ module Script
     module Application
       class ConnectApp
         class << self
-          def call(ctx:, force: false, strict: false)
+          def call(ctx:, force: false)
             script_project_repo = Layers::Infrastructure::ScriptProjectRepository.new(ctx: ctx)
             script_project = script_project_repo.get
 
@@ -40,10 +40,6 @@ module Script
 
             uuid = Forms::AskScriptUuid.ask(ctx, scripts, nil)&.uuid
 
-            if strict && uuid.nil?
-              ctx.abort(ctx.message("script.connect.missing_script"))
-            end
-
             script_project_repo.create_env(
               api_key: app["apiKey"],
               secret: app["apiSecretKeys"].first["secret"],
@@ -52,6 +48,16 @@ module Script
             ctx.done(ctx.message("script.connect.connected", app["title"]))
 
             true
+          rescue SmartProperties::InitializationError, SmartProperties::InvalidValueError => error
+            handle_error(error, context: ctx)
+          end
+
+          def handle_error(error, context:)
+            properties_hash = { api_key: "SHOPIFY_API_KEY", secret: "SHOPIFY_API_SECRET" }
+            missing_env_variables = error.properties.map { |p| properties_hash[p.name] }.compact.join(", ")
+            raise ShopifyCLI::Abort,
+              context.message("script.connect.error.missing_env_file_variables", missing_env_variables,
+                ShopifyCLI::TOOL_NAME)
           end
 
           private

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

@@ -4,37 +4,61 @@ module Script
   module Layers
     module Application
       class ExtensionPoints
-        def self.get(type:)
-          Infrastructure::ExtensionPointRepository.new.get_extension_point(type)
-        end
+        class << self
+          def get(type:)
+            extension_point_repository.get_extension_point(type)
+          end
 
-        def self.types
-          Infrastructure::ExtensionPointRepository.new.extension_point_types
-        end
+          def types
+            extension_point_repository.extension_point_types
+          end
 
-        def self.available_types
-          Infrastructure::ExtensionPointRepository.new.extension_points.select do |ep|
-            next false if ep.deprecated?
-            !ep.beta? || ShopifyCLI::Feature.enabled?(:scripts_beta_extension_points)
-          end.map(&:type)
-        end
+          def available_types
+            available_extension_points.map(&:type)
+          end
 
-        def self.deprecated_types
-          Infrastructure::ExtensionPointRepository.new
-            .extension_points
-            .select(&:deprecated?)
-            .map(&:type)
-        end
+          def deprecated_types
+            extension_point_repository
+              .extension_points
+              .select(&:deprecated?)
+              .map(&:type)
+          end
 
-        def self.languages(type:)
-          get(type: type).libraries.all.map do |library|
-            next nil if library.beta? && !ShopifyCLI::Feature.enabled?(:scripts_beta_languages)
-            library.language
-          end.compact
-        end
+          def all_languages
+            available_extension_points
+              .map { |ep| ep.library_languages(include_betas: include_beta_languages?) }
+              .flatten
+              .uniq
+          end
+
+          def languages(type:)
+            get(type: type).library_languages(include_betas: include_beta_languages?)
+          end
+
+          def supported_language?(type:, language:)
+            languages(type: type).include?(language.downcase)
+          end
+
+          private
+
+          def available_extension_points
+            extension_point_repository.extension_points.select do |ep|
+              next false if ep.deprecated?
+              ep.stable? || include_beta_extension_points?
+            end
+          end
+
+          def extension_point_repository
+            Infrastructure::ExtensionPointRepository.new
+          end
+
+          def include_beta_languages?
+            ShopifyCLI::Feature.enabled?(:scripts_beta_languages)
+          end
 
-        def self.supported_language?(type:, language:)
-          languages(type: type).include?(language.downcase)
+          def include_beta_extension_points?
+            ShopifyCLI::Feature.enabled?(:scripts_beta_extension_points)
+          end
         end
       end
     end

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

@@ -5,9 +5,10 @@ module Script
     module Application
       class PushScript
         class << self
-          def call(ctx:, force:)
+          def call(ctx:, force:, project:)
             script_project_repo = Infrastructure::ScriptProjectRepository.new(ctx: ctx)
             script_project = script_project_repo.get
+            script_project.env = project.env
             task_runner = Infrastructure::Languages::TaskRunner
               .for(ctx, script_project.language, script_project.script_name)
 
@@ -29,7 +30,6 @@ module Script
             UI::PrintingSpinner.spin(ctx, ctx.message("script.application.pushing")) do |p_ctx, spinner|
               package = Infrastructure::PushPackageRepository.new(ctx: p_ctx).get_push_package(
                 script_project: script_project,
-                compiled_type: task_runner.compiled_type,
                 metadata: task_runner.metadata,
                 library: library,
               )
@@ -46,8 +46,11 @@ module Script
                 script_config: package.script_config,
                 module_upload_url: module_upload_url,
                 library: package.library,
+                input_query: script_project.input_query,
               )
-              script_project_repo.update_env(uuid: uuid)
+              if ShopifyCLI::Environment.interactive?
+                script_project_repo.update_env(uuid: uuid)
+              end
               spinner.update_title(p_ctx.message("script.application.pushed"))
             end
           end

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

@@ -15,10 +15,11 @@ module Script
         end
 
         class MissingScriptConfigFieldError < ScriptProjectError
-          attr_reader :field
-          def initialize(field)
+          attr_reader :field, :filename
+          def initialize(field:, filename:)
             super()
             @field = field
+            @filename = filename
           end
         end
 

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

@@ -18,6 +18,10 @@ module Script
           @beta
         end
 
+        def stable?
+          !beta?
+        end
+
         def deprecated?
           @deprecated
         end
@@ -26,6 +30,12 @@ module Script
           @type.gsub("_", "-")
         end
 
+        def library_languages(include_betas: false)
+          @libraries.all.map do |library|
+            include_betas || library.stable? ? library.language : nil
+          end.compact
+        end
+
         class ExtensionPointLibraries
           def initialize(config)
             @config = config
@@ -57,6 +67,10 @@ module Script
             @beta
           end
 
+          def stable?
+            !beta?
+          end
+
           def versioned?
             @version
           end

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

@@ -9,7 +9,6 @@ module Script
           :extension_point_type,
           :script_config,
           :script_content,
-          :compiled_type,
           :metadata,
           :library
 
@@ -18,7 +17,6 @@ module Script
           uuid:,
           extension_point_type:,
           script_content:,
-          compiled_type: nil,
           metadata:,
           script_config:,
           library:
@@ -27,7 +25,6 @@ module Script
           @uuid = uuid
           @extension_point_type = extension_point_type
           @script_content = script_content
-          @compiled_type = compiled_type
           @metadata = metadata
           @script_config = script_config
           @library = library

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

@@ -4,13 +4,13 @@ module Script
   module Layers
     module Domain
       class ScriptConfig
-        attr_reader :content, :version, :title, :description, :configuration_ui, :configuration
+        attr_reader :content, :version, :title, :description, :configuration_ui, :configuration, :filename
 
         REQUIRED_FIELDS = %w(version title)
 
-        def initialize(content:)
+        def initialize(content:, filename:)
+          @filename = filename
           validate_content!(content)
-
           @content = content
           @version = @content["version"].to_s
           @title = @content["title"]
@@ -23,7 +23,9 @@ module Script
 
         def validate_content!(content)
           REQUIRED_FIELDS.each do |field|
-            raise Errors::MissingScriptConfigFieldError, field if content[field].nil?
+            if content[field].nil?
+              raise Errors::MissingScriptConfigFieldError.new(field: field, filename: filename)
+            end
           end
         end
       end

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

@@ -16,6 +16,7 @@ module Script
         property! :language, accepts: String
 
         property :script_config, accepts: ScriptConfig
+        property :input_query, accepts: String
 
         def initialize(*)
           super