shopify-cli 2.13.0 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e54fd77e2aa3b1721ea02cd7cad4a84afdae67a3c73510e6ee8b01e44bfc5949
-  data.tar.gz: a92380f94b7a33cea4eae04d2d528ef09a51d161a5b77a900a294e7176ee89e9
+  metadata.gz: be8f00a6bb6d3e7059a63e77ff74327d9e11474cc34b156ec54da33080119e11
+  data.tar.gz: ed986614e2b2c0b9b9ca70a175c2133a3130643f3678bbf17148556be4f39f86
 SHA512:
-  metadata.gz: 3a55cc0e5a57ab4a842411667dfca871140ef324d17c537157e3913cce383c84ae70ebd26cbf8f14a020b94283c9d6264ab71af5f55c37255fbe7966ee8f46f5
-  data.tar.gz: 24328c051c6795d7c4778fdaea861cc77d3337a886126074bce4ae3073b635b6bcd878457e8cad4399c5982b0be5d168a3f6f3c86c5e3bbbe7b7b2ce192e4d58
+  metadata.gz: cc1c384e33b5bc316e38ab1ab58b978ab56e811309c82746f9218fc8de2cd4d57b243414f324421baff1abdc69829d952840e2c2bd94049963858ca3700c5600
+  data.tar.gz: d065d5a10be15c0f79c800798fb0302e9b2519b7b22fea5879ae321297e8bd0859d8b21756b40ae8abe78387e1e3e62b600d0e796a5848545b1c8e5c37af4cd2

data/.github/CODEOWNERS

@@ -3,3 +3,8 @@
 
 /lib/project_types/script/ @shopify/scripts-platform
 /test/project_types/script/ @shopify/scripts-platform
+
+/lib/project_types/theme/ @shopify/theme-platform-dev-experience
+/lib/shopify_cli/theme/ @shopify/theme-platform-dev-experience
+/test/project_types/theme/ @shopify/theme-platform-dev-experience
+/test/shopify-cli/theme/ @shopify/theme-platform-dev-experience

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -40,4 +40,4 @@ Fixes #0000 <!-- link to issue if one exists -->
 - [ ] I've added a CHANGELOG entry for this PR (if the change is public-facing)
 - [ ] I've considered possible cross-platform impacts (Mac, Linux, Windows).
 - [ ] I've left the version number as is (we'll handle incrementing this when releasing).
-- [ ] I've included any post-release steps in the section above.
+- [ ] I've included any post-release steps in the section above (if needed).

data/CHANGELOG.md

@@ -2,6 +2,20 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
+## Version 2.14.0
+
+### Changed
+* [#2126](https://github.com/Shopify/shopify-cli/pull/2126): Use javy version 0.2.1
+
+### Added
+* [#2103](https://github.com/Shopify/shopify-cli/pull/2103): Improve `shopify theme package` to include the `release-notes.md` file
+
+### Fixed
+* [#2112](https://github.com/Shopify/shopify-cli/pull/2112): Fix intermittent error ("can't add a new key into hash during iteration") in the `theme push` command
+* [#2088](https://github.com/Shopify/shopify-cli/pull/2088): Update theme-check to 1.10.1
+* [#2130](https://github.com/Shopify/shopify-cli/pull/2130): Fix Homebrew installation.
+* [#2133](https://github.com/Shopify/shopify-cli/pull/2133): Fix ignore file handling in DevServer::Watcher.
+
 ## Version 2.13.0
 
 ### Added
@@ -11,6 +25,10 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 ### 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
+* [#2114](https://github.com/Shopify/shopify-cli/pull/2114): Fix `theme` command error messaging with `ThemeAdminAPI` wrapper
+
+### Removed
+* [#2102](https://github.com/Shopify/shopify-cli/pull/2102): Remove AssemblyScript as a supported script language.
 
 ## Version 2.12.0
 ### Added

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.13.0)
+    shopify-cli (2.14.0)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
-      theme-check (~> 1.9.0)
+      theme-check (~> 1.10.1)
 
 GEM
   remote: https://rubygems.org/
@@ -81,7 +81,7 @@ GEM
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.21.0)
-    parser (3.1.0.0)
+    parser (3.1.1.0)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -119,7 +119,7 @@ GEM
     ruby-progressbar (1.11.0)
     sys-uname (1.2.2)
       ffi (~> 1.1)
-    theme-check (1.9.0)
+    theme-check (1.10.1)
       liquid (>= 5.1.0)
       nokogiri (>= 1.12)
       parser (~> 3)
@@ -134,7 +134,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.2.2)
+  bundler (~> 2.3.8)
   byebug
   colorize (~> 0.8.1)
   cucumber (~> 7.0)
@@ -155,4 +155,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.2.29
+   2.3.8

data/Rakefile

@@ -2,6 +2,8 @@ ENV["SHOPIFY_CLI_TEST"] = "1"
 
 require_relative "bin/load_shopify"
 require_relative "utilities/utilities"
+require_relative "lib/shopify_cli/constants"
+require_relative "lib/shopify_cli/version"
 require "rake/testtask"
 require "rubocop/rake_task"
 require "bundler/gem_tasks"
@@ -33,6 +35,20 @@ task :console do
   exec("irb", "-r", "./bin/load_shopify.rb", "-r", "byebug")
 end
 
+desc("Notifies a new version to Bugsnag")
+task :notify_version_to_bugsnag do
+  # This task runs at deployment time to notify
+  # Bugsnag about new versions. Because the deployment
+  # environment has Node, we can run the Bugsnag CLI
+  # through npx.
+  system(
+    { "npm_config_yes" => "true" },
+    "npx", "-q", "bugsnag-build-reporter",
+    "-k", ShopifyCLI::Constants::Bugsnag::API_KEY,
+    "-v", ShopifyCLI::VERSION
+  ) || abort
+end
+
 namespace :rdoc do
   repo = "https://github.com/Shopify/shopify-cli.wiki.git"
   intermediate = "markdown_intermediate"

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

@@ -0,0 +1 @@
+80576fe617d6e093a72bc826f041207ddc57605381f0db6451ba27310e57e830

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

@@ -0,0 +1 @@
+6b7b6f6745594c2e8efcaf948c0ef367911446101d2b8a7c8138ce2aca868cbd

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

@@ -0,0 +1 @@
+4010c2d154f1ef7ebf1f8c49621a0742ab75c60fd77746a5fa175878d07f16ef

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

@@ -0,0 +1 @@
+c12418f7b3e4edead87ade1f44bd7280626a92d8d1238d7f8eb91b1122f20f20

data/ext/javy/version

@@ -1 +1 @@
-v0.2.0
+v0.2.1

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

@@ -2,9 +2,27 @@ require "semantic/semantic"
 
 module Extension
   module Models
-    NpmPackage = Struct.new(:name, :version, keyword_init: true) do
+    class NpmPackage
+      include SmartProperties
       include Comparable
 
+      property :name
+      property :version
+      property :scripts, accepts: Hash
+      property :dependencies, accepts: Hash
+      property :dev_dependencies, accepts: Hash
+
+      def initialize(**config)
+        super(**config.select { |property_name, _| self.class.properties.key?(property_name) })
+      end
+
+      def self.parse(io)
+        ShopifyCLI::Result.call { JSON.parse(io.read) }
+          .then(&ShopifyCLI::TransformDataStructure.new(underscore_keys: true, symbolize_keys: true, shallow: true))
+          .then { |specification| new(**specification) }
+          .unwrap { |error| raise "Failed to parse NPM package specification: #{error}" }
+      end
+
       def <=>(other)
         return nil unless name == other.name
         Semantic::Version.new(version) <=> Semantic::Version.new(other.version)

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

@@ -13,15 +13,16 @@ module Extension
         ]
 
         property! :name, accepts: VALID_RENDERERS
+        property! :version, accepts: String, default: "latest"
 
         def self.find(type)
           case type.downcase
           when "product_subscription"
-            new(name: "@shopify/admin-ui-extensions")
+            new(name: "@shopify/admin-ui-extensions", version: "^1.0.1")
           when "checkout_ui_extension"
-            new(name: "@shopify/checkout-ui-extensions")
+            new(name: "@shopify/checkout-ui-extensions", version: "^0.14.0")
           when "checkout_post_purchase"
-            new(name: "@shopify/post-purchase-ui-extensions")
+            new(name: "@shopify/post-purchase-ui-extensions", version: "^0.13.2")
           end
         end
       end

data/lib/project_types/script/cli.rb

@@ -64,10 +64,6 @@ module Script
       autoload :ServiceLocator, Project.project_filepath("layers/infrastructure/service_locator")
 
       module Languages
-        autoload :AssemblyScriptProjectCreator,
-          Project.project_filepath("layers/infrastructure/languages/assemblyscript_project_creator")
-        autoload :AssemblyScriptTaskRunner,
-          Project.project_filepath("layers/infrastructure/languages/assemblyscript_task_runner")
         autoload :ProjectCreator, Project.project_filepath("layers/infrastructure/languages/project_creator")
         autoload :TaskRunner, Project.project_filepath("layers/infrastructure/languages/task_runner")
         autoload :TypeScriptProjectCreator,

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

@@ -1,9 +1,6 @@
 payment_methods:
   domain: 'checkout'
   libraries:
-    assemblyscript:
-      repo: "https://github.com/Shopify/scripts-apis-examples"
-      package: "@shopify/scripts-checkout-apis"
     typescript:
       beta: true
       package: "@shopify/scripts-checkout-apis"
@@ -13,9 +10,6 @@ payment_methods:
 shipping_methods:
   domain: 'checkout'
   libraries:
-    assemblyscript:
-      repo: "https://github.com/Shopify/scripts-apis-examples"
-      package: "@shopify/scripts-checkout-apis"
     typescript:
       beta: true
       package: "@shopify/scripts-checkout-apis"

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

@@ -5,31 +5,16 @@ module Script
     module Application
       class BuildScript
         class << self
-          def call(ctx:, task_runner:, script_project:, library:)
+          def call(ctx:, task_runner:)
             CLI::UI::Frame.open(ctx.message("script.application.building")) do
               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,
-                )
+                task_runner.build
                 spinner.update_title(ctx.message("script.application.built"))
               end
-            rescue StandardError => e
+            rescue Infrastructure::Errors::BuildError => 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

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

@@ -21,30 +21,32 @@ module Script
               api: script_project.extension_point_type
             ) if library.nil? && (script_project.language != "wasm")
 
-            library_name = library&.package
-            library_data = {
-              language: script_project.language,
-              version: task_runner.library_version(library_name),
-            } if library_name
-
             ProjectDependencies.install(ctx: ctx, task_runner: task_runner)
-            BuildScript.call(ctx: ctx, task_runner: task_runner, script_project: script_project, library: library_data)
-
-            metadata_file_location = task_runner.metadata_file_location
-            metadata = Infrastructure::MetadataRepository.new(ctx: ctx).get_metadata(metadata_file_location)
+            BuildScript.call(ctx: ctx, task_runner: task_runner)
 
             CLI::UI::Frame.open(ctx.message("script.application.pushing")) do
               UI::PrintingSpinner.spin(ctx, ctx.message("script.application.pushing_script")) do |p_ctx, spinner|
+                library_name = library&.package
+                library_data = {
+                  language: script_project.language,
+                  version: task_runner.library_version(library_name),
+                } if library_name
+
+                metadata_file_location = task_runner.metadata_file_location
+                metadata = Infrastructure::MetadataRepository.new(ctx: ctx).get_metadata(metadata_file_location)
+
                 package = Infrastructure::PushPackageRepository.new(ctx: p_ctx).get_push_package(
                   script_project: script_project,
                   metadata: metadata,
                   library: library_data,
                 )
+
                 script_service = Infrastructure::ServiceLocator.script_service(
                   ctx: p_ctx,
                   api_key: script_project.api_key
                 )
                 module_upload_url = Infrastructure::ScriptUploader.new(script_service).upload(package.script_content)
+
                 uuid = script_service.set_app_script(
                   uuid: package.uuid,
                   extension_point_type: package.extension_point_type,

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

@@ -26,7 +26,6 @@ module Script
           )
 
             project_creators = {
-              "assemblyscript" => AssemblyScriptProjectCreator,
               "typescript" => TypeScriptProjectCreator,
               "wasm" => WasmProjectCreator,
             }

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

@@ -9,7 +9,6 @@ module Script
 
           def self.for(ctx, language)
             task_runners = {
-              "assemblyscript" => AssemblyScriptTaskRunner,
               "typescript" => TypeScriptTaskRunner,
               "wasm" => WasmTaskRunner,
             }

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

@@ -18,7 +18,8 @@ module Script
 
           def build
             compile
-            bytecode
+          rescue Errors::SystemCallFailureError => e
+            raise Errors::BuildError, e.out
           end
 
           def install_dependencies
@@ -95,15 +96,6 @@ module Script
             raise Errors::BuildScriptNotFoundError,
               "Build script not found" if build_script.nil?
           end
-
-          def bytecode
-            raise Errors::WebAssemblyBinaryNotFoundError unless ctx.file_exist?(BYTECODE_FILE)
-
-            contents = ctx.binread(BYTECODE_FILE)
-            ctx.rm(BYTECODE_FILE)
-
-            contents
-          end
         end
       end
     end

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

@@ -5,7 +5,7 @@ module Script
     module Infrastructure
       module Languages
         class WasmTaskRunner < TaskRunner
-          BYTECODE_FILE = "script.wasm"
+          BYTECODE_FILE = "build/index.wasm"
 
           def dependencies_installed?
             true

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

@@ -7,23 +7,6 @@ module Script
         include SmartProperties
         property! :ctx, accepts: ShopifyCLI::Context
 
-        def create_push_package(script_project:, script_content:, metadata:, library:)
-          build_file_path = file_path(script_project.id)
-          write_to_path(build_file_path, script_content)
-
-          Domain::PushPackage.new(
-            id: build_file_path,
-            uuid: script_project.uuid,
-            extension_point_type: script_project.extension_point_type,
-            title: script_project.title,
-            description: script_project.description,
-            script_content: script_content,
-            metadata: metadata,
-            script_config: script_project.script_config,
-            library: library
-          )
-        end
-
         def get_push_package(script_project:, metadata:, library:)
           build_file_path = file_path(script_project.id)
           raise Domain::Errors::PushPackageNotFoundError unless ctx.file_exist?(build_file_path)
@@ -44,13 +27,8 @@ module Script
 
         private
 
-        def write_to_path(path, content)
-          ctx.mkdir_p(File.dirname(path))
-          ctx.binwrite(path, content)
-        end
-
         def file_path(path_to_script)
-          "#{path_to_script}/build/script.wasm"
+          "#{path_to_script}/build/index.wasm"
         end
       end
     end

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

@@ -136,7 +136,7 @@ module Script
         end
 
         def default_language
-          "assemblyscript"
+          "wasm"
         end
 
         def validate_metadata!(extension_point_type, language)

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

@@ -135,8 +135,8 @@ module Script
             "\nbuild: npx shopify-scripts-toolchain-as build --src src/shopify_main.ts --binary build/<script_name>.wasm --metadata build/metadata.json -- --lib node_modules --optimize --use Date=",
 
           web_assembly_binary_not_found: "Wasm binary not found.",
-          web_assembly_binary_not_found_suggestion: "Check that there is a valid Wasm binary in the root directory" \
-          "Your Wasm binary should match the script name: <script_name>.wasm",
+          web_assembly_binary_not_found_suggestion: "Check that a valid Wasm binary is present. " \
+          "The Wasm binary's filepath must be 'build/index.wasm'.",
 
           project_config_not_found: "Internal error - Script can't be created because the project's config file is missing from the repository.",
 

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

@@ -15,6 +15,7 @@ module Theme
         sections
         snippets
         templates
+        release-notes.md
       ]
 
       def call(args, _name)

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

@@ -7,6 +7,8 @@ module Theme
           Suite of commands for developing Shopify themes. See {{command:%1$s theme <command> --help}} for usage of each command.
             Usage: {{command:%1$s theme [ %2$s ]}}
         HELP
+        ensure_user_error: "You are not authorized to edit themes on %s.",
+        ensure_user_try_this: "Make sure you are a user of that store, and allowed to edit themes.",
 
         init: {
           help: <<~HELP,

data/lib/shopify_cli/commands/app/deploy.rb

@@ -2,7 +2,6 @@ module ShopifyCLI
   module Commands
     class App
       class Deploy < ShopifyCLI::Command::AppSubCommand
-        subcommand :Heroku, "heroku", "shopify_cli/commands/app/deploy/heroku"
         prerequisite_task :ensure_git_dependency
 
         recommend_default_ruby_range

data/lib/shopify_cli/context.rb

@@ -103,7 +103,7 @@ module ShopifyCLI
     # any command run by the context.
     attr_accessor :env
 
-    def initialize(root: Dir.pwd, env: ($original_env || ENV).clone) # :nodoc:
+    def initialize(root: Dir.pwd, env: ($original_env || ENV).to_h) # :nodoc:
       self.root = root
       self.env = env
     end
@@ -164,7 +164,7 @@ module ShopifyCLI
 
     # will return true while tests are running, either locally or on CI
     def testing?
-      ci? || ENV["TEST"]
+      ci? || ENV["SHOPIFY_CLI_TEST"]
     end
 
     ##

data/lib/shopify_cli/core/entry_point.rb

@@ -5,7 +5,7 @@ module ShopifyCLI
     module EntryPoint
       class << self
         def call(args, ctx = Context.new)
-          if ctx.development?
+          if ctx.development? && !ctx.testing?
             ctx.warn(
               ctx.message("core.warning.development_version", File.join(ShopifyCLI::ROOT, "bin", ShopifyCLI::TOOL_NAME))
             )

data/lib/shopify_cli/core/monorail.rb

@@ -17,11 +17,7 @@ module ShopifyCLI
 
         def log(name, args, &block) # rubocop:disable Lint/UnusedMethodArgument
           command, command_name = Commands::Registry.lookup_command(name)
-          final_command = [command_name]
-          if command
-            subcommand, subcommand_name = command.subcommand_registry.lookup_command(args.first)
-            final_command << subcommand_name if subcommand
-          end
+          full_command = self.full_command(command, args, resolved_command: [command_name])
 
           start_time = now_in_milliseconds
           err = nil
@@ -35,9 +31,21 @@ module ShopifyCLI
             # If there's an error, we don't prompt from here and we let the exception
             # reporter do that.
             if report?(prompt: err.nil?)
-              send_event(start_time, final_command, args - final_command, err&.message)
+              send_event(start_time, full_command, args - full_command, err&.message)
+            end
+          end
+        end
+
+        def full_command(command, args, resolved_command:)
+          resolved_command = resolved_command.dup
+          if command
+            subcommand, subcommand_name = command.subcommand_registry.lookup_command(args.first)
+            resolved_command << subcommand_name if subcommand
+            if subcommand&.subcommand_registry
+              resolved_command = full_command(subcommand, args.drop(1), resolved_command: resolved_command)
             end
           end
+          resolved_command
         end
 
         private

data/lib/shopify_cli/exception_reporter.rb

@@ -46,6 +46,8 @@ module ShopifyCLI
       Bugsnag.notify(error) do |event|
         event.add_metadata(:device, metadata)
       end
+    rescue
+      nil
     end
 
     def self.report?(context:)

data/lib/shopify_cli/packager.rb

@@ -81,7 +81,7 @@ module ShopifyCLI
       puts "Grabbing sha256 checksum from Rubygems.org"
       require "digest/sha2"
       require "open-uri"
-      gem_checksum = open("https://rubygems.org/downloads/shopify-cli-#{ShopifyCLI::VERSION}.gem") do |io|
+      gem_checksum = URI.open("https://rubygems.org/downloads/shopify-cli-#{ShopifyCLI::VERSION}.gem") do |io|
         Digest::SHA256.new.hexdigest(io.read)
       end
 

data/lib/shopify_cli/result.rb

@@ -181,6 +181,13 @@ module ShopifyCLI
         self
       end
 
+      ##
+      # returns the value this success represents
+      #
+      def unwrap!
+        value
+      end
+
       ##
       # returns the success value and ignores the fallback value that was either
       # provided as a method argument or by passing a block. However, the caller
@@ -339,6 +346,13 @@ module ShopifyCLI
         raise ArgumentError, "expected either a fallback value or a block" unless (args.length == 1) ^ block
         block ? block.call(@error) : args.pop
       end
+
+      ##
+      # raises the error this failure represents
+      #
+      def unwrap!
+        raise error
+      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"
@@ -59,7 +60,7 @@ module ShopifyCLI
       end
 
       def shop
-        AdminAPI.get_shop_or_abort(@ctx)
+        api_client.get_shop_or_abort
       end
 
       def editor_url
@@ -101,9 +102,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 +110,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 +194,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")

data/lib/shopify_cli/theme/theme_admin_api.rb

@@ -0,0 +1,71 @@
+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
+        handle_permissions_error
+      end
+
+      def handle_permissions_error
+        ensure_user_error = @ctx.message("theme.ensure_user_error", get_shop_or_abort)
+        ensure_user_try_this = @ctx.message("theme.ensure_user_try_this")
+
+        @ctx.abort(ensure_user_error, ensure_user_try_this)
+      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/version.rb

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

data/shipit.yml

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

data/shopify-cli.gemspec

@@ -35,11 +35,18 @@ Gem::Specification.new do |spec|
   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")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.14.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-02 00:00:00.000000000 Z
+date: 2022-03-15 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
@@ -155,12 +155,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
@@ -317,8 +321,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
@@ -502,12 +504,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

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

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-module Script
-  module Layers
-    module Infrastructure
-      module Languages
-        class AssemblyScriptProjectCreator < ProjectCreator
-          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
-    end
-  end
-end

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

@@ -1,109 +0,0 @@
-# frozen_string_literal: true
-
-module Script
-  module Layers
-    module Infrastructure
-      module Languages
-        class AssemblyScriptTaskRunner < TaskRunner
-          NODE_MIN_VERSION = "14.15.0"
-          NPM_MIN_VERSION = "5.2.0"
-
-          BYTECODE_FILE = "build/script.wasm"
-          METADATA_FILE = "build/metadata.json"
-          SCRIPT_SDK_BUILD = "npm run build"
-          NPM_SET_REGISTRY_COMMAND = "npm --userconfig ./.npmrc config set @shopify:registry https://registry.npmjs.com"
-          NPM_SET_ENGINE_STRICT_COMMAND = "npm --userconfig ./.npmrc config set engine-strict true"
-          NPM_INSTALL_COMMAND = "npm install --no-audit --no-optional --legacy-peer-deps --loglevel error"
-
-          def build
-            compile
-            bytecode
-          end
-
-          def install_dependencies
-            run_cmd_with_env_check(NPM_INSTALL_COMMAND)
-
-          rescue Errors::SystemCallFailureError => e
-            raise Errors::DependencyInstallError, e.out
-          end
-
-          def dependencies_installed?
-            # Assuming if node_modules folder exist at root of script folder, all deps are installed
-            ctx.dir_exist?("node_modules")
-          end
-
-          def metadata_file_location
-            METADATA_FILE
-          end
-
-          def library_version(library_name)
-            output = JSON.parse(run_cmd_with_env_check("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
-
-          def set_npm_config
-            run_cmd_with_env_check(NPM_SET_REGISTRY_COMMAND)
-            run_cmd_with_env_check(NPM_SET_ENGINE_STRICT_COMMAND)
-          end
-
-          private
-
-          def ensure_environment
-            return if defined?(@environment_checked)
-            @environment_checked = true
-
-            ToolVersionChecker.check_node(minimum_version: NODE_MIN_VERSION)
-            ToolVersionChecker.check_npm(minimum_version: NPM_MIN_VERSION)
-          end
-
-          def run_cmd_with_env_check(cmd)
-            ensure_environment
-            CommandRunner.new(ctx: ctx).call(cmd)
-          end
-
-          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 compile
-            check_compilation_dependencies!
-            run_cmd_with_env_check(SCRIPT_SDK_BUILD)
-          end
-
-          def check_compilation_dependencies!
-            pkg = JSON.parse(File.read("package.json"))
-            build_script = pkg.dig("scripts", "build")
-
-            raise Errors::BuildScriptNotFoundError,
-              "Build script not found" if build_script.nil?
-          end
-
-          def bytecode
-            raise Errors::WebAssemblyBinaryNotFoundError unless ctx.file_exist?(BYTECODE_FILE)
-
-            contents = ctx.binread(BYTECODE_FILE)
-            ctx.rm(BYTECODE_FILE)
-
-            contents
-          end
-        end
-      end
-    end
-  end
-end