shopify-cli 2.7.2 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b15f9181fc2d774f3fcc0c7297881090097c32a873f5586a766a9f1af3ca4771
-  data.tar.gz: b05883edae91e131bbe30ea0fcf78fc7b7c31d775299ee37e7ce4b14b14f875a
+  metadata.gz: f839cd234fbc37b84d85cc7ba1efddedf6b1571adba40562b3f4296286ca0130
+  data.tar.gz: fb66a6a0728d317bddc220e1af1c4fa0049bd42e34cbef6f4310daa19cfe9e86
 SHA512:
-  metadata.gz: fd64941e6aee6553c078d9cb52c9ff97d04f2975d396943cb94b009e862ea14e2be44632534786288fdc71075bea47337d474a63a87d889393ecb159848c5958
-  data.tar.gz: 24086b852a37609e95cc6a3f3c639b4d7b32c90b3b8b3db8154dd840f86f72b13b9c09b060e3f6da3dfeaa905e5a0c93c31c607c7ba7d7ea4d0029b80a90025e
+  metadata.gz: 11c1e49165ad7140139fe89b56e55287e6a3facca584c18234a4dbb302428d01a62cf2f4c5c27edf1943c9ec7f6610c8733fc1689b3cb78f9425b01c2f4f3836
+  data.tar.gz: 8fc34d5588a785bbd8fa7f47b0dc8f9682dc955a8c23aa733dd33e39e37ebc9fbe898c542314ea16604a7f08a384d54ec693c8eb129af7bde0a156567c345058

data/.github/CODEOWNERS

@@ -1,5 +1,5 @@
 *       @shopify/core-build-learn
 *       @shopify/development-lifecycle
 
-/lib/project_types/script/ @shopify/scripts-experience
-/test/project_types/script/ @shopify/scripts-experience
+/lib/project_types/script/ @shopify/scripts-platform
+/test/project_types/script/ @shopify/scripts-platform

data/.github/workflows/shopify.yml

@@ -19,7 +19,7 @@ jobs:
         version:
           - 3.0.2
           - 2.6.6
-          - 2.7.1
+          - 2.7.5
         os:
           - macos-10.15
           - macos-11

data/.ruby-version

@@ -1 +1 @@
-2.7.1
+2.7.5

data/CHANGELOG.md

@@ -1,4 +1,19 @@
 From version 2.6.0, the sections in this file adhere to the [keep a changelog](https://keepachangelog.com/en/1.0.0/) specification.
+## Version 2.7.3
+### Added
+* [#1826](https://github.com/Shopify/shopify-cli/pull/1826): Support using `script.config.yml` file for script configuration
+* [#1843](https://github.com/Shopify/shopify-cli/pull/1826): Support using javy on Apple ARM processors
+
+### Fixed
+* [#1811](https://github.com/Shopify/shopify-cli/pull/1811): Update theme-check to 1.9.0
+* [#1831](https://github.com/Shopify/shopify-cli/pull/1831): Ensure correct `ngrok` version is downloaded for Apple M1
+* [#1823](https://github.com/Shopify/shopify-cli/pull/1823): Indicate git is unavailable; don't error out
+* [#1807](https://github.com/Shopify/shopify-cli/pull/1807): Fix `--live` parameter, it should not imply `--allow-live` in the `theme push` command
+* [#1812](https://github.com/Shopify/shopify-cli/pull/1812): App creation with Rails 7
+* [#1821](https://github.com/Shopify/shopify-cli/pull/1821): Fix Shopify hosted fonts to load via the local preview URL
+* [#1830](https://github.com/Shopify/shopify-cli/pull/1830): Fix hot reload when users update many files "simultaneously"
+* [#1837](https://github.com/Shopify/shopify-cli/pull/1837): Fix `ShopifyCLI::Theme::DevServer::CdnFonts` class to support any font
+
 ## Version 2.7.2
 ### Fixed
 * [#1763](https://github.com/Shopify/shopify-cli/pull/1763): Fix: Tunnel --PORT parameter not working in Node.js app.

data/Codespace.dockerfile

@@ -1,7 +1,7 @@
 # This is a Docker image to test the CLI in UNIX environments other than macOS
 # Build the image: docker build . -t shopify-cli
 # Run tests: docker run -t --rm --volume "$(pwd):/usr/src/app" shopify-cli bundle exec rake test
-FROM cimg/ruby:2.7.1
+FROM cimg/ruby:2.7.5
 
 RUN git config --global user.email "development-lifecycle@shopify.com"
 RUN git config --global user.name "Development Lifecycle"
@@ -29,7 +29,7 @@ RUN sudo apt-get install -y nodejs
 RUN sudo npm install --global yarn
 
 # Python is necessary to compile NPM packages with native extensions through node-gyp
-RUN sudo apt install python-minimal -y
+RUN sudo apt install python2-minimal -y
 
 # Install sqlite3
 RUN sudo apt-get install libsqlite3-dev -y

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.7.2)
+    shopify-cli (2.7.3)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
-      theme-check (~> 1.8.0)
+      theme-check (~> 1.9.0)
 
 GEM
   remote: https://rubygems.org/
@@ -81,7 +81,7 @@ GEM
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     parallel (1.21.0)
-    parser (3.0.2.0)
+    parser (3.0.3.1)
       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.8.0)
+    theme-check (1.9.0)
       liquid (>= 5.1.0)
       nokogiri (>= 1.12)
       parser (~> 3)

data/Tests.dockerfile

@@ -1,7 +1,7 @@
 # This is a Docker image to test the CLI in UNIX environments other than macOS
 # Build the image: docker build . -t shopify-cli
 # Run tests: docker run -t --rm --volume "$(pwd):/usr/src/app" shopify-cli bundle exec rake test
-FROM cimg/ruby:2.7.1
+FROM cimg/ruby:2.7.5
 
 RUN git config --global user.email "development-lifecycle@shopify.com"
 RUN git config --global user.name "Development Lifecycle"
@@ -29,7 +29,7 @@ RUN sudo apt-get install -y nodejs
 RUN sudo npm install --global yarn
 
 # Python is necessary to compile NPM packages with native extensions through node-gyp
-RUN sudo apt install python-minimal -y
+RUN sudo apt install python2-minimal -y
 
 # Install sqlite3
 RUN sudo apt-get install libsqlite3-dev -y

data/dev.yml

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

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

@@ -0,0 +1 @@
+16e1a74c06eff6e5be79253a8ee96a08a404e95be3479a6e384c8926bb736e43

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

@@ -0,0 +1 @@
+53cb9d0e8a345d68f91512a28a7d2eab93463dc8650c7a044f03cbee1f7cac05

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

@@ -0,0 +1 @@
+5e1ca88385206a653980139ab969efd80de11fd9b298dafe450d3ac27d6d0173

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

@@ -0,0 +1 @@
+37f9b3f75b4ffca68b06656d6f90abfbac57597ee45fffb59b3a559b6b5de44e

data/ext/javy/javy.rb

@@ -2,10 +2,12 @@ require "rbconfig"
 require "open-uri"
 require "zlib"
 require "open3"
+require "digest/sha2"
 
 module Javy
   ROOT = __dir__
   BIN_FOLDER = File.join(ROOT, "bin")
+  HASH_FOLDER = File.join(ROOT, "hashes")
   VERSION = File.read(File.join(ROOT, "version")).strip
   TARGET = File.join(BIN_FOLDER, "javy-#{VERSION}")
 
@@ -17,14 +19,13 @@ module Javy
     end
 
     def build(source:, dest: nil)
-      ensure_installed
-
       optional_args = []
       optional_args += ["-o", dest] unless dest.nil?
 
       ShopifyCLI::Result
-        .wrap { exec(source, *optional_args) }
+        .wrap { ensure_installed }
         .call
+        .then { exec(source, *optional_args) }
     end
 
     private
@@ -45,7 +46,8 @@ module Javy
 
     def ensure_installed
       delete_outdated_installations
-      install unless Installer.installed?(target: target)
+      install.unwrap { |e| raise e } unless Installer.installed?(target: target)
+      true
     end
 
     def delete_outdated_installations
@@ -97,16 +99,25 @@ module Javy
         url: url
       ))
     end
+
+    def self.invalid_binary
+      new("Invalid Javy binary downloaded.")
+    end
   end
 
   Asset = Struct.new(:platform, :version, :owner, :repository, :basename, keyword_init: true) do
     def download(target:)
       FileUtils.mkdir_p(BIN_FOLDER)
 
+      source_file = url.open
+      validate_sha!(source_file)
+      source_file.seek(0)
+
       Dir.chdir(File.dirname(target)) do
         File.open(File.basename(target), "wb") do |target_file|
-          decompress(url.open, target_file)
+          decompress(source_file, target_file)
         end
+
         File.chmod(0755, target)
       end
 
@@ -143,6 +154,12 @@ module Javy
     ensure
       zlib.close
     end
+
+    def validate_sha!(source)
+      generated_hash = Digest::SHA256.hexdigest(source.read).strip
+      expected_hash = File.read(File.join(HASH_FOLDER, "#{filename}.sha256")).strip
+      raise InstallationError.invalid_binary unless generated_hash == expected_hash
+    end
   end
 
   Platform = Struct.new(:ruby_config) do
@@ -169,6 +186,8 @@ module Javy
       case ruby_config.fetch("host_cpu")
       when "x64", "x86_64"
         "x86_64"
+      when "arm"
+        "arm"
       else
         raise InstallationError.cpu_unsupported
       end

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

@@ -156,10 +156,10 @@ module Rails
 
         CLI::UI::Frame.open(@ctx.message("rails.create.generating_app", name)) do
           new_command = %w(rails new)
+          new_command << name
           new_command += DEFAULT_RAILS_FLAGS
           new_command << "--database=#{db}"
           new_command += options.flags[:rails_opts].split unless options.flags[:rails_opts].nil?
-          new_command << name
 
           syscall(new_command)
         end

data/lib/project_types/script/cli.rb

@@ -46,7 +46,7 @@ module Script
       autoload :PushPackage, Project.project_filepath("layers/domain/push_package")
       autoload :Metadata, Project.project_filepath("layers/domain/metadata")
       autoload :ExtensionPoint, Project.project_filepath("layers/domain/extension_point")
-      autoload :ScriptJson, Project.project_filepath("layers/domain/script_json")
+      autoload :ScriptConfig, Project.project_filepath("layers/domain/script_config")
       autoload :ScriptProject, Project.project_filepath("layers/domain/script_project")
     end
 

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

@@ -18,11 +18,19 @@ shipping_methods:
       beta: true
       package: "@shopify/scripts-checkout-apis"
       repo: "https://github.com/Shopify/scripts-apis-examples"
-discount_types:
+merchandise_discount_types:
   beta: true
   domain: 'discounts'
   libraries:
     typescript:
       beta: true
-      package: "@shopify/scripts-discount-apis"
+      package: "@shopify/scripts-discounts-apis"
+      repo: "https://github.com/Shopify/scripts-apis-examples"
+delivery_discount_types:
+  beta: true
+  domain: 'discounts'
+  libraries:
+    typescript:
+      beta: true
+      package: "@shopify/scripts-discounts-apis"
       repo: "https://github.com/Shopify/scripts-apis-examples"

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

@@ -6,7 +6,7 @@ mutation AppScriptSet(
   $force: Boolean,
   $schemaMajorVersion: String,
   $schemaMinorVersion: String,
-  $scriptJsonVersion: String!,
+  $scriptConfigVersion: String!,
   $configurationUi: Boolean!,
   $configurationDefinition: String!,
   $moduleUploadUrl: String!,
@@ -20,7 +20,7 @@ mutation AppScriptSet(
     force: $force
     schemaMajorVersion: $schemaMajorVersion
     schemaMinorVersion: $schemaMinorVersion,
-    scriptJsonVersion: $scriptJsonVersion,
+    scriptConfigVersion: $scriptConfigVersion,
     configurationUi: $configurationUi,
     configurationDefinition: $configurationDefinition,
     moduleUploadUrl: $moduleUploadUrl,

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

@@ -36,7 +36,7 @@ module Script
               )
 
               install_dependencies(ctx, language, script_name, project_creator)
-              script_project_repo.update_or_create_script_json(title: script_name)
+              script_project_repo.update_script_config(title: script_name)
               project
             end
           end

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

@@ -43,7 +43,7 @@ module Script
                 extension_point_type: package.extension_point_type,
                 force: force,
                 metadata: package.metadata,
-                script_json: package.script_json,
+                script_config: package.script_config,
                 module_upload_url: module_upload_url,
                 library: package.library,
               )

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

@@ -14,7 +14,7 @@ module Script
           end
         end
 
-        class MissingScriptJsonFieldError < ScriptProjectError
+        class MissingScriptConfigFieldError < ScriptProjectError
           attr_reader :field
           def initialize(field)
             super()
@@ -22,9 +22,6 @@ module Script
           end
         end
 
-        class InvalidScriptJsonDefinitionError < ScriptProjectError; end
-        class NoScriptJsonFile < ScriptProjectError; end
-
         class ScriptNotFoundError < ScriptProjectError
           attr_reader :script_name, :extension_point_type
           def initialize(extension_point_type, script_name)

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

@@ -7,7 +7,7 @@ module Script
         attr_reader :id,
           :uuid,
           :extension_point_type,
-          :script_json,
+          :script_config,
           :script_content,
           :compiled_type,
           :metadata,
@@ -20,7 +20,7 @@ module Script
           script_content:,
           compiled_type: nil,
           metadata:,
-          script_json:,
+          script_config:,
           library:
         )
           @id = id
@@ -29,7 +29,7 @@ module Script
           @script_content = script_content
           @compiled_type = compiled_type
           @metadata = metadata
-          @script_json = script_json
+          @script_config = script_config
           @library = library
         end
       end

data/lib/project_types/script/layers/domain/{script_json.rb → script_config.rb}

@@ -3,7 +3,7 @@
 module Script
   module Layers
     module Domain
-      class ScriptJson
+      class ScriptConfig
         attr_reader :content, :version, :title, :description, :configuration_ui, :configuration
 
         REQUIRED_FIELDS = %w(version title)
@@ -23,7 +23,7 @@ module Script
 
         def validate_content!(content)
           REQUIRED_FIELDS.each do |field|
-            raise Errors::MissingScriptJsonFieldError, field if content[field].nil?
+            raise Errors::MissingScriptConfigFieldError, field if content[field].nil?
           end
         end
       end

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

@@ -15,7 +15,7 @@ module Script
         property! :script_name, accepts: String
         property! :language, accepts: String
 
-        property :script_json, accepts: ScriptJson
+        property :script_config, accepts: ScriptConfig
 
         def initialize(*)
           super

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

@@ -5,9 +5,9 @@ module Script
     module Infrastructure
       module Errors
         class BuildError < ScriptProjectError; end
-        class ScriptJsonSyntaxError < ScriptProjectError; end
+        class ScriptConfigSyntaxError < ScriptProjectError; end
 
-        class ScriptJsonMissingKeysError < ScriptProjectError
+        class ScriptConfigMissingKeysError < ScriptProjectError
           attr_reader :missing_keys
           def initialize(missing_keys)
             super()
@@ -15,7 +15,7 @@ module Script
           end
         end
 
-        class ScriptJsonInvalidValueError < ScriptProjectError
+        class ScriptConfigInvalidValueError < ScriptProjectError
           attr_reader :valid_input_modes
           def initialize(valid_input_modes)
             super()
@@ -23,7 +23,7 @@ module Script
           end
         end
 
-        class ScriptJsonFieldsMissingKeysError < ScriptProjectError
+        class ScriptConfigFieldsMissingKeysError < ScriptProjectError
           attr_reader :missing_keys
           def initialize(missing_keys)
             super()
@@ -31,7 +31,7 @@ module Script
           end
         end
 
-        class ScriptJsonFieldsInvalidValueError < ScriptProjectError
+        class ScriptConfigFieldsInvalidValueError < ScriptProjectError
           attr_reader :valid_types
           def initialize(valid_types)
             super()
@@ -39,6 +39,29 @@ module Script
           end
         end
 
+        class InvalidScriptConfigYmlDefinitionError < ScriptProjectError; end
+
+        class InvalidScriptJsonDefinitionError < ScriptProjectError; end
+
+        class MissingScriptConfigYmlFieldError < ScriptProjectError
+          attr_reader :field
+          def initialize(field)
+            super()
+            @field = field
+          end
+        end
+
+        class MissingScriptJsonFieldError < ScriptProjectError
+          attr_reader :field
+          def initialize(field)
+            super()
+            @field = field
+          end
+        end
+
+        class NoScriptConfigYmlFileError < ScriptProjectError; end
+        class NoScriptConfigFileError < ScriptProjectError; end
+
         class APILibraryNotFoundError < ScriptProjectError
           attr_reader :library_name
           def initialize(library_name)

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

@@ -18,7 +18,7 @@ module Script
             script_content: script_content,
             compiled_type: compiled_type,
             metadata: metadata,
-            script_json: script_project.script_json,
+            script_config: script_project.script_config,
             library: library
           )
         end
@@ -34,7 +34,7 @@ module Script
             extension_point_type: script_project.extension_point_type,
             script_content: script_content,
             metadata: metadata,
-            script_json: script_project.script_json,
+            script_config: script_project.script_config,
             library: library
           )
         end

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

@@ -7,7 +7,6 @@ module Script
         include SmartProperties
         property! :ctx, accepts: ShopifyCLI::Context
 
-        SCRIPT_JSON_FILENAME = "script.json"
         MUTABLE_ENV_VALUES = %i(uuid)
 
         def create(script_name:, extension_point_type:, language:)
@@ -40,7 +39,7 @@ module Script
             script_name: script_name,
             extension_point_type: extension_point_type,
             language: language,
-            script_json: ScriptJsonRepository.new(ctx: ctx).get
+            script_config: script_config_repository.get!
           )
         end
 
@@ -58,7 +57,7 @@ module Script
             script_name: script_name,
             extension_point_type: extension_point_type,
             language: language,
-            script_json: ScriptJsonRepository.new(ctx: ctx).get,
+            script_config: script_config_repository.get!,
           )
         end
 
@@ -77,14 +76,12 @@ module Script
             script_name: script_name,
             extension_point_type: extension_point_type,
             language: language,
-            script_json: ScriptJsonRepository.new(ctx: ctx).get,
+            script_config: script_config_repository.get!,
           )
         end
 
-        def update_or_create_script_json(title:)
-          script_json = ScriptJsonRepository
-            .new(ctx: ctx)
-            .update_or_create(title: title)
+        def update_script_config(title:)
+          script_config = script_config_repository.update!(title: title)
 
           Domain::ScriptProject.new(
             id: ctx.root,
@@ -92,7 +89,7 @@ module Script
             script_name: script_name,
             extension_point_type: extension_point_type,
             language: language,
-            script_json: script_json,
+            script_config: script_config,
           )
         end
 
@@ -140,40 +137,120 @@ module Script
           end
         end
 
-        class ScriptJsonRepository
+        def script_config_repository
+          @script_config_repository ||= begin
+            supported_repos = [
+              ScriptConfigYmlRepository.new(ctx: ctx),
+              ScriptJsonRepository.new(ctx: ctx),
+            ]
+            repo = supported_repos.find(&:active?)
+            raise Infrastructure::Errors::NoScriptConfigYmlFileError if repo.nil?
+            repo
+          end
+        end
+
+        class ScriptConfigRepository
           include SmartProperties
           property! :ctx, accepts: ShopifyCLI::Context
 
-          def get
-            current_script_json || raise(Domain::Errors::NoScriptJsonFile)
+          def active?
+            ctx.file_exist?(filename)
+          end
+
+          def get!
+            raise Infrastructure::Errors::NoScriptConfigFileError unless active?
+
+            content = ctx.read(filename)
+            hash = file_content_to_hash(content)
+
+            from_h(hash)
+          end
+
+          def update!(title:)
+            hash = get!.content
+            update_hash(hash: hash, title: title)
+
+            ctx.write(filename, hash_to_file_content(hash))
+
+            from_h(hash)
+          end
+
+          private
+
+          def update_hash(hash:, title:)
+            hash["version"] ||= "2"
+            hash["title"] = title
+          end
+
+          def from_h(hash)
+            Domain::ScriptConfig.new(content: hash)
+          rescue Domain::Errors::MissingScriptConfigFieldError => e
+            raise missing_field_error, e.field
+          end
+
+          # to be implemented by subclasses
+          def filename
+            raise NotImplementedError
           end
 
-          def update_or_create(title:)
-            json = current_script_json&.content || {}
-            json["version"] ||= "1"
-            json["title"] = title
+          def file_content_to_hash(file_content)
+            raise NotImplementedError
+          end
 
-            ctx.write(SCRIPT_JSON_FILENAME, JSON.pretty_generate(json))
+          def hash_to_file_content(hash)
+            raise NotImplementedError
+          end
 
-            Domain::ScriptJson.new(content: json)
+          def missing_field_error
+            raise NotImplementedError
           end
+        end
 
+        class ScriptConfigYmlRepository < ScriptConfigRepository
           private
 
-          def current_script_json
-            return nil unless ctx.file_exist?(SCRIPT_JSON_FILENAME)
+          def filename
+            "script.config.yml"
+          end
+
+          def file_content_to_hash(file_content)
+            begin
+              hash = YAML.load(file_content)
+            rescue Psych::SyntaxError
+              raise Errors::InvalidScriptConfigYmlDefinitionError
+            end
+            raise Errors::InvalidScriptConfigYmlDefinitionError unless hash.is_a?(Hash)
+            hash
+          end
+
+          def hash_to_file_content(hash)
+            YAML.dump(hash)
+          end
 
-            content = ctx.read(SCRIPT_JSON_FILENAME)
-            raise Domain::Errors::InvalidScriptJsonDefinitionError unless valid_script_json?(content)
+          def missing_field_error
+            Errors::MissingScriptConfigYmlFieldError
+          end
+        end
+
+        class ScriptJsonRepository < ScriptConfigRepository
+          private
 
-            Domain::ScriptJson.new(content: JSON.parse(content))
+          def filename
+            "script.json"
           end
 
-          def valid_script_json?(content)
-            JSON.parse(content)
-            true
+          def file_content_to_hash(file_content)
+            JSON.parse(file_content)
           rescue JSON::ParserError
-            false
+            raise Errors::InvalidScriptJsonDefinitionError
+          end
+
+          def hash_to_file_content(hash)
+            JSON.pretty_generate(hash)
+          end
+
+          def missing_field_error
+            Errors::MissingScriptJsonFieldError
           end
         end
       end

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

@@ -17,7 +17,7 @@ module Script
           extension_point_type:,
           force: false,
           metadata:,
-          script_json:,
+          script_config:,
           module_upload_url:,
           library:
         )
@@ -25,14 +25,14 @@ module Script
           variables = {
             uuid: uuid,
             extensionPointName: extension_point_type.upcase,
-            title: script_json.title,
-            description: script_json.description,
+            title: script_config.title,
+            description: script_config.description,
             force: force,
             schemaMajorVersion: metadata.schema_major_version.to_s, # API expects string value
             schemaMinorVersion: metadata.schema_minor_version.to_s, # API expects string value
-            scriptJsonVersion: script_json.version,
-            configurationUi: script_json.configuration_ui,
-            configurationDefinition: script_json.configuration&.to_json,
+            scriptConfigVersion: script_config.version,
+            configurationUi: script_config.configuration_ui,
+            configurationDefinition: script_config.configuration&.to_json,
             moduleUploadUrl: module_upload_url,
             library: {
               language: library[:language],
@@ -47,19 +47,19 @@ module Script
           if user_errors.any? { |e| e["tag"] == "already_exists_error" }
             raise Errors::ScriptRepushError, uuid
           elsif (e = user_errors.any? { |err| err["tag"] == "configuration_definition_syntax_error" })
-            raise Errors::ScriptJsonSyntaxError
+            raise Errors::ScriptConfigSyntaxError
           elsif (e = user_errors.find { |err| err["tag"] == "configuration_definition_missing_keys_error" })
-            raise Errors::ScriptJsonMissingKeysError, e["message"]
+            raise Errors::ScriptConfigMissingKeysError, e["message"]
           elsif (e = user_errors.find { |err| err["tag"] == "configuration_definition_invalid_value_error" })
-            raise Errors::ScriptJsonInvalidValueError, e["message"]
+            raise Errors::ScriptConfigInvalidValueError, e["message"]
           elsif (e = user_errors.find do |err|
                    err["tag"] == "configuration_definition_schema_field_missing_keys_error"
                  end)
-            raise Errors::ScriptJsonFieldsMissingKeysError, e["message"]
+            raise Errors::ScriptConfigFieldsMissingKeysError, e["message"]
           elsif (e = user_errors.find do |err|
                    err["tag"] == "configuration_definition_schema_field_invalid_value_error"
                  end)
-            raise Errors::ScriptJsonFieldsInvalidValueError, e["message"]
+            raise Errors::ScriptConfigFieldsInvalidValueError, e["message"]
           elsif user_errors.find { |err| %w(not_use_msgpack_error schema_version_argument_error).include?(err["tag"]) }
             raise Domain::Errors::MetadataValidationError
           else

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

@@ -47,14 +47,20 @@ module Script
           invalid_language_cause: "Invalid language %s.",
           invalid_language_help: "Allowed values: %s.",
 
+          missing_script_config_yml_field_cause: "The script.config.yml file is missing the required %s field.",
+          missing_script_config_yml_field_help: "Add the field and try again.",
+
           missing_script_json_field_cause: "The script.json file is missing the required %s field.",
           missing_script_json_field_help: "Add the field and try again.",
 
           invalid_script_json_definition_cause: "The script.json file contains invalid JSON.",
           invalid_script_json_definition_help: "Fix the errors and try again.",
 
-          no_script_json_file_cause: "The script.json file is missing.",
-          no_script_json_file_help: "Create this file and try again.",
+          invalid_script_config_yml_definition_cause: "The script.config.yml file contains invalid YAML.",
+          invalid_script_config_yml_definition_help: "Fix the errors and try again.",
+
+          no_script_config_yml_file_cause: "The script.config.yml file is missing.",
+          no_script_config_yml_file_help: "Create this file and try again.",
 
           configuration_syntax_error_cause: "The script.json is not formatted properly.",
           configuration_syntax_error_help: "Fix the errors and try again.",

data/lib/project_types/script/ui/error_handler.rb

@@ -103,32 +103,47 @@ module Script
             cause_of_error: ShopifyCLI::Context.message("script.error.metadata_not_found_cause"),
             help_suggestion: ShopifyCLI::Context.message("script.error.metadata_not_found_help"),
           }
-        when Layers::Domain::Errors::MissingScriptJsonFieldError
+        when Layers::Infrastructure::Errors::BuildError
           {
-            cause_of_error: ShopifyCLI::Context.message("script.error.missing_script_json_field_cause", e.field),
-            help_suggestion: ShopifyCLI::Context.message("script.error.missing_script_json_field_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.build_error_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.build_error_help"),
+          }
+        when Layers::Infrastructure::Errors::InvalidScriptConfigYmlDefinitionError
+          {
+            cause_of_error: ShopifyCLI::Context.message("script.error.invalid_script_config_yml_definition_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.invalid_script_config_yml_definition_help"),
           }
-        when Layers::Domain::Errors::InvalidScriptJsonDefinitionError
+        when Layers::Infrastructure::Errors::InvalidScriptJsonDefinitionError
           {
             cause_of_error: ShopifyCLI::Context.message("script.error.invalid_script_json_definition_cause"),
             help_suggestion: ShopifyCLI::Context.message("script.error.invalid_script_json_definition_help"),
           }
-        when Layers::Domain::Errors::NoScriptJsonFile
+        when Layers::Infrastructure::Errors::MissingScriptConfigYmlFieldError
           {
-            cause_of_error: ShopifyCLI::Context.message("script.error.no_script_json_file_cause"),
-            help_suggestion: ShopifyCLI::Context.message("script.error.no_script_json_file_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.missing_script_config_yml_field_cause", e.field),
+            help_suggestion: ShopifyCLI::Context.message("script.error.missing_script_config_yml_field_help"),
           }
-        when Layers::Infrastructure::Errors::BuildError
+        when Layers::Infrastructure::Errors::MissingScriptConfigYmlFieldError
           {
-            cause_of_error: ShopifyCLI::Context.message("script.error.build_error_cause"),
-            help_suggestion: ShopifyCLI::Context.message("script.error.build_error_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.missing_script_config_yml_field_cause", e.field),
+            help_suggestion: ShopifyCLI::Context.message("script.error.missing_script_config_yml_field_help"),
+          }
+        when Layers::Infrastructure::Errors::MissingScriptJsonFieldError
+          {
+            cause_of_error: ShopifyCLI::Context.message("script.error.missing_script_json_field_cause", e.field),
+            help_suggestion: ShopifyCLI::Context.message("script.error.missing_script_json_field_help"),
+          }
+        when Layers::Infrastructure::Errors::NoScriptConfigYmlFileError
+          {
+            cause_of_error: ShopifyCLI::Context.message("script.error.no_script_config_yml_file_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.no_script_config_yml_file_help"),
           }
-        when Layers::Infrastructure::Errors::ScriptJsonSyntaxError
+        when Layers::Infrastructure::Errors::ScriptConfigSyntaxError
           {
             cause_of_error: ShopifyCLI::Context.message("script.error.configuration_syntax_error_cause"),
             help_suggestion: ShopifyCLI::Context.message("script.error.configuration_syntax_error_help"),
           }
-        when Layers::Infrastructure::Errors::ScriptJsonMissingKeysError
+        when Layers::Infrastructure::Errors::ScriptConfigMissingKeysError
           {
             cause_of_error: ShopifyCLI::Context.message(
               "script.error.configuration_missing_keys_error_cause",
@@ -136,7 +151,7 @@ module Script
             ),
             help_suggestion: ShopifyCLI::Context.message("script.error.configuration_missing_keys_error_help"),
           }
-        when Layers::Infrastructure::Errors::ScriptJsonInvalidValueError
+        when Layers::Infrastructure::Errors::ScriptConfigInvalidValueError
           {
             cause_of_error: ShopifyCLI::Context.message(
               "script.error.configuration_invalid_value_error_cause",
@@ -144,7 +159,7 @@ module Script
             ),
             help_suggestion: ShopifyCLI::Context.message("script.error.configuration_invalid_value_error_help"),
           }
-        when Layers::Infrastructure::Errors::ScriptJsonFieldsMissingKeysError
+        when Layers::Infrastructure::Errors::ScriptConfigFieldsMissingKeysError
           {
             cause_of_error: ShopifyCLI::Context.message(
               "script.error.configuration_schema_field_missing_keys_error_cause",
@@ -154,7 +169,7 @@ module Script
               "script.error.configuration_definition_schema_field_missing_keys_error_help"
             ),
           }
-        when Layers::Infrastructure::Errors::ScriptJsonFieldsInvalidValueError
+        when Layers::Infrastructure::Errors::ScriptConfigFieldsInvalidValueError
           {
             cause_of_error: ShopifyCLI::Context.message(
               "script.error.configuration_schema_field_invalid_value_error_cause",

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

@@ -50,8 +50,7 @@ module Theme
           form.theme
         end
 
-        is_confirm_required = !options.flags[:allow_live] && !options.flags[:live]
-        if theme.live? && is_confirm_required
+        if theme.live? && !options.flags[:allow_live]
           return unless CLI::UI::Prompt.confirm(@ctx.message("theme.push.live"))
         end
 

data/lib/shopify_cli/context.rb

@@ -61,6 +61,7 @@ module ShopifyCLI
     # will return which operating system that the cli is running on [:mac, :linux]
     def os
       host = uname
+      return :mac_m1 if /arm64-apple-darwin/i.match(host)
       return :mac if /darwin/i.match(host)
       return :windows if /mswin|mingw|cygwin/i.match(host)
       return :linux if /linux|bsd/i.match(host)

data/lib/shopify_cli/git.rb

@@ -8,6 +8,8 @@ module ShopifyCLI
       def available?(ctx)
         _output, status = ctx.capture2e("git", "status")
         status.success?
+      rescue Errno::ENOENT # git is not installed
+        false
       end
 
       ##

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

@@ -159,10 +159,10 @@ module ShopifyCLI
 
             CLI::UI::Frame.open(context.message("core.app.create.rails.generating_app", name)) do
               new_command = %w(rails new)
+              new_command << name
               new_command += DEFAULT_RAILS_FLAGS
               new_command << "--database=#{db}"
               new_command += rails_opts.split unless rails_opts.nil?
-              new_command << name
 
               syscall(new_command)
             end

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module ShopifyCLI
+  module Theme
+    module DevServer
+      class CdnFonts
+        FONTS_PATH = "/fonts"
+        FONTS_CDN = "https://fonts.shopifycdn.com"
+        FONTS_REGEX = %r{#{FONTS_CDN}}
+
+        def initialize(app, theme:)
+          @app = app
+          @theme = theme
+        end
+
+        def call(env)
+          path = env["PATH_INFO"]
+
+          # Serve from fonts CDN
+          return serve_font(env) if path.start_with?(FONTS_PATH)
+
+          # Proxy the request, and replace the URLs in the response
+          status, headers, body = @app.call(env)
+          body = replace_font_urls(body)
+          [status, headers, body]
+        end
+
+        private
+
+        def serve_font(env)
+          parameters = %w(PATH_INFO QUERY_STRING REQUEST_METHOD rack.input)
+          path, query, method, body_stream = *env.slice(*parameters).values
+
+          uri = fonts_cdn_uri(path, query)
+
+          response = Net::HTTP.start(uri.host, 443, use_ssl: true) do |http|
+            req_class = Net::HTTP.const_get(method.capitalize)
+            req = req_class.new(uri)
+            req.initialize_http_header(fonts_cdn_headers)
+            req.body_stream = body_stream
+            http.request(req)
+          end
+
+          [
+            response.code.to_s,
+            {
+              "Content-Type" => response.content_type,
+              "Content-Length" => response.content_length.to_s,
+            },
+            [response.body],
+          ]
+        end
+
+        def fonts_cdn_headers
+          {
+            "Referer" => "https://#{@theme.shop}",
+            "Transfer-Encoding" => "chunked",
+          }
+        end
+
+        def fonts_cdn_uri(path, query)
+          uri = URI.join("#{FONTS_CDN}/", path.gsub(%r{^#{FONTS_PATH}\/}, ""))
+          uri.query = query.split("&").last
+          uri
+        end
+
+        def replace_font_urls(body)
+          [body.join.gsub(FONTS_REGEX, FONTS_PATH)]
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/theme/dev_server/hot-reload.js

@@ -17,19 +17,35 @@
 
   connect();
 
+  function isRefreshRequired(files) {
+    return files.some((file) => !isCssFile(file) && !isSectionFile(file));
+  }
+
+  function refreshFile(file) {
+    if (isCssFile(file)) {
+      reloadCssFile(file);
+      return;
+    }
+
+    if (isSectionFile(file)) {
+      reloadSection(file);
+      return;
+    }
+  }
+
+  function refreshPage() {
+    console.log('[HotReload] Refreshing entire page');
+    window.location.reload();
+  }
+
   function handleUpdate(message) {
     var data = JSON.parse(message.data);
+    var modifiedFiles = data.modified;
 
-    // Assume only one file is modified at a time
-    var modified = data.modified[0];
-
-    if (isCssFile(modified)) {
-      reloadCssFile(modified)
-    } else if (isSectionFile(modified)) {
-      reloadSection(modified);
+    if (isRefreshRequired(modifiedFiles)) {
+      refreshPage();
     } else {
-      console.log(`[HotReload] Refreshing entire page`);
-      window.location.reload();
+      modifiedFiles.forEach(refreshFile);
     }
   }
 

data/lib/shopify_cli/theme/dev_server.rb

@@ -3,6 +3,7 @@ require_relative "development_theme"
 require_relative "ignore_filter"
 require_relative "syncer"
 
+require_relative "dev_server/cdn_fonts"
 require_relative "dev_server/hot_reload"
 require_relative "dev_server/header_hash"
 require_relative "dev_server/local_assets"
@@ -33,6 +34,7 @@ module ShopifyCLI
 
           # Setup the middleware stack. Mimics Rack::Builder / config.ru, but in reverse order
           @app = Proxy.new(ctx, theme: theme, syncer: @syncer)
+          @app = CdnFonts.new(@app, theme: theme)
           @app = LocalAssets.new(ctx, @app, theme: theme)
           @app = HotReload.new(ctx, @app, theme: theme, watcher: watcher, ignore_filter: ignore_filter)
           stopped = false

data/lib/shopify_cli/tunnel.rb

@@ -21,6 +21,7 @@ module ShopifyCLI
     # mapping for supported operating systems for where to download ngrok from.
     DOWNLOAD_URLS = {
       mac: "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-darwin-amd64.zip",
+      mac_m1: "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-darwin-arm64.zip",
       linux: "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip",
       windows: "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-windows-amd64.zip",
     }

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.7.2"
+  VERSION = "2.7.3"
 end

data/shopify-cli.gemspec

@@ -41,5 +41,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency("bugsnag", "~> 6.22")
   spec.add_dependency("listen", "~> 3.7.0")
-  spec.add_dependency("theme-check", "~> 1.8.0")
+  spec.add_dependency("theme-check", "~> 1.9.0")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.3
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-30 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
 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
@@ -150,6 +150,10 @@ files:
 - docs/contributors/testing.md
 - docs/users/installation.md
 - docs/users/migrate-from-themekit.md
+- ext/javy/hashes/javy-arm-macos-v0.1.0.gz.sha256
+- ext/javy/hashes/javy-x86_64-linux-v0.1.0.gz.sha256
+- ext/javy/hashes/javy-x86_64-macos-v0.1.0.gz.sha256
+- ext/javy/hashes/javy-x86_64-windows-v0.1.0.gz.sha256
 - ext/javy/javy.rb
 - ext/javy/version
 - ext/shopify-extensions/extconf.rb
@@ -294,7 +298,7 @@ files:
 - lib/project_types/script/layers/domain/extension_point.rb
 - lib/project_types/script/layers/domain/metadata.rb
 - lib/project_types/script/layers/domain/push_package.rb
-- lib/project_types/script/layers/domain/script_json.rb
+- lib/project_types/script/layers/domain/script_config.rb
 - lib/project_types/script/layers/domain/script_project.rb
 - lib/project_types/script/layers/infrastructure/api_clients/partners_proxy_api_client.rb
 - lib/project_types/script/layers/infrastructure/api_clients/script_service_api_client.rb
@@ -444,6 +448,7 @@ files:
 - lib/shopify_cli/tasks/select_org_and_shop.rb
 - lib/shopify_cli/tasks/update_dashboard_urls.rb
 - lib/shopify_cli/theme/dev_server.rb
+- lib/shopify_cli/theme/dev_server/cdn_fonts.rb
 - lib/shopify_cli/theme/dev_server/certificate_manager.rb
 - lib/shopify_cli/theme/dev_server/header_hash.rb
 - lib/shopify_cli/theme/dev_server/hot-reload.js