shopify-cli 2.13.0 → 2.15.1

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: 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/dev_server/hot_reload/remote_file_reloader.rb

@@ -28,6 +28,10 @@ module ShopifyCLI
 
           private
 
+          def api_client
+            @api_client ||= ThemeAdminAPI.new(@ctx, @theme.shop)
+          end
+
           def updated_file?(body, file)
             remote_checksum = body.dig("asset", "checksum")
             local_checksum = file.checksum
@@ -45,12 +49,8 @@ module ShopifyCLI
           end
 
           def fetch_asset(file)
-            ShopifyCLI::AdminAPI.rest_request(
-              @ctx,
-              shop: @theme.shop,
+            api_client.get(
               path: "themes/#{@theme.id}/assets.json",
-              method: "GET",
-              api_version: "unstable",
               query: URI.encode_www_form("asset[key]" => file.relative_path.to_s),
             )
           rescue ShopifyCLI::API::APIRequestNotFoundError

data/lib/shopify_cli/theme/dev_server/watcher.rb

@@ -45,13 +45,21 @@ module ShopifyCLI
         def filter_theme_files(files)
           files
             .select { |file| @theme.theme_file?(file) }
-            .reject { |file| @ignore_filter&.ignore?(file) }
+            .map { |file| @theme[file] }
+            .reject { |file| ignore_file?(file) }
         end
 
         def filter_remote_files(files)
           files
             .select { |file| @syncer.remote_file?(file) }
-            .reject { |file| @ignore_filter&.ignore?(file) }
+            .map { |file| @theme[file] }
+            .reject { |file| ignore_file?(file) }
+        end
+
+        private
+
+        def ignore_file?(file)
+          @ignore_filter&.ignore?(file.relative_path.to_s)
         end
       end
     end

data/lib/shopify_cli/theme/development_theme.rb

@@ -45,11 +45,8 @@ module ShopifyCLI
       def exists?
         return false unless id
 
-        ShopifyCLI::AdminAPI.rest_request(
-          @ctx,
-          shop: shop,
-          path: "themes/#{id}.json",
-          api_version: "unstable",
+        api_client.get(
+          path: "themes/#{id}.json"
         )
       rescue ShopifyCLI::API::APIRequestNotFoundError
         false

data/lib/shopify_cli/theme/syncer.rb

@@ -7,15 +7,15 @@ require "forwardable"
 require_relative "syncer/error_reporter"
 require_relative "syncer/standard_reporter"
 require_relative "syncer/operation"
+require_relative "theme_admin_api"
 
 module ShopifyCLI
   module Theme
     class Syncer
       extend Forwardable
 
-      API_VERSION = "unstable"
-
       attr_reader :checksums
+      attr_reader :checksums_mutex
       attr_accessor :include_filter
       attr_accessor :ignore_filter
 
@@ -39,6 +39,9 @@ module ShopifyCLI
         # Mutex used to pause all threads when backing-off when hitting API rate limits
         @backoff_mutex = Mutex.new
 
+        # Mutex used to coordinate changes in the checksums (shared accross all threads)
+        @checksums_mutex = Mutex.new
+
         # Latest theme assets checksums. Updated on each upload.
         @checksums = {}
 
@@ -46,6 +49,10 @@ module ShopifyCLI
         @error_checksums = []
       end
 
+      def api_client
+        @api_client ||= ThemeAdminAPI.new(@ctx, @theme.shop)
+      end
+
       def lock_io!
         @reporters.each(&:disable!)
       end
@@ -96,11 +103,8 @@ module ShopifyCLI
       end
 
       def fetch_checksums!
-        _status, response = ShopifyCLI::AdminAPI.rest_request(
-          @ctx,
-          shop: @theme.shop,
-          path: "themes/#{@theme.id}/assets.json",
-          api_version: API_VERSION,
+        _status, response = api_client.get(
+          path: "themes/#{@theme.id}/assets.json"
         )
         update_checksums(response)
       end
@@ -239,12 +243,8 @@ module ShopifyCLI
           asset[:attachment] = Base64.encode64(file.read)
         end
 
-        _status, body, response = ShopifyCLI::AdminAPI.rest_request(
-          @ctx,
-          shop: @theme.shop,
+        _status, body, response = api_client.put(
           path: "themes/#{@theme.id}/assets.json",
-          method: "PUT",
-          api_version: API_VERSION,
           body: JSON.generate(asset: asset)
         )
 
@@ -272,16 +272,12 @@ module ShopifyCLI
       end
 
       def ignored_by_include_filter?(path)
-        include_filter && !include_filter.match?(path)
+        !!include_filter && !include_filter.match?(path)
       end
 
       def get(file)
-        _status, body, response = ShopifyCLI::AdminAPI.rest_request(
-          @ctx,
-          shop: @theme.shop,
+        _status, body, response = api_client.get(
           path: "themes/#{@theme.id}/assets.json",
-          method: "GET",
-          api_version: API_VERSION,
           query: URI.encode_www_form("asset[key]" => file.relative_path.to_s),
         )
 
@@ -298,12 +294,8 @@ module ShopifyCLI
       end
 
       def delete(file)
-        _status, _body, response = ShopifyCLI::AdminAPI.rest_request(
-          @ctx,
-          shop: @theme.shop,
+        _status, _body, response = api_client.delete(
           path: "themes/#{@theme.id}/assets.json",
-          method: "DELETE",
-          api_version: API_VERSION,
           body: JSON.generate(asset: {
             key: file.relative_path.to_s,
           })
@@ -314,14 +306,17 @@ module ShopifyCLI
 
       def update_checksums(api_response)
         api_response.values.flatten.each do |asset|
-          if asset["key"]
+          next unless asset["key"]
+          checksums_mutex.synchronize do
             @checksums[asset["key"]] = asset["checksum"]
           end
         end
         # Generate .liquid asset files are reported twice in checksum:
         # once of generated, once for .liquid. We only keep the .liquid, that's the one we have
         # on disk.
-        @checksums.reject! { |key, _| @checksums.key?("#{key}.liquid") }
+        checksums_mutex.synchronize do
+          @checksums.reject! { |key, _| @checksums.key?("#{key}.liquid") }
+        end
       end
 
       def file_has_changed?(file)

data/lib/shopify_cli/theme/theme.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require_relative "file"
+require_relative "theme_admin_api"
 
 require "pathname"
 require "time"
@@ -20,11 +21,11 @@ module ShopifyCLI
       end
 
       def theme_files
-        glob(["**/*.liquid", "**/*.json", "assets/*"]).uniq
+        (glob(["**/*.liquid", "**/*.json"]) + static_asset_files).uniq
       end
 
       def static_asset_files
-        glob("assets/*").reject(&:liquid?)
+        glob("assets/*", raise_on_dir: true).reject(&:liquid?)
       end
 
       def liquid_files
@@ -35,8 +36,11 @@ module ShopifyCLI
         glob("**/*.json")
       end
 
-      def glob(pattern)
-        root.glob(pattern).map { |path| File.new(path, root) }
+      def glob(pattern, raise_on_dir: false)
+        root.glob(pattern).map do |path|
+          abort_if_directory!(path) if raise_on_dir
+          File.new(path, root)
+        end
       end
 
       def theme_file?(file)
@@ -59,7 +63,7 @@ module ShopifyCLI
       end
 
       def shop
-        AdminAPI.get_shop_or_abort(@ctx)
+        api_client.get_shop_or_abort
       end
 
       def editor_url
@@ -101,9 +105,7 @@ module ShopifyCLI
       def create
         raise InvalidThemeRole, "Can't create live theme. Use publish." if live?
 
-        _status, body = ShopifyCLI::AdminAPI.rest_request(
-          @ctx,
-          shop: shop,
+        _status, body = api_client.post(
           path: "themes.json",
           body: JSON.generate({
             theme: {
@@ -111,31 +113,21 @@ module ShopifyCLI
               role: role,
             },
           }),
-          method: "POST",
-          api_version: "unstable",
         )
 
         @id = body["theme"]["id"]
       end
 
       def delete
-        AdminAPI.rest_request(
-          @ctx,
-          shop: shop,
-          method: "DELETE",
-          path: "themes/#{id}.json",
-          api_version: "unstable",
+        api_client.delete(
+          path: "themes/#{id}.json"
         )
       end
 
       def publish
         return if live?
-        AdminAPI.rest_request(
-          @ctx,
-          shop: shop,
-          method: "PUT",
+        api_client.put(
           path: "themes/#{id}.json",
-          api_version: "unstable",
           body: JSON.generate(theme: {
             role: "main",
           })
@@ -205,23 +197,23 @@ module ShopifyCLI
         end
 
         def fetch_themes(ctx)
-          AdminAPI.rest_request(
-            ctx,
-            shop: AdminAPI.get_shop_or_abort(ctx),
-            path: "themes.json",
-            api_version: "unstable",
+          api_client = ThemeAdminAPI.new(ctx)
+
+          api_client.get(
+            path: "themes.json"
           )
         end
       end
 
       private
 
+      def api_client
+        @api_client ||= ThemeAdminAPI.new(@ctx)
+      end
+
       def load_info_from_api
-        _status, body = AdminAPI.rest_request(
-          @ctx,
-          shop: shop,
-          path: "themes/#{id}.json",
-          api_version: "unstable",
+        _status, body = api_client.get(
+          path: "themes/#{id}.json"
         )
 
         @name = body.dig("theme", "name")
@@ -229,6 +221,11 @@ module ShopifyCLI
 
         self
       end
+
+      def abort_if_directory!(path)
+        return unless ::File.directory?(path)
+        @ctx.abort(@ctx.message("theme.serve.error.invalid_subdirectory", path.to_s))
+      end
     end
   end
 end

data/lib/shopify_cli/theme/theme_admin_api.rb

@@ -0,0 +1,72 @@
+module ShopifyCLI
+  module Theme
+    class ThemeAdminAPI
+      API_VERSION = "unstable"
+
+      attr_reader :shop
+
+      def initialize(ctx, shop = nil)
+        @ctx = ctx
+        @shop = shop || get_shop_or_abort
+      end
+
+      def get(path:, **args)
+        rest_request(method: "GET", path: path, **args)
+      end
+
+      def put(path:, **args)
+        rest_request(method: "PUT", path: path, **args)
+      end
+
+      def post(path:, **args)
+        rest_request(method: "POST", path: path, **args)
+      end
+
+      def delete(path:, **args)
+        rest_request(method: "DELETE", path: path, **args)
+      end
+
+      def get_shop_or_abort # rubocop:disable Naming/AccessorMethodName
+        ShopifyCLI::AdminAPI.get_shop_or_abort(@ctx)
+      end
+
+      private
+
+      def rest_request(**args)
+        ShopifyCLI::AdminAPI.rest_request(
+          @ctx,
+          shop: @shop,
+          api_version: API_VERSION,
+          **args.compact
+        )
+      rescue ShopifyCLI::API::APIRequestForbiddenError,
+             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", 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/transform_data_structure.rb

@@ -40,6 +40,7 @@ module ShopifyCLI
 
     property! :underscore_keys, accepts: [true, false], default: false, reader: :underscore_keys?
     property! :symbolize_keys, accepts: [true, false], default: false, reader: :symbolize_keys?
+    property! :shallow, accepts: [true, false], default: false, reader: :shallow?
     property! :associative_array_container,
       accepts: ->(c) { c.respond_to?(:new) && c.method_defined?(:[]=) },
       default: -> { Hash }
@@ -47,10 +48,10 @@ module ShopifyCLI
     def call(object)
       case object
       when Array
-        object.map(&self).map(&:value)
+        shallow? ? object.dup : object.map(&self).map(&:value)
       when Hash
         object.each.with_object(associative_array_container.new) do |(key, value), result|
-          result[transform_key(key)] = call(value).value
+          result[transform_key(key)] = shallow? ? value : call(value).value
         end
       else
         ShopifyCLI::Result.success(object)

data/lib/shopify_cli/tunnel.rb

@@ -178,6 +178,15 @@ module ShopifyCLI
 
     def fetch_url(ctx, log_path)
       LogParser.new(log_path)
+    rescue NgrokError => e
+      # Full error messages/descriptions: https://ngrok.com/docs/errors
+      case e.message
+      when /ERR_NGROK_107/
+        ctx.abort(ctx.message("tunnel.invalid_token", e.message))
+      when /ERR_NGROK_108/
+        ctx.abort(ctx.message("tunnel.duplicate_session", e.message))
+      end
+      raise e.class, e.message
     rescue RuntimeError => e
       stop(ctx)
       raise e.class, e.message

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.13.0"
+  VERSION = "2.15.1"
 end

data/shipit.yml

@@ -0,0 +1,3 @@
+deploy:
+  post:
+    - bundle exec rake notify_version_to_bugsnag

data/shopify-cli.gemspec

@@ -28,18 +28,27 @@ Gem::Specification.new do |spec|
   spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
     %x(git ls-files -z).split("\x0").reject do |f|
       f.match(%r{^(test|spec|features|packaging)/}) ||
-      f.match(%r{^bin/(update-deps|shopify.bat)$})
+        f.match(%r{^bin/(update-deps|shopify.bat)$})
     end
   end
   spec.bindir = "bin"
   spec.require_paths = ["lib", "vendor"]
   spec.executables << "shopify"
 
-  spec.add_development_dependency("bundler", "~> 2.2.2")
+  spec.add_development_dependency("bundler", "~> 2.3.8")
   spec.add_development_dependency("rake", "~> 12.3", ">= 12.3.3")
   spec.add_development_dependency("minitest", "~> 5.0")
 
   spec.add_dependency("bugsnag", "~> 6.22")
   spec.add_dependency("listen", "~> 3.7.0")
-  spec.add_dependency("theme-check", "~> 1.9.0")
+
+  # We prefer being more strict here with the version range to have a more deterministic build.
+  # The added benefit is that, if the user upgrades the CLI, and we have "~> 1.10.1" version range,
+  # they will get a theme-check update.
+  # Whereas if we were to have "~> 1.9", that version would still be satisfied and thus not upgraded.
+  # Both shopify-cli and theme-check gems are owned and developed by Shopify.
+  # These gems are currently being actively developed and it's easiest to update them together.
+  spec.add_dependency("theme-check", "~> 1.10.1")
+
+  spec.extensions = ["ext/shopify-extensions/extconf.rb"]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.15.1
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-02 00:00:00.000000000 Z
+date: 2022-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.3.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.3.8
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.1
 description: |
   Shopify CLI helps you build Shopify apps faster. It quickly scaffolds Node.js
   and Ruby on Rails embedded apps. It also automates many common tasks in the
@@ -109,7 +109,8 @@ email:
 - dev-tools-education@shopify.com
 executables:
 - shopify
-extensions: []
+extensions:
+- ext/shopify-extensions/extconf.rb
 extra_rdoc_files: []
 files:
 - ".devcontainer.json"
@@ -124,6 +125,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"
@@ -155,12 +157,16 @@ files:
 - docs/users/migrate-from-themekit.md
 - ext/javy/hashes/javy-arm-macos-v0.1.0.gz.sha256
 - ext/javy/hashes/javy-arm-macos-v0.2.0.gz.sha256
+- ext/javy/hashes/javy-arm-macos-v0.2.1.gz.sha256
 - ext/javy/hashes/javy-x86_64-linux-v0.1.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-linux-v0.2.0.gz.sha256
+- ext/javy/hashes/javy-x86_64-linux-v0.2.1.gz.sha256
 - ext/javy/hashes/javy-x86_64-macos-v0.1.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-macos-v0.2.0.gz.sha256
+- ext/javy/hashes/javy-x86_64-macos-v0.2.1.gz.sha256
 - ext/javy/hashes/javy-x86_64-windows-v0.1.0.gz.sha256
 - ext/javy/hashes/javy-x86_64-windows-v0.2.0.gz.sha256
+- ext/javy/hashes/javy-x86_64-windows-v0.2.1.gz.sha256
 - ext/javy/javy.rb
 - ext/javy/version
 - ext/shopify-extensions/extconf.rb
@@ -283,7 +289,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
@@ -317,8 +322,6 @@ files:
 - lib/project_types/script/layers/infrastructure/command_runner.rb
 - lib/project_types/script/layers/infrastructure/errors.rb
 - lib/project_types/script/layers/infrastructure/extension_point_repository.rb
-- lib/project_types/script/layers/infrastructure/languages/assemblyscript_project_creator.rb
-- lib/project_types/script/layers/infrastructure/languages/assemblyscript_task_runner.rb
 - lib/project_types/script/layers/infrastructure/languages/project_creator.rb
 - lib/project_types/script/layers/infrastructure/languages/task_runner.rb
 - lib/project_types/script/layers/infrastructure/languages/tool_version_checker.rb
@@ -367,6 +370,7 @@ files:
 - lib/shopify_cli/admin_api/schema.rb
 - lib/shopify_cli/api.rb
 - lib/shopify_cli/app_type_detector.rb
+- lib/shopify_cli/changelog.rb
 - lib/shopify_cli/command.rb
 - lib/shopify_cli/command/app_sub_command.rb
 - lib/shopify_cli/command/project_command.rb
@@ -442,11 +446,13 @@ files:
 - lib/shopify_cli/project.rb
 - lib/shopify_cli/project_commands.rb
 - lib/shopify_cli/project_type.rb
+- lib/shopify_cli/release.rb
 - lib/shopify_cli/reporting_configuration_controller.rb
 - lib/shopify_cli/resolve_constant.rb
 - lib/shopify_cli/resources.rb
 - lib/shopify_cli/resources/env_file.rb
 - lib/shopify_cli/result.rb
+- lib/shopify_cli/sed.rb
 - lib/shopify_cli/services.rb
 - lib/shopify_cli/services/app/connect_service.rb
 - lib/shopify_cli/services/app/create/node_service.rb
@@ -502,12 +508,14 @@ files:
 - lib/shopify_cli/theme/syncer/operation.rb
 - lib/shopify_cli/theme/syncer/standard_reporter.rb
 - lib/shopify_cli/theme/theme.rb
+- lib/shopify_cli/theme/theme_admin_api.rb
 - lib/shopify_cli/thread_pool.rb
 - lib/shopify_cli/thread_pool/job.rb
 - lib/shopify_cli/transform_data_structure.rb
 - lib/shopify_cli/tunnel.rb
 - lib/shopify_cli/utilities.rb
 - lib/shopify_cli/version.rb
+- shipit.yml
 - shopify-cli.gemspec
 - shopify-dev
 - utilities/constants.rb