shopify-cli 2.16.1 → 2.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 671c2f790725e98a8ff2cd52ba3e82bfba8602119b9438e935f5762b2369944d
-  data.tar.gz: 3636ef6682230d30d507f1e721771a52230fa6dedda9537b56ecd133729d5ddf
+  metadata.gz: bad168cdd878e04ba4bc934a9caa6bfd19ffba653564734395d0e53a20957a81
+  data.tar.gz: 2f45edbce9f20fe63472a26221a71ef4733ad6e9f951abe86f3b213a869b0cc4
 SHA512:
-  metadata.gz: 90a96e0a4357d43118ed0417e310042327e520ac4ecfc3c6789a66a2acc502f908c99ce54b16768b56975ad8a83ca9e74f23d2f14fa2475083b2e46f126f238d
-  data.tar.gz: f969943491bee41c44c172984942d8ee406e6e9bbbf95556b93f4843978925b127db0d52f52d961d19fff7ede178b990db25e83ff7a19dd0107f6ce040d50f6d
+  metadata.gz: 14ced1d055b8aa918d0168aa0b91ba8e8a3093a99838868a630866b34af28f4547e55cf208dc6051ee4ef20426b5202badaa5b7ab2ac5c536a9e39030a4d1744
+  data.tar.gz: 37d84adeb8489f6596f2ed9bf1481ecc9060697a88fb10fcd5b59e8c20bf3e021c0502019c43b38fb0ec1e424b06ecd4f377ebb20a5517272a9e46cce2fcc1ff

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.16.1)
+    shopify-cli (2.18.1)
       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

@@ -122,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/forms/questions/ask_template.rb

@@ -12,7 +12,7 @@ module Extension
 
         def call(project_details)
           if template_required?(project_details)
-            project_details.template = template || choose_interactively
+            project_details.template = template || choose_interactively(project_details)
           end
           project_details
         end
@@ -24,9 +24,9 @@ module Extension
           Models::DevelopmentServerRequirements.supported?(type)
         end
 
-        def choose_interactively
+        def choose_interactively(project_details)
           prompt.call(ctx.message("create.ask_template")) do |handler|
-            Models::ServerConfig::Development::VALID_TEMPLATES.each do |template|
+            Models::ServerConfig::Development.find(project_details&.type&.identifier).each do |template|
               handler.option(template) { template }
             end
           end

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

@@ -216,6 +216,22 @@ module Extension
             * Add a develop script: shopify-cli-extensions develop
             * Change the build script to: shopify-cli-extensions build
           TEXT
+          product_subscription: <<~TEXT.strip,
+            Please update your package.json as follows:
+            * Replace the development dependency @shopify/admin-ui-extensions-run
+              with @shopify/shopify-cli-extensions
+            * Remove the start and server script
+            * Add a develop script: shopify-cli-extensions develop
+            * Change the build script to: shopify-cli-extensions build
+          TEXT
+          checkout_post_purchase: <<~TEXT.strip,
+            Please update your package.json as follows:
+            * Replace the development dependency @shopify/checkout-ui-extensions-run
+              with @shopify/shopify-cli-extensions
+            * Remove the start and server script
+            * Add a develop script: shopify-cli-extensions develop
+            * Change the build script to: shopify-cli-extensions build
+          TEXT
         },
       },
       warnings: {

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

@@ -9,7 +9,7 @@ module Extension
         "checkout_ui_extension",
         "checkout_post_purchase",
         "product_subscription",
-        "beacon_extension",
+        "web_pixel_extension",
         "pos_ui_extension",
       ]
 

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

@@ -18,6 +18,15 @@ module Extension
         property  :renderer, accepts: ServerConfig::DevelopmentRenderer
         property  :entries, accepts: ServerConfig::DevelopmentEntries
         property  :resource, accepts: ServerConfig::DevelopmentResource
+
+        def self.find(type)
+          case type.downcase
+          when "web_pixel_extension"
+            ["javascript"]
+          else
+            VALID_TEMPLATES
+          end
+        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 "web_pixel_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/models/specification_handlers/{beacon_extension.rb → web_pixel_extension.rb}

@@ -2,45 +2,46 @@
 require "base64"
 require "fileutils"
 require "json"
-require_relative "beacon_extension_utils/script_config"
-require_relative "beacon_extension_utils/script_config_repository"
+require_relative "web_pixel_extension_utils/script_config"
+require_relative "web_pixel_extension_utils/script_config_repository"
 
 module Extension
   module Models
     module SpecificationHandlers
-      class BeaconExtension < Default
+      class WebPixelExtension < Default
         SCRIPT_FILE = "build/main.js"
 
         def name
-          "Beacon Extension"
+          "Web Pixel Extension"
         end
 
         def read_configuration
         end
 
         def access_config_property(context, ext_config, key, &process_value)
-          context.abort(context.message("core.extension.push.beacon_extension.error.missing_config_key_error",
+          context.abort(context.message("core.extension.push.web_pixel_extension.error.missing_config_key_error",
             key)) unless ext_config.key?(key)
 
           begin
             process_value.nil? ? ext_config[key] : process_value.call(ext_config[key])
           rescue StandardError
-            context.abort(context.message("core.extension.push.beacon_extension.error.invalid_config_value_error", key))
+            context.abort(context.message("core.extension.push.web_pixel_extension.error.invalid_config_value_error",
+              key))
           end
         end
 
         def config(context)
           begin
-            ext_config = BeaconExtensionUtils::ScriptConfigYmlRepository.new(ctx: context).get!.content
+            ext_config = WebPixelExtensionUtils::ScriptConfigYmlRepository.new(ctx: context).get!.content
           rescue StandardError
-            context.abort(context.message("core.extension.push.beacon_extension.error.file_read_error",
-              BeaconExtensionUtils::ScriptConfigYmlRepository.filename))
+            context.abort(context.message("core.extension.push.web_pixel_extension.error.file_read_error",
+              WebPixelExtensionUtils::ScriptConfigYmlRepository.filename))
           end
 
           begin
             script_contents = File.read(File.join(context.root, SCRIPT_FILE)).chomp
           rescue
-            context.abort(context.message("core.extension.push.beacon_extension.error.file_read_error", SCRIPT_FILE))
+            context.abort(context.message("core.extension.push.web_pixel_extension.error.file_read_error", SCRIPT_FILE))
           end
           {
             runtime_context: access_config_property(context, ext_config, "runtime_context"),

data/lib/project_types/extension/models/specification_handlers/{beacon_extension_utils → web_pixel_extension_utils}/script_config.rb

@@ -3,7 +3,7 @@
 module Extension
   module Models
     module SpecificationHandlers
-      module BeaconExtensionUtils
+      module WebPixelExtensionUtils
         class ScriptConfig
           attr_reader :content, :version, :configuration, :filename
 

data/lib/project_types/extension/models/specification_handlers/{beacon_extension_utils → web_pixel_extension_utils}/script_config_repository.rb

@@ -2,7 +2,7 @@ require_relative "script_config"
 module Extension
   module Models
     module SpecificationHandlers
-      module BeaconExtensionUtils
+      module WebPixelExtensionUtils
         class ScriptConfigRepository
           include SmartProperties
           property! :ctx, accepts: ShopifyCLI::Context
@@ -27,7 +27,7 @@ module Extension
           private
 
           def from_h(hash)
-            Extension::Models::SpecificationHandlers::BeaconExtensionUtils::ScriptConfig.new(content: hash,
+            Extension::Models::SpecificationHandlers::WebPixelExtensionUtils::ScriptConfig.new(content: hash,
               filename: filename)
           end
 

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

@@ -14,7 +14,7 @@ module Extension
 
       def configure_skip_build(attributes)
         attributes[:options].merge!(skip_build: attributes[:identifier] == "theme_app_extension" ||
-         attributes[:identifier] == "beacon_extension")
+         attributes[:identifier] == "web_pixel_extension")
       end
     end
   end

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/execute_commands/outdated_extension_detection.rb

@@ -20,6 +20,10 @@ module Extension
             case type
             when "checkout_ui_extension"
               context.message("errors.outdated_extensions.checkout_ui_extension")
+            when "product_subscription"
+              context.message("errors.outdated_extensions.product_subscription")
+            when "checkout_post_purchase"
+              context.message("errors.outdated_extensions.checkout_post_purchase")
             else
               context.message("errors.outdated_extensions.unknown")
             end
@@ -33,7 +37,7 @@ module Extension
 
           def valid?(package)
             case type
-            when "checkout_ui_extension"
+            when "checkout_ui_extension", "product_subscription", "checkout_post_purchase"
               package.dev_dependency?("@shopify/shopify-cli-extensions") &&
                 package.script?("build") &&
                 package.script?("develop")

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