shopify-cli 2.20.1 → 2.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bab2227e665dd4dec8e90ca261705072971a838f85d19bcbb85d18ed1a1d5b0
-  data.tar.gz: 90e22472586a681a26974882b79ac3fd326fdcf696db2aa29201ab5d9a37c2b0
+  metadata.gz: db890ff22a5395154b92a4cf782ad621c2462b8aac8cc843c102be2a388a098b
+  data.tar.gz: e1ce745c465a52a84b33075e0b7ba8ffe15a10397061a9a5bea5bc1bd3669618
 SHA512:
-  metadata.gz: 24701865a98be1b3062ff7644fff3d35b61532803e96c39d84c7fae636b8205531e57e41641d1222dbd09275288e4dee2f2f94c837d58846212a0f4ed1643b28
-  data.tar.gz: 6e5c53ef75f07879d338692ce9271749002c13f8174a19fe3857b3396ec1512a2368770ec50bd24de2a0c9dc325dddb5b3547564c79cc360a40d1b19b35d2c50
+  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/.github/workflows/shopify.yml

@@ -22,7 +22,6 @@ jobs:
           - 2.6.6
           - 2.7.5
         os:
-          - macos-10.15
           - macos-11
           - ubuntu-20.04
           - ubuntu-18.04

data/CHANGELOG.md

@@ -2,6 +2,32 @@ 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
+* [#2512](https://github.com/Shopify/shopify-cli/pull/2512): Add the `-t/--theme` parameter to the `shopify theme serve -h` message
+* [#2505](https://github.com/Shopify/shopify-cli/pull/2505): Show warning messages when `shopify theme push/pull` has errors
+
+## Version 2.21.0 - 2022-08-03
+
+### Fixed
+* [#2453](https://github.com/Shopify/shopify-cli/pull/2453): Fix [#2382](https://github.com/Shopify/shopify-cli/issues/2382): Ensure we wait 24 hours to show update message again
+* [#2463](https://github.com/Shopify/shopify-cli/pull/2463): Fix for "Keep the remote version" deletes files on new development theme
+* [#2405](https://github.com/Shopify/shopify-cli/pull/2405): Fix `theme serve` to trigger page refresh when a file is deleted
+* [#2489](https://github.com/Shopify/shopify-cli/pull/2489): Fix `theme serve` to hot reload many occurrences of a stylesheet
+
+### Added
+* [#2496](https://github.com/Shopify/shopify-cli/pull/2496): Accept storefront renderer token from ENV variable
+
 ## Version 2.20.1 - 2022-07-18
 
 ### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.20.1)
+    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/pull.rb

@@ -52,7 +52,11 @@ module Theme
           CLI::UI::Frame.open(@ctx.message("theme.pull.pulling", theme.name, theme.id, theme.shop)) do
             UI::SyncProgressBar.new(syncer).progress(:download_theme!, delete: delete)
           end
-          @ctx.done(@ctx.message("theme.pull.done"))
+          if syncer.has_any_error?
+            @ctx.warn(@ctx.message("theme.pull.done_with_errors"))
+          else
+            @ctx.done(@ctx.message("theme.pull.done"))
+          end
         rescue ShopifyCLI::API::APIRequestNotFoundError
           @ctx.abort(@ctx.message("theme.pull.theme_not_found", "##{theme.id}"))
         ensure

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

@@ -63,20 +63,12 @@ module Theme
           syncer.start_threads
           if options.flags[:json]
             syncer.upload_theme!(delete: delete)
-            puts(JSON.generate(theme: theme.to_h))
           else
             CLI::UI::Frame.open(@ctx.message("theme.push.info.pushing", theme.name, theme.id, theme.shop)) do
               UI::SyncProgressBar.new(syncer).progress(:upload_theme!, delete: delete)
             end
-
-            if options.flags[:publish]
-              theme.publish
-              @ctx.done(@ctx.message("theme.publish.done", theme.preview_url))
-            else
-              @ctx.done(@ctx.message("theme.push.done", theme.preview_url, theme.editor_url))
-            end
           end
-          raise ShopifyCLI::AbortSilent if syncer.has_any_error?
+          push_completion_handler(theme, syncer.has_any_error?)
         ensure
           syncer.shutdown
         end
@@ -90,6 +82,23 @@ module Theme
 
       private
 
+      def push_completion_handler(theme, has_errors)
+        if options.flags[:json]
+          output = { theme: theme.to_h }
+          output[:warning] = @ctx.message("theme.push.with_errors") if has_errors
+
+          puts(JSON.generate(output))
+        elsif options.flags[:publish]
+          theme.publish
+          return @ctx.done(@ctx.message("theme.publish.done", theme.preview_url)) unless has_errors
+          @ctx.warn(@ctx.message("theme.publish.done_with_errors", theme.preview_url))
+        else
+          return @ctx.done(@ctx.message("theme.push.done", theme.preview_url, theme.editor_url)) unless has_errors
+          @ctx.warn(@ctx.message("theme.push.done_with_errors", theme.preview_url, theme.editor_url))
+        end
+        raise ShopifyCLI::AbortSilent if has_errors
+      end
+
       def find_theme(root, theme_id: nil, theme: nil, live: nil, development: nil, unpublished: nil, **_args)
         if theme_id
           @ctx.warn(@ctx.message("theme.push.deprecated_themeid"))

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

@@ -43,6 +43,7 @@ module Theme
               Run without arguments to select theme from a list.
           HELP
           done: "Your theme is now live at %s",
+          done_with_errors: "{{warning:Your theme was published with errors and is now live at %s.}}",
           not_found: "Theme #%s does not exist",
           no_themes_error: "You don't have any theme to be published.",
           no_themes_resolution: "Try to create an unpublished theme with {{command:theme push -u -t <theme_name>}}.",
@@ -102,7 +103,17 @@ module Theme
               {{info:Customize this theme in the Theme Editor:}}
               {{underline:%s}}
           DONE
+          done_with_errors: <<~WARN,
+            {{yellow:Your theme was pushed with errors.}}
+
+              {{info:View your theme:}}
+              {{underline:%s}}
+
+              {{info:Customize this theme in the Theme Editor:}}
+              {{underline:%s}}
+          WARN
           name: "Theme name",
+          with_errors: "Theme pushed with errors.",
         },
         serve: {
           theme_not_found: "Theme \"%s\" doesn't exist",
@@ -112,14 +123,15 @@ module Theme
             Usage: {{command:%s theme serve [ ROOT ]}}
 
             Options:
-              {{command:--port=PORT}}         Local port to serve theme preview from.
-              {{command:--poll}}              Force polling to detect file changes.
-              {{command:--host=HOST}}         Set which network interface the web server listens on. The default value is 127.0.0.1.
-              {{command:--theme-editor-sync}} Synchronize Theme Editor updates in the local theme files.
-              {{command:--live-reload=MODE}}  The live reload mode switches the server behavior when a file is modified:
-                                  - {{command:hot-reload}} Hot reloads local changes to CSS and sections (default)
-                                  - {{command:full-page}}  Always refreshes the entire page
-                                  - {{command:off}}        Deactivate live reload
+              {{command:-t, --theme=NAME_OR_ID}} Theme ID or name of the remote theme.
+              {{command:--port=PORT}}            Local port to serve theme preview from.
+              {{command:--poll}}                 Force polling to detect file changes.
+              {{command:--host=HOST}}            Set which network interface the web server listens on. The default value is 127.0.0.1.
+              {{command:--theme-editor-sync}}    Synchronize Theme Editor updates in the local theme files.
+              {{command:--live-reload=MODE}}     The live reload mode switches the server behavior when a file is modified:
+                                     - {{command:hot-reload}} Hot reloads local changes to CSS and sections (default)
+                                     - {{command:full-page}}  Always refreshes the entire page
+                                     - {{command:off}}        Deactivate live reload
           HELP
           reload_mode_is_not_valid: "The live reload mode `%s` is not valid.",
           try_a_valid_reload_mode: "Try a valid live reload mode: %s.",
@@ -318,7 +330,8 @@ module Theme
           HELP
           select: "Select a theme to pull from",
           pulling: "Pulling theme files from %s (#%s) on %s",
-          done: "Theme pulled successfully",
+          done: "Theme pulled successfully.",
+          done_with_errors: "{{warning:Your theme was pulled with errors.}}",
           deprecated_themeid: <<~WARN,
             {{warning:The {{command:-i, --themeid}} flag is deprecated. Use {{command:-t, --theme}} instead.}}
           WARN

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.
@@ -54,6 +55,7 @@ module ShopifyCLI
       # Authentication
       AUTH_TOKEN = "SHOPIFY_CLI_AUTH_TOKEN"
       ADMIN_AUTH_TOKEN = "SHOPIFY_CLI_ADMIN_AUTH_TOKEN"
+      STOREFRONT_RENDERER_AUTH_TOKEN = "SHOPIFY_CLI_STOREFRONT_RENDERER_AUTH_TOKEN"
 
       # Monorail
       MONORAIL_REAL_EVENTS = "MONORAIL_REAL_EVENTS"

data/lib/shopify_cli/context.rb

@@ -628,9 +628,10 @@ module ShopifyCLI
           thread = Thread.new { retrieve_latest_gem_version }
           at_exit { thread.join }
         end
+        latest_version =
+          ShopifyCLI::Config.get(VERSION_CHECK_SECTION, LATEST_VERSION_FIELD, default: ShopifyCLI::VERSION)
+        latest_version if ::Semantic::Version.new(latest_version) > ::Semantic::Version.new(ShopifyCLI::VERSION)
       end
-      latest_version = ShopifyCLI::Config.get(VERSION_CHECK_SECTION, LATEST_VERSION_FIELD, default: ShopifyCLI::VERSION)
-      latest_version if ::Semantic::Version.new(latest_version) > ::Semantic::Version.new(ShopifyCLI::VERSION)
     end
 
     # Returns file extension depending on OS

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

@@ -170,6 +170,10 @@ module ShopifyCLI
       env_variables[Constants::EnvironmentVariables::ADMIN_AUTH_TOKEN]
     end
 
+    def self.storefront_renderer_auth_token(env_variables: ENV)
+      env_variables[Constants::EnvironmentVariables::STOREFRONT_RENDERER_AUTH_TOKEN]
+    end
+
     def self.store(env_variables: ENV)
       env_variables[Constants::EnvironmentVariables::STORE]
     end
@@ -177,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/resources/env_file.rb

@@ -30,7 +30,7 @@ module ShopifyCLI
         def parse(directory)
           File.read(path(directory))
             .gsub("\r\n", "\n").split("\n").each_with_object({}) do |line, output|
-            match = /\A([A-Za-z_0-9]+)\s*=\s*(.*)\z/.match(line)
+            match = /\A(#*\s*[A-Za-z_0-9]+)\s*=\s*(.*)\z/.match(line)
             if match
               key = match[1]
               output[key] = case match[2]

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

@@ -14,7 +14,7 @@
   function connect() {
     const eventSource = new EventSource('/hot-reload');
 
-    eventSource.onmessage = handleUpdate;
+    eventSource.onmessage = onMessage;
 
     eventSource.onopen = () => console.log('[HotReload] SSE connected.');
 
@@ -97,10 +97,23 @@
     window.location.reload();
   }
 
-  function handleUpdate(message) {
-    var data = JSON.parse(message.data);
+  function onMessage(message) {
+    const data = JSON.parse(message.data);
+    if (data.reload_page) {
+      refreshPage([]);
+      return;
+    }
+
+    handleUpdate(data);
+  }
+
+  function handleUpdate(data) {
     var modifiedFiles = data.modified;
 
+    if (modifiedFiles === undefined) {
+      return;
+    }
+
     if (isRefreshRequired(modifiedFiles)) {
       refreshPage(modifiedFiles);
     } else {
@@ -114,13 +127,15 @@
 
   function reloadCssFile(filename) {
     // Find a stylesheet link starting with /assets (locally-served only) containing the filename
-    let link = document.querySelector(`link[href^="/assets"][href*="${filename}"][rel="stylesheet"]`);
+    let links = document.querySelectorAll(`link[href^="/assets"][href*="${filename}"][rel="stylesheet"]`);
 
-    if (!link) {
+    if (!links.length) {
       console.log(`[HotReload] Could not find link for stylesheet ${filename}`);
     } else {
-      link.href = new URL(link.href).pathname + `?v=${Date.now()}`;
-      console.log(`[HotReload] Reloaded stylesheet ${filename}`);
+      links.forEach(link => {
+        link.href = new URL(link.href).pathname + `?v=${Date.now()}`;
+        console.log(`[HotReload] Reloaded stylesheet ${filename}`);
+      })
     }
   }
 

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

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module ShopifyCLI
+  module Theme
+    module DevServer
+      class HotReload
+        class RemoteFileDeleter
+          def initialize(ctx, theme:, streams:)
+            @ctx = ctx
+            @theme = theme
+            @streams = streams
+          end
+
+          def delete(file)
+            retries = 6
+
+            until retries.zero?
+              retries -= 1
+
+              _status, body = fetch_asset(file)
+              retries = 0 if deleted_file?(body)
+
+              wait
+            end
+
+            notify(file)
+          end
+
+          private
+
+          def api_client
+            @api_client ||= ThemeAdminAPI.new(@ctx, @theme.shop)
+          end
+
+          def deleted_file?(body)
+            remote_checksum = body.dig("asset", "checksum")
+
+            remote_checksum.nil?
+          end
+
+          def notify(file)
+            @streams.broadcast(JSON.generate(deleted: [file]))
+            @ctx.debug("[RemoteFileDeleter] Deleted #{file}")
+          end
+
+          def wait
+            sleep(1)
+          end
+
+          def fetch_asset(file)
+            api_client.get(
+              path: "themes/#{@theme.id}/assets.json",
+              query: URI.encode_www_form("asset[key]" => file.relative_path),
+            )
+          rescue ShopifyCLI::API::APIRequestNotFoundError
+            [404, {}]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "hot_reload/remote_file_reloader"
+require_relative "hot_reload/remote_file_deleter"
 require_relative "hot_reload/sections_index"
 
 module ShopifyCLI
@@ -14,6 +15,7 @@ module ShopifyCLI
           @mode = mode
           @streams = SSE::Streams.new
           @remote_file_reloader = RemoteFileReloader.new(ctx, theme: @theme, streams: @streams)
+          @remote_file_deleter = RemoteFileDeleter.new(ctx, theme: @theme, streams: @streams)
           @sections_index = SectionsIndex.new(@theme)
           @watcher = watcher
           @watcher.add_observer(self, :notify_streams_of_file_change)
@@ -36,13 +38,20 @@ module ShopifyCLI
           @streams.close
         end
 
-        def notify_streams_of_file_change(modified, added, _removed)
+        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
+            .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?
+
           hot_reload(files) unless files.empty?
           remote_reload(liquid_css_files)
         end
@@ -55,8 +64,21 @@ module ShopifyCLI
           @ctx.debug("[HotReload] Modified #{paths.join(", ")}")
         end
 
+        def reload_page(removed)
+          @streams.broadcast(JSON.generate(reload_page: true))
+          @ctx.debug("[ReloadPage] Deleted #{removed.join(", ")}")
+        end
+
+        def remote_delete(files)
+          files.each do |file|
+            @ctx.debug("delete file each -> file.relative_path #{file.relative_path}")
+            @remote_file_deleter.delete(file)
+          end
+        end
+
         def remote_reload(files)
           files.each do |file|
+            @ctx.debug("reload file each -> file.relative_path #{file.relative_path}")
             @remote_file_reloader.reload(file)
           end
         end

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

@@ -94,6 +94,7 @@ module ShopifyCLI
         end
 
         def bearer_token
+          Environment.storefront_renderer_auth_token ||
           ShopifyCLI::DB.get(:storefront_renderer_production_exchange_token) ||
             raise(KeyError, "storefront_renderer_production_exchange_token missing")
         end

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)
@@ -393,7 +395,11 @@ module ShopifyCLI
       end
 
       def overwrite_json?
-        @overwrite_json
+        theme_created_at_runtime? || @overwrite_json
+      end
+
+      def theme_created_at_runtime?
+        @theme.created_at_runtime?
       end
 
       def backingoff?

data/lib/shopify_cli/theme/theme.rb

@@ -120,6 +120,7 @@ module ShopifyCLI
         )
 
         @id = body["theme"]["id"]
+        @created_at_runtime = true
       end
 
       def delete
@@ -147,6 +148,10 @@ module ShopifyCLI
         development? && id != ShopifyCLI::DB.get(:development_theme_id)
       end
 
+      def created_at_runtime?
+        @created_at_runtime ||= false
+      end
+
       def to_h
         {
           id: id,

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.20.1"
+  VERSION = "2.23.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.20.1
+  version: 2.23.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-18 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
@@ -507,6 +508,7 @@ files:
 - lib/shopify_cli/theme/dev_server/hot-reload-no-script.html
 - lib/shopify_cli/theme/dev_server/hot-reload.js
 - lib/shopify_cli/theme/dev_server/hot_reload.rb
+- lib/shopify_cli/theme/dev_server/hot_reload/remote_file_deleter.rb
 - lib/shopify_cli/theme/dev_server/hot_reload/remote_file_reloader.rb
 - lib/shopify_cli/theme/dev_server/hot_reload/sections_index.rb
 - lib/shopify_cli/theme/dev_server/local_assets.rb