shopify-cli 2.16.0 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26f358d4694d7c5dd9b64208107c69def6144f79ee55ba2536c138a14ca81ea7
-  data.tar.gz: f1dccbffeece205fb67601a3510a351073ea61ff45e2c1276679a1604a489c2d
+  metadata.gz: 7dc113806552b27305be696850c04b292d7ba8feb0e5a60c0755bdb93b193535
+  data.tar.gz: 7fd46f5612eda607b0e2b2f01ea8662ce1d6d4803475b4e7d3bde98155ed06db
 SHA512:
-  metadata.gz: e208397e4a7ed51e65a651b567c535d23bcbd90f5587a518c69bb1aa70f67efa9cd21bce69a5eda57e005d427456776ab76543938f8188be2a262c421935ac52
-  data.tar.gz: '083e6f590ccdb81cc43f9c1200bceca765c5242d7b701a872311b49f10184fb62723df553df74f76f7e311343e814038a360821dc434ffa46a83c9907ff881e4'
+  metadata.gz: d1553e12053b6666755dde7c4381fce2018da1d73ab2f85cc456f6ad97fd58db89360a4fe02beb7b40d3a6d0010e2c8f15b68ff6246ff25426796f39f451aafc
+  data.tar.gz: 5a9f020586bfaf2b828aed9bb1ae4040bc0deab133e71181fe49c5710fd9a5a3b3cc71faf653f0311054038b76d749303947e0af6d902b7096cf84c2c610a3bf

data/CHANGELOG.md

@@ -2,6 +2,39 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
+## Version 2.18.0 - 2022-05-30
+
+### Added
+* [#2336](https://github.com/Shopify/shopify-cli/pull/2336): Add `--theme/-t` flag support to the `theme serve` command
+* [#2325](https://github.com/Shopify/shopify-cli/pull/2325): Add `-e/--editor` flag to open theme editor in the `theme open` command
+* [#2330](https://github.com/Shopify/shopify-cli/pull/2330): Add remote file deleted warning flow to `theme serve --theme-editor-sync`
+
+### Fixed
+* [#2352](https://github.com/Shopify/shopify-cli/pull/2352): Provide better DX when dealing with empty theme selection
+* [#2347](https://github.com/Shopify/shopify-cli/pull/2347): Fix #2346 Heroku CLI installation for Apple silicon
+
+## Version 2.17.0 - 2022-05-12
+
+### Added
+* [#2262](https://github.com/Shopify/shopify-cli/pull/2262): Add `capabilities` permissions to checkout extensions config
+* [#2292](https://github.com/Shopify/shopify-cli/pull/2292): Add support for App Bridge create/details URLs for scripts
+
+### Fixed
+* [#2287](https://github.com/Shopify/shopify-cli/pull/2287): Fix `Encoding::UndefinedConversionError` on `theme serve` and `theme pull`
+* [#2310](https://github.com/Shopify/shopify-cli/pull/2310): Fix live-reload to be resilient and no longer raise an error when a locale file is invalid
+* [#2297](https://github.com/Shopify/shopify-cli/pull/2297): Only show update message when the new version is higher
+* [#2270](https://github.com/Shopify/shopify-cli/pull/2270): Use ignore filter regex in watcher class
+
+### Changed
+* [#2299](https://github.com/Shopify/shopify-cli/pull/2299): Improve the unauthorized API errors when doing theme development
+
+## Version 2.16.1 - 2022-04-26
+
+### Fixed
+* [#2279](https://github.com/Shopify/shopify-cli/pull/2279): Fix logout when there are theme permission issues
+* [#2285](https://github.com/Shopify/shopify-cli/pull/2285): Fix extension loading for extension connect
+* [#2284](https://github.com/Shopify/shopify-cli/pull/2284): Fix version check for Windows
+
 ## Version 2.16.0 - 2022-04-25
 
 ### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.16.0)
+    shopify-cli (2.18.0)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
       theme-check (~> 1.10.1)
@@ -101,7 +101,7 @@ GEM
     mocha (1.13.0)
     multi_test (0.1.2)
     multipart-post (2.1.1)
-    nokogiri (1.13.4)
+    nokogiri (1.13.6)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     octokit (4.22.0)
@@ -118,7 +118,7 @@ GEM
       pry (~> 0.13.0)
     public_suffix (4.0.6)
     racc (1.6.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rainbow (3.1.1)
     rake (13.0.6)
     rb-fsevent (0.11.1)

data/ext/shopify-extensions/version

@@ -1 +1 @@
-v0.4.0
+v0.12.0

data/lib/project_types/extension/cli.rb

@@ -2,6 +2,7 @@
 
 require "pathname"
 require "json"
+require "yaml"
 
 module Extension
   class PackageResolutionFailed < RuntimeError; end
@@ -121,6 +122,7 @@ module Extension
     module ServerConfig
       autoload :Base, Project.project_filepath("models/server_config/base")
       autoload :App, Project.project_filepath("models/server_config/app")
+      autoload :Capabilities, Project.project_filepath("models/server_config/capabilities")
       autoload :Development, Project.project_filepath("models/server_config/development")
       autoload :DevelopmentEntries, Project.project_filepath("models/server_config/development_entries")
       autoload :DevelopmentRenderer, Project.project_filepath("models/server_config/development_renderer")

data/lib/project_types/extension/commands/build.rb

@@ -4,8 +4,6 @@ require "shopify_cli"
 module Extension
   class Command
     class Build < ExtensionCommand
-      hidden_feature
-
       prerequisite_task ensure_project_type: :extension
 
       YARN_BUILD_COMMAND = %w(build)

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

@@ -14,6 +14,9 @@ module Extension
         parser.on("--resourceUrl=RESOURCE_URL", "Provide a resource URL") do |resource_url|
           flags[:resource_url] = resource_url
         end
+        parser.on("-p", "--port=PORT", "Specify the port to use") do |port|
+          flags[:port] = port.to_i
+        end
       end
 
       class RuntimeConfiguration
@@ -22,13 +25,14 @@ module Extension
         property :tunnel_url, accepts: String, default: nil
         property :resource_url, accepts: String, default: nil
         property! :tunnel_requested, accepts: [true, false], reader: :tunnel_requested?, default: true
-        property! :port, accepts: (1...(2**16)), default: DEFAULT_PORT
+        property :port, accepts: (1...(2**16))
       end
 
       def call(_args, _command_name)
         config = RuntimeConfiguration.new(
           tunnel_requested: tunnel_requested?,
-          resource_url: options.flags[:resource_url]
+          resource_url: options.flags[:resource_url],
+          port: options.flags[:port]
         )
 
         ShopifyCLI::Result
@@ -51,10 +55,11 @@ module Extension
       end
 
       def find_available_port(runtime_configuration)
+        return runtime_configuration unless runtime_configuration.port.nil?
         return runtime_configuration unless specification_handler.choose_port?(@ctx)
 
         chosen_port = Tasks::ChooseNextAvailablePort
-          .call(from: runtime_configuration.port)
+          .call(from: DEFAULT_PORT)
           .unwrap { |_error| @ctx.abort(@ctx.message("serve.no_available_ports_found")) }
         runtime_configuration.tap { |c| c.port = chosen_port }
       end

data/lib/project_types/extension/features/argo_serve.rb

@@ -9,7 +9,7 @@ module Extension
       property! :specification_handler, accepts: Extension::Models::SpecificationHandlers::Default
       property :argo_runtime, accepts: -> (runtime) { runtime.class < Features::Runtimes::Base }
       property! :context, accepts: ShopifyCLI::Context
-      property! :port, accepts: Integer, default: ShopifyCLI::Constants::Extension::DEFAULT_PORT
+      property! :port, accepts: Integer
       property  :tunnel_url, accepts: String, default: nil
       property! :js_system, accepts: ->(jss) { jss.respond_to?(:call) }, default: ShopifyCLI::JsSystem
       property :resource_url, accepts: String, default: nil

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

@@ -0,0 +1,11 @@
+module Extension
+  module Models
+    module ServerConfig
+      class Capabilities < Base
+        include SmartProperties
+
+        property :network_access, accepts: [true, false], default: false
+      end
+    end
+  end
+end

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

@@ -26,6 +26,8 @@ module Extension
             new(name: "@shopify/post-purchase-ui-extensions", version: "^0.13.2")
           when "pos_ui_extension"
             new(name: "@shopify/retail-ui-extensions", version: "^0.1.0")
+          when "beacon_extension"
+            nil
           else
             raise ArgumentError, "Unknown extension type: #{type}"
           end

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

@@ -10,11 +10,14 @@ module Extension
         property! :type, accepts: String
         property! :user, accepts: ServerConfig::User
         property! :development, accepts: ServerConfig::Development
+        property  :capabilities, accepts: ServerConfig::Capabilities
         property  :extension_points, accepts: Array
-        property  :version, accepts: String
         property  :title, accepts: String
+        property  :description, accepts: String
+        property  :version, accepts: String
+        property  :metafields, accepts: Array
 
-        def self.build(uuid: "", template:, type:, root_dir:)
+        def self.build(uuid: "", template:, type:, root_dir:, **args)
           renderer = ServerConfig::DevelopmentRenderer.find(type)
           entry = ServerConfig::DevelopmentEntries.find(template)
           new(
@@ -26,7 +29,11 @@ module Extension
               template: template,
               renderer: renderer,
               entries: entry
-            )
+            ),
+            capabilities: ServerConfig::Capabilities.new(
+              network_access: false
+            ),
+            metafields: args.delete(:metafields)
           )
         end
 

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

@@ -15,7 +15,7 @@ module Extension
            (?<region>[a-zA-Z]{2}) # Optional region subtag
           )?
           \z}x
-        PERMITTED_CONFIG_KEYS = [:extension_points, :metafields, :name]
+        PERMITTED_CONFIG_KEYS = [:extension_points, :metafields, :name, :capabilities]
 
         def config(context)
           {

data/lib/project_types/extension/tasks/convert_server_config.rb

@@ -9,13 +9,14 @@ module Extension
       property! :api_key, accepts: String
       property! :context, accepts: ShopifyCLI::Context
       property! :hash, accepts: Hash
-      property  :port, accepts: Integer, default: ShopifyCLI::Constants::Extension::DEFAULT_PORT
+      property! :port, accepts: Integer
       property! :registration_uuid, accepts: String
       property  :resource_url, accepts: String
       property! :store, accepts: String
       property! :title, accepts: String
       property  :tunnel_url, accepts: String
       property! :type, accepts: String
+      property  :metafields, accepts: Array
 
       DEFAULT_BUILD_DIR = "build"
 
@@ -27,10 +28,9 @@ module Extension
         context.abort(context.message("tasks.errors.parse_error")) if hash.nil?
 
         renderer = Models::ServerConfig::DevelopmentRenderer.find(type)
-
         extension = Models::ServerConfig::Extension.new(
           uuid: registration_uuid,
-          type: type.upcase,
+          type: type,
           user: Models::ServerConfig::User.new,
           development: Models::ServerConfig::Development.new(
             build_dir: hash.dig("development", "build_dir") || DEFAULT_BUILD_DIR,
@@ -40,8 +40,12 @@ module Extension
             )
           ),
           extension_points: hash.dig("extension_points"),
+          capabilities: Models::ServerConfig::Capabilities.new(
+            network_access: hash.dig("capabilities", "network_access") || false
+          ),
           version: renderer ? version(renderer.name, context) : nil,
-          title: title
+          title: title,
+          metafields: metafields
         )
 
         unless resource_url.nil?

data/lib/project_types/extension/tasks/merge_server_config.rb

@@ -9,7 +9,7 @@ module Extension
 
       property! :context, accepts: ShopifyCLI::Context
       property! :file_path, accepts: ->(path) { Pathname(path).yield_self(&:absolute?) }
-      property  :port, accepts: Integer, default: ShopifyCLI::Constants::Extension::DEFAULT_PORT
+      property! :port, accepts: Integer, default: ShopifyCLI::Constants::Extension::DEFAULT_PORT
       property  :resource_url, accepts: String
       property  :tunnel_url, accepts: String
       property! :type, accepts: Models::DevelopmentServerRequirements::SUPPORTED_EXTENSION_TYPES
@@ -32,7 +32,9 @@ module Extension
           store: project.env.shop || "",
           title: project.title,
           tunnel_url: tunnel_url,
-          type: type
+          type: type,
+          port: port,
+          metafields: config["metafields"]
         )
       rescue Psych::SyntaxError => e
         raise(

data/lib/project_types/script/cli.rb

@@ -50,6 +50,7 @@ module Script
       autoload :ExtensionPoint, Project.project_filepath("layers/domain/extension_point")
       autoload :ScriptConfig, Project.project_filepath("layers/domain/script_config")
       autoload :ScriptProject, Project.project_filepath("layers/domain/script_project")
+      autoload :AppBridge, Project.project_filepath("layers/domain/app_bridge")
     end
 
     module Infrastructure

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

@@ -9,50 +9,52 @@ payment_methods:
       repo: "https://github.com/Shopify/scripts-apis-examples"
     rust:
       repo: "https://github.com/Shopify/scripts-apis-examples"
-shipping_methods:
+payment_customization:
+  beta: true
   domain: 'checkout'
   libraries:
-    typescript:
-      beta: true
-      package: "@shopify/scripts-checkout-apis"
-      repo: "https://github.com/Shopify/scripts-apis-examples"
     wasm:
       repo: "https://github.com/Shopify/scripts-apis-examples"
-merchandise_discount_types:
-  beta: true
-  domain: 'discounts'
+    rust:
+      repo: "https://github.com/Shopify/scripts-apis-examples"
+shipping_methods:
+  domain: 'checkout'
   libraries:
     typescript:
       beta: true
-      package: "@shopify/scripts-discounts-apis"
+      package: "@shopify/scripts-checkout-apis"
       repo: "https://github.com/Shopify/scripts-apis-examples"
     wasm:
       repo: "https://github.com/Shopify/scripts-apis-examples"
-delivery_discount_types:
+    rust:
+      repo: "https://github.com/Shopify/scripts-apis-examples"
+product_discounts:
   beta: true
   domain: 'discounts'
   libraries:
-    typescript:
-      beta: true
-      package: "@shopify/scripts-discounts-apis"
-      repo: "https://github.com/Shopify/scripts-apis-examples"
     wasm:
       repo: "https://github.com/Shopify/scripts-apis-examples"
-product_discount_type:
+    rust:
+      repo: "https://github.com/Shopify/scripts-apis-examples"
+order_discounts:
   beta: true
   domain: 'discounts'
   libraries:
     wasm:
       repo: "https://github.com/Shopify/scripts-apis-examples"
-order_discount_type:
+    rust:
+      repo: "https://github.com/Shopify/scripts-apis-examples"
+shipping_discounts:
   beta: true
   domain: 'discounts'
   libraries:
     wasm:
       repo: "https://github.com/Shopify/scripts-apis-examples"
-shipping_discount_type:
+    rust:
+      repo: "https://github.com/Shopify/scripts-apis-examples"
+shipping_rates_consolidation:
   beta: true
-  domain: 'discounts'
+  domain: 'checkout'
   libraries:
     wasm:
       repo: "https://github.com/Shopify/scripts-apis-examples"

data/lib/project_types/script/graphql/app_script_set.graphql

@@ -12,6 +12,7 @@ mutation AppScriptSet(
   $moduleUploadUrl: String!,
   $library: LibraryInput,
   $inputQuery: String,
+  $appBridge: AppBridgeInput!,
 ) {
   appScriptSet(
     uuid: $uuid
@@ -27,6 +28,7 @@ mutation AppScriptSet(
     moduleUploadUrl: $moduleUploadUrl,
     library: $library,
     inputQuery: $inputQuery,
+    appBridge: $appBridge
 ) {
     userErrors {
       field

data/lib/project_types/script/layers/application/push_script.rb

@@ -55,6 +55,7 @@ module Script
                   force: force,
                   metadata: package.metadata,
                   script_config: package.script_config,
+                  app_bridge: script_project.app_bridge,
                   module_upload_url: module_upload_url,
                   library: package.library,
                   input_query: script_project.input_query,

data/lib/project_types/script/layers/domain/app_bridge.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Domain
+      class AppBridge
+        attr_reader :create_path, :details_path
+
+        def initialize(create_path:, details_path:)
+          @create_path = create_path
+          @details_path = details_path
+        end
+      end
+    end
+  end
+end

data/lib/project_types/script/layers/domain/script_project.rb

@@ -17,6 +17,7 @@ module Script
         property! :language, accepts: String
 
         property :script_config, accepts: ScriptConfig
+        property :app_bridge, accepts: AppBridge
         property :input_query, accepts: String
 
         def initialize(*)

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

@@ -194,6 +194,17 @@ module Script
             messages.join("\n")
           end
         end
+
+        class InvalidAppBridgePathError < ScriptProjectError
+          def initialize(path_type)
+            @path_type = path_type
+            super()
+          end
+
+          def path_key
+            "app_bridge_#{@path_type}_path"
+          end
+        end
       end
     end
   end

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

@@ -54,6 +54,7 @@ module Script
             extension_point_type: extension_point_type,
             language: language,
             script_config: script_config_repository.get!,
+            app_bridge: app_bridge,
             input_query: read_input_query,
           )
         end
@@ -94,6 +95,7 @@ module Script
             extension_point_type: extension_point_type,
             language: language,
             script_config: script_config,
+            app_bridge: app_bridge,
           )
         end
 
@@ -121,6 +123,16 @@ module Script
           project_config_value("language")&.downcase || default_language
         end
 
+        def app_bridge
+          create_path = project_config_value("app_bridge_create_path") || "/"
+          details_path = project_config_value("app_bridge_details_path") || "/"
+
+          Domain::AppBridge.new(
+            create_path: create_path,
+            details_path: details_path,
+          )
+        end
+
         def project_config_value(key)
           return nil unless project.config.key?(key)
           project.config[key]

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

@@ -20,6 +20,7 @@ module Script
           force: false,
           metadata:,
           script_config:,
+          app_bridge:,
           module_upload_url:,
           library:,
           input_query: nil
@@ -36,6 +37,10 @@ module Script
             scriptConfigVersion: script_config.version,
             configurationUi: script_config.configuration_ui,
             configurationDefinition: script_config.configuration&.to_json,
+            appBridge: {
+              createPath: app_bridge.create_path,
+              detailsPath: app_bridge.details_path,
+            },
             moduleUploadUrl: module_upload_url,
             inputQuery: input_query,
           }
@@ -87,6 +92,10 @@ module Script
             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
+          elsif user_errors.find { |err| err["tag"] == "invalid_app_bridge_create_path" }
+            raise Errors::InvalidAppBridgePathError, "create"
+          elsif user_errors.find { |err| err["tag"] == "invalid_app_bridge_details_path" }
+            raise Errors::InvalidAppBridgePathError, "details"
           else
             raise Errors::GraphqlError, user_errors
           end

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

@@ -164,6 +164,9 @@ module Script
           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}} ",
+
+          invalid_app_bridge_path_cause: "The script couldn't be pushed because the App Bridge path is incorrect in .shopify-cli.yml.",
+          invalid_app_bridge_path_help: "The %{path_key} needs to be set to a path that starts with {{command:/}}.",
         },
 
         create: {

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

@@ -316,6 +316,14 @@ module Script
               ),
             help_suggestion: ShopifyCLI::Context.message("script.error.language_library_for_api_not_found_help"),
           }
+        when Layers::Infrastructure::Errors::InvalidAppBridgePathError
+          {
+            cause_of_error: ShopifyCLI::Context.message("script.error.invalid_app_bridge_path_cause"),
+            help_suggestion: ShopifyCLI::Context.message(
+              "script.error.invalid_app_bridge_path_help",
+              path_key: e.path_key,
+            ),
+          }
         end
       end
     end

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

@@ -25,6 +25,7 @@ module Theme
             title: @ctx.message("theme.delete.select"),
             exclude_roles: ["live"],
             include_foreign_developments: options.flags[:show_all],
+            cmd: :delete
           )
           return unless form
           [form.theme]

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

@@ -12,13 +12,18 @@ module Theme
         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("-e", "--editor") { flags[:editor] = true }
       end
 
       def call(_args, _name)
         theme = find_theme(**options.flags)
 
         @ctx.puts(@ctx.message("theme.open.details", theme.name, theme.preview_url, theme.editor_url))
-        @ctx.open_browser_url!(theme.preview_url)
+        if options.flags[:editor]
+          @ctx.open_browser_url!(theme.editor_url)
+        else
+          @ctx.open_browser_url!(theme.preview_url)
+        end
       end
 
       def self.help

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

@@ -19,6 +19,7 @@ module Theme
             [],
             title: @ctx.message("theme.publish.select"),
             exclude_roles: ["live", "development", "demo"],
+            cmd: :publish
           )
           return unless form
           form.theme

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

@@ -17,12 +17,16 @@ module Theme
         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 }
+        parser.on("-t", "--theme=NAME_OR_ID") { |theme| flags[:theme] = theme }
       end
 
       def call(_args, name)
+        valid_authentication_method!
+
         root = root_value(options, name)
         flags = options.flags.dup
         host = flags[:host] || DEFAULT_HTTP_HOST
+
         ShopifyCLI::Theme::DevServer.start(@ctx, root, host: host, **flags) do |syncer|
           UI::SyncProgressBar.new(syncer).progress(:upload_theme!, delay_low_priority_files: true)
         end
@@ -38,6 +42,30 @@ module Theme
       def self.help
         ShopifyCLI::Context.message("theme.serve.help", ShopifyCLI::TOOL_NAME)
       end
+
+      private
+
+      def valid_authentication_method!
+        if exchange_token && !storefront_renderer_token
+          ShopifyCLI::Context.abort(error_message, help_message)
+        end
+      end
+
+      def error_message
+        ShopifyCLI::Context.message("theme.serve.auth.error_message", ShopifyCLI::TOOL_NAME)
+      end
+
+      def help_message
+        ShopifyCLI::Context.message("theme.serve.auth.help_message", ShopifyCLI::TOOL_NAME, ShopifyCLI::TOOL_NAME)
+      end
+
+      def exchange_token
+        ShopifyCLI::DB.get(:shopify_exchange_token)
+      end
+
+      def storefront_renderer_token
+        ShopifyCLI::DB.get(:storefront_renderer_production_exchange_token)
+      end
     end
   end
 end

data/lib/project_types/theme/forms/select.rb

@@ -6,7 +6,7 @@ module Theme
   module Forms
     class Select < ShopifyCLI::Form
       attr_accessor :theme
-      flag_arguments :root, :title, :exclude_roles, :include_foreign_developments
+      flag_arguments :root, :title, :exclude_roles, :include_foreign_developments, :cmd
 
       def ask
         self.theme = CLI::UI::Prompt.ask(title, allow_empty: false) do |handler|
@@ -18,6 +18,9 @@ module Theme
 
             handler.option(presenter.to_s(:short)) { theme }
           end
+          if handler.options.empty? && cmd
+            @ctx.abort(@ctx.message("theme.#{cmd}.no_themes_error"), @ctx.message("theme.#{cmd}.no_themes_resolution"))
+          end
         end
       end
 

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

@@ -8,6 +8,11 @@ module Theme
             Usage: {{command:%1$s theme [ %2$s ]}}
         HELP
         ensure_user_error: "You are not authorized to edit themes on %s.",
+        unauthorized_error: <<~EOD,
+          You can't use Shopify CLI with development stores if you only have Partner staff member access. If you want to use Shopify CLI to work on a development store, then you should be the store owner or create a staff account on the store.
+
+          If you're the store owner, then you need to log in to the store directly using the store URL at least once (for example, using %s.myshopify.com/admin) before you log in using Shopify CLI. Logging in to the Shopify admin directly connects the development store with your Shopify login.
+        EOD
         ensure_user_try_this: <<~ENSURE_USER,
           Check if your user is activated, has permission to edit themes at the store, and try to re-login.
         ENSURE_USER
@@ -37,6 +42,8 @@ module Theme
           HELP
           done: "Your theme 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>}}.",
           select: "Select theme to push to",
           confirm: "Are you sure you want to make %s the new live theme on %s?",
         },
@@ -96,6 +103,7 @@ module Theme
           name: "Theme name",
         },
         serve: {
+          theme_not_found: "Theme \"%s\" doesn't exist",
           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.
 
@@ -116,6 +124,14 @@ module Theme
           viewing_theme: "Viewing theme…",
           syncing_theme: "Syncing theme #%s on %s",
           open_fail: "Couldn't open the theme",
+          auth: {
+            error_message: <<~ERROR_MESSAGE,
+              It looks like you are using credentials that do not work with {{command:%s theme serve}}.
+            ERROR_MESSAGE
+            help_message: <<~HELP_MESSAGE,
+              Run {{command:%s logout}} and {{command:%s login --password "" --store STORE}} to force the authentication thought your browser.
+            HELP_MESSAGE
+          },
           operation: {
             status: {
               error: "ERROR",
@@ -126,14 +142,14 @@ module Theme
           syncer: {
             forms: {
               apply_to_all: {
-                title: "Would like apply this to all the other %s files?",
+                title: "Would you like to 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."
+                  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",
@@ -141,10 +157,21 @@ module Theme
                 union_merge: "Merge files (it may break the local file)",
                 exit: "Exit",
               },
+              update_remote_deleted_strategy: {
+                title_context: <<~TITLE,
+
+                  The local file {{command:%s}} doesn’t exist in the remote version of the development theme.
+                TITLE
+                title_question: "What would you like to do?",
+                keep_remote: "Keep the remote version (and remove it locally)",
+                keep_local: "Keep the local version (and restore it remotely)",
+                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.",
+                  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",
@@ -209,6 +236,8 @@ module Theme
           HELP
           select: "Select theme to delete",
           done: "%s theme(s) deleted",
+          no_themes_error: "You don't have any theme to be deleted.",
+          no_themes_resolution: "Try to create an unpublished theme with {{command:theme push -u -t <theme_name>}}.",
           not_found: "{{x}} Theme #%s does not exist",
           live: "{{x}} Theme #%s is your live theme. You can't delete it.",
           confirm: "Are you sure you want to delete %s on %s?",
@@ -280,6 +309,7 @@ module Theme
               {{command:-t, --theme=NAME_OR_ID}} Theme ID or name of your theme.
               {{command:-l, --live}}             Open your live theme.
               {{command:-d, --development}}      Open your development theme.
+              {{command:-e, --editor}}           Open the editor to the specified/selected theme.
           HELP
         },
         list: {

data/lib/shopify_cli/admin_api.rb

@@ -156,7 +156,7 @@ module ShopifyCLI
     def auth_headers(token)
       {
         Authorization: "Bearer #{token}",
-        "X-Shopify-Access-Token" => token, # TODO: Remove when we no longer need private apps
+        "X-Shopify-Access-Token" => token,
       }
     end
   end

data/lib/shopify_cli/commands/login.rb

@@ -26,8 +26,8 @@ module ShopifyCLI
           end
         end
 
-        # As password auth will soon be deprecated, we enable only in CI
-        if @ctx.ci? && (password = options.flags[:password] || @ctx.getenv("SHOPIFY_PASSWORD"))
+        password = options.flags[:password] || @ctx.getenv("SHOPIFY_PASSWORD")
+        if !password.nil? && !password.empty?
           ShopifyCLI::DB.set(shopify_exchange_token: password)
         else
           IdentityAuth.new(ctx: @ctx).authenticate(spinner: true)

data/lib/shopify_cli/commands/logout.rb

@@ -31,7 +31,7 @@ module ShopifyCLI
         return unless has_shop?
 
         ShopifyCLI::Theme::DevelopmentTheme.delete(@ctx)
-      rescue ShopifyCLI::API::APIRequestError
+      rescue ShopifyCLI::API::APIRequestError, ShopifyCLI::Abort, ShopifyCLI::AbortSilent
         # Ignore since we can't delete it
       end
     end

data/lib/shopify_cli/context.rb

@@ -621,12 +621,16 @@ module ShopifyCLI
     #
     def new_version
       if (time_of_last_check + VERSION_CHECK_INTERVAL) < (Time.now.to_i)
-        fork do
-          retrieve_latest_gem_version
+        # Fork is not supported in Windows
+        if Process.respond_to?(:fork)
+          fork { retrieve_latest_gem_version }
+        else
+          thread = Thread.new { retrieve_latest_gem_version }
+          at_exit { thread.join }
         end
       end
       latest_version = ShopifyCLI::Config.get(VERSION_CHECK_SECTION, LATEST_VERSION_FIELD, default: ShopifyCLI::VERSION)
-      latest_version unless latest_version == 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/monorail.rb

@@ -6,7 +6,7 @@ require "rbconfig"
 module ShopifyCLI
   module Core
     module Monorail
-      ENDPOINT_URI = URI.parse("https://monorail-edge.shopifycloud.com/v1/produce")
+      ENDPOINT_URI = URI.parse("https://monorail-edge.shopifysvc.com/v1/produce")
       INVOCATIONS_SCHEMA = "app_cli_command/5.0"
 
       # Extra hash of data that will be sent in the payload

data/lib/shopify_cli/heroku.rb

@@ -4,6 +4,7 @@ module ShopifyCLI
       linux: "https://cli-assets.heroku.com/heroku-linux-x64.tar.gz",
       mac: "https://cli-assets.heroku.com/heroku-darwin-x64.tar.gz",
       windows: "https://cli-assets.heroku.com/heroku-x64.exe",
+      mac_m1: "https://cli-assets.heroku.com/heroku-darwin-x64.tar.gz",
     }
 
     def initialize(ctx)
@@ -97,15 +98,16 @@ module ShopifyCLI
       if File.exist?(local_path)
         local_path
       elsif @ctx.windows?
-        # Check if Heroku exists in the Windows registry and run it from there
-        require "win32/registry"
         begin
+          # Check if Heroku exists in the Windows registry and run it from there
+          require "win32/registry"
+
           windows_path = Win32::Registry::HKEY_CURRENT_USER.open('SOFTWARE\heroku') do |reg|
             reg[""] # This reads the 'Default' registry key
           end
 
           File.join(windows_path, "bin", "heroku").to_s
-        rescue
+        rescue StandardError, LoadError
           "heroku"
         end
       else

data/lib/shopify_cli/partners_api/app_extensions.rb

@@ -24,7 +24,7 @@ module ShopifyCLI
         end
 
         def consume_jobs!(jobs)
-          thread_pool = ShopifyCLI::ThreadPool.new
+          thread_pool = ShopifyCLI::ThreadPool.new(pool_size: 1)
           jobs.each do |job|
             thread_pool.schedule(job)
           end

data/lib/shopify_cli/release.rb

@@ -8,7 +8,6 @@ module ShopifyCLI
   class Release
     def initialize(new_version, github_access_token)
       @new_version = new_version
-      @changelog = ShopifyCLI::Changelog.new
       @github = Octokit::Client.new(access_token: github_access_token)
     end
 
@@ -32,7 +31,7 @@ module ShopifyCLI
 
     private
 
-    attr_reader :new_version, :changelog, :github
+    attr_reader :new_version, :github
 
     def ensure_updated_main
       # We can't be sure what is the correct action to take if changes have been
@@ -190,5 +189,9 @@ module ShopifyCLI
     def system_or_fail(command, action)
       raise "Failed to #{action}!" unless system(command)
     end
+
+    def changelog
+      @changelog ||= ShopifyCLI::Changelog.new
+    end
   end
 end

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

@@ -184,7 +184,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', '>=18.1.0'"
+              f.puts "\ngem 'shopify_app', '~>19.0.1'"
             end
             CLI::UI::Frame.open(context.message("core.app.create.rails.running_bundle_install")) do
               syscall(%w(bundle install))

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

@@ -14,13 +14,12 @@ module ShopifyCLI
 
             files.each do |file|
               section_hash(file).each do |key, value|
-                name = key
-                type = value&.dig("type")
-
-                next if !name || !type
+                next unless key
+                next unless value.is_a?(Hash)
+                next unless (type = value&.dig("type"))
 
                 index[type] = [] unless index[type]
-                index[type] << name
+                index[type] << key
               end
             end
 
@@ -42,7 +41,7 @@ module ShopifyCLI
           end
 
           def files
-            @theme.json_files
+            @theme.json_files.filter(&:template?)
           end
         end
       end

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

@@ -14,7 +14,8 @@ module ShopifyCLI
           @theme = theme
           @syncer = syncer
           @ignore_filter = ignore_filter
-          @listener = Listen.to(@theme.root, force_polling: poll) do |modified, added, removed|
+          @listener = Listen.to(@theme.root, force_polling: poll,
+            ignore: @ignore_filter&.regexes) do |modified, added, removed|
             changed
             notify_observers(modified, added, removed)
           end

data/lib/shopify_cli/theme/dev_server.rb

@@ -27,12 +27,13 @@ module ShopifyCLI
       class << self
         attr_accessor :ctx
 
-        def start(ctx, root, host: "127.0.0.1", port: 9292, poll: false, editor_sync: false, mode: ReloadMode.default)
+        def start(ctx, root, host: "127.0.0.1", theme: nil, port: 9292, poll: false, editor_sync: false,
+          mode: ReloadMode.default)
           @ctx = ctx
-          theme = DevelopmentTheme.find_or_create!(ctx, root: root)
+          theme = find_theme(root, theme)
           ignore_filter = IgnoreFilter.from_path(root)
           @syncer = Syncer.new(ctx, theme: theme, ignore_filter: ignore_filter, overwrite_json: !editor_sync)
-          watcher = Watcher.new(ctx, theme: theme, syncer: @syncer, poll: poll)
+          watcher = Watcher.new(ctx, theme: theme, ignore_filter: ignore_filter, syncer: @syncer, poll: poll)
           remote_watcher = RemoteWatcher.to(theme: theme, syncer: @syncer)
 
           # Setup the middleware stack. Mimics Rack::Builder / config.ru, but in reverse order
@@ -108,6 +109,22 @@ module ShopifyCLI
           @syncer.shutdown
           WebServer.shutdown
         end
+
+        private
+
+        def find_theme(root, identifier)
+          return theme_by_identifier(root, identifier) if identifier
+          DevelopmentTheme.find_or_create!(@ctx, root: root)
+        end
+
+        def theme_by_identifier(root, identifier)
+          theme = ShopifyCLI::Theme::Theme.find_by_identifier(@ctx, root: root, identifier: identifier)
+          theme || not_found_error(identifier)
+        end
+
+        def not_found_error(identifier)
+          @ctx.abort(@ctx.message("theme.serve.theme_not_found", identifier))
+        end
       end
     end
   end

data/lib/shopify_cli/theme/development_theme.rb

@@ -79,13 +79,23 @@ module ShopifyCLI
 
         theme_name = "Development ()"
         hostname_character_limit = API_NAME_LIMIT - theme_name.length - hash.length - 1
-        identifier = "#{hash}-#{hostname[0, hostname_character_limit]}"
+        identifier = encode_identifier("#{hash}-#{hostname[0, hostname_character_limit]}")
         theme_name = "Development (#{identifier})"
 
         ShopifyCLI::DB.set(development_theme_name: theme_name)
 
         theme_name
       end
+
+      ##
+      # In some cases, the identifier string encoding may be obfuscated by the hostname,
+      # which may be an ASCII string.
+      #
+      # This method ensures the result identifier is a UTF-8 valid string.
+      #
+      def encode_identifier(identifier)
+        identifier.encode(Encoding::UTF_8, invalid: :replace, undef: :replace, replace: "-")
+      end
     end
   end
 end

data/lib/shopify_cli/theme/file.rb

@@ -30,6 +30,15 @@ module ShopifyCLI
         else
           path.write(content, 0, mode: "wb")
         end
+      rescue Encoding::UndefinedConversionError
+        ##
+        # The CLI tries to write the file and normalize EOL characters to avoid
+        # errors on Windows when files are shared across different operational systems.
+        #
+        # The CLI fallbacks any error during the conversion by writing the file
+        # in binary mode when the normalization fails (e.g., ASCII files), so no data is lost.
+        #
+        path.write(content, 0, mode: "wb")
       end
 
       def delete

data/lib/shopify_cli/theme/syncer/forms/select_update_strategy.rb

@@ -7,7 +7,7 @@ module ShopifyCLI
     class Syncer
       module Forms
         class SelectUpdateStrategy < BaseStrategyForm
-          flag_arguments :file
+          flag_arguments :file, :exists_remotely
 
           def strategies
             %i[
@@ -19,7 +19,7 @@ module ShopifyCLI
           end
 
           def prefix
-            "theme.serve.syncer.forms.update_strategy"
+            "theme.serve.syncer.forms.#{exists_remotely ? "update_strategy" : "update_remote_deleted_strategy"}"
           end
         end
       end

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

@@ -74,7 +74,7 @@ module ShopifyCLI
         end
 
         def ask_update_strategy(file)
-          Forms::SelectUpdateStrategy.ask(@ctx, [], file: file).strategy
+          Forms::SelectUpdateStrategy.ask(@ctx, [], file: file, exists_remotely: file_exist_remotely?(file)).strategy
         end
       end
     end

data/lib/shopify_cli/theme/theme_admin_api.rb

@@ -53,8 +53,10 @@ module ShopifyCLI
         # * when an asset operation cannot be performed:
         #   - <APIRequestForbiddenError: 403 {"message":"templates/gift_card.liquid could not be deleted"}>
         #
-        if empty_response?(error) || unauthorized_response?(error)
+        if empty_response?(error)
           return permission_error
+        elsif unauthorized_response?(error)
+          raise ShopifyCLI::Abort, @ctx.message("theme.unauthorized_error", @shop)
         end
 
         raise error

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.16.0"
+  VERSION = "2.18.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.16.0
+  version: 2.18.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-25 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -244,6 +244,7 @@ files:
 - lib/project_types/extension/models/registration.rb
 - lib/project_types/extension/models/server_config/app.rb
 - lib/project_types/extension/models/server_config/base.rb
+- lib/project_types/extension/models/server_config/capabilities.rb
 - lib/project_types/extension/models/server_config/development.rb
 - lib/project_types/extension/models/server_config/development_entries.rb
 - lib/project_types/extension/models/server_config/development_renderer.rb
@@ -320,6 +321,7 @@ files:
 - lib/project_types/script/layers/application/extension_points.rb
 - lib/project_types/script/layers/application/project_dependencies.rb
 - lib/project_types/script/layers/application/push_script.rb
+- lib/project_types/script/layers/domain/app_bridge.rb
 - lib/project_types/script/layers/domain/errors.rb
 - lib/project_types/script/layers/domain/extension_point.rb
 - lib/project_types/script/layers/domain/metadata.rb