shopify-cli 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1eb0f785e6ead5199faf7921e48209506987a24d942568e24661e96f2bc0861
-  data.tar.gz: 06e4effc8a4b95bf78404630b452e4cf364407019846660b0d293cace45ae245
+  metadata.gz: 180a4674bfed27bb04ad09499b5c128980a93288666d3ab6aa58aa6d404d61c6
+  data.tar.gz: 8906cecf6a5a76db71e37ef5c1f756d417a3785c63618d4e70d808e3dcad5773
 SHA512:
-  metadata.gz: 65df9edf44e3c2ce1263acb79d619736ffc6c4b30c50d9d71f6943dfa7c740dd0a9c9440a6879d46c59387f9bc2db6671cd65a31f700bf964b65bfb9dc1da2dc
-  data.tar.gz: a1b9f5a17dc58b2570294205e33dd3fc1cb0a198bb4b7ca9594d91366d6169d4c92f7c9b7df0cbf8401f9a81123e78b55331ef8afd909247889a17cc046e58a2
+  metadata.gz: 443523c8b3e6ec1bcf3b7aef21f0e45148f6c5d1c3ebbc90b7206600bfb2ba484e87e63db423bd1e9abf21e03cda550680283d37534a5879dbcfcb93ed3a80e7
+  data.tar.gz: 8b0c0c59a792fdc06cb2a990bc745ba1bcc64f44ed2c7caa31ef7a1daa11ccec868eb6539b3c195302b046dd1bd7fe80501a4fac2043462dc68224e0a1506b2d

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Unreleased
 ------
 
+Version 1.9.1
+-------------
+* [1201](https://github.com/Shopify/shopify-app-cli/pull/1201) Determine Argo Renderer Dynamically. This fixes `shopify serve` and `shopify push` for extensions.
+
 Version 1.9.0
 -------------
 * [1181](https://github.com/Shopify/shopify-app-cli/pull/1181): Remove the subcommand references of the `generate` command for node apps (fixes [1176](https://github.com/Shopify/shopify-app-cli/issues/1176))

data/lib/project_types/extension/cli.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 module Extension
+  class PackageNotFound < RuntimeError; end
+
   class Project < ShopifyCli::ProjectType
     hidden_feature
     title("App Extension")

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

@@ -14,8 +14,8 @@ module Extension
       SCRIPT_PATH = %w(build main.js).freeze
 
       NPM_LIST_COMMAND = %w(list).freeze
-      YARN_LIST_COMMAND = %w(list --pattern).freeze
-      NPM_LIST_PARAMETERS = %w(--prod).freeze
+      YARN_LIST_COMMAND = %w(list).freeze
+      NPM_LIST_PARAMETERS = %w(--prod --depth=1).freeze
       YARN_LIST_PARAMETERS = %w(--production).freeze
       private_constant :NPM_LIST_COMMAND, :YARN_LIST_COMMAND, :NPM_LIST_PARAMETERS, :YARN_LIST_PARAMETERS
 
@@ -39,7 +39,7 @@ module Extension
         context.abort(context.message("features.argo.missing_file_error")) unless File.exist?(filepath)
         begin
           {
-            renderer_version: extract_argo_renderer_version(context),
+            renderer_version: renderer_package(context).version,
             serialized_script: Base64.strict_encode64(File.read(filepath).chomp),
           }
         rescue StandardError
@@ -48,50 +48,28 @@ module Extension
       end
 
       def renderer_package(context)
-        Features::ArgoRendererPackage.new(
-          package_name: renderer_package_name, version: extract_argo_renderer_version(context)
-        )
-      end
-
-      private
-
-      def extract_argo_renderer_version(context)
-        result = run_list_command(context)
-        found_version = find_version_number(context, result)
-        context.abort(
-          context.message("features.argo.dependencies.argo_renderer_package_invalid_version_error")
-        ) if found_version.nil?
-        ::Semantic::Version.new(found_version).to_s
-      rescue ArgumentError
+        Features::ArgoRendererPackage.from_package_manager(run_list_command(context))
+      rescue Extension::PackageNotFound
         context.abort(
-          context.message("features.argo.dependencies.argo_renderer_package_invalid_version_error")
+          context.message("features.argo.dependencies.argo_missing_renderer_package_error")
         )
       end
 
-      def find_version_number(context, result)
-        packages = result.to_json.split('\n')
-        found_package = packages.find do |package|
-          package.match(/#{renderer_package_name}@/)
-        end
-        if found_package.nil?
-          error = "'#{renderer_package_name}' not found."
-          context.abort(
-            context.message("features.argo.dependencies.argo_missing_renderer_package_error", error)
-          )
-        end
-        found_package.split("@")[2]&.strip
-      end
+      private
 
       def run_list_command(context)
-        js_system = ShopifyCli::JsSystem.new(ctx: context)
-        result, error, status = js_system.call(
-          yarn: YARN_LIST_COMMAND + [renderer_package_name] + YARN_LIST_PARAMETERS,
-          npm: NPM_LIST_COMMAND + [renderer_package_name] + NPM_LIST_PARAMETERS,
+        yarn_list = YARN_LIST_COMMAND + YARN_LIST_PARAMETERS
+        npm_list = NPM_LIST_COMMAND + NPM_LIST_PARAMETERS
+
+        result, error, status = ShopifyCli::JsSystem.call(
+          context,
+          yarn: yarn_list,
+          npm: npm_list,
           capture_response: true
         )
-        context.abort(
-          context.message("features.argo.dependencies.argo_missing_renderer_package_error", error)
-        ) unless status.success?
+        # context.abort(
+        #   context.message("features.argo.dependencies.argo_missing_renderer_package_error", error)
+        # ) unless status.success?
         result
       end
 

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

@@ -5,16 +5,27 @@ module Extension
 
       ARGO_CHECKOUT = "@shopify/argo-checkout"
       ARGO_ADMIN = "@shopify/argo-admin"
+      ARGO_POST_PURCHASE = "@shopify/argo-post-purchase"
 
       PACKAGE_NAMES = [
         ARGO_CHECKOUT,
         ARGO_ADMIN,
+        ARGO_POST_PURCHASE
       ].freeze
       MINIMUM_ARGO_VERSION = "0.9.3".freeze
 
       property! :package_name, accepts: PACKAGE_NAMES
       property! :version, accepts: String
 
+      class << self
+        def from_package_manager(package_manager_output)
+          pattern = /(?<name>#{PACKAGE_NAMES.join("|")})@(?<version>\d.*)$/
+          match = package_manager_output.match(pattern)
+          raise PackageNotFound, package_manager_output if match.nil?
+          return new(package_name: match[:name], version: match[:version].strip)
+        end
+      end
+
       def checkout?
         package_name == ARGO_CHECKOUT
       end
@@ -23,9 +34,13 @@ module Extension
         package_name == ARGO_ADMIN
       end
 
+      ##
+      # Temporarily returns false in all cases as the argo webpack server is
+      # unable to handle the UUID flag.
       def supports_uuid_flag?
-        return false if checkout?
-        Gem::Version.new(version) > Gem::Version.new(MINIMUM_ARGO_VERSION)
+        return false
+        # return false if checkout?
+        # Gem::Version.new(version) > Gem::Version.new(MINIMUM_ARGO_VERSION)
       end
     end
   end

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

@@ -9,7 +9,7 @@ module Extension
       SCRIPTS_DIRECTORY = "scripts"
 
       property! :git_template, accepts: String
-      property! :dependency_checks, default: []
+      property! :dependency_checks, default: -> { [] }
 
       def call(directory_name, identifier, context)
         steps = [

data/lib/project_types/extension/messages/messages.rb

@@ -98,10 +98,7 @@ module Extension
               node_not_installed: "Node must be installed to create this extension.",
               version_too_low: "Your node version %s does not meet the minimum required version %s",
             },
-            argo_missing_renderer_package_error: "%s Install the missing package and try again.",
-            argo_renderer_package_invalid_version_error: <<~MESSAGE,
-              The renderer package version is not a valid SemVer Version (http://semver.org)
-            MESSAGE
+            argo_missing_renderer_package_error: "Extension template references invalid renderer package please contact Shopify for help.",
             yarn_install_error: "Something went wrong while running 'yarn install'. %s.",
             yarn_run_script_error: "Something went wrong while running script. %s.",
           },

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

@@ -10,8 +10,8 @@ module Extension
           property! :surface, converts: :to_str
           property! :renderer_package_name, converts: :to_str
           property! :git_template, converts: :to_str
-          property! :required_fields, accepts: Array, default: []
-          property! :required_shop_beta_flags, accepts: Array, default: []
+          property! :required_fields, accepts: Array, default: -> { [] }
+          property! :required_shop_beta_flags, accepts: Array, default: -> { [] }
         end
 
         def self.build(feature_set_attributes)

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

@@ -9,7 +9,7 @@ module Extension
       property! :last_user_interaction_at, accepts: Time
       property  :context, accepts: String
       property  :location, accepts: String
-      property :validation_errors, accepts: Models::ValidationError::IS_VALIDATION_ERROR_LIST, default: []
+      property :validation_errors, accepts: Models::ValidationError::IS_VALIDATION_ERROR_LIST, default: -> { [] }
     end
   end
 end

data/lib/project_types/node/messages/messages.rb

@@ -59,21 +59,21 @@ module Node
             installed: "Installed Heroku CLI",
             authenticating: "Authenticating with Heroku…",
             authenticated: "{{v}} Authenticated with Heroku",
-            authenticated_with_account: "{{v}} Authenticated with Heroku as `%s`",
+            authenticated_with_account: "{{v}} Authenticated with Heroku as {{green:%s}}",
             deploying: "Deploying to Heroku…",
             deployed: "{{v}} Deployed to Heroku",
             git: {
               checking: "Checking git repo…",
               initialized: "Git repo initialized",
               what_branch: "What branch would you like to deploy?",
-              branch_selected: "{{v}} Git branch `%s` selected for deploy",
+              branch_selected: "{{v}} Git branch {{green:%s}} selected for deploy",
             },
             app: {
               no_apps_found: "No existing Heroku app found. What would you like to do?",
               name: "What is your Heroku app’s name?",
               select: "Specify an existing Heroku app",
-              selecting: "Selecting Heroku app `%s`…",
-              selected: "{{v}} Heroku app `%s` selected",
+              selecting: "Selecting Heroku app %s…",
+              selected: "{{v}} Heroku app {{green:%s}} selected",
               create: "Create a new Heroku app",
               creating: "Creating new Heroku app…",
               created: "{{v}} New Heroku app created",

data/lib/project_types/rails/messages/messages.rb

@@ -89,7 +89,7 @@ module Rails
             downloaded: "Downloaded Heroku CLI",
             installing: "Installing Heroku CLI...",
             installed: "Installed Heroku CLI",
-            authenticated_with_account: "{{v}} Authenticated with Heroku as `%s`",
+            authenticated_with_account: "{{v}} Authenticated with Heroku as {{green:%s}}",
             authenticating: "Authenticating with Heroku...",
             authenticated: "{{v}} Authenticated with Heroku",
             deploying: "Deploying to Heroku...",
@@ -109,14 +109,14 @@ module Rails
               checking: "Checking git repo...",
               initialized: "Git repo initialized",
               what_branch: "What branch would you like to deploy?",
-              branch_selected: "{{v}} Git branch `%s` selected for deploy",
+              branch_selected: "{{v}} Git branch {{green:%s}} selected for deploy",
             },
             app: {
               no_apps_found: "No existing Heroku app found. What would you like to do?",
               name: "What is your Heroku app’s name?",
               select: "Specify an existing Heroku app",
-              selecting: "Selecting Heroku app `%s`...",
-              selected: "{{v}} Heroku app `%s` selected",
+              selecting: "Selecting Heroku app %s...",
+              selected: "{{v}} Heroku app {{green:%s}} selected",
               create: "Create a new Heroku app",
               creating: "Creating new Heroku app...",
               created: "{{v}} New Heroku app created",

data/lib/project_types/script/graphql/app_script_update_or_create.graphql

@@ -7,7 +7,8 @@ mutation AppScriptUpdateOrCreate(
   $force: Boolean,
   $schemaMajorVersion: String,
   $schemaMinorVersion: String,
-  $useMsgpack: Boolean
+  $useMsgpack: Boolean,
+  $uuid: String
 ) {
   appScriptUpdateOrCreate(
     extensionPointName: $extensionPointName
@@ -18,7 +19,8 @@ mutation AppScriptUpdateOrCreate(
     force: $force
     schemaMajorVersion: $schemaMajorVersion
     schemaMinorVersion: $schemaMinorVersion
-    useMsgpack: $useMsgpack
+    useMsgpack: $useMsgpack,
+    uuid: $uuid
 ) {
     userErrors {
       field
@@ -26,6 +28,7 @@ mutation AppScriptUpdateOrCreate(
       tag
     }
     appScript {
+      uuid
       appKey
       configSchema
       extensionPointName

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

@@ -6,7 +6,8 @@ module Script
       class PushScript
         class << self
           def call(ctx:, force:)
-            script_project = Infrastructure::ScriptProjectRepository.new(ctx: ctx).get
+            script_project_repo = Infrastructure::ScriptProjectRepository.new(ctx: ctx)
+            script_project = script_project_repo.get
             task_runner = Infrastructure::TaskRunner.for(ctx, script_project.language, script_project.script_name)
 
             ProjectDependencies.install(ctx: ctx, task_runner: task_runner)
@@ -18,7 +19,8 @@ module Script
                 compiled_type: task_runner.compiled_type,
                 metadata: task_runner.metadata,
               )
-              package.push(Infrastructure::ScriptService.new(ctx: p_ctx), script_project.api_key, force)
+              uuid = package.push(Infrastructure::ScriptService.new(ctx: p_ctx), script_project.api_key, force)
+              script_project_repo.update_env(uuid: uuid)
               spinner.update_title(p_ctx.message("script.application.pushed"))
             end
           end

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

@@ -5,6 +5,7 @@ module Script
     module Domain
       class PushPackage
         attr_reader :id,
+          :uuid,
           :extension_point_type,
           :script_name,
           :config_ui,
@@ -14,6 +15,7 @@ module Script
 
         def initialize(
           id:,
+          uuid:,
           extension_point_type:,
           script_name:,
           script_content:,
@@ -22,6 +24,7 @@ module Script
           config_ui:
         )
           @id = id
+          @uuid = uuid
           @extension_point_type = extension_point_type
           @script_name = script_name
           @script_content = script_content
@@ -32,6 +35,7 @@ module Script
 
         def push(script_service, api_key, force)
           script_service.push(
+            uuid: @uuid,
             extension_point_type: @extension_point_type,
             script_name: @script_name,
             script_content: @script_content,

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

@@ -26,7 +26,11 @@ module Script
         end
 
         def api_key
-          env[:api_key]
+          env&.api_key
+        end
+
+        def uuid
+          env&.extra&.[]("UUID")
         end
       end
     end

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

@@ -17,6 +17,15 @@ module Script
           end
         end
 
+        class ConfigUiInvalidInputModeError < ScriptProjectError
+          attr_reader :filename, :valid_input_modes
+          def initialize(filename, valid_input_modes)
+            super()
+            @filename = filename
+            @valid_input_modes = valid_input_modes
+          end
+        end
+
         class ConfigUiFieldsMissingKeysError < ScriptProjectError
           attr_reader :filename, :missing_keys
           def initialize(filename, missing_keys)
@@ -26,6 +35,15 @@ module Script
           end
         end
 
+        class ConfigUiFieldsInvalidTypeError < ScriptProjectError
+          attr_reader :filename, :valid_types
+          def initialize(filename, valid_types)
+            super()
+            @filename = filename
+            @valid_types = valid_types
+          end
+        end
+
         class DependencyInstallError < ScriptProjectError; end
         class DeprecatedEPError < ScriptProjectError; end
         class EmptyResponseError < ScriptProjectError; end

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

@@ -13,6 +13,7 @@ module Script
 
           Domain::PushPackage.new(
             id: build_file_path,
+            uuid: script_project.uuid,
             extension_point_type: script_project.extension_point_type,
             script_name: script_project.script_name,
             script_content: script_content,
@@ -30,6 +31,7 @@ module Script
 
           Domain::PushPackage.new(
             id: build_file_path,
+            uuid: script_project.uuid,
             extension_point_type: script_project.extension_point_type,
             script_name: script_project.script_name,
             script_content: script_content,

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

@@ -8,6 +8,7 @@ module Script
         property! :ctx, accepts: ShopifyCli::Context
 
         DEFAULT_CONFIG_UI_FILENAME = "config-ui.yml"
+        MUTABLE_ENV_VALUES = %i(uuid)
 
         def create(script_name:, extension_point_type:, language:, no_config_ui:)
           validate_metadata!(extension_point_type, language)
@@ -43,11 +44,6 @@ module Script
         end
 
         def get
-          extension_point_type = project_config_value!("extension_point_type")
-          script_name = project_config_value!("script_name")
-          config_ui_file = project_config_value("config_ui_file")
-          language = project_config_value("language")&.downcase || default_language
-
           validate_metadata!(extension_point_type, language)
 
           config_ui = ConfigUiRepository.new(ctx: ctx).get(config_ui_file)
@@ -62,8 +58,46 @@ module Script
           )
         end
 
+        def update_env(**args)
+          capture_io do
+            args.slice(*MUTABLE_ENV_VALUES).each do |key, value|
+              project.env.extra[key.to_s.upcase] = value
+              project.env.update(ctx, :extra, project.env.extra)
+            end
+          end
+
+          Domain::ScriptProject.new(
+            id: ctx.root,
+            env: project.env,
+            script_name: script_name,
+            extension_point_type: extension_point_type,
+            language: language,
+            config_ui: ConfigUiRepository.new(ctx: ctx).get(config_ui_file),
+          )
+        end
+
         private
 
+        def capture_io(&block)
+          CLI::UI::StdoutRouter::Capture.new(&block).run
+        end
+
+        def extension_point_type
+          project_config_value!("extension_point_type")
+        end
+
+        def script_name
+          project_config_value!("script_name")
+        end
+
+        def config_ui_file
+          project_config_value("config_ui_file")
+        end
+
+        def language
+          project_config_value("language")&.downcase || default_language
+        end
+
         def project_config_value(key)
           return nil unless project.config.key?(key)
           project.config[key]

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

@@ -11,6 +11,7 @@ module Script
         property! :ctx, accepts: ShopifyCli::Context
 
         def push(
+          uuid:,
           extension_point_type:,
           script_name:,
           script_content:,
@@ -22,6 +23,7 @@ module Script
         )
           query_name = "app_script_update_or_create"
           variables = {
+            uuid: uuid,
             extensionPointName: extension_point_type.upcase,
             title: script_name,
             configUi: config_ui&.content,
@@ -35,7 +37,7 @@ module Script
           resp_hash = script_service_request(query_name: query_name, api_key: api_key, variables: variables)
           user_errors = resp_hash["data"]["appScriptUpdateOrCreate"]["userErrors"]
 
-          return resp_hash if user_errors.empty?
+          return resp_hash["data"]["appScriptUpdateOrCreate"]["appScript"]["uuid"] if user_errors.empty?
 
           if user_errors.any? { |e| e["tag"] == "already_exists_error" }
             raise Errors::ScriptRepushError, api_key
@@ -43,8 +45,12 @@ module Script
             raise Errors::ConfigUiSyntaxError, config_ui&.filename
           elsif (e = user_errors.find { |err| err["tag"] == "config_ui_missing_keys_error" })
             raise Errors::ConfigUiMissingKeysError.new(config_ui&.filename, e["message"])
+          elsif (e = user_errors.find { |err| err["tag"] == "config_ui_invalid_input_mode_error" })
+            raise Errors::ConfigUiInvalidInputModeError.new(config_ui&.filename, e["message"])
           elsif (e = user_errors.find { |err| err["tag"] == "config_ui_fields_missing_keys_error" })
             raise Errors::ConfigUiFieldsMissingKeysError.new(config_ui&.filename, e["message"])
+          elsif (e = user_errors.find { |err| err["tag"] == "config_ui_fields_invalid_type_error" })
+            raise Errors::ConfigUiFieldsInvalidTypeError.new(config_ui&.filename, 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

@@ -64,10 +64,18 @@ module Script
                                               "%{missing_keys}.",
           config_ui_missing_keys_error_help: "Add the keys and try again.",
 
+          config_ui_invalid_input_mode_error_cause: "The UI configuration file %{filename} only accept "\
+                                              "one of the following input mode(s): %{valid_input_modes}.",
+          config_ui_invalid_input_mode_error_help: "Change the input modes and try again.",
+
           config_ui_fields_missing_keys_error_cause: "A field entry in the UI configuration file %{filename} is "\
                                                      "missing required keys: %{missing_keys}.",
           config_ui_fields_missing_keys_error_help: "Add the keys and try again.",
 
+          config_ui_fields_invalid_type_error_cause: "The UI configuration file %{filename} fields only accept "\
+                                                     "one of the following type(s): %{valid_types}.",
+          config_ui_fields_invalid_type_error_help: "Change the types and try again.",
+
           script_not_found_cause: "Couldn't find script %s for extension point %s",
 
           service_failure_cause: "Internal service error.",

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

@@ -163,6 +163,15 @@ module Script
             ),
             help_suggestion: ShopifyCli::Context.message("script.error.config_ui_missing_keys_error_help"),
           }
+        when Layers::Infrastructure::Errors::ConfigUiInvalidInputModeError
+          {
+            cause_of_error: ShopifyCli::Context.message(
+              "script.error.config_ui_invalid_input_mode_error_cause",
+              filename: e.filename,
+              valid_input_modes: e.valid_input_modes
+            ),
+            help_suggestion: ShopifyCli::Context.message("script.error.config_ui_invalid_input_mode_error_help"),
+          }
         when Layers::Infrastructure::Errors::ConfigUiFieldsMissingKeysError
           {
             cause_of_error: ShopifyCli::Context.message(
@@ -172,6 +181,15 @@ module Script
             ),
             help_suggestion: ShopifyCli::Context.message("script.error.config_ui_fields_missing_keys_error_help"),
           }
+        when Layers::Infrastructure::Errors::ConfigUiFieldsInvalidTypeError
+          {
+            cause_of_error: ShopifyCli::Context.message(
+              "script.error.config_ui_fields_invalid_type_error_cause",
+              filename: e.filename,
+              valid_types: e.valid_types
+            ),
+            help_suggestion: ShopifyCli::Context.message("script.error.config_ui_fields_invalid_type_error_help"),
+          }
         when Layers::Infrastructure::Errors::DependencyInstallError
           {
             cause_of_error: ShopifyCli::Context.message("script.error.dependency_install_cause"),

data/lib/shopify-cli/js_system.rb

@@ -37,8 +37,8 @@ module ShopifyCli
       #
       #   ShopifyCli::JsSystem.call(ctx, yarn: ['install', '--silent'], npm: ['install', '--no-audit'])
       #
-      def call(ctx, yarn:, npm:)
-        JsSystem.new(ctx: ctx).call(yarn: yarn, npm: npm)
+      def call(ctx, yarn:, npm:, capture_response: false)
+        JsSystem.new(ctx: ctx).call(yarn: yarn, npm: npm, capture_response: capture_response)
       end
     end
 

data/lib/shopify-cli/messages/messages.rb

@@ -82,7 +82,8 @@ module ShopifyCli
           error: {
             directory_exists: "Project directory already exists. Please create a project with a new name.",
             no_branches_found: "Could not find any git branches",
-            repo_not_initiated: "Git repo is not initiated. Please run `git init` and make at least one commit.",
+            repo_not_initiated:
+              "Git repo is not initiated. Please run {{command:git init}} and make at least one commit.",
             no_commits_made: "No git commits have been made. Please make at least one commit.",
           },
 
@@ -110,7 +111,7 @@ module ShopifyCli
             deploy: "Could not deploy to Heroku",
             download: "Heroku CLI could not be downloaded",
             install: "Could not install Heroku CLI",
-            could_not_select_app: "Heroku app `%s` could not be selected",
+            could_not_select_app: "Heroku app {{green:%s}} could not be selected",
           },
         },
 

data/lib/shopify-cli/oauth.rb

@@ -24,10 +24,10 @@ module ShopifyCli
     property! :service, accepts: String
     property! :client_id, accepts: String
     property! :scopes
-    property :store, default: ShopifyCli::DB.new
+    property :store, default: -> { ShopifyCli::DB.new }
     property :secret, accepts: String
     property :request_exchange, accepts: String
-    property :options, default: {}, accepts: Hash
+    property :options, default: -> { {} }, accepts: Hash
     property :auth_path, default: "/authorize", accepts: ->(path) { path.is_a?(String) && path.start_with?("/") }
     property :token_path, default: "/token", accepts: ->(path) { path.is_a?(String) && path.start_with?("/") }
     property :state_token, accepts: String, default: SecureRandom.hex(30)

data/lib/shopify-cli/packager.rb

@@ -99,7 +99,7 @@ module ShopifyCli
         raise <<~MESSAGE
 
           Could not find program #{program} which is required to build the package.
-          You can install it by running `#{installation_cmd}`.
+          You can install it by running #{installation_cmd}.
 
         MESSAGE
       end

data/lib/shopify-cli/resolve_constant.rb

@@ -11,7 +11,7 @@
 module ShopifyCli
   class ResolveConstant
     include ShopifyCli::MethodObject
-    property! :namespace, accepts: ->(ns) { ns.respond_to?(:const_get) }, default: Kernel
+    property! :namespace, accepts: ->(ns) { ns.respond_to?(:const_get) }, default: -> { Kernel }
 
     def call(name)
       name

data/lib/shopify-cli/resources/env_file.rb

@@ -57,7 +57,7 @@ module ShopifyCli
       property :shop
       property :scopes
       property :host
-      property :extra, default: {}
+      property :extra, default: -> { {} }
 
       def to_h
         out = {}

data/lib/shopify-cli/transform_data_structure.rb

@@ -42,7 +42,7 @@ module ShopifyCli
     property! :symbolize_keys, accepts: [true, false], default: false, reader: :symbolize_keys?
     property! :associative_array_container,
       accepts: ->(c) { c.respond_to?(:new) && c.method_defined?(:[]=) },
-      default: Hash
+      default: -> { Hash }
 
     def call(object)
       case object

data/lib/shopify-cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCli
-  VERSION = "1.9.0"
+  VERSION = "1.9.1"
 end

data/vendor/deps/smart_properties/REVISION

@@ -1 +1 @@
-691028e47d022a29405b7f0ccc8683c9d062c502
+cfe83ef361e68ba7c471af75144f2b85cf1e1ec6

data/vendor/deps/smart_properties/lib/smart_properties/property.rb

@@ -1,6 +1,7 @@
 module SmartProperties
   class Property
     MODULE_REFERENCE = :"@_smart_properties_method_scope"
+    ALLOWED_DEFAULT_CLASSES = [Proc, Numeric, String, Range, TrueClass, FalseClass, NilClass, Symbol, Module].freeze
 
     attr_reader :name
     attr_reader :converter
@@ -27,6 +28,11 @@ module SmartProperties
 
       @instance_variable_name = :"@#{name}"
 
+      unless ALLOWED_DEFAULT_CLASSES.any? { |cls| @default.is_a?(cls) }
+        raise ConfigurationError, "Default attribute value #{@default.inspect} cannot be specified as literal, "\
+          "use the syntax `default: -> { ... }` instead."
+      end
+
       unless attrs.empty?
         raise ConfigurationError, "SmartProperties do not support the following configuration options: #{attrs.keys.map { |m| m.to_s }.sort.join(', ')}."
       end
@@ -66,7 +72,7 @@ module SmartProperties
     end
 
     def default(scope)
-      @default.kind_of?(Proc) ? scope.instance_exec(&@default) : @default
+      @default.kind_of?(Proc) ? scope.instance_exec(&@default) : @default.dup
     end
 
     def accepts?(value, scope)

data/vendor/deps/smart_properties/lib/smart_properties/version.rb

@@ -1,3 +1,3 @@
 module SmartProperties
-  VERSION = "1.14.0"
+  VERSION = "1.15.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-27 00:00:00.000000000 Z
+date: 2021-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler