shopify-cli 2.10.2 → 2.11.0

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

@@ -5,6 +5,9 @@ module ShopifyCLI
         class Rails < ShopifyCLI::Command::AppSubCommand
           prerequisite_task :ensure_authenticated
 
+          recommend_default_node_range
+          recommend_default_ruby_range
+
           options do |parser, flags|
             parser.on("--name=NAME") { |t| flags[:name] = t }
             parser.on("--organization-id=ID") { |id| flags[:organization_id] = id }

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

@@ -6,6 +6,9 @@ module ShopifyCLI
         subcommand :PHP, "php", "shopify_cli/commands/app/create/php"
         subcommand :Node, "node", "shopify_cli/commands/app/create/node"
 
+        recommend_default_node_range
+        recommend_default_ruby_range
+
         def call(_args, _command_name)
           @ctx.puts(self.class.help)
         end

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

@@ -4,6 +4,9 @@ module ShopifyCLI
       class Deploy < ShopifyCLI::Command::AppSubCommand
         subcommand :Heroku, "heroku", "shopify_cli/commands/app/deploy/heroku"
 
+        recommend_default_node_range
+        recommend_default_ruby_range
+
         def call(args, _name)
           platform = args.shift
           case platform

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

@@ -6,6 +6,9 @@ module ShopifyCLI
 
         prerequisite_task :ensure_env, :ensure_dev_store
 
+        recommend_default_ruby_range
+        recommend_default_node_range
+
         options do |parser, flags|
           parser.on("--host=HOST") do |h|
             flags[:host] = h.gsub('"', "")

data/lib/shopify_cli/constants.rb

@@ -58,6 +58,18 @@ module ShopifyCLI
       MONORAIL_REAL_EVENTS = "MONORAIL_REAL_EVENTS"
     end
 
+    module SupportedVersions
+      module Ruby
+        FROM = "2.6.6"
+        TO = "3.1.0"
+      end
+
+      module Node
+        FROM = "12.0.0"
+        TO = "17.0.0"
+      end
+    end
+
     module Identity
       CLIENT_ID_DEV = "e5380e02-312a-7408-5718-e07017e9cf52"
       CLIENT_ID = "fbdb2649-e327-4907-8f67-908d24cfd7e3"

data/lib/shopify_cli/environment.rb

@@ -1,9 +1,25 @@
+require "semantic/semantic"
+
 module ShopifyCLI
   # The environment module provides an interface to get information from
   # the environment in which the CLI runs
   module Environment
     TRUTHY_ENV_VARIABLE_VALUES = ["1", "true", "TRUE", "yes", "YES"]
 
+    def self.ruby_version(context: Context.new)
+      out, err, stat = context.capture3('ruby -e "puts RUBY_VERSION"')
+      raise ShopifyCLI::Abort, err unless stat.success?
+      out = out.gsub('"', "")
+      ::Semantic::Version.new(out.chomp)
+    end
+
+    def self.node_version(context: Context.new)
+      out, err, stat = context.capture3("node", "--version")
+      raise ShopifyCLI::Abort, err unless stat.success?
+      out = out.gsub("v", "")
+      ::Semantic::Version.new(out.chomp)
+    end
+
     def self.interactive=(interactive)
       @interactive = interactive
     end
@@ -90,7 +106,17 @@ module ShopifyCLI
 
     def self.spin_url(env_variables: ENV)
       if infer_spin?(env_variables: env_variables)
-        %x(spin info fqdn 2> /dev/null).strip
+        # TODO: Remove version check and delete spin-legacy branch
+        #  once spin2 becomes the installed "spin" binary by default
+        spin_version = %x(spin version 2> /dev/null).strip
+        if spin_version.start_with?("spin-")
+          # spin2
+          raise ShopifyCLI:: Abort, "SPIN_INSTANCE must be specified" unless ENV.key?("SPIN_INSTANCE")
+          %x(spin show -o fqdn 2> /dev/null).strip
+        else
+          # spin-legacy
+          %x(spin info fqdn 2> /dev/null).strip
+        end
       else
         spin_workspace = spin_workspace(env_variables: env_variables)
         spin_namespace = spin_namespace(env_variables: env_variables)

data/lib/shopify_cli/exception_reporter.rb

@@ -1,5 +1,10 @@
 module ShopifyCLI
   module ExceptionReporter
+    def self.report_error_silently(error)
+      return unless ReportingConfigurationController.reporting_enabled?
+      report_to_bugsnag(error: error)
+    end
+
     def self.report(error, _logs = nil, _api_key = nil, custom_metadata = {})
       context = ShopifyCLI::Context.new
       unless ShopifyCLI::Environment.development?
@@ -19,6 +24,10 @@ module ShopifyCLI
       return unless reportable_error?(error)
 
       return unless report?(context: context)
+      report_to_bugsnag(error: error, custom_metadata: custom_metadata)
+    end
+
+    def self.report_to_bugsnag(error:, custom_metadata: {})
       ENV["BUGSNAG_DISABLE_AUTOCONFIGURE"] = "1"
       require "bugsnag"
 

data/lib/shopify_cli/github/issue_url_generator.rb

@@ -2,17 +2,28 @@ module ShopifyCLI
   module GitHub
     module IssueURLGenerator
       def self.error_url(error)
-        title = "#{error.class}: #{error.message}"
+        title = "[Bug]: #{error.class}: #{error.message}"
         labels = "type:bug"
-        content = File.read(File.join(ShopifyCLI::ROOT, ".github/ISSUE_TEMPLATE.md"))
 
         # take at most 5 lines from backtrace
-        stacktrace = error.backtrace.length < 5 ? error.backtrace : error.backtrace[0..4]
-        body = stacktrace.join("\n").to_s
-        output = content.gsub(/<!--Stacktrace(.|\n)*-->/, body)
-        query = URI.encode_www_form({ title: title, body: output, labels: labels })
-        url = "#{ShopifyCLI::Constants::Links::NEW_ISSUE}?#{query}"
-        url
+        stacktrace_text =
+          if error.backtrace # Sometimes errors seem to appear without backtrace, see https://github.com/Shopify/shopify-cli/issues/1972#issuecomment-1028013630
+            stacktrace = error.backtrace.length < 5 ? error.backtrace : error.backtrace[0..4]
+            stacktrace.join("\n").to_s
+          else
+            ""
+          end
+        query = URI.encode_www_form({
+          title: title,
+          labels: labels,
+          template: "bug_report.yaml",
+          stack_trace: stacktrace_text,
+          os: RUBY_PLATFORM,
+          cli_version: ShopifyCLI::VERSION,
+          ruby_version: "#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}",
+          shell: ENV["SHELL"],
+        })
+        "#{ShopifyCLI::Constants::Links::NEW_ISSUE}?#{query}"
       end
     end
   end

data/lib/shopify_cli/identity_auth/env_auth_token.rb

@@ -0,0 +1,34 @@
+module ShopifyCLI
+  class IdentityAuth
+    class EnvAuthToken
+      Token = Struct.new(:token, :expires_at, keyword_init: true)
+
+      class << self
+        attr_accessor :exchanged_partners_token
+
+        def partners_token_present?
+          Environment.auth_token
+        end
+
+        def fetch_exchanged_partners_token
+          current_time = Time.now.to_i
+
+          # If we have an in-memory token that hasn't expired yet, we reuse it.
+          if exchanged_partners_token && current_time < exchanged_partners_token.expires_at.to_i
+            return exchanged_partners_token.token
+          end
+
+          new_exchanged_token = yield(Environment.auth_token)
+          token = new_exchanged_token["access_token"]
+          expires_in = new_exchanged_token["expires_in"].to_i
+          expires_at = Time.at(current_time + expires_in)
+
+          token = Token.new(token: token, expires_at: expires_at)
+
+          self.exchanged_partners_token = token
+          token.token
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/identity_auth.rb

@@ -13,6 +13,7 @@ module ShopifyCLI
     include SmartProperties
 
     autoload :Servlet, "shopify_cli/identity_auth/servlet"
+    autoload :EnvAuthToken, "shopify_cli/identity_auth/env_auth_token"
 
     class Error < StandardError; end
     class Timeout < StandardError; end
@@ -68,9 +69,12 @@ module ShopifyCLI
       request_exchange_tokens
     end
 
-    def self.fetch_or_auth_partners_token(ctx:)
-      env_var_auth_token = Environment.auth_token
-      return env_var_auth_token if env_var_auth_token
+    def fetch_or_auth_partners_token
+      if EnvAuthToken.partners_token_present?
+        return EnvAuthToken.fetch_exchanged_partners_token do |env_token|
+          exchange_partners_auth_token(env_token)
+        end
+      end
 
       ShopifyCLI::DB.get(:partners_exchange_token) do
         IdentityAuth.new(ctx: ctx).authenticate
@@ -78,6 +82,15 @@ module ShopifyCLI
       end
     end
 
+    def exchange_partners_auth_token(subject_token)
+      application = "partners"
+      request_exchange_token(
+        audience: client_id_for_application(application),
+        scopes: APPLICATION_SCOPES[application],
+        subject_token: subject_token,
+      )
+    end
+
     def self.environment_auth_token?
       !!Environment.auth_token
     end
@@ -195,30 +208,35 @@ module ShopifyCLI
 
     def request_exchange_tokens
       APPLICATION_SCOPES.each do |key, scopes|
-        request_exchange_token(key, client_id_for_application(key), scopes)
+        request_and_save_exchange_token(key, client_id_for_application(key), scopes)
       end
     end
 
-    def request_exchange_token(name, audience, additional_scopes)
+    def request_and_save_exchange_token(name, audience, additional_scopes)
       return if name == "shopify" && !store.exists?(:shop)
+      access_token = request_exchange_token(
+        audience: audience,
+        scopes: scopes(additional_scopes),
+        subject_token: store.get(:identity_access_token),
+        destination: name == "shopify" ? "https://#{store.get(:shop)}/admin" : nil
+      )["access_token"]
+      store.set("#{name}_exchange_token".to_sym => access_token)
+      ctx.debug("#{name}_exchange_token: " + access_token)
+    end
 
+    def request_exchange_token(audience:, scopes:, subject_token:, destination: nil)
       params = {
         grant_type: "urn:ietf:params:oauth:grant-type:token-exchange",
         requested_token_type: "urn:ietf:params:oauth:token-type:access_token",
         subject_token_type: "urn:ietf:params:oauth:token-type:access_token",
         client_id: client_id,
         audience: audience,
-        scope: scopes(additional_scopes),
-        subject_token: store.get(:identity_access_token),
-      }.tap do |result|
-        if name == "shopify"
-          result[:destination] = "https://#{store.get(:shop)}/admin"
-        end
-      end
+        scope: scopes,
+        subject_token: subject_token,
+        destination: destination,
+      }.compact
       # ctx.debug(params)
-      resp = post_token_request(params)
-      store.set("#{name}_exchange_token".to_sym => resp["access_token"])
-      ctx.debug("#{name}_exchange_token: " + resp["access_token"])
+      post_token_request(params)
     end
 
     def post_token_request(params)

data/lib/shopify_cli/messages/messages.rb

@@ -53,7 +53,7 @@ module ShopifyCLI
                     {{command:--organization-id=ID}} Partner organization ID. Must be an existing organization.
                     {{command:--store-domain=MYSHOPIFYDOMAIN }} Development store URL. Must be an existing development store.
                     {{command:--db=DB}} Database type. Must be one of: mysql, postgresql, sqlite3, oracle, frontbase, ibm_db, sqlserver, jdbcmysql, jdbcsqlite3, jdbcpostgresql, jdbc.
-                    {{command:--rails-opts=RAILSOPTS}} Additional options. Must be string containing one or more valid Rails options, separated by spaces.
+                    {{command:--rails-opts=RAILSOPTS}} Additional options. Must be a string containing one or more valid Rails options, separated by spaces.
               HELP
 
               error: {

data/lib/shopify_cli/partners_api.rb

@@ -38,7 +38,11 @@ module ShopifyCLI
       def query(ctx, query_name, **variables)
         CLI::Kit::Util.begin do
           api_client(ctx).query(query_name, variables: variables)
-        end.retry_after(API::APIRequestUnauthorizedError, retries: 1) do
+        end.retry_after(
+          API::APIRequestUnauthorizedError,
+          retries: 1,
+          only: -> { !IdentityAuth::EnvAuthToken.partners_token_present? }
+        ) do
           ShopifyCLI::IdentityAuth.new(ctx: ctx).reauthenticate
         end
       rescue API::APIRequestUnauthorizedError => e
@@ -60,9 +64,10 @@ module ShopifyCLI
       private
 
       def api_client(ctx)
+        identity_auth = ShopifyCLI::IdentityAuth.new(ctx: ctx)
         new(
           ctx: ctx,
-          token: IdentityAuth.fetch_or_auth_partners_token(ctx: ctx),
+          token: identity_auth.fetch_or_auth_partners_token,
           url: "https://#{Environment.partners_domain}/api/cli/graphql",
         )
       end

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

@@ -41,12 +41,7 @@ module ShopifyCLI
 
             raise ShopifyCLI::AbortSilent if form.nil?
 
-            ruby_version = Rails::Ruby.version(context)
-            context.abort(context.message("core.app.create.rails.error.invalid_ruby_version")) unless
-              ruby_version.satisfies?("~>2.5") || ruby_version.satisfies?("~>3.0.0")
-
-            check_node
-            check_yarn
+            check_dependencies
 
             build(form.name, form.db)
             set_custom_ua
@@ -106,6 +101,18 @@ module ShopifyCLI
             end
           end
 
+          def check_dependencies
+            check_ruby
+            check_node
+            check_yarn
+          end
+
+          def check_ruby
+            ruby_version = Rails::Ruby.version(context)
+            return if ruby_version.satisfies?("~>2.5") || ruby_version.satisfies?("~>3.0.0")
+            context.abort(context.message("core.app.create.rails.error.invalid_ruby_version"))
+          end
+
           def check_node
             cmd_path = context.which("node")
             if cmd_path.nil?
@@ -148,11 +155,13 @@ module ShopifyCLI
           end
 
           def build(name, db)
-            context.abort(context.message("core.app.create.rails.error.install_failure",
-              "rails")) unless install_gem("rails",
-                "<6.1")
-            context.abort(context.message("core.app.create.rails.error.install_failure", "bundler ~>2.0")) unless
-              install_gem("bundler", "~>2.0")
+            unless install_gem("rails")
+              context.abort(context.message("core.app.create.rails.error.install_failure", "rails"))
+            end
+
+            unless install_gem("bundler", "~>2.0")
+              context.abort(context.message("core.app.create.rails.error.install_failure", "bundler ~>2.0"))
+            end
 
             full_path = File.join(context.root, name)
             context.abort(context.message("core.app.create.rails.error.dir_exists", name)) if Dir.exist?(full_path)
@@ -173,7 +182,7 @@ module ShopifyCLI
 
             context.puts(context.message("core.app.create.rails.adding_shopify_gem"))
             File.open(File.join(context.root, "Gemfile"), "a") do |f|
-              f.puts "\ngem 'shopify_app', '>=17.0.3'"
+              f.puts "\ngem 'shopify_app', '>=18.1.0'"
             end
             CLI::UI::Frame.open(context.message("core.app.create.rails.running_bundle_install")) do
               syscall(%w(bundle install))
@@ -188,7 +197,7 @@ module ShopifyCLI
               syscall(%w(rails db:migrate RAILS_ENV=development))
             end
 
-            unless File.exist?(File.join(context.root, "config/webpacker.yml"))
+            if install_webpacker?
               CLI::UI::Frame.open(context.message("core.app.create.rails.running_webpacker_install")) do
                 syscall(%w(rails webpacker:install))
               end
@@ -208,6 +217,21 @@ module ShopifyCLI
           def install_gem(name, version = nil)
             Rails::Gem.install(context, name, version)
           end
+
+          def install_webpacker?
+            rails_version < ::Semantic::Version.new("7.0.0") &&
+              !File.exist?(File.join(context.root, "config/webpacker.yml"))
+          end
+
+          def rails_version
+            output, status = context.capture2e("rails", "--version")
+            unless status.success?
+              context.abort(context.message("core.app.create.rails.error.install_failure", "rails"))
+            end
+
+            version = output.scan(/Rails \d+\.\d+\.\d+/).first.split(" ").last
+            ::Semantic::Version.new(version)
+          end
         end
       end
     end

data/lib/shopify_cli/theme/include_filter.rb

@@ -7,36 +7,58 @@ module ShopifyCLI
     class IncludeFilter
       include Filter::PathMatcher
 
-      def initialize(pattern = nil)
-        @pattern = pattern
+      attr_reader :globs, :regexes
+
+      def initialize(patterns = [])
+        @patterns = patterns.nil? ? [] : patterns.compact.reject(&:empty?)
+
+        regexes, globs = patterns_to_regexes_and_globs(@patterns)
+
+        @regexes = regexes
+        @globs = globs
       end
 
       def match?(path)
-        return true unless present?(@pattern)
+        return true unless present?(@patterns)
+
+        path = path.to_s
+
+        return true if path.empty?
 
-        if regex_pattern?
-          regex_match?(regex_pattern, path)
-        else
-          glob_match?(glob_pattern, path)
+        regexes.each do |regex|
+          return true if regex_match?(regex, path)
         end
+
+        globs.each do |glob|
+          return true if glob_match?(glob, path)
+        end
+
+        false
       end
 
       private
 
-      def present?(pattern)
-        !pattern.nil? && !pattern.empty?
+      def present?(patterns)
+        !patterns.nil? && !patterns.empty?
       end
 
-      def regex_pattern?
-        @is_regex_pattern ||= regex?(@pattern)
-      end
+      # Take in string patterns and convert them to either
+      # regex patterns or glob patterns so that they are handled in an expected manner.
+      def patterns_to_regexes_and_globs(patterns)
+        new_regexes = []
+        new_globs = []
 
-      def regex_pattern
-        @regex_pattern ||= as_regex(@pattern)
-      end
+        patterns
+          .map(&:strip)
+          .each do |pattern|
+            if regex?(pattern)
+              new_regexes << as_regex(pattern)
+            else
+              new_globs << as_glob(pattern)
+            end
+          end
 
-      def glob_pattern
-        @glob_pattern ||= as_glob(@pattern)
+        [new_regexes, new_globs]
       end
     end
   end

data/lib/shopify_cli/utilities.rb

@@ -0,0 +1,7 @@
+module ShopifyCLI
+  module Utilities
+    def self.version_dropping_pre_and_build(version)
+      Semantic::Version.new("#{version.major}.#{version.minor}.#{version.patch}")
+    end
+  end
+end

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.10.2"
+  VERSION = "2.11.0"
 end

data/lib/shopify_cli.rb

@@ -136,6 +136,7 @@ module ShopifyCLI
   autoload :Tasks, "shopify_cli/tasks"
   autoload :TransformDataStructure, "shopify_cli/transform_data_structure"
   autoload :Tunnel, "shopify_cli/tunnel"
+  autoload :Utilities, "shopify_cli/utilities"
 
   require "shopify_cli/messages/messages"
   Context.load_messages(ShopifyCLI::Messages::MESSAGES)

data/vendor/deps/cli-kit/lib/cli/kit/system.rb

@@ -227,7 +227,7 @@ module CLI
         end
 
         def which(cmd, env)
-          exts = os == :windows ? env.fetch('PATHEXT', ['']).split(';') : ['']
+          exts = (os == :windows && env['PATHEXT']&.split(';')) || ['']
           env.fetch('PATH', '').split(File::PATH_SEPARATOR).each do |path|
             exts.each do |ext|
               exe = File.join(path, "#{cmd}#{ext}")

data/vendor/deps/cli-kit/lib/cli/kit/util.rb

@@ -168,9 +168,13 @@ module CLI
           @block_that_might_raise = block_that_might_raise
         end
 
-        def retry_after(exception = StandardError, retries: 1, &before_retry)
+        def retry_after(exception = StandardError, retries: 1, only: nil, &before_retry)
           @block_that_might_raise.call
         rescue exception => e
+          should_retry = only ? only.call : true
+  
+          raise unless should_retry
+
           raise if (retries -= 1) < 0
           if before_retry
             if before_retry.arity == 0

data/vendor/lib/semantic/version.rb

@@ -21,7 +21,6 @@ module Semantic
       @version = version_str
     end
 
-
     def build=(b)
       @build = (!b.nil? && b.empty?) ? nil : b
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.10.2
+  version: 2.11.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-31 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,6 +118,9 @@ files:
 - ".github/CONTRIBUTING.md"
 - ".github/DESIGN.md"
 - ".github/ISSUE_TEMPLATE.md"
+- ".github/ISSUE_TEMPLATE/bug_report.yaml"
+- ".github/ISSUE_TEMPLATE/enhancement.yaml"
+- ".github/ISSUE_TEMPLATE/feature.yaml"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/probots.yml"
 - ".github/workflows/shopify.yml"
@@ -273,7 +276,6 @@ files:
 - lib/project_types/php/forms/create.rb
 - lib/project_types/php/messages/messages.rb
 - lib/project_types/rails/cli.rb
-- lib/project_types/rails/commands/create.rb
 - lib/project_types/rails/forms/create.rb
 - lib/project_types/rails/gem.rb
 - lib/project_types/rails/messages/messages.rb
@@ -405,6 +407,7 @@ files:
 - lib/shopify_cli/heroku.rb
 - lib/shopify_cli/http_request.rb
 - lib/shopify_cli/identity_auth.rb
+- lib/shopify_cli/identity_auth/env_auth_token.rb
 - lib/shopify_cli/identity_auth/servlet.rb
 - lib/shopify_cli/js_deps.rb
 - lib/shopify_cli/js_system.rb
@@ -488,6 +491,7 @@ files:
 - lib/shopify_cli/thread_pool/job.rb
 - lib/shopify_cli/transform_data_structure.rb
 - lib/shopify_cli/tunnel.rb
+- lib/shopify_cli/utilities.rb
 - lib/shopify_cli/version.rb
 - shopify-cli.gemspec
 - shopify-dev