shopify-cli 2.22.0 → 2.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fdf2b1a1c6ff2b21a3adb26654fda425436a5660d27b487dd1473fc2530b02c
-  data.tar.gz: 572fa0ba305ec75391c3aac020f1bb72c0874a8d138c7b05da8aaf0fdba68719
+  metadata.gz: db890ff22a5395154b92a4cf782ad621c2462b8aac8cc843c102be2a388a098b
+  data.tar.gz: e1ce745c465a52a84b33075e0b7ba8ffe15a10397061a9a5bea5bc1bd3669618
 SHA512:
-  metadata.gz: bb78577fab62082d1fb27eacb1865a690c04a8985fea4af5684399e84a942d025e79b36792c1c382704231f8e73c67e71edd9cd055898de0aa48099b2d5dfb2e
-  data.tar.gz: 7e19eb12d7e1cfc5d22002bde244451f21277547180a13617f3211de1b657099e12b85efa46ce8f5649954336cd24c672c98e9ac807af00212f7ea921e57f37f
+  metadata.gz: 506f249416682dda65299eaf0dd6d589f1dea1fbb2097f92f4738e5ad529184aabeb3b84387ed8d012db60da271e28ef53df24a9c49a85bdcfab0d722be23459
+  data.tar.gz: 7fdb0b575be5f09c9185479a04313bb16f0144e21316ebe48e17e98ef80d9766d765760c6d65fdcca1611eb367f2a3b59153c60f6406f92e5c98fa4cd1c36b58

data/.github/CODEOWNERS

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

data/CHANGELOG.md

@@ -2,6 +2,15 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
+## Version 2.23.0 - 2022-08-22
+
+### Fixed
+* [#2528](https://github.com/Shopify/shopify-cli/pull/2528): Switch from using absolute file paths to relative paths for ignore filter
+
+### Added
+* [#2520](https://github.com/Shopify/shopify-cli/pull/2520): Add the option to ignore new version warnings by passing the `SHOPIFY_CLI_RUN_AS_SUBPROCESS` environment variable
+* [#2440](https://github.com/Shopify/shopify-cli/pull/2440): Warn when using CLI 2.0 in a CLI 3.0 project
+
 ## Version 2.22.0 - 2022-08-08
 
 ### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.22.0)
+    shopify-cli (2.23.0)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
       theme-check (~> 1.10.3)

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

@@ -1,14 +1,3 @@
-payment_methods:
-  domain: 'checkout'
-  libraries:
-    typescript:
-      beta: true
-      package: "@shopify/scripts-checkout-apis"
-      repo: "https://github.com/Shopify/function-examples"
-    wasm:
-      repo: "https://github.com/Shopify/function-examples"
-    rust:
-      repo: "https://github.com/Shopify/function-examples"
 payment_customization:
   beta: true
   domain: 'checkout'
@@ -20,10 +9,6 @@ payment_customization:
 shipping_methods:
   domain: 'checkout'
   libraries:
-    typescript:
-      beta: true
-      package: "@shopify/scripts-checkout-apis"
-      repo: "https://github.com/Shopify/function-examples"
     wasm:
       repo: "https://github.com/Shopify/function-examples"
     rust:

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

@@ -85,7 +85,7 @@ module Theme
       def push_completion_handler(theme, has_errors)
         if options.flags[:json]
           output = { theme: theme.to_h }
-          output[:warning] = "Theme pushed with errors." if has_errors
+          output[:warning] = @ctx.message("theme.push.with_errors") if has_errors
 
           puts(JSON.generate(output))
         elsif options.flags[:publish]

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

@@ -113,6 +113,7 @@ module Theme
               {{underline:%s}}
           WARN
           name: "Theme name",
+          with_errors: "Theme pushed with errors.",
         },
         serve: {
           theme_not_found: "Theme \"%s\" doesn't exist",

data/lib/shopify_cli/constants.rb

@@ -31,6 +31,7 @@ module ShopifyCLI
     module EnvironmentVariables
       STACKTRACE = "SHOPIFY_CLI_STACKTRACE"
       TTY = "SHOPIFY_CLI_TTY"
+      RUN_AS_SUBPROCESS = "SHOPIFY_CLI_RUN_AS_SUBPROCESS"
 
       # When true the CLI points to a local instance of
       # the partners dashboard and identity.

data/lib/shopify_cli/core/cli_version.rb

@@ -0,0 +1,20 @@
+module ShopifyCLI
+  module Core
+    ##
+    # ShopifyCLI::Core::CliVersion checks that the CLI in use is correct for the project.
+    #
+    class CliVersion
+      class << self
+        def using_3_0?
+          !!cli_3_0_toml_dir
+        end
+
+        private
+
+        def cli_3_0_toml_dir
+          Utilities.directory("shopify.app.toml", Dir.pwd)
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/core/entry_point.rb

@@ -5,13 +5,27 @@ module ShopifyCLI
     module EntryPoint
       class << self
         def call(args, ctx = Context.new)
-          if ctx.development? && !ctx.testing?
-            ctx.warn(
-              ctx.message("core.warning.development_version", File.join(ShopifyCLI::ROOT, "bin", ShopifyCLI::TOOL_NAME))
-            )
-          elsif !ctx.testing?
-            new_version = ctx.new_version
-            ctx.warn(ctx.message("core.warning.new_version", ShopifyCLI::VERSION, new_version)) unless new_version.nil?
+          # Only instruct the user to update the CLI, or warn them that they're
+          # using CLI2 not CLI3, if they're running CLI2 directly. Otherwise the
+          # warnings will be confusing and/or incorrect.
+          unless Environment.run_as_subprocess?
+            if ctx.development? && !ctx.testing?
+              ctx.warn(
+                ctx.message(
+                  "core.warning.development_version",
+                  File.join(ShopifyCLI::ROOT, "bin", ShopifyCLI::TOOL_NAME)
+                )
+              )
+              # because `!ctx.new_version.nil?` will change the config by calling ::Config.set
+              # it's important to keep the checks in this order so that we don't trigger it while testing
+              # since changing the config will throw errors
+            elsif !ctx.testing? && !ctx.new_version.nil?
+              ctx.warn(ctx.message("core.warning.new_version", ShopifyCLI::VERSION, ctx.new_version))
+            end
+
+            if ShopifyCLI::Core::CliVersion.using_3_0?
+              ctx.warn(ctx.message("core.warning.in_3_0_directory"))
+            end
           end
 
           ProjectType.load_all

data/lib/shopify_cli/core.rb

@@ -4,5 +4,6 @@ module ShopifyCLI
     autoload :Executor, "shopify_cli/core/executor"
     autoload :HelpResolver, "shopify_cli/core/help_resolver"
     autoload :Monorail, "shopify_cli/core/monorail"
+    autoload :CliVersion, "shopify_cli/core/cli_version"
   end
 end

data/lib/shopify_cli/environment.rb

@@ -181,5 +181,12 @@ module ShopifyCLI
     def self.env_variable_truthy?(variable_name, env_variables: ENV)
       TRUTHY_ENV_VARIABLE_VALUES.include?(env_variables[variable_name.to_s])
     end
+
+    def self.run_as_subprocess?(env_variables: ENV)
+      env_variable_truthy?(
+        Constants::EnvironmentVariables::RUN_AS_SUBPROCESS,
+        env_variables: env_variables
+      )
+    end
   end
 end

data/lib/shopify_cli/messages/messages.rb

@@ -791,6 +791,16 @@ module ShopifyCLI
               {{underline:https://shopify.dev/tools/cli/troubleshooting#upgrade-shopify-cli}}}}
 
           MESSAGE
+
+          in_3_0_directory: <<~MESSAGE,
+            {{*}} {{yellow:You appear to be working with a CLI 3.0 project, but running a CLI 2.0 command. New syntax documentation: https://shopify.dev/apps/tools/cli/commands#command-syntax}}
+
+              For more information on CLI 3.0, see the documentation:
+              {{underline:https://shopify.dev/apps/tools/cli}}
+
+              Already have CLI 3.0 installed? Run it using your node package manager, as explained here:
+              {{underline:https://shopify.dev/apps/tools/cli/cli-2#running-shopify-cli-2-x-and-3-x-in-the-same-environment}}
+          MESSAGE
         },
         reporting: {
           help: <<~HELP,

data/lib/shopify_cli/project.rb

@@ -119,18 +119,9 @@ module ShopifyCLI
       private
 
       def directory(dir)
-        @dir ||= Hash.new { |h, k| h[k] = __directory(k) }
+        @dir ||= Hash.new { |h, k| h[k] = Utilities.directory(".shopify-cli.yml", k) }
         @dir[dir]
       end
-
-      def __directory(curr)
-        loop do
-          return nil if curr == "/" || /^[A-Z]:\/$/.match?(curr)
-          file = File.join(curr, ".shopify-cli.yml")
-          return curr if File.exist?(file)
-          curr = File.dirname(curr)
-        end
-      end
     end
 
     property :directory # :nodoc:

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

@@ -40,14 +40,14 @@ module ShopifyCLI
 
         def notify_streams_of_file_change(modified, added, removed)
           files = (modified + added)
-            .reject { |file| @ignore_filter&.ignore?(file) }
             .map { |file| @theme[file] }
+            .reject { |file| @ignore_filter&.ignore?(file.relative_path) }
 
           files -= liquid_css_files = files.select(&:liquid_css?)
 
           deleted_files = removed
-            .reject { |file| @ignore_filter&.ignore?(file) }
             .map { |file| @theme[file] }
+            .reject { |file| @ignore_filter&.ignore?(file.relative_path) }
 
           remote_delete(deleted_files) unless deleted_files.empty?
           reload_page(removed) unless deleted_files.empty?

data/lib/shopify_cli/theme/syncer/ignore_helper.rb

@@ -10,7 +10,7 @@ module ShopifyCLI
         end
 
         def ignore_file?(file)
-          path = file.path
+          path = file.relative_path
           ignore_path?(path)
         end
 

data/lib/shopify_cli/theme/syncer.rb

@@ -382,7 +382,9 @@ module ShopifyCLI
       rescue JSON::ParserError
         [exception.message]
       rescue StandardError => e
-        ["The asset #{operation.file} is could not be synced (cause: #{e.message})."]
+        cause = "(cause: #{e.message})"
+        backtrace = e.backtrace.join("\n")
+        ["The asset #{operation.file} could not be synced #{cause} #{backtrace}"]
       end
 
       def backoff_if_near_limit!(used, limit)

data/lib/shopify_cli/utilities.rb

@@ -3,5 +3,14 @@ module ShopifyCLI
     def self.version_dropping_pre_and_build(version)
       Semantic::Version.new("#{version.major}.#{version.minor}.#{version.patch}")
     end
+
+    def self.directory(pattern, curr)
+      loop do
+        return nil if curr == "/" || /^[A-Z]:\/$/.match?(curr)
+        file = File.join(curr, pattern)
+        return curr if File.exist?(file)
+        curr = File.dirname(curr)
+      end
+    end
   end
 end

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.22.0"
+  VERSION = "2.23.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.22.0
+  version: 2.23.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-08 00:00:00.000000000 Z
+date: 2022-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -422,6 +422,7 @@ files:
 - lib/shopify_cli/constants.rb
 - lib/shopify_cli/context.rb
 - lib/shopify_cli/core.rb
+- lib/shopify_cli/core/cli_version.rb
 - lib/shopify_cli/core/entry_point.rb
 - lib/shopify_cli/core/executor.rb
 - lib/shopify_cli/core/finalize.rb