shopify-cli 2.18.0 → 2.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dc113806552b27305be696850c04b292d7ba8feb0e5a60c0755bdb93b193535
-  data.tar.gz: 7fd46f5612eda607b0e2b2f01ea8662ce1d6d4803475b4e7d3bde98155ed06db
+  metadata.gz: bad168cdd878e04ba4bc934a9caa6bfd19ffba653564734395d0e53a20957a81
+  data.tar.gz: 2f45edbce9f20fe63472a26221a71ef4733ad6e9f951abe86f3b213a869b0cc4
 SHA512:
-  metadata.gz: d1553e12053b6666755dde7c4381fce2018da1d73ab2f85cc456f6ad97fd58db89360a4fe02beb7b40d3a6d0010e2c8f15b68ff6246ff25426796f39f451aafc
-  data.tar.gz: 5a9f020586bfaf2b828aed9bb1ae4040bc0deab133e71181fe49c5710fd9a5a3b3cc71faf653f0311054038b76d749303947e0af6d902b7096cf84c2c610a3bf
+  metadata.gz: 14ced1d055b8aa918d0168aa0b91ba8e8a3093a99838868a630866b34af28f4547e55cf208dc6051ee4ef20426b5202badaa5b7ab2ac5c536a9e39030a4d1744
+  data.tar.gz: 37d84adeb8489f6596f2ed9bf1481ecc9060697a88fb10fcd5b59e8c20bf3e021c0502019c43b38fb0ec1e424b06ecd4f377ebb20a5517272a9e46cce2fcc1ff

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.18.0)
+    shopify-cli (2.18.1)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
       theme-check (~> 1.10.1)

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/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,7 +26,7 @@ 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"
+          when "web_pixel_extension"
             nil
           else
             raise ArgumentError, "Unknown extension type: #{type}"

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/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/script/layers/infrastructure/script_project_repository.rb

@@ -37,7 +37,9 @@ module Script
             extension_point_type: extension_point_type,
             title: title,
             description: nil,
-            language: language
+            language: language,
+            app_bridge_create_path: "/",
+            app_bridge_details_path: "/",
           )
 
           build_script_project(script_config: nil)
@@ -124,8 +126,8 @@ module Script
         end
 
         def app_bridge
-          create_path = project_config_value("app_bridge_create_path") || "/"
-          details_path = project_config_value("app_bridge_details_path") || "/"
+          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,

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

@@ -24,7 +24,7 @@ module Script
           oauth_help: "Wait a few minutes and try again.",
 
           invalid_context_cause: "Your .shopify-cli.yml is formatted incorrectly. It's missing values for "\
-                                 "extension_point_type or title.",
+                                 "extension_point_type, title, app_bridge_create_path or app_bridge_details_path.",
           invalid_context_help: "Add these values.",
 
           invalid_script_title_cause: "Script title contains unsupported characters.",

data/lib/shopify_cli/git.rb

@@ -67,9 +67,14 @@ module ShopifyCLI
         if Dir.exist?(dest)
           ctx.abort(ctx.message("core.git.error.directory_exists"))
         else
+          repo, branch = repository.split("#")
           success_message = ctx.message("core.git.cloned", dest)
-          CLI::UI::Frame.open(ctx.message("core.git.cloning", repository, dest), success_text: success_message) do
-            clone_progress("clone", "--single-branch", repository, dest, ctx: ctx)
+          CLI::UI::Frame.open(ctx.message("core.git.cloning", repo, dest), success_text: success_message) do
+            if branch
+              clone_progress("clone", "--single-branch", "--branch", branch, repo, dest, ctx: ctx)
+            else
+              clone_progress("clone", "--single-branch", repo, dest, ctx: ctx)
+            end
           end
         end
       end

data/lib/shopify_cli/messages/messages.rb

@@ -285,7 +285,7 @@ module ShopifyCLI
         },
         extension: {
           push: {
-            beacon_extension: {
+            web_pixel_extension: {
               error: {
                 file_read_error: "There was a problem reading %s",
                 missing_config_key_error: "Configuration is missing key: %s",

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

@@ -117,7 +117,7 @@ module ShopifyCLI
           end
 
           def build(name)
-            ShopifyCLI::Git.clone("https://github.com/Shopify/shopify-app-node.git", name)
+            ShopifyCLI::Git.clone("https://github.com/Shopify/shopify-app-template-node.git#cli_two", name)
 
             context.root = File.join(context.root, name)
 

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

@@ -74,7 +74,7 @@ module ShopifyCLI
           end
 
           def build(form)
-            ShopifyCLI::Git.clone("https://github.com/Shopify/shopify-app-php.git", form.name)
+            ShopifyCLI::Git.clone("https://github.com/Shopify/shopify-app-template-php.git#cli_two", form.name)
 
             context.root = File.join(context.root, form.name)
             context.chdir(context.root)

data/lib/shopify_cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.18.0
+  version: 2.18.1
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-30 00:00:00.000000000 Z
+date: 2022-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -253,13 +253,13 @@ files:
 - lib/project_types/extension/models/server_config/root.rb
 - lib/project_types/extension/models/server_config/user.rb
 - lib/project_types/extension/models/specification.rb
-- lib/project_types/extension/models/specification_handlers/beacon_extension.rb
-- lib/project_types/extension/models/specification_handlers/beacon_extension_utils/script_config.rb
-- lib/project_types/extension/models/specification_handlers/beacon_extension_utils/script_config_repository.rb
 - lib/project_types/extension/models/specification_handlers/checkout_post_purchase.rb
 - lib/project_types/extension/models/specification_handlers/checkout_ui_extension.rb
 - lib/project_types/extension/models/specification_handlers/default.rb
 - lib/project_types/extension/models/specification_handlers/theme_app_extension.rb
+- lib/project_types/extension/models/specification_handlers/web_pixel_extension.rb
+- lib/project_types/extension/models/specification_handlers/web_pixel_extension_utils/script_config.rb
+- lib/project_types/extension/models/specification_handlers/web_pixel_extension_utils/script_config_repository.rb
 - lib/project_types/extension/models/specifications.rb
 - lib/project_types/extension/models/validation_error.rb
 - lib/project_types/extension/models/version.rb