shopify-cli 2.14.0 → 2.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be8f00a6bb6d3e7059a63e77ff74327d9e11474cc34b156ec54da33080119e11
-  data.tar.gz: ed986614e2b2c0b9b9ca70a175c2133a3130643f3678bbf17148556be4f39f86
+  metadata.gz: a06f3c09c3e5e000956befefcbb7b8108096236d9b03cd021959881324c7cfe5
+  data.tar.gz: b1daa60127f1b93ceed1f00d151e67f9709bca8ae77a962913f6fd1edfaac0c9
 SHA512:
-  metadata.gz: cc1c384e33b5bc316e38ab1ab58b978ab56e811309c82746f9218fc8de2cd4d57b243414f324421baff1abdc69829d952840e2c2bd94049963858ca3700c5600
-  data.tar.gz: d065d5a10be15c0f79c800798fb0302e9b2519b7b22fea5879ae321297e8bd0859d8b21756b40ae8abe78387e1e3e62b600d0e796a5848545b1c8e5c37af4cd2
+  metadata.gz: 31e29e63fd9f7e569f7d4834549645b1ca206489274709aa7577f57b6888b3bd28d06eb5bd5899721cf9478239fa524b7937c009575a93c0ac096cd56c911fa6
+  data.tar.gz: '09f19940da497bf3fab8d8c78c801fc127c2a8cad8fe49887f86b05de373dc96acb805c8c282ce76c72d7ea89526d65f0ec0ef3732d6854110a50d02de2f240b'

data/.github/CONTRIBUTING.md

@@ -17,7 +17,7 @@ When contributing to the Shopify CLI, there are a set of [design guidelines](htt
 
 ### Where to find known issues
 
-We track all of our issues in GitHub and [bugs](https://github.com/Shopify/shopify-cli/labels/Bug) are labeled accordingly. If you are planning to work on an issue, avoid ones which already have an assignee, where someone has commented within the last two weeks they are working on it, or the issue is labeled with [fix in progress](https://github.com/Shopify/shopify-cli/labels/fix%20in%20progress). We will do our best to communicate when an issue is being worked on internally.
+We track all of our issues in GitHub and [bugs](https://github.com/Shopify/shopify-cli/labels/type:bug) are labeled accordingly. If you are planning to work on an issue, avoid ones which already have an assignee, where someone has commented within the last two weeks they are working on it, or the issue is labeled with [fix in progress](https://github.com/Shopify/shopify-cli/labels/fix%20in%20progress). We will do our best to communicate when an issue is being worked on internally.
 
 ### Running against a local environment
 

data/.github/workflows/stale.yml

@@ -0,0 +1,46 @@
+# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/actions/stale
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: '31 3 * * *' # randomly chosen time of day
+  workflow_dispatch:
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+    - uses: actions/stale@v4
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        days-before-issue-stale: 90
+        days-before-pr-stale: 30
+        days-before-close: 10
+        stale-issue-message: |-
+          This issue seems inactive. If it's still relevant, please add a comment saying so. Otherwise, take no action.
+
+          → If there's no activity within a week, then a bot will automatically close this.
+
+          Thanks for helping to improve Shopify's dev tooling and experience.
+        stale-pr-message: |-
+          This PR seems inactive. If it's still relevant, please add a comment saying so. Otherwise, take no action.
+
+          → If there's no activity within a week, then a bot will automatically close this.
+
+          Thanks for helping to improve Shopify's dev tooling and experience.
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'
+        ascending: true
+        # The math seems a bit fuzzy, but this should amount to a max of 50 issues daily.
+        # But then the same issues get checked first so we don't end up progressing too quickly until we can close what we started.
+        # Hopefully https://github.com/actions/stale/issues/692 will be closed and fix some of this mess.
+        operations-per-run: 200

data/CHANGELOG.md

@@ -2,6 +2,30 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
+## Version 2.15.2
+
+### Fixed
+* [#2121](https://github.com/Shopify/shopify-cli/pull/2121): Fix the hot-reload to work when the section name is not equal to the type
+
+## Version 2.15.1
+
+### Added
+* [#1934](https://github.com/Shopify/shopify-cli/pull/1934): Block directories in theme assets
+* [#1880](https://github.com/Shopify/shopify-cli/pull/1880): Recognize attempts to pass a store name and suggest correction
+* [#2174](https://github.com/Shopify/shopify-cli/pull/2174): Add optional 2-way sync between the CLI (`theme serve`) and the Theme Editor
+
+### Fixed
+* [#1874](https://github.com/Shopify/shopify-cli/pull/1874): Make ngrok errors more robust and helpful
+* [#2172](https://github.com/Shopify/shopify-cli/pull/2172): Fix Ruby check for Rails app creation
+
+## Version 2.15.0
+
+### Fixed
+* [#2086](https://github.com/Shopify/shopify-cli/pull/2086): Improve check of dependency versions
+* [#2149](https://github.com/Shopify/shopify-cli/pull/2149): Fix `ThemeAdminAPI` not to handle asset errors
+* [#2122](https://github.com/Shopify/shopify-cli/pull/2122): Fix `--only`/`--ignore` flags parser to support multiple occurrences without quotes
+* [#2146](https://github.com/Shopify/shopify-cli/pull/2146): Prevent duplicate locales for Checkout extension localization
+
 ## Version 2.14.0
 
 ### Changed

data/Gemfile

@@ -15,6 +15,7 @@ group :development, :test do
   gem "rubocop-rake", require: false
   gem "iniparse", "~> 1.5"
   gem "colorize", "~> 0.8.1"
+  gem "octokit", "~> 4.0"
 end
 
 group :test do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.14.0)
+    shopify-cli (2.15.2)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
       theme-check (~> 1.10.1)
@@ -13,13 +13,13 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
     ast (2.4.2)
-    bugsnag (6.23.0)
+    bugsnag (6.24.2)
       concurrent-ruby (~> 1.0)
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crack (0.4.5)
       rexml
     cucumber (7.0.0)
@@ -55,11 +55,34 @@ GEM
       cucumber-messages (~> 17.0, >= 17.0.1)
     diff-lcs (1.4.4)
     fakefs (1.3.2)
+    faraday (1.10.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
     ffi (1.15.4)
     hashdiff (1.0.1)
     iniparse (1.5.0)
-    liquid (5.1.0)
-    listen (3.7.0)
+    liquid (5.3.0)
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     method_source (1.0.0)
@@ -77,9 +100,13 @@ GEM
       ruby-progressbar
     mocha (1.13.0)
     multi_test (0.1.2)
+    multipart-post (2.1.1)
     nokogiri (1.13.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
+    octokit (4.22.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
     parallel (1.21.0)
     parser (3.1.1.0)
       ast (~> 2.4.1)
@@ -94,7 +121,7 @@ GEM
     rack (2.2.3)
     rainbow (3.1.1)
     rake (13.0.6)
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     regexp_parser (2.2.0)
@@ -117,9 +144,13 @@ GEM
     rubocop-shopify (2.0.1)
       rubocop (~> 1.11)
     ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     sys-uname (1.2.2)
       ffi (~> 1.1)
-    theme-check (1.10.1)
+    theme-check (1.10.2)
       liquid (>= 5.1.0)
       nokogiri (>= 1.12)
       parser (~> 3)
@@ -144,6 +175,7 @@ DEPENDENCIES
   minitest-fail-fast
   minitest-reporters
   mocha
+  octokit (~> 4.0)
   pry-byebug
   rack
   rake

data/Rakefile

@@ -129,6 +129,46 @@ end
 desc("Builds all distribution packages of the CLI")
 task(package: "package:all")
 
+namespace :release do
+  require "shopify_cli/release"
+
+  task :prepare, [:new_version] do |_t, args|
+    new_version = args[:new_version]
+    unless new_version
+      raise <<~NO_NEW_VERSION
+        New version must be provided, e.g.:
+
+        $ GITHUB_ACCESS_TOKEN=abcdef rake "release:prepare[1.2.3]"
+
+      NO_NEW_VERSION
+    end
+    github_access_token = ENV["GITHUB_ACCESS_TOKEN"]
+    unless github_access_token
+      raise <<~NO_GITHUB_ACCESS_TOKEN
+        GitHub access token must be provided, e.g.:
+
+        $ GITHUB_ACCESS_TOKEN=abcdef rake "release:prepare[1.2.3]"
+      NO_GITHUB_ACCESS_TOKEN
+    end
+
+    ShopifyCLI::Release.new(new_version, github_access_token).prepare!
+    puts "Completed!"
+  end
+
+  task :package do
+    github_access_token = ENV["GITHUB_ACCESS_TOKEN"]
+    unless github_access_token
+      raise <<~NO_GITHUB_ACCESS_TOKEN
+        GitHub access token must be provided, e.g.:
+
+        $ GITHUB_ACCESS_TOKEN=abcdef rake release:package
+      NO_GITHUB_ACCESS_TOKEN
+    end
+    ShopifyCLI::Release.new(ShopifyCLI::VERSION, github_access_token).package!
+    puts "Completed!"
+  end
+end
+
 namespace :extensions do
   task :update do
     version = ENV.fetch("VERSION").strip

data/ext/shopify-extensions/version

@@ -1 +1 @@
-v0.1.0
+v0.2.0

data/lib/project_types/extension/forms/questions/ask_template.rb

@@ -11,21 +11,18 @@ module Extension
           default: -> { CLI::UI::Prompt.method(:ask) }
 
         def call(project_details)
-          return project_details unless template_required?(project_details)
-          project_details.template = template || choose_interactively
+          if template_required?(project_details)
+            project_details.template = template || choose_interactively
+          end
           project_details
         end
 
         private
 
         def template_required?(project_details)
-          return false unless extension_server_beta?
           type = project_details&.type&.identifier
-          Models::DevelopmentServerRequirements::SUPPORTED_EXTENSION_TYPES.include?(type.downcase)
-        end
-
-        def extension_server_beta?
-          ShopifyCLI::Shopifolk.check && ShopifyCLI::Feature.enabled?(:extension_server_beta)
+          (Models::DevelopmentServerRequirements.beta_enabled? &&
+            Models::DevelopmentServerRequirements.type_supported?(type.downcase))
         end
 
         def choose_interactively

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

@@ -41,7 +41,7 @@ module Extension
         invalid_api_key: "The API key %s does not match any of your apps.",
         ask_app: "Which app would you like to register this extension with?",
         no_apps: "{{x}} You don’t have any apps.",
-        learn_about_apps: "{{*}} Learn more about building apps at <https://shopify.dev/concepts/apps>, " \
+        learn_about_apps: "{{*}} Learn more about building apps at <https://shopify.dev/apps>, " \
           "or try creating a new app using {{command:shopify [node|rails] create}}.",
         loading_apps: "Loading your apps…",
         no_available_extensions: "{{x}} There are no available extensions for this app.",
@@ -115,6 +115,16 @@ module Extension
         tunnel_already_running: "A tunnel running on another port has been detected. Close the tunnel and try again.",
       },
       tunnel: {
+        duplicate_session: <<~MESSAGE,
+          Another ngrok tunnel is currently running with your auth token, possibly on another machine.
+
+          Terminate that tunnel before opening a new one.
+        MESSAGE
+        invalid_token: <<~MESSAGE,
+          The ngrok token currently configured is invalid.
+
+          After generating a new token, update your local ngrok configuration using {{command:shopify app tunnel auth <token>}}
+        MESSAGE
         missing_token: "{{x}} {{red:auth requires a token argument}}. "\
           "Find it on your ngrok dashboard: {{underline:https://dashboard.ngrok.com/auth/your-authtoken}}.",
         invalid_port: "%s is not a valid port.",

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "shopify_cli"
 
 module Extension
@@ -12,21 +13,26 @@ module Extension
 
       class << self
         def supported?(type)
-          binary_installed? && type_supported?(type) && beta_enabled?
+          binary_installed? && type_supported?(type) && type_enabled?(type)
         end
 
-        private
-
-        def binary_installed?
-          Models::DevelopmentServer.new.executable_installed?
+        def beta_enabled?
+          ShopifyCLI::Feature.enabled?(:extension_server_beta)
         end
 
         def type_supported?(type)
           SUPPORTED_EXTENSION_TYPES.include?(type.downcase)
         end
 
-        def beta_enabled?
-          ShopifyCLI::Shopifolk.check && ShopifyCLI::Feature.enabled?(:extension_server_beta)
+        private
+
+        def binary_installed?
+          Models::DevelopmentServer.new.executable_installed?
+        end
+
+        # Some types are enabled unconditionally; others require beta_enabled
+        def type_enabled?(type)
+          beta_enabled? || "checkout_ui_extension" == type.downcase
         end
       end
     end

data/lib/project_types/extension/models/server_config/root.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "yaml"
+
 module Extension
   module Models
     module ServerConfig

data/lib/project_types/extension/models/specification_handlers/checkout_ui_extension.rb

@@ -43,6 +43,7 @@ module Extension
             # Localization is optional
             return {} if locale_filenames.empty?
 
+            validate_no_duplicate_locale(locale_filenames)
             validate_total_size(locale_filenames)
             default_locale = single_default_locale(locale_filenames)
 
@@ -61,6 +62,18 @@ module Extension
           end
         end
 
+        def validate_no_duplicate_locale(locale_filenames)
+          duplicate_locale = locale_filenames
+            .map { |filename| basename_for_locale_filename(filename.downcase) }
+            .group_by { |locale| locale }
+            .detect { |_k, v| v.size > 1 }
+            &.first
+          raise(
+            ShopifyCLI::Abort,
+            ShopifyCLI::Context.message("#{L10N_ERROR_PREFIX}.duplicate_locale_code", duplicate_locale)
+          ) unless duplicate_locale.nil?
+        end
+
         def validate_total_size(locale_filenames)
           total_size = locale_filenames.sum { |filename| File.size(filename) }
           if total_size > L10N_BUNDLE_SIZE_LIMIT

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

@@ -36,3 +36,21 @@ delivery_discount_types:
       repo: "https://github.com/Shopify/scripts-apis-examples"
     wasm:
       repo: "https://github.com/Shopify/scripts-apis-examples"
+product_discount_type:
+  beta: true
+  domain: 'discounts'
+  libraries:
+    wasm:
+      repo: "https://github.com/Shopify/scripts-apis-examples"
+order_discount_type:
+  beta: true
+  domain: 'discounts'
+  libraries:
+    wasm:
+      repo: "https://github.com/Shopify/scripts-apis-examples"
+shipping_discount_type:
+  beta: true
+  domain: 'discounts'
+  libraries:
+    wasm:
+      repo: "https://github.com/Shopify/scripts-apis-examples"

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

@@ -180,6 +180,23 @@ module Script
             @max_size = max_size
           end
         end
+
+        class InvalidInputQueryErrors < ScriptProjectError
+          attr_reader :messages
+
+          def initialize(messages)
+            @messages = messages
+            super()
+          end
+
+          def input_query_path
+            ScriptProjectRepository::INPUT_QUERY_PATH
+          end
+
+          def message
+            messages.join("\n")
+          end
+        end
       end
     end
   end

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

@@ -83,6 +83,8 @@ module Script
               valid_types: e["message"],
               filename: script_config.filename,
             )
+          elsif (errors = user_errors.filter { |err| err["tag"] == "input_query_validation_error" }).any?
+            raise Errors::InvalidInputQueryErrors, errors.map { |err| err["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

@@ -86,6 +86,9 @@ module Script
                                                      "type(s): %{valid_types}.",
           configuration_schema_field_invalid_value_error_help: "Change the value of the type.",
 
+          input_query_error_cause: "Input query is invalid:\n%{messages}\n\n",
+          input_query_error_help: "Fix the query in the `%{input_query_path}` file.",
+
           script_not_found_cause: "Can't find script %s for Script API %s",
 
           system_call_failure_cause: "Something went wrong while running: {{command:%{cmd}}}.",

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

@@ -216,6 +216,17 @@ module Script
               "script.error.configuration_schema_field_invalid_value_error_help"
             ),
           }
+        when Layers::Infrastructure::Errors::InvalidInputQueryErrors
+          {
+            cause_of_error: ShopifyCLI::Context.message(
+              "script.error.input_query_error_cause",
+              messages: e.messages.map { |message| "  {{x}} #{message}." }.join("\n"),
+            ),
+            help_suggestion: ShopifyCLI::Context.message(
+              "script.error.input_query_error_help",
+              input_query_path: e.input_query_path,
+            ),
+          }
         when Layers::Infrastructure::Errors::DependencyInstallError
           {
             cause_of_error: ShopifyCLI::Context.message("script.error.dependency_install_cause"),

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

@@ -26,11 +26,11 @@ module Theme
         parser.on("-d", "--development") { flags[:development] = true }
         parser.on("-o", "--only=PATTERN", Conversions::IncludeGlob) do |pattern|
           flags[:includes] ||= []
-          flags[:includes] += pattern
+          flags[:includes] |= pattern
         end
         parser.on("-x", "--ignore=PATTERN", Conversions::IgnoreGlob) do |pattern|
           flags[:ignores] ||= []
-          flags[:ignores] += pattern
+          flags[:ignores] |= pattern
         end
       end
 

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

@@ -30,11 +30,11 @@ module Theme
         parser.on("-p", "--publish") { flags[:publish] = true }
         parser.on("-o", "--only=PATTERN", Conversions::IncludeGlob) do |pattern|
           flags[:includes] ||= []
-          flags[:includes] += pattern
+          flags[:includes] |= pattern
         end
         parser.on("-x", "--ignore=PATTERN", Conversions::IgnoreGlob) do |pattern|
           flags[:ignores] ||= []
-          flags[:ignores] += pattern
+          flags[:ignores] |= pattern
         end
       end
 

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

@@ -16,6 +16,7 @@ module Theme
         parser.on("--port=PORT") { |port| flags[:port] = port.to_i }
         parser.on("--poll") { flags[:poll] = true }
         parser.on("--live-reload=MODE") { |mode| flags[:mode] = as_reload_mode(mode) }
+        parser.on("--theme-editor-sync") { flags[:editor_sync] = true }
       end
 
       def call(_args, name)

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

@@ -10,8 +10,22 @@ module Theme
 
         def convert(parser)
           argv = parser.default_argv
-          option_index = argv.index { |v| options.include?(v) }
+          values = []
+
+          option_indexes(argv).each do |option_index|
+            values += option_values(argv, parser, option_index)
+          end
+
+          values
+        end
+
+        def options
+          raise "`#{self.class.name}#options` must be defined"
+        end
+
+        private
 
+        def option_values(argv, parser, option_index)
           return [] if option_index.nil?
 
           start_index = option_index + 1
@@ -26,12 +40,13 @@ module Theme
           values
         end
 
-        def options
-          raise "`#{self.class.name}#options` must be defined"
+        def option_indexes(argv)
+          argv
+            .each_with_index
+            .select { |item, _index| options.include?(item) }
+            .map(&:last)
         end
 
-        private
-
         def options_map(parser)
           map = {}
           parser.top.list.each do |option|

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

@@ -101,13 +101,14 @@ 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:--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:--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.",
@@ -121,18 +122,56 @@ module Theme
               fixed: "Fixed",
             },
           },
+          syncer: {
+            forms: {
+              apply_to_all: {
+                title: "Would like apply this to all the other %s files?",
+                yes: "Yes",
+                no: "No",
+              },
+              update_strategy: {
+                title_context: <<~TITLE,
+
+                  The local file {{command:%s}} is different from the remote version in the development theme."
+                TITLE
+                title_question: "What would you like to do?",
+                keep_remote: "Keep the remote version",
+                keep_local: "Keep the local version",
+                union_merge: "Merge files (it may break the local file)",
+                exit: "Exit",
+              },
+              delete_strategy: {
+                title_context: <<~TITLE,
+
+                  The local file {{command:%s}} has been recently removed, but it's present on your remote development theme.",
+                TITLE
+                title_question: "What would you like to do?",
+                delete: "Delete permanently",
+                restore: "Restore with the remote version",
+                exit: "Exit",
+              },
+            },
+          },
           error: {
             address_binding_error: "Couldn't bind to localhost."\
               " To serve your theme, set a different address with {{command:%s theme serve --host=<address>}}",
+            invalid_subdirectory: <<~MESSAGE,
+              The presence of %s in the directory structure isn't supported.
+
+              Move any files to a parent folder, then delete unsupported subdirectories.
+
+              • Required directory structure: https://shopify.dev/themes/architecture#directory-structure-and-component-types
+            MESSAGE
           },
           serving: <<~SERVING,
 
             Serving %s
 
           SERVING
+          download_changes: ", and use 'theme pull' to get the changes",
           customize_or_preview: <<~CUSTOMIZE_OR_PREVIEW,
 
-            Customize this theme in the Theme Editor:
+            Customize this theme in the Theme Editor%s:
             {{green:%s}}
 
             Share this theme preview: