shopify-cli 2.12.0 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee0786bedc79f0e7fb3646adc5161faeb0fb2f4f15c6147394782db33236f425
-  data.tar.gz: 13d805804c7764151bfdd80747e879bd480ffcf85ba91fa280b776b93f784855
+  metadata.gz: e54fd77e2aa3b1721ea02cd7cad4a84afdae67a3c73510e6ee8b01e44bfc5949
+  data.tar.gz: a92380f94b7a33cea4eae04d2d528ef09a51d161a5b77a900a294e7176ee89e9
 SHA512:
-  metadata.gz: 8347252541e765517a6bc485cc7bc1b811771a55610543549d676d5321944185e9a446bed4c8a3909f21f336fd56ae76b91ede2e3731f30ea66c0916d1a3e591
-  data.tar.gz: 930367d81adf351b66aa7365daaf9f4406067db80a4959409e68ddd5ab7041ed10db4f983f81d1af3d8f2457b8d79543cbf33c927e69bfbde027a31da4b166a8
+  metadata.gz: 3a55cc0e5a57ab4a842411667dfca871140ef324d17c537157e3913cce383c84ae70ebd26cbf8f14a020b94283c9d6264ab71af5f55c37255fbe7966ee8f46f5
+  data.tar.gz: 24328c051c6795d7c4778fdaea861cc77d3337a886126074bce4ae3073b635b6bcd878457e8cad4399c5982b0be5d168a3f6f3c86c5e3bbbe7b7b2ce192e4d58

data/.github/workflows/shopify.yml

@@ -17,6 +17,7 @@ jobs:
     strategy:
       matrix:
         version:
+          - 3.1.0
           - 3.0.2
           - 2.6.6
           - 2.7.5
@@ -82,7 +83,7 @@ jobs:
     strategy:
       matrix:
         version:
-          - 3.0.2
+          - 3.1.0
         os:
           - macos-latest
     steps:

data/.rubocop.yml

@@ -46,7 +46,7 @@ AllCops:
     - "vendor/**/*"
     - "docs/**/*"
     - "packaging/**/*"
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.6
 
 Layout/EmptyLines:
   Exclude:

data/.ruby-version

@@ -1 +1 @@
-2.7.5
+3.1.0

data/CHANGELOG.md

@@ -2,6 +2,16 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
+## Version 2.13.0
+
+### Added
+* [#2087](https://github.com/Shopify/shopify-cli/pull/2087): Add new Theme CLI commands: `theme list` and `theme open`
+* [#2035](https://github.com/Shopify/shopify-cli/pull/2035): Support Ruby 3.1
+
+### Fixed
+* [#2092](https://github.com/Shopify/shopify-cli/pull/2092): Fix `RootHelper` parse logic to support options with an equal (e.g.: `option=value`)
+* [#2089](https://github.com/Shopify/shopify-cli/pull/2089): Use javy version 0.2.0
+
 ## Version 2.12.0
 ### Added
 * [#1866](https://github.com/Shopify/shopify-cli/pull/1866): Enforce git dependency

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.12.0)
+    shopify-cli (2.13.0)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
       theme-check (~> 1.9.0)
@@ -66,7 +66,7 @@ GEM
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0901)
-    mini_portile2 (2.6.1)
+    mini_portile2 (2.8.0)
     minitest (5.14.4)
     minitest-fail-fast (0.1.0)
       minitest (~> 5)
@@ -77,11 +77,11 @@ GEM
       ruby-progressbar
     mocha (1.13.0)
     multi_test (0.1.2)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.21.0)
-    parser (3.0.3.1)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -92,24 +92,24 @@ GEM
     public_suffix (4.0.6)
     racc (1.6.0)
     rack (2.2.3)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.0)
     rexml (3.2.5)
-    rubocop (1.12.1)
+    rubocop (1.25.1)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
+    rubocop-ast (1.15.1)
+      parser (>= 3.0.1.1)
     rubocop-minitest (0.10.1)
       rubocop (>= 0.87)
     rubocop-rake (0.5.1)
@@ -123,8 +123,8 @@ GEM
       liquid (>= 5.1.0)
       nokogiri (>= 1.12)
       parser (~> 3)
-    timecop (0.9.2)
-    unicode-display_width (2.0.0)
+    timecop (0.9.4)
+    unicode-display_width (2.1.0)
     webmock (3.9.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)

data/bin/shopify

@@ -44,8 +44,8 @@ end
 
 require_relative "./load_shopify"
 
-exit(proc do
-  begin
+exit(
+  proc do
     ShopifyCLI::ErrorHandler.call do
       ShopifyCLI::Core::EntryPoint.call(ARGV.dup)
     end
@@ -56,5 +56,5 @@ exit(proc do
     else
       1
     end
-  end
-end.call)
+  end.call
+)

data/dev.yml

@@ -6,7 +6,7 @@ env:
   SHOPIFY_CLI_DEVELOPMENT: "1"
 
 up:
-  - ruby: 2.7.5
+  - ruby: 3.1.0
   - homebrew:
       - dpkg:
           version: 1.21.1

data/ext/javy/hashes/javy-arm-macos-v0.2.0.gz.sha256

@@ -0,0 +1 @@
+69ac26fd99a41aa1839cdf8fc8a734874370947ef79e88b90f661c2e58485ae0

data/ext/javy/hashes/javy-x86_64-linux-v0.2.0.gz.sha256

@@ -0,0 +1 @@
+9d2686f5caccc34e30baff614ccfc487e90c5d1220e515ca4e47337a0b6a2daf

data/ext/javy/hashes/javy-x86_64-macos-v0.2.0.gz.sha256

@@ -0,0 +1 @@
+a68b5cbfce2b4b6c1a7e89e50d41dfc63f083e73f846547232897e06345e9ca3

data/ext/javy/hashes/javy-x86_64-windows-v0.2.0.gz.sha256

@@ -0,0 +1 @@
+786e417716969fcac4e97d9c0c701966c54a49152f9f57fa164f916cf14ae5f3

data/ext/javy/version

@@ -1 +1 @@
-v0.1.0
+v0.2.0

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

@@ -17,12 +17,10 @@ module Extension
 
       def self.clone_template(git_template)
         ArgoSetupStep.default do |context, _identifier, directory_name, _js_system|
-          begin
-            ShopifyCLI::Git.clone(git_template, directory_name, ctx: context)
-            context.root = File.join(context.root, directory_name)
-          rescue StandardError
-            context.puts("{{x}} Unable to clone the repository.")
-          end
+          ShopifyCLI::Git.clone(git_template, directory_name, ctx: context)
+          context.root = File.join(context.root, directory_name)
+        rescue StandardError
+          context.puts("{{x}} Unable to clone the repository.")
         end
       end
 

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

@@ -12,13 +12,21 @@ module Extension
           argo_configuration = extract_argo_configuration(attributes)
           next if argo_configuration.nil?
           surface_area = extract_surface_area(argo_configuration)
-          surface_area_configuration = fetch_surface_area_configuration(surface_area)
-          argo_configuration.merge!(surface_area_configuration)
+          if known_surface_area?(surface_area)
+            surface_area_configuration = fetch_surface_area_configuration(surface_area)
+            argo_configuration.merge!(surface_area_configuration)
+          else
+            clear_argo_configuration(attributes)
+          end
         end
       end
 
       private
 
+      def known_surface_area?(surface_area)
+        surface_area_configurations.keys.include?(surface_area.to_sym)
+      end
+
       def extract_argo_configuration(attributes)
         attributes.dig(:features, :argo)
       end
@@ -35,6 +43,11 @@ module Extension
         end
       end
 
+      def clear_argo_configuration(attributes)
+        attributes[:name] = "#{attributes[:name]} (Warning: surface area not configured properly)"
+        attributes[:features][:argo] = nil
+      end
+
       def surface_area_configurations
         {
           admin: {

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

@@ -18,6 +18,7 @@ module Extension
       property! :type, accepts: String
 
       DEFAULT_BUILD_DIR = "build"
+      DEFAULT_MAIN = Dir["src/*"].lazy.grep(/index.[jt]sx?/).first
 
       def self.call(*args)
         new(*args).call
@@ -36,7 +37,7 @@ module Extension
             build_dir: hash.dig("development", "build_dir") || DEFAULT_BUILD_DIR,
             renderer: renderer,
             entries: Models::ServerConfig::DevelopmentEntries.new(
-              main: hash.dig("development", "entries", "main")
+              main: hash.dig("development", "entries", "main") || DEFAULT_MAIN
             )
           ),
           extension_points: hash.dig("extension_points"),

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

@@ -8,7 +8,7 @@ module Script
       recommend_default_ruby_range
 
       options do |parser, flags|
-        parser.on("--name=NAME") { |name| flags[:name] = name }
+        parser.on("--title=TITLE") { |title| flags[:title] = title }
         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 }
@@ -18,7 +18,7 @@ module Script
         form = Forms::Create.ask(@ctx, args, options.flags)
         return @ctx.puts(self.class.help) if form.nil?
 
-        unless !form.name.empty? && form.extension_point
+        unless !form.title.empty? && form.extension_point
           return @ctx.puts(self.class.help)
         end
 
@@ -26,10 +26,10 @@ module Script
           ctx: @ctx,
           language: options.flags[:language]&.downcase || "wasm",
           sparse_checkout_branch: options.flags[:branch] || "master",
-          script_name: form.name,
+          title: form.title,
           extension_point_type: form.extension_point,
         )
-        @ctx.puts(@ctx.message("script.create.change_directory_notice", project.script_name))
+        @ctx.puts(@ctx.message("script.create.change_directory_notice", project.title))
       rescue StandardError => e
         UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message("script.create.error.operation_failed"))
       end

data/lib/project_types/script/errors.rb

@@ -2,7 +2,7 @@
 
 module Script
   module Errors
-    class InvalidScriptNameError < ScriptProjectError; end
+    class InvalidScriptTitleError < ScriptProjectError; end
 
     class NoExistingAppsError < ScriptProjectError; end
     class NoExistingOrganizationsError < ScriptProjectError; end

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

@@ -3,10 +3,10 @@
 module Script
   module Forms
     class Create < ShopifyCLI::Form
-      flag_arguments :extension_point, :name
+      flag_arguments :extension_point, :title
 
       def ask
-        self.name = valid_name
+        self.title = valid_name
         self.extension_point ||= ask_extension_point
       end
 
@@ -19,14 +19,14 @@ module Script
         )
       end
 
-      def ask_name
-        CLI::UI::Prompt.ask(@ctx.message("script.forms.create.script_name"))
+      def ask_title
+        CLI::UI::Prompt.ask(@ctx.message("script.forms.create.script_title"))
       end
 
       def valid_name
-        n = (name || ask_name).downcase.gsub(" ", "_")
-        return n if n.match?(/^[0-9A-Za-z_-]*$/)
-        raise Errors::InvalidScriptNameError
+        normalized_title = (title || ask_title).downcase.gsub(" ", "_")
+        return normalized_title if normalized_title.match?(/^[0-9A-Za-z_-]*$/)
+        raise Errors::InvalidScriptTitleError
       end
     end
   end

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

@@ -7,32 +7,30 @@ module Script
         class << self
           def call(ctx:, task_runner:, script_project:, library:)
             CLI::UI::Frame.open(ctx.message("script.application.building")) do
-              begin
-                UI::StrictSpinner.spin(ctx.message("script.application.building_script")) do |spinner|
-                  script_content = task_runner.build
-                  metadata_file_location = task_runner.metadata_file_location
-                  metadata = Infrastructure::MetadataRepository.new(ctx: ctx).get_metadata(metadata_file_location)
+              UI::StrictSpinner.spin(ctx.message("script.application.building_script")) do |spinner|
+                script_content = task_runner.build
+                metadata_file_location = task_runner.metadata_file_location
+                metadata = Infrastructure::MetadataRepository.new(ctx: ctx).get_metadata(metadata_file_location)
 
-                  Infrastructure::PushPackageRepository.new(ctx: ctx).create_push_package(
-                    script_project: script_project,
-                    script_content: script_content,
-                    metadata: metadata,
-                    library: library,
-                  )
-                  spinner.update_title(ctx.message("script.application.built"))
-                end
-              rescue StandardError => e
-                CLI::UI::Frame.with_frame_color_override(:red) do
-                  ctx.puts("\n{{red:#{e.message}}}")
-                end
-                errors = [
-                  Infrastructure::Errors::BuildScriptNotFoundError,
-                  Infrastructure::Errors::WebAssemblyBinaryNotFoundError,
-                ]
-
-                raise Infrastructure::Errors::BuildError unless errors.any? { |err| e.is_a?(err) }
-                raise
+                Infrastructure::PushPackageRepository.new(ctx: ctx).create_push_package(
+                  script_project: script_project,
+                  script_content: script_content,
+                  metadata: metadata,
+                  library: library,
+                )
+                spinner.update_title(ctx.message("script.application.built"))
+              end
+            rescue StandardError => e
+              CLI::UI::Frame.with_frame_color_override(:red) do
+                ctx.puts("\n{{red:#{e.message}}}")
               end
+              errors = [
+                Infrastructure::Errors::BuildScriptNotFoundError,
+                Infrastructure::Errors::WebAssemblyBinaryNotFoundError,
+              ]
+
+              raise Infrastructure::Errors::BuildError unless errors.any? { |err| e.is_a?(err) }
+              raise
             end
           end
         end

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

@@ -7,17 +7,17 @@ module Script
     module Application
       class CreateScript
         class << self
-          def call(ctx:, language:, sparse_checkout_branch:, script_name:, extension_point_type:)
+          def call(ctx:, language:, sparse_checkout_branch:, title:, extension_point_type:)
             script_project_repo = Infrastructure::ScriptProjectRepository.new(
               ctx: ctx,
-              directory: script_name,
+              directory: title,
               initial_directory: ctx.root
             )
 
             in_new_directory_context(script_project_repo) do
               extension_point = ExtensionPoints.get(type: extension_point_type)
               project = script_project_repo.create(
-                script_name: script_name,
+                title: title,
                 extension_point_type: extension_point_type,
                 language: language
               )
@@ -31,35 +31,34 @@ module Script
                 ctx: ctx,
                 language: language,
                 type: type,
-                project_name: script_name,
+                project_name: title,
                 path_to_project: project.id,
                 sparse_checkout_repo: sparse_checkout_repo,
                 sparse_checkout_branch: sparse_checkout_branch,
                 sparse_checkout_set_path: "#{domain}/#{language}/#{type}/default"
               )
 
-              install_dependencies(ctx, language, script_name, project_creator)
-              script_project_repo.update_script_config(title: script_name)
+              install_dependencies(ctx, language, title, project_creator)
               project
             end
           end
 
           private
 
-          def install_dependencies(ctx, language, script_name, project_creator)
+          def install_dependencies(ctx, language, title, project_creator)
             task_runner = Infrastructure::Languages::TaskRunner.for(ctx, language)
             CLI::UI::Frame.open(ctx.message(
               "core.git.pulling_from_to",
               project_creator.sparse_checkout_repo,
-              script_name,
+              title,
             )) do
               UI::StrictSpinner.spin(ctx.message(
                 "core.git.pulling",
                 project_creator.sparse_checkout_repo,
-                script_name,
+                title,
               )) do |spinner|
                 project_creator.setup_dependencies
-                spinner.update_title(ctx.message("core.git.pulled", script_name))
+                spinner.update_title(ctx.message("core.git.pulled", title))
               end
             end
             ProjectDependencies.install(ctx: ctx, task_runner: task_runner)

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

@@ -4,22 +4,20 @@ module Script
       class ProjectDependencies
         def self.install(ctx:, task_runner:)
           CLI::UI::Frame.open(ctx.message("script.project_deps.checking")) do
-            begin
-              if task_runner.dependencies_installed?
-                ctx.puts(ctx.message("script.project_deps.none_required"))
-              else
-                UI::StrictSpinner.spin(ctx.message("script.project_deps.installing")) do |spinner|
-                  task_runner.install_dependencies
-                  spinner.update_title(ctx.message("script.project_deps.installed"))
-                end
+            if task_runner.dependencies_installed?
+              ctx.puts(ctx.message("script.project_deps.none_required"))
+            else
+              UI::StrictSpinner.spin(ctx.message("script.project_deps.installing")) do |spinner|
+                task_runner.install_dependencies
+                spinner.update_title(ctx.message("script.project_deps.installed"))
               end
-              true
-            rescue Infrastructure::Errors::DependencyInstallError => e
-              CLI::UI::Frame.with_frame_color_override(:red) do
-                ctx.puts("\n#{e.message}")
-              end
-              raise e
             end
+            true
+          rescue Infrastructure::Errors::DependencyInstallError => e
+            CLI::UI::Frame.with_frame_color_override(:red) do
+              ctx.puts("\n#{e.message}")
+            end
+            raise e
           end
         end
       end

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

@@ -48,6 +48,8 @@ module Script
                 uuid = script_service.set_app_script(
                   uuid: package.uuid,
                   extension_point_type: package.extension_point_type,
+                  title: package.title,
+                  description: package.description,
                   force: force,
                   metadata: package.metadata,
                   script_config: package.script_config,

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

@@ -24,10 +24,10 @@ module Script
         end
 
         class ScriptNotFoundError < ScriptProjectError
-          attr_reader :script_name, :extension_point_type
-          def initialize(extension_point_type, script_name)
+          attr_reader :title, :extension_point_type
+          def initialize(extension_point_type, title)
             super()
-            @script_name = script_name
+            @title = title
             @extension_point_type = extension_point_type
           end
         end

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

@@ -7,6 +7,8 @@ module Script
         attr_reader :id,
           :uuid,
           :extension_point_type,
+          :title,
+          :description,
           :script_config,
           :script_content,
           :metadata,
@@ -16,6 +18,8 @@ module Script
           id:,
           uuid:,
           extension_point_type:,
+          title:,
+          description:,
           script_content:,
           metadata:,
           script_config:,
@@ -24,6 +28,8 @@ module Script
           @id = id
           @uuid = uuid
           @extension_point_type = extension_point_type
+          @title = title
+          @description = description
           @script_content = script_content
           @metadata = metadata
           @script_config = script_config

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

@@ -4,17 +4,15 @@ module Script
   module Layers
     module Domain
       class ScriptConfig
-        attr_reader :content, :version, :title, :description, :configuration_ui, :configuration, :filename
+        attr_reader :content, :version, :configuration_ui, :configuration, :filename
 
-        REQUIRED_FIELDS = %w(version title)
+        REQUIRED_FIELDS = %w(version)
 
         def initialize(content:, filename:)
           @filename = filename
           validate_content!(content)
           @content = content
           @version = @content["version"].to_s
-          @title = @content["title"]
-          @description = @content["description"]
           @configuration_ui = @content.fetch("configurationUi", true)
           @configuration = @content["configuration"]
         end

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

@@ -12,7 +12,8 @@ module Script
         property :env, accepts: ShopifyCLI::Resources::EnvFile
 
         property! :extension_point_type, accepts: String
-        property! :script_name, accepts: String
+        property! :title, accepts: String
+        property  :description, accepts: String
         property! :language, accepts: String
 
         property :script_config, accepts: ScriptConfig
@@ -22,7 +23,7 @@ module Script
           super
 
           ShopifyCLI::Core::Monorail.metadata = {
-            "script_name" => script_name,
+            "script_name" => title,
             "extension_point_type" => extension_point_type,
             "language" => language,
           }

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

@@ -5,14 +5,29 @@ module Script
     module Infrastructure
       module Languages
         class AssemblyScriptProjectCreator < ProjectCreator
-          def self.config_file
-            "package.json"
-          end
-
           def setup_dependencies
             task_runner = Infrastructure::Languages::AssemblyScriptTaskRunner.new(ctx)
             task_runner.set_npm_config
             super
+
+            update_package_json_name
+          end
+
+          private
+
+          def update_package_json_name
+            file_content = ctx.read("package.json")
+            hash = file_content_to_hash(file_content)
+            hash["name"] = project_name
+            ctx.write("package.json", hash_to_file_content(hash))
+          end
+
+          def file_content_to_hash(content)
+            JSON.parse(content)
+          end
+
+          def hash_to_file_content(hash)
+            JSON.pretty_generate(hash)
           end
         end
       end

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

@@ -43,15 +43,10 @@ module Script
             )
           end
 
-          def self.config_file
-            raise NotImplementedError
-          end
-
           # the sparse checkout process is common to all script types
           def setup_dependencies
             setup_sparse_checkout
             clean
-            update_project_name(File.join(path_to_project, self.class.config_file))
           end
 
           private
@@ -72,16 +67,6 @@ module Script
             ctx.rm_rf(".git")
           end
 
-          def update_project_name(config_file)
-            raise Errors::ProjectConfigNotFoundError unless File.exist?(config_file)
-            upstream_name = "#{type.gsub("_", "-")}-default"
-            contents = File.read(config_file)
-
-            raise Errors::InvalidProjectConfigError unless contents.include?(upstream_name)
-            new_contents = contents.gsub(upstream_name, project_name)
-            File.write(config_file, new_contents)
-          end
-
           def command_runner
             @command_runner ||= CommandRunner.new(ctx: ctx)
           end