shopify-cli 2.11.2 → 2.12.0

data/lib/project_types/script/loaders/project.rb

@@ -20,21 +20,22 @@ module Script
         project.env = env
         project
       rescue SmartProperties::InitializationError, SmartProperties::InvalidValueError => error
-        handle_error(error, context: context, env_file_present: env_file_present)
+        handle_error(error, context: context)
       end
 
-      def self.handle_error(error, context:, env_file_present:)
-        if env_file_present
+      def self.handle_error(error, context:)
+        if ShopifyCLI::Environment.interactive?
           properties_hash = { api_key: "SHOPIFY_API_KEY", secret: "SHOPIFY_API_SECRET" }
           missing_env_variables = error.properties.map { |p| properties_hash[p.name] }.compact.join(", ")
-          raise ShopifyCLI::Abort,
-            context.message("script.error.missing_env_file_variables", missing_env_variables, ShopifyCLI::TOOL_NAME)
+          message = context.message("script.error.missing_env_file_variables", missing_env_variables)
+          message += context.message("script.error.missing_env_file_variables_solution", ShopifyCLI::TOOL_NAME)
         else
           properties_hash = { api_key: "--api-key", secret: "--api-secret" }
           missing_options = error.properties.map { |p| properties_hash[p.name] }.compact.join(", ")
-          raise ShopifyCLI::Abort, context.message("script.error.missing_push_options", missing_options,
-            ShopifyCli::TOOL_NAME)
+          message = context.message("script.error.missing_push_options_ci", missing_options)
+          message += context.message("script.error.missing_push_options_ci_solution", ShopifyCLI::TOOL_NAME)
         end
+        raise ShopifyCLI::Abort, message
       end
 
       def self.env_file_exists?(directory)

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

@@ -113,6 +113,10 @@ module Script
           dependency_install_cause: "Something went wrong while installing the needed dependencies.",
           dependency_install_help: "Correct the errors.",
 
+          invalid_environment_cause: "Your environment %{tool} version, %{env_version}, "\
+                                     "is too low. It must be at least %{minimum_version}.",
+          invalid_environment_help: "Update %{tool}.",
+
           failed_api_request_cause: "Something went wrong while communicating with Shopify.",
           failed_api_request_help: "Try again.",
 
@@ -150,11 +154,13 @@ module Script
           language_library_for_api_not_found_cause: "Script can’t be pushed because the %{language} library for API %{api} is missing.",
           language_library_for_api_not_found_help: "Make sure extension_point.yml contains the correct API library.",
           no_scripts_found_in_app: "The selected apps have no scripts. Please, create them first on the partners' dashboard.",
-          missing_env_file_variables: "The following are missing in the .env file: %s."\
-            " To add it, run {{command:%s script connect}}",
-          missing_push_options: "The following are missing: %s. "\
-            "To add them to a CI environment:\n\t1. Run a connect command {{command:%s script connect}}\n\t2. Navigate to the .env file at the root of your project\n\t"\
-            "3. Copy the missing values, then pass them through as arguments.",
+          missing_push_options_ci: "The following are missing: %s. ",
+          missing_push_options_ci_solution: "To add them to a CI environment:\n\t1. Run a connect command " \
+          "({{command:%1$s script connect}})\n\t2. Navigate to the .env file at the root of your project\n\t" \
+          "3. Copy the missing values and pass them through as arguments in {{command:%1$s script push}}",
+          missing_env_file_variables: "The following are missing in the .env file: %s. ",
+          missing_env_file_variables_solution: "To add it, connect your script with " \
+          "{{command:%1$s script connect}} ",
         },
 
         create: {
@@ -164,7 +170,7 @@ module Script
               Options:
                 {{command:--name=NAME}} Script project name.
                 {{command:--api=TYPE}} Script API name. Supported values: %2$s.
-                {{command:--language=LANGUAGE}} Programming language. Supported values: %3$s.
+                {{command:--language=LANGUAGE}} Programming language. Defaults to wasm. Supported values: %3$s.
           HELP
 
           error: {
@@ -191,9 +197,7 @@ module Script
           HELP
 
           error: {
-            operation_failed_no_uuid: "UUID is required to push in a CI environment.",
-            operation_failed_with_api_key: "Couldn't push script to app (API key: %{api_key}).",
-            operation_failed_no_api_key: "Couldn't push script to app.",
+            operation_failed: "Couldn't push script to app.",
           },
 
           script_pushed: "{{v}} Script pushed to app (API key: %{api_key}).",
@@ -206,8 +210,6 @@ module Script
           HELP
           error: {
             operation_failed: "Couldn't connect script to app.",
-            missing_env_file_variables: "The following variables are missing in the .env file: %s."\
-            " To connect the script to an app, enter the value into the .env file or delete the .env file, and then run {{command:%s script connect}}",
           },
         },
         javy: {
@@ -233,7 +235,6 @@ module Script
         forms: {
           create: {
             select_extension_point: "Which Script API do you want to use?",
-            select_language: "Which language do you want to use?",
             script_name: "What do you want to name your script?",
           },
         },

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

@@ -237,6 +237,19 @@ module Script
             ),
             help_suggestion: ShopifyCLI::Context.message("script.error.graphql_error_help"),
           }
+        when Layers::Infrastructure::Errors::InvalidEnvironmentError
+          {
+            cause_of_error: ShopifyCLI::Context.message(
+              "script.error.invalid_environment_cause",
+              tool: e.tool,
+              env_version: e.env_version,
+              minimum_version: e.minimum_version,
+            ),
+            help_suggestion: ShopifyCLI::Context.message(
+              "script.error.invalid_environment_help",
+              tool: e.tool,
+            ),
+          }
         when Layers::Infrastructure::Errors::SystemCallFailureError
           {
             cause_of_error: ShopifyCLI::Context

data/lib/project_types/theme/commands/common/root_helper.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module Theme
+  class Command
+    module Common
+      module RootHelper
+        def root_value(options, name)
+          argv = default_argv(options)
+          command_index = argv.index(name.to_s)
+
+          return "." if command_index.nil?
+
+          next_index = command_index + 1
+          option_by_key = options_map(options)
+
+          while next_index < argv.size
+            element = argv[next_index]
+            option = option_by_key[element]
+
+            return element if option.nil?
+
+            # Skip the option argument
+            next_index += 1 unless option.arg.nil?
+
+            # PATTERN arguments take precedence over the `root`
+            if option.arg =~ /PATTERN/
+              next_index += 1 while option_argument?(argv, next_index, option_by_key)
+              next
+            end
+
+            next_index += 1
+          end
+
+          "."
+        end
+
+        private
+
+        def default_argv(options)
+          options.parser.default_argv
+        end
+
+        def options_map(options)
+          map = {}
+          options_list(options).each do |option|
+            map[option.short.first] = option
+            map[option.long.first] = option
+          end
+          map
+        end
+
+        def options_list(options)
+          options.parser.top.list
+        end
+
+        def option_argument?(argv, next_index, option_by_key)
+          return false unless next_index < argv.size
+
+          element = argv[next_index]
+          option_by_key[element].nil?
+        end
+      end
+    end
+  end
+end

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

@@ -9,6 +9,8 @@ module Theme
         parser.on("-u", "--clone-url URL") { |url| flags[:clone_url] = url }
       end
 
+      prerequisite_task :ensure_git_dependency
+
       DEFAULT_CLONE_URL = "https://github.com/Shopify/dawn.git"
 
       def call(args, _name)

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

@@ -4,35 +4,43 @@ require "shopify_cli/theme/development_theme"
 require "shopify_cli/theme/ignore_filter"
 require "shopify_cli/theme/include_filter"
 require "shopify_cli/theme/syncer"
+require "project_types/theme/commands/common/root_helper"
+require "project_types/theme/conversions/include_glob"
+require "project_types/theme/conversions/ignore_glob"
 
 module Theme
   class Command
     class Pull < ShopifyCLI::Command::SubCommand
+      include Common::RootHelper
+
       recommend_default_ruby_range
 
       options do |parser, flags|
+        Conversions::IncludeGlob.register(parser)
+        Conversions::IgnoreGlob.register(parser)
+
         parser.on("-n", "--nodelete") { flags[:nodelete] = true }
         parser.on("-i", "--themeid=ID") { |theme_id| flags[:theme_id] = theme_id }
         parser.on("-t", "--theme=NAME_OR_ID") { |theme| flags[:theme] = theme }
         parser.on("-l", "--live") { flags[:live] = true }
         parser.on("-d", "--development") { flags[:development] = true }
-        parser.on("-o", "--only=PATTERN") do |pattern|
+        parser.on("-o", "--only=PATTERN", Conversions::IncludeGlob) do |pattern|
           flags[:includes] ||= []
-          flags[:includes] << pattern
+          flags[:includes] += pattern
         end
-        parser.on("-x", "--ignore=PATTERN") do |pattern|
+        parser.on("-x", "--ignore=PATTERN", Conversions::IgnoreGlob) do |pattern|
           flags[:ignores] ||= []
-          flags[:ignores] << pattern
+          flags[:ignores] += pattern
         end
       end
 
-      def call(args, _name)
-        root = args.first || "."
+      def call(_args, name)
+        root = root_value(options, name)
         delete = !options.flags[:nodelete]
         theme = find_theme(root, **options.flags)
         return if theme.nil?
 
-        include_filter = ShopifyCLI::Theme::IncludeFilter.new(options.flags[:includes])
+        include_filter = ShopifyCLI::Theme::IncludeFilter.new(root, options.flags[:includes])
         ignore_filter = ShopifyCLI::Theme::IgnoreFilter.from_path(root)
         ignore_filter.add_patterns(options.flags[:ignores]) if options.flags[:ignores]
 
@@ -75,7 +83,7 @@ module Theme
 
         if development
           dev_theme = ShopifyCLI::Theme::DevelopmentTheme.find(@ctx, root: root)
-          return dev_theme || @ctx.abort(@ctx.message("theme.pull.theme_not_found", dev_theme.name))
+          return dev_theme || @ctx.abort(@ctx.message("theme.pull.theme_not_found", "development"))
         end
 
         select_theme(root)

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

@@ -4,13 +4,21 @@ require "shopify_cli/theme/development_theme"
 require "shopify_cli/theme/ignore_filter"
 require "shopify_cli/theme/include_filter"
 require "shopify_cli/theme/syncer"
+require "project_types/theme/commands/common/root_helper"
+require "project_types/theme/conversions/include_glob"
+require "project_types/theme/conversions/ignore_glob"
 
 module Theme
   class Command
     class Push < ShopifyCLI::Command::SubCommand
+      include Common::RootHelper
+
       recommend_default_ruby_range
 
       options do |parser, flags|
+        Conversions::IncludeGlob.register(parser)
+        Conversions::IgnoreGlob.register(parser)
+
         parser.on("-n", "--nodelete") { flags[:nodelete] = true }
         parser.on("-i", "--themeid=ID") { |theme_id| flags[:theme_id] = theme_id }
         parser.on("-t", "--theme=NAME_OR_ID") { |theme| flags[:theme] = theme }
@@ -20,18 +28,18 @@ module Theme
         parser.on("-j", "--json") { flags[:json] = true }
         parser.on("-a", "--allow-live") { flags[:allow_live] = true }
         parser.on("-p", "--publish") { flags[:publish] = true }
-        parser.on("-o", "--only=PATTERN") do |pattern|
+        parser.on("-o", "--only=PATTERN", Conversions::IncludeGlob) do |pattern|
           flags[:includes] ||= []
-          flags[:includes] << pattern
+          flags[:includes] += pattern
         end
-        parser.on("-x", "--ignore=PATTERN") do |pattern|
+        parser.on("-x", "--ignore=PATTERN", Conversions::IgnoreGlob) do |pattern|
           flags[:ignores] ||= []
-          flags[:ignores] << pattern
+          flags[:ignores] += pattern
         end
       end
 
-      def call(args, _name)
-        root = args.first || "."
+      def call(_args, name)
+        root = root_value(options, name)
         delete = !options.flags[:nodelete]
         theme = find_theme(root, **options.flags)
         return if theme.nil?
@@ -42,7 +50,7 @@ module Theme
           return unless CLI::UI::Prompt.confirm(question)
         end
 
-        include_filter = ShopifyCLI::Theme::IncludeFilter.new(options.flags[:includes])
+        include_filter = ShopifyCLI::Theme::IncludeFilter.new(root, options.flags[:includes])
         ignore_filter = ShopifyCLI::Theme::IgnoreFilter.from_path(root)
         ignore_filter.add_patterns(options.flags[:ignores]) if options.flags[:ignores]
 

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

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 require "shopify_cli/theme/dev_server"
+require "project_types/theme/commands/common/root_helper"
 
 module Theme
   class Command
     class Serve < ShopifyCLI::Command::SubCommand
+      include Common::RootHelper
+
       recommend_default_ruby_range
 
       DEFAULT_HTTP_HOST = "127.0.0.1"
@@ -15,10 +18,11 @@ module Theme
         parser.on("--live-reload=MODE") { |mode| flags[:mode] = as_reload_mode(mode) }
       end
 
-      def call(*)
+      def call(_args, name)
+        root = root_value(options, name)
         flags = options.flags.dup
         host = flags[:host] || DEFAULT_HTTP_HOST
-        ShopifyCLI::Theme::DevServer.start(@ctx, ".", host: host, **flags) do |syncer|
+        ShopifyCLI::Theme::DevServer.start(@ctx, root, host: host, **flags) do |syncer|
           UI::SyncProgressBar.new(syncer).progress(:upload_theme!, delay_low_priority_files: true)
         end
       rescue ShopifyCLI::Theme::DevServer::AddressBindingError

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

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Theme
+  module Conversions
+    class BaseGlob
+      class << self
+        def register(parser)
+          parser.accept(self) { |_val| convert(parser) }
+        end
+
+        def convert(parser)
+          argv = parser.default_argv
+          option_index = argv.index { |v| options.include?(v) }
+
+          return [] if option_index.nil?
+
+          start_index = option_index + 1
+          option_by_key = options_map(parser)
+          values = []
+
+          argv[start_index..-1].each do |value|
+            return values unless option_by_key[value].nil?
+            values << value
+          end
+
+          values
+        end
+
+        def options
+          raise "`#{self.class.name}#options` must be defined"
+        end
+
+        private
+
+        def options_map(parser)
+          map = {}
+          parser.top.list.each do |option|
+            map[option.short.first] = option
+            map[option.long.first] = option
+          end
+          map
+        end
+
+        def parameter?(value)
+          value.start_with?("-")
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative "base_glob"
+
+module Theme
+  module Conversions
+    class IgnoreGlob < BaseGlob
+      class << self
+        def options
+          %w(-x --ignore)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative "base_glob"
+
+module Theme
+  module Conversions
+    class IncludeGlob < BaseGlob
+      class << self
+        def options
+          %w(-o --only)
+        end
+      end
+    end
+  end
+end

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

@@ -65,8 +65,8 @@ module Theme
                 {{command:-j, --json}}             Output JSON instead of a UI.
                 {{command:-a, --allow-live}}       Allow push to a live theme.
                 {{command:-p, --publish}}          Publish as the live theme after uploading.
-                {{command:-o, --only}}             Upload only the specified files.
-                {{command:-x, --ignore}}           Skip uploading the specified files.
+                {{command:-o, --only}}             Upload only the specified files (Multiple flags allowed).
+                {{command:-x, --ignore}}           Skip uploading the specified files (Multiple flags allowed).
 
               Run without options to select theme from a list.
           HELP
@@ -96,7 +96,7 @@ module Theme
           help: <<~HELP,
             Uploads the current theme as a development theme to the connected store, then prints theme editor and preview URLs to your terminal. While running, changes will push to the store in real time.
 
-            Usage: {{command:%s theme serve}}
+            Usage: {{command:%s theme serve [ ROOT ]}}
 
             Options:
               {{command:--port=PORT}}        Local port to serve theme preview from.
@@ -202,8 +202,8 @@ module Theme
               {{command:-l, --live}}             Pull theme files from your remote live theme.
               {{command:-d, --development}}      Pull theme files from your remote development theme.
               {{command:-n, --nodelete}}         Runs the pull command without deleting local files.
-              {{command:-o, --only}}             Download only the specified files.
-              {{command:-x, --ignore}}           Skip downloading the specified files.
+              {{command:-o, --only}}             Download only the specified files (Multiple flags allowed).
+              {{command:-x, --ignore}}           Skip downloading the specified files (Multiple flags allowed).
 
             Run without options to select theme from a list.
           HELP

data/lib/shopify_cli/commands/app/create/node.rb

@@ -4,6 +4,7 @@ module ShopifyCLI
       class Create
         class Node < ShopifyCLI::Command::AppSubCommand
           prerequisite_task :ensure_authenticated
+          prerequisite_task :ensure_git_dependency
 
           recommend_default_node_range
           recommend_default_ruby_range

data/lib/shopify_cli/commands/app/create/php.rb

@@ -4,6 +4,7 @@ module ShopifyCLI
       class Create
         class PHP < ShopifyCLI::Command::AppSubCommand
           prerequisite_task :ensure_authenticated
+          prerequisite_task :ensure_git_dependency
 
           options do |parser, flags|
             parser.on("--name=NAME") { |name| flags[:name] = name }

data/lib/shopify_cli/commands/app/create/rails.rb

@@ -4,6 +4,7 @@ module ShopifyCLI
       class Create
         class Rails < ShopifyCLI::Command::AppSubCommand
           prerequisite_task :ensure_authenticated
+          prerequisite_task :ensure_git_dependency
 
           recommend_default_ruby_range
           recommend_default_node_range

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

@@ -3,6 +3,7 @@ module ShopifyCLI
     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/environment.rb

@@ -25,6 +25,12 @@ module ShopifyCLI
       ::Semantic::Version.new(out.chomp)
     end
 
+    def self.npm_version(context: Context.new)
+      out, err, stat = context.capture3("npm", "--version")
+      raise ShopifyCLI::Abort, err unless stat.success?
+      ::Semantic::Version.new(out.chomp)
+    end
+
     def self.interactive=(interactive)
       @interactive = interactive
     end

data/lib/shopify_cli/git.rb

@@ -4,7 +4,15 @@ module ShopifyCLI
   # git.
   class Git
     class << self
-      # Check if Git is available in the environment
+      # Check if Git exists in the environment
+      def exists?(ctx)
+        _output, status = ctx.capture2e("git", "version")
+        status.success?
+      rescue Errno::ENOENT # git is not installed
+        false
+      end
+
+      # Check if the current working directory is a Git repository
       def available?(ctx)
         _output, status = ctx.capture2e("git", "status")
         status.success?

data/lib/shopify_cli/messages/messages.rb

@@ -277,6 +277,24 @@ module ShopifyCLI
               HELP
           },
         },
+        extension: {
+          push: {
+            checkout_ui_extension: {
+              localization: {
+                error: {
+                  bundle_too_large: "Total size of all locale files must be less than %s.",
+                  file_empty: "Locale file `%s` is empty.",
+                  file_too_large: "Locale file `%s` too large; size must be less than %s.",
+                  invalid_file_extension: "Invalid locale filename: `%s`; only .json files are allowed.",
+                  invalid_locale_code: "Invalid locale filename: `%s`; locale code should be 2 or 3 letters,"\
+                    " optionally followed by a two-letter region code, e.g. `fr-CA`.",
+                  single_default_locale: "There must be one and only one locale identified as the default locale,"\
+                    " e.g. `en.default.json`",
+                },
+              },
+            },
+          },
+        },
         error_reporting: {
           unhandled_error: {
             message: "{{x}} {{red:An unexpected error occured.}}",
@@ -355,6 +373,7 @@ 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",
+            nonexistent: "Git needs to be installed: https://git-scm.com/download",
             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.",
@@ -672,7 +691,8 @@ module ShopifyCLI
             },
           },
           ensure_dev_store: {
-            could_not_verify_store: "Couldn't verify your store %s",
+            could_not_verify_store: "Couldn't verify your store. If you don't have a development store set up, "\
+              "please create one in your Partners dashboard and run `shopify app connect`.",
             convert_to_dev_store: <<~MESSAGE,
               Do you want to convert %s to a development store?
               Doing this will allow you to install your app, but the store will become {{bold:transfer-disabled}}.

data/lib/shopify_cli/tasks/ensure_git_dependency.rb

@@ -0,0 +1,14 @@
+require "shopify_cli"
+
+module ShopifyCLI
+  module Tasks
+    class EnsureGitDependency < ShopifyCLI::Task
+      def call(ctx)
+        return if ShopifyCLI::Environment.acceptance_test?
+        unless ShopifyCLI::Git.exists?(ctx)
+          raise ShopifyCLI::Abort, ctx.message("core.git.error.nonexistent")
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/tasks.rb

@@ -34,6 +34,7 @@ module ShopifyCLI
     register :CreateApiClient, :create_api_client, "shopify_cli/tasks/create_api_client"
     register :EnsureAuthenticated, :ensure_authenticated, "shopify_cli/tasks/ensure_authenticated"
     register :EnsureEnv, :ensure_env, "shopify_cli/tasks/ensure_env"
+    register :EnsureGitDependency, :ensure_git_dependency, "shopify_cli/tasks/ensure_git_dependency"
     register :EnsureLoopbackURL, :ensure_loopback_url, "shopify_cli/tasks/ensure_loopback_url"
     register :EnsureProjectType, :ensure_project_type, "shopify_cli/tasks/ensure_project_type"
     register :EnsureDevStore, :ensure_dev_store, "shopify_cli/tasks/ensure_dev_store"

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

@@ -3,7 +3,6 @@ require "net/http"
 require "stringio"
 require "time"
 require "cgi"
-
 require_relative "proxy/template_param_builder"
 
 module ShopifyCLI
@@ -70,13 +69,26 @@ module ShopifyCLI
             @core_endpoints << env["PATH_INFO"]
           end
 
-          body = response.body || [""]
+          body = patch_body(env, response.body)
           body = [body] unless body.respond_to?(:each)
           [response.code, headers, body]
         end
 
         private
 
+        def patch_body(env, body)
+          return [""] unless body
+
+          body.gsub(%r{(data-.+=(["']))(http:|https:)?//#{@theme.shop}(.*)(\2)}) do |_|
+            match = Regexp.last_match
+            "#{match[1]}http://#{host(env)}#{match[4]}#{match[5]}"
+          end
+        end
+
+        def host(env)
+          env["HTTP_HOST"]
+        end
+
         def has_body?(headers)
           headers["Content-Length"] || headers["Transfer-Encoding"]
         end

data/lib/shopify_cli/theme/include_filter.rb

@@ -9,7 +9,8 @@ module ShopifyCLI
 
       attr_reader :globs, :regexes
 
-      def initialize(patterns = [])
+      def initialize(root, patterns = [])
+        @root = Pathname.new(root)
         @patterns = patterns.nil? ? [] : patterns.compact.reject(&:empty?)
 
         regexes, globs = patterns_to_regexes_and_globs(@patterns)
@@ -22,9 +23,10 @@ module ShopifyCLI
         return true unless present?(@patterns)
 
         path = path.to_s
-
         return true if path.empty?
 
+        path = @root.join(path).to_s
+
         regexes.each do |regex|
           return true if regex_match?(regex, path)
         end