shopify-cli 2.14.0 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be8f00a6bb6d3e7059a63e77ff74327d9e11474cc34b156ec54da33080119e11
-  data.tar.gz: ed986614e2b2c0b9b9ca70a175c2133a3130643f3678bbf17148556be4f39f86
+  metadata.gz: e5861ffd7a22ca4048791e4993469dff421162159c7dabbf06b413522297c4a8
+  data.tar.gz: b5593ee5d6cfbf5c9b616b050263eb825d2d7a9846f5bf71953b4d7f708ee06e
 SHA512:
-  metadata.gz: cc1c384e33b5bc316e38ab1ab58b978ab56e811309c82746f9218fc8de2cd4d57b243414f324421baff1abdc69829d952840e2c2bd94049963858ca3700c5600
-  data.tar.gz: d065d5a10be15c0f79c800798fb0302e9b2519b7b22fea5879ae321297e8bd0859d8b21756b40ae8abe78387e1e3e62b600d0e796a5848545b1c8e5c37af4cd2
+  metadata.gz: 8cf0ff62f5bf1687d5d98f4d808bf9f7d0bb921322483a5e446e34ef6638ff5a67a5ae15b3e34916a9c4fe627f4aee581f8630d4182925928eb67a762624c103
+  data.tar.gz: 161eba94f7e0fd3ca350a162eef9706c8f5a76da972eb4b3cbefdc2f9f3fdc8a37a72b7a48f47d81e1860dca4367eb8c2ceae6fe1bd57d4a9a61c7df3ecd0209

data/.github/CONTRIBUTING.md

@@ -17,7 +17,7 @@ When contributing to the Shopify CLI, there are a set of [design guidelines](htt
 
 ### Where to find known issues
 
-We track all of our issues in GitHub and [bugs](https://github.com/Shopify/shopify-cli/labels/Bug) are labeled accordingly. If you are planning to work on an issue, avoid ones which already have an assignee, where someone has commented within the last two weeks they are working on it, or the issue is labeled with [fix in progress](https://github.com/Shopify/shopify-cli/labels/fix%20in%20progress). We will do our best to communicate when an issue is being worked on internally.
+We track all of our issues in GitHub and [bugs](https://github.com/Shopify/shopify-cli/labels/type:bug) are labeled accordingly. If you are planning to work on an issue, avoid ones which already have an assignee, where someone has commented within the last two weeks they are working on it, or the issue is labeled with [fix in progress](https://github.com/Shopify/shopify-cli/labels/fix%20in%20progress). We will do our best to communicate when an issue is being worked on internally.
 
 ### Running against a local environment
 

data/.github/workflows/stale.yml

@@ -0,0 +1,41 @@
+# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/actions/stale
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: '31 3 * * *' # randomly chosen time of day
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+    - uses: actions/stale@v3
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        days-before-issue-stale: 90
+        days-before-pr-stale: 30
+        days-before-close: 10
+        stale-issue-message: |-
+          This issue seems inactive. If it's still relevant, please add a comment saying so. Otherwise, take no action.
+
+          → If there's no activity within a week, then a bot will automatically close this.
+
+          Thanks for helping to improve Shopify's dev tooling and experience.
+        stale-pr-message: |-
+          This PR seems inactive. If it's still relevant, please add a comment saying so. Otherwise, take no action.
+
+          → If there's no activity within a week, then a bot will automatically close this.
+
+          Thanks for helping to improve Shopify's dev tooling and experience.
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'
+        operations-per-run: 10 # temporary so we can ease into staling and see what happens

data/CHANGELOG.md

@@ -2,6 +2,14 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
+## Version 2.15.0
+
+### Fixed
+* [#2086](https://github.com/Shopify/shopify-cli/pull/2086): Improve check of dependency versions
+* [#2149](https://github.com/Shopify/shopify-cli/pull/2149): Fix `ThemeAdminAPI` not to handle asset errors
+* [#2122](https://github.com/Shopify/shopify-cli/pull/2122): Fix `--only`/`--ignore` flags parser to support multiple occurrences without quotes
+* [#2146](https://github.com/Shopify/shopify-cli/pull/2146): Prevent duplicate locales for Checkout extension localization
+
 ## Version 2.14.0
 
 ### Changed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.14.0)
+    shopify-cli (2.15.0)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
       theme-check (~> 1.10.1)

data/lib/project_types/extension/models/specification_handlers/checkout_ui_extension.rb

@@ -43,6 +43,7 @@ module Extension
             # Localization is optional
             return {} if locale_filenames.empty?
 
+            validate_no_duplicate_locale(locale_filenames)
             validate_total_size(locale_filenames)
             default_locale = single_default_locale(locale_filenames)
 
@@ -61,6 +62,18 @@ module Extension
           end
         end
 
+        def validate_no_duplicate_locale(locale_filenames)
+          duplicate_locale = locale_filenames
+            .map { |filename| basename_for_locale_filename(filename.downcase) }
+            .group_by { |locale| locale }
+            .detect { |_k, v| v.size > 1 }
+            &.first
+          raise(
+            ShopifyCLI::Abort,
+            ShopifyCLI::Context.message("#{L10N_ERROR_PREFIX}.duplicate_locale_code", duplicate_locale)
+          ) unless duplicate_locale.nil?
+        end
+
         def validate_total_size(locale_filenames)
           total_size = locale_filenames.sum { |filename| File.size(filename) }
           if total_size > L10N_BUNDLE_SIZE_LIMIT

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

@@ -26,11 +26,11 @@ module Theme
         parser.on("-d", "--development") { flags[:development] = true }
         parser.on("-o", "--only=PATTERN", Conversions::IncludeGlob) do |pattern|
           flags[:includes] ||= []
-          flags[:includes] += pattern
+          flags[:includes] |= pattern
         end
         parser.on("-x", "--ignore=PATTERN", Conversions::IgnoreGlob) do |pattern|
           flags[:ignores] ||= []
-          flags[:ignores] += pattern
+          flags[:ignores] |= pattern
         end
       end
 

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

@@ -30,11 +30,11 @@ module Theme
         parser.on("-p", "--publish") { flags[:publish] = true }
         parser.on("-o", "--only=PATTERN", Conversions::IncludeGlob) do |pattern|
           flags[:includes] ||= []
-          flags[:includes] += pattern
+          flags[:includes] |= pattern
         end
         parser.on("-x", "--ignore=PATTERN", Conversions::IgnoreGlob) do |pattern|
           flags[:ignores] ||= []
-          flags[:ignores] += pattern
+          flags[:ignores] |= pattern
         end
       end
 

data/lib/project_types/theme/conversions/base_glob.rb

@@ -10,8 +10,22 @@ module Theme
 
         def convert(parser)
           argv = parser.default_argv
-          option_index = argv.index { |v| options.include?(v) }
+          values = []
+
+          option_indexes(argv).each do |option_index|
+            values += option_values(argv, parser, option_index)
+          end
+
+          values
+        end
+
+        def options
+          raise "`#{self.class.name}#options` must be defined"
+        end
+
+        private
 
+        def option_values(argv, parser, option_index)
           return [] if option_index.nil?
 
           start_index = option_index + 1
@@ -26,12 +40,13 @@ module Theme
           values
         end
 
-        def options
-          raise "`#{self.class.name}#options` must be defined"
+        def option_indexes(argv)
+          argv
+            .each_with_index
+            .select { |item, _index| options.include?(item) }
+            .map(&:last)
         end
 
-        private
-
         def options_map(parser)
           map = {}
           parser.top.list.each do |option|

data/lib/shopify_cli/command.rb

@@ -102,16 +102,10 @@ module ShopifyCLI
       def check_node_version
         return unless @compatible_node_range
 
-        context = Context.new
-        if context.which("node").nil?
-          raise ShopifyCLI::Abort, context.message("core.errors.missing_node")
-        end
-
         check_version(
           Environment.node_version,
           range: @compatible_node_range,
-          runtime: "Node",
-          context: context
+          runtime: "Node"
         )
       end
 

data/lib/shopify_cli/environment.rb

@@ -12,23 +12,31 @@ module ShopifyCLI
     ]
 
     def self.ruby_version(context: Context.new)
-      out, err, stat = context.capture3('ruby -e "puts RUBY_VERSION"')
-      raise ShopifyCLI::Abort, err unless stat.success?
-      out = out.gsub('"', "")
-      ::Semantic::Version.new(out.chomp)
+      output, status = context.capture2e("ruby", "--version")
+      raise ShopifyCLI::Abort, context.message("core.errors.missing_ruby") unless status.success?
+      version = output.match(/ruby (\d+\.\d+\.\d+)/)[1]
+      ::Semantic::Version.new(version)
     end
 
     def self.node_version(context: Context.new)
-      out, err, stat = context.capture3("node", "--version")
-      raise ShopifyCLI::Abort, err unless stat.success?
-      out = out.gsub("v", "")
-      ::Semantic::Version.new(out.chomp)
+      output, status = context.capture2e("node", "--version")
+      raise ShopifyCLI::Abort, context.message("core.errors.missing_node") unless status.success?
+      version = output.match(/v(\d+\.\d+\.\d+)/)[1]
+      ::Semantic::Version.new(version)
     end
 
     def self.npm_version(context: Context.new)
-      out, err, stat = context.capture3("npm", "--version")
-      raise ShopifyCLI::Abort, err unless stat.success?
-      ::Semantic::Version.new(out.chomp)
+      output, status = context.capture2e("npm", "--version")
+      raise ShopifyCLI::Abort, context.message("core.errors.missing_npm") unless status.success?
+      version = output.match(/(\d+\.\d+\.\d+)/)[1]
+      ::Semantic::Version.new(version)
+    end
+
+    def self.rails_version(context: Context.new)
+      output, status = context.capture2e("rails", "--version")
+      context.abort(context.message("core.app.create.rails.error.install_failure", "rails")) unless status.success?
+      version = output.match(/Rails (\d+\.\d+\.\d+)/)[1]
+      ::Semantic::Version.new(version)
     end
 
     def self.interactive=(interactive)

data/lib/shopify_cli/messages/messages.rb

@@ -15,7 +15,9 @@ module ShopifyCLI
       },
       core: {
         errors: {
-          missing_node: "Node is required to continue. Install node here: https://nodejs.org/en/download.",
+          missing_node: "Node.js is required to continue. Install Node.js here: https://nodejs.org/en/download.",
+          missing_npm: "npm is required to continue. Install npm here: https://www.npmjs.com/get-npm.",
+          missing_ruby: "Ruby is required to continue. Install Ruby here: https://www.ruby-lang.org/en/downloads.",
           option_parser: {
             invalid_option: "The option {{command:%s}} is not supported.",
             missing_argument: "The required argument {{command:%s}} is missing.",
@@ -95,8 +97,6 @@ module ShopifyCLI
               HELP
               error: {
                 node_required: "node is required to create an app project. Download at https://nodejs.org/en/download.",
-                node_version_failure: "Failed to get the current node version. Please make sure it is installed as " \
-                  "per the instructions at https://nodejs.org/en.",
                 npm_required: "npm is required to create an app project. Download at https://www.npmjs.com/get-npm.",
                 npm_version_failure: "Failed to get the current npm version. Please make sure it is installed as per " \
                   "the instructions at https://www.npmjs.com/get-npm.",
@@ -131,8 +131,6 @@ module ShopifyCLI
                     {{underline:https://getcomposer.org/download/}}
                   COMPOSER
                 npm_required: "npm is required to create an app project. Download at https://www.npmjs.com/get-npm.",
-                npm_version_failure: "Failed to get the current npm version. Please make sure it is installed as per " \
-                  "the instructions at https://www.npmjs.com/get-npm.",
                 app_setup: "Failed to set up the app",
               },
 
@@ -283,6 +281,8 @@ module ShopifyCLI
               localization: {
                 error: {
                   bundle_too_large: "Total size of all locale files must be less than %s.",
+                  duplicate_locale_code: "Duplicate locale found: `%s`; locale codes"\
+                    " should be unique and are case insensitive.",
                   file_empty: "Locale file `%s` is empty.",
                   file_too_large: "Locale file `%s` too large; size must be less than %s.",
                   invalid_file_extension: "Invalid locale filename: `%s`; only .json files are allowed.",

data/lib/shopify_cli/services/app/create/node_service.rb

@@ -88,24 +88,12 @@ module ShopifyCLI
           end
 
           def check_node
-            cmd_path = context.which("node")
-            context.abort(context.message("core.app.create.node.error.node_required")) if cmd_path.nil?
-
-            version, stat = context.capture2e("node", "-v")
-            unless stat.success?
-              context.abort(context.message("core.app.create.node.error.node_version_failure"))
-            end
-
+            version = ShopifyCLI::Environment.node_version(context: context)
             context.done(context.message("core.app.create.node.node_version", version))
           end
 
           def check_npm
-            cmd_path = context.which("npm")
-            context.abort(context.message("core.app.create.node.error.npm_required")) if cmd_path.nil?
-
-            version, stat = context.capture2e("npm", "-v")
-            context.abort(context.message("core.app.create.node.error.npm_version_failure")) unless stat.success?
-
+            version = ShopifyCLI::Environment.npm_version(context: context)
             context.done(context.message("core.app.create.node.npm_version", version))
           end
 

data/lib/shopify_cli/services/app/create/php_service.rb

@@ -69,12 +69,7 @@ module ShopifyCLI
           end
 
           def check_npm
-            cmd_path = context.which("npm")
-            context.abort(context.message("core.app.create.php.error.npm_required")) if cmd_path.nil?
-
-            version, stat = context.capture2e("npm", "-v")
-            context.abort(context.message("core.app.create.php.error.npm_version_failure")) unless stat.success?
-
+            version = ShopifyCLI::Environment.npm_version(context: context)
             context.done(context.message("core.app.create.php.npm_version", version))
           end
 

data/lib/shopify_cli/services/app/create/rails_service.rb

@@ -108,7 +108,7 @@ module ShopifyCLI
           end
 
           def check_ruby
-            ruby_version = Rails::Ruby.version(context)
+            ruby_version = Environment.ruby_version(context)
             return if ruby_version.satisfies?("~>2.5") || ruby_version.satisfies?("~>3.1.0")
             context.abort(context.message("core.app.create.rails.error.invalid_ruby_version"))
           end
@@ -219,18 +219,10 @@ module ShopifyCLI
           end
 
           def install_webpacker?
-            rails_version < ::Semantic::Version.new("7.0.0") &&
-              !File.exist?(File.join(context.root, "config/webpacker.yml"))
-          end
-
-          def rails_version
-            output, status = context.capture2e("rails", "--version")
-            unless status.success?
-              context.abort(context.message("core.app.create.rails.error.install_failure", "rails"))
-            end
+            rails_version = Environment.rails_version(context: context)
+            webpacker_config = File.exist?(File.join(context.root, "config/webpacker.yml"))
 
-            version = output.scan(/Rails \d+\.\d+\.\d+/).first.split(" ").last
-            ::Semantic::Version.new(version)
+            rails_version < ::Semantic::Version.new("7.0.0") && !webpacker_config
           end
         end
       end

data/lib/shopify_cli/theme/theme_admin_api.rb

@@ -11,35 +11,19 @@ module ShopifyCLI
       end
 
       def get(path:, **args)
-        rest_request(
-          method: "GET",
-          path: path,
-          **args
-        )
+        rest_request(method: "GET", path: path, **args)
       end
 
       def put(path:, **args)
-        rest_request(
-          method: "PUT",
-          path: path,
-          **args
-        )
+        rest_request(method: "PUT", path: path, **args)
       end
 
       def post(path:, **args)
-        rest_request(
-          method: "POST",
-          path: path,
-          **args
-        )
+        rest_request(method: "POST", path: path, **args)
       end
 
       def delete(path:, **args)
-        rest_request(
-          method: "DELETE",
-          path: path,
-          **args
-        )
+        rest_request(method: "DELETE", path: path, **args)
       end
 
       def get_shop_or_abort # rubocop:disable Naming/AccessorMethodName
@@ -56,16 +40,33 @@ module ShopifyCLI
           **args.compact
         )
       rescue ShopifyCLI::API::APIRequestForbiddenError,
-             ShopifyCLI::API::APIRequestUnauthorizedError
-        handle_permissions_error
+             ShopifyCLI::API::APIRequestUnauthorizedError => error
+        # The Admin API returns 403 Forbidden responses on different
+        # scenarios:
+        #
+        # * when a user doesn't have permissions for a request:
+        #   <APIRequestForbiddenError: 403 {}>
+        #
+        # * when an asset operation cannot be performed:
+        #   <APIRequestForbiddenError: 403 {"message":"templates/gift_card.liquid could not be deleted"}>
+        if empty_response_error?(error)
+          return handle_permissions_error
+        end
+
+        raise error
       end
 
       def handle_permissions_error
-        ensure_user_error = @ctx.message("theme.ensure_user_error", get_shop_or_abort)
+        ensure_user_error = @ctx.message("theme.ensure_user_error", shop)
         ensure_user_try_this = @ctx.message("theme.ensure_user_try_this")
 
         @ctx.abort(ensure_user_error, ensure_user_try_this)
       end
+
+      def empty_response_error?(error)
+        error_message = error&.response&.body.to_s
+        error_message.empty?
+      end
     end
   end
 end

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.14.0"
+  VERSION = "2.15.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.15.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2022-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,6 +124,7 @@ files:
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/probots.yml"
 - ".github/workflows/shopify.yml"
+- ".github/workflows/stale.yml"
 - ".github/workflows/triage.yml"
 - ".gitignore"
 - ".rubocop.yml"
@@ -287,7 +288,6 @@ files:
 - lib/project_types/rails/forms/create.rb
 - lib/project_types/rails/gem.rb
 - 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

data/lib/project_types/rails/ruby.rb

@@ -1,17 +0,0 @@
-module Rails
-  class Ruby
-    include SmartProperties
-
-    VERSION_STRING = /ruby ([\d\.]+)/
-
-    property :ctx, accepts: ShopifyCLI::Context, required: true
-
-    class << self
-      def version(ctx)
-        require "semantic/semantic"
-        out, _ = ctx.capture2("ruby", "-v")
-        Semantic::Version.new(VERSION_STRING.match(out)[1])
-      end
-    end
-  end
-end