shopify-cli 2.17.0 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3acc31975c1b9d6478fe3f5d39ebf4ca0550b5956dc22dd4710103ae77bb0b4
-  data.tar.gz: 2cbf01bd46b9d3d175b6b4f534f28b52ce69972125169a243788d922a68bf19a
+  metadata.gz: 7dc113806552b27305be696850c04b292d7ba8feb0e5a60c0755bdb93b193535
+  data.tar.gz: 7fd46f5612eda607b0e2b2f01ea8662ce1d6d4803475b4e7d3bde98155ed06db
 SHA512:
-  metadata.gz: 7999265576034095a1114c3a29a2ab9bbaee62bac8c29b26b79d2c724b8be1dbc045e0da7c94a1863e465545bd7be32851f2f36ae1b020a269346d4417c0008c
-  data.tar.gz: e5affc3532841d156305192ad2aa775065a9571a7bbf8ee6ab7b56d7f5d62c7a30407cf25e658bb99283d8429eb1b009ff406651fa7915c9e2a07508923be993
+  metadata.gz: d1553e12053b6666755dde7c4381fce2018da1d73ab2f85cc456f6ad97fd58db89360a4fe02beb7b40d3a6d0010e2c8f15b68ff6246ff25426796f39f451aafc
+  data.tar.gz: 5a9f020586bfaf2b828aed9bb1ae4040bc0deab133e71181fe49c5710fd9a5a3b3cc71faf653f0311054038b76d749303947e0af6d902b7096cf84c2c610a3bf

data/CHANGELOG.md

@@ -2,6 +2,17 @@ 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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.17.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/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/tasks/convert_server_config.rb

@@ -30,7 +30,7 @@ module Extension
         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,

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

@@ -9,35 +9,25 @@ 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'
-  libraries:
-    typescript:
-      beta: true
-      package: "@shopify/scripts-discounts-apis"
-      repo: "https://github.com/Shopify/scripts-apis-examples"
-    wasm:
+    rust:
       repo: "https://github.com/Shopify/scripts-apis-examples"
-delivery_discount_types:
-  beta: true
-  domain: 'discounts'
+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"
+    rust:
+      repo: "https://github.com/Shopify/scripts-apis-examples"
 product_discounts:
   beta: true
   domain: 'discounts'

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_service.rb

@@ -92,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,6 +17,7 @@ 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)

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

@@ -42,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?",
         },
@@ -101,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.
 
@@ -139,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",
@@ -154,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",
@@ -222,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?",
@@ -293,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/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/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/theme/dev_server.rb

@@ -27,9 +27,10 @@ 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, ignore_filter: ignore_filter, syncer: @syncer, poll: poll)
@@ -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/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/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.17.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.17.0
+  version: 2.18.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-12 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler