shopify-cli 2.6.2 → 2.6.6

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

@@ -63,7 +63,7 @@ module Extension
         ShopifyCLI::Tasks::EnsureDevStore.call(context) if required_fields.include?(:shop)
 
         project = ExtensionProject.current
-        ensure_resource_resource_url! if specification_handler.supplies_resource_url?
+        ensure_resource_resource_url! if specification_handler.supplies_resource_url? && !supports_development_server?
 
         return if required_fields.all? do |field|
           value = project.env.public_send(field)

data/lib/project_types/extension/forms/create.rb

@@ -24,7 +24,7 @@ module Extension
         ShopifyCLI::Result.wrap(ExtensionProjectDetails.new)
           .then(&Questions::AskApp.new(ctx: ctx, api_key: api_key))
           .then(&Questions::AskType.new(ctx: ctx, type: type))
-          .then(&Questions::AskTemplate.new(ctx: ctx))
+          .then(&Questions::AskTemplate.new(ctx: ctx, template: template))
           .then(&Questions::AskName.new(ctx: ctx, name: name))
           .unwrap { |e| raise e }
           .tap do |project_details|

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

@@ -9,13 +9,14 @@ module Extension
         ]
 
         property! :ctx
+        property :template, accepts: Models::ServerConfig::Development::VALID_TEMPLATES
         property :prompt,
           accepts: ->(prompt) { prompt.respond_to?(:call) },
           default: -> { CLI::UI::Prompt.method(:ask) }
 
         def call(project_details)
           return project_details unless template_required?(project_details)
-          project_details.template = choose_interactively
+          project_details.template = template || choose_interactively
           project_details
         end
 

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

@@ -175,6 +175,7 @@ module Extension
       errors: {
         unknown_type: "Unknown extension type %s",
         package_not_found: "`%s` package not found.",
+        module_not_found: "Unable to find module %s. Ensure your dependencies are up-to-date and try again.",
       },
       warnings: {
         resource_url_auto_generation_failed: "{{*}} {{yellow:Warning:}} Unable to auto generate " \

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

@@ -5,10 +5,12 @@ module Extension
     module ServerConfig
       class Extension < Base
         include SmartProperties
+
         property! :uuid, accepts: String
         property! :type, accepts: String
         property! :user, accepts: ServerConfig::User
         property! :development, accepts: ServerConfig::Development
+        property :extension_points, accepts: Array
 
         def self.build(uuid: "", template:, type:, root_dir:)
           renderer = ServerConfig::DevelopmentRenderer.find(type)

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

@@ -11,7 +11,7 @@ module Extension
         def config(context)
           {
             **Features::ArgoConfig.parse_yaml(context, PERMITTED_CONFIG_KEYS),
-            **argo.config(context),
+            **argo.config(context, include_renderer_version: false),
           }
         end
 

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

@@ -9,7 +9,7 @@ module Extension
         def config(context)
           {
             **Features::ArgoConfig.parse_yaml(context, PERMITTED_CONFIG_KEYS),
-            **argo.config(context),
+            **argo.config(context, include_renderer_version: false),
           }
         end
 

data/lib/project_types/extension/tasks/converters/server_config_converter.rb

@@ -5,13 +5,11 @@ module Extension
   module Tasks
     module Converters
       module ServerConfigConverter
-        def self.from_hash(hash, type)
+        def self.from_hash(hash:, type:, registration_uuid:)
           context.abort(context.message("tasks.errors.parse_error")) if hash.nil?
 
-          project = ExtensionProject.current
-
           extension = Models::ServerConfig::Extension.new(
-            uuid: project.registration_uuid,
+            uuid: registration_uuid,
             type: type.upcase,
             user: Models::ServerConfig::User.new,
             development: Models::ServerConfig::Development.new(
@@ -20,7 +18,8 @@ module Extension
               entries: Models::ServerConfig::DevelopmentEntries.new(
                 main: hash.dig("development", "entries", "main")
               )
-            )
+            ),
+            extension_points: hash.dig("extension_points")
           )
 
           Models::ServerConfig::Root.new(extensions: [extension])

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+require "json"
+
+module Extension
+  module Tasks
+    class FindPackageFromJson < ShopifyCLI::Task
+      include SmartProperties
+
+      property! :context, accepts: ShopifyCLI::Context
+
+      def self.call(package_name, **config)
+        new(**config).call(package_name)
+      end
+
+      def call(package_name)
+        ShopifyCLI::Result.success(resolve_package_json(package_name))
+          .then { |file| File.read(file) }
+          .then { |file| JSON.parse(file) }
+          .then { |file| file.dig("version") }
+          .then { |version| return Models::NpmPackage.new(name: package_name, version: version) }
+          .unwrap do |error|
+            context.debug(error)
+            context.abort(context.message("errors.module_not_found", package_name))
+          end
+      end
+
+      private
+
+      def resolve_package_json(package_name)
+        path = "path.join(require.resolve('#{package_name}'), '../package.json')"
+        package_json, error, _ = CLI::Kit::System.capture3("node", "-p", path)
+        return error unless !error.nil?
+        package_json.chomp
+      end
+    end
+  end
+end

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

@@ -10,7 +10,12 @@ module Extension
       class << self
         def call(file_name:, type:)
           config = YAML.load_file(file_name)
-          Tasks::Converters::ServerConfigConverter.from_hash(config, type)
+          project = ExtensionProject.current
+          Tasks::Converters::ServerConfigConverter.from_hash(
+            hash: config,
+            type: type,
+            registration_uuid: project.registration_uuid
+          )
         rescue Psych::SyntaxError => e
           raise(
             ShopifyCLI::Abort,

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

@@ -2,20 +2,18 @@
 module Node
   class Command
     class Serve < ShopifyCLI::SubCommand
+      include ShopifyCLI::CommandOptions::CommandServeOptions
+
       prerequisite_task ensure_project_type: :node
       prerequisite_task :ensure_env, :ensure_dev_store
 
-      options do |parser, flags|
-        parser.on("--host=HOST") do |h|
-          flags[:host] = h.gsub('"', "")
-        end
-        parser.on("--port=PORT") { |port| flags[:port] = port }
-      end
+      parse_host_option
+      parse_port_option
 
       def call(*)
         project = ShopifyCLI::Project.current
-        url = options.flags[:host] || ShopifyCLI::Tunnel.start(@ctx)
-        @ctx.abort(@ctx.message("node.serve.error.host_must_be_https")) if url.match(/^https/i).nil?
+        tunnel_port = port.to_s
+        url = host || ShopifyCLI::Tunnel.start(@ctx, port: tunnel_port)
         project.env.update(@ctx, :host, url)
         ShopifyCLI::Tasks::UpdateDashboardURLS.call(
           @ctx,
@@ -30,18 +28,11 @@ module Node
 
         CLI::UI::Frame.open(@ctx.message("node.serve.running_server")) do
           env = project.env.to_h
-          env["PORT"] = port.to_s
+          env["PORT"] = tunnel_port
           @ctx.system("npm run dev", env: env)
         end
       end
 
-      def port
-        return ShopifyCLI::Tunnel::PORT.to_s unless options.flags.key?(:port)
-        port = options.flags[:port].to_i
-        @ctx.abort(@ctx.message("node.serve.error.invalid_port", options.flags[:port])) unless port > 0
-        port
-      end
-
       def self.help
         ShopifyCLI::Context.message("node.serve.help", ShopifyCLI::TOOL_NAME)
       end

data/lib/project_types/node/messages/messages.rb

@@ -122,11 +122,6 @@ module Node
               {{cyan:--port=PORT}}: Use custom port.
           HELP
 
-          error: {
-            host_must_be_https: "HOST must be a HTTPS url.",
-            invalid_port: "%s is not a valid port.",
-          },
-
           open_info: <<~MESSAGE,
             {{*}} To install and start using your app, open this URL in your browser:
             {{green:%s}}

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

@@ -2,20 +2,17 @@
 module PHP
   class Command
     class Serve < ShopifyCLI::SubCommand
-      PORT = 3000
+      include ShopifyCLI::CommandOptions::CommandServeOptions
 
       prerequisite_task :ensure_env, :ensure_dev_store
 
-      options do |parser, flags|
-        parser.on("--host=HOST") do |h|
-          flags[:host] = h.gsub('"', "")
-        end
-      end
+      parse_host_option
+      parse_port_option
 
       def call(*)
         project = ShopifyCLI::Project.current
-        url = options.flags[:host] || ShopifyCLI::Tunnel.start(@ctx, port: PORT)
-        @ctx.abort(@ctx.message("php.serve.error.host_must_be_https")) if url.match(/^https/i).nil?
+        tunnel_port = port.to_s
+        url = host || ShopifyCLI::Tunnel.start(@ctx, port: tunnel_port)
         project.env.update(@ctx, :host, url)
         ShopifyCLI::Tasks::UpdateDashboardURLS.call(
           @ctx,
@@ -35,7 +32,7 @@ module PHP
           ShopifyCLI::ProcessSupervision.start(:npm_watch, "npm run watch", force_spawn: true)
 
           env = project.env.to_h
-          @ctx.system("php", "artisan", "serve", "--port", PORT.to_s, env: env)
+          @ctx.system("php", "artisan", "serve", "--port", tunnel_port, env: env)
         end
       end
 

data/lib/project_types/php/messages/messages.rb

@@ -133,12 +133,9 @@ module PHP
           extended_help: <<~HELP,
             {{bold:Options:}}
               {{cyan:--host=HOST}}: Bypass running tunnel and use custom host. HOST must be HTTPS url.
+              {{cyan:--port=PORT}}: Use custom port.
             HELP
 
-          error: {
-            host_must_be_https: "HOST must be a HTTPS url.",
-          },
-
           open_info: <<~MESSAGE,
             {{*}} To install and start using your app, open this URL in your browser:
             {{green:%s}}

data/lib/project_types/rails/commands/create.rb

@@ -2,7 +2,9 @@
 module Rails
   class Command
     class Create < ShopifyCLI::SubCommand
-      prerequisite_task :ensure_authenticated
+      unless ShopifyCLI::Environment.acceptance_test?
+        prerequisite_task :ensure_authenticated
+      end
 
       USER_AGENT_CODE = <<~USERAGENT
         module ShopifyAPI
@@ -31,8 +33,8 @@ module Rails
       end
 
       def call(args, _name)
-        form = Forms::Create.ask(@ctx, args, options.flags)
-        return @ctx.puts(self.class.help) if form.nil?
+        form_data = self.form_data(args)
+        return @ctx.puts(self.class.help) if form_data.nil?
 
         ruby_version = Ruby.version(@ctx)
         @ctx.abort(@ctx.message("rails.create.error.invalid_ruby_version")) unless
@@ -41,34 +43,61 @@ module Rails
         check_node
         check_yarn
 
-        build(form.name, form.db)
+        build(form_data.name, form_data.db)
+
         set_custom_ua
         ShopifyCLI::Project.write(
           @ctx,
           project_type: "rails",
-          organization_id: form.organization_id,
+          organization_id: form_data.organization_id,
         )
 
-        api_client = ShopifyCLI::Tasks::CreateApiClient.call(
-          @ctx,
-          org_id: form.organization_id,
-          title: form.title,
-          type: form.type,
-        )
+        api_client = if ShopifyCLI::Environment.acceptance_test?
+          {
+            "apiKey" => "public_api_key",
+            "apiSecretKeys" => [
+              {
+                "secret" => "api_secret_key",
+              },
+            ],
+          }
+        else
+          ShopifyCLI::Tasks::CreateApiClient.call(
+            @ctx,
+            org_id: form_data.organization_id,
+            title: form_data.title,
+            type: form_data.type,
+          )
+        end
 
         ShopifyCLI::Resources::EnvFile.new(
           api_key: api_client["apiKey"],
           secret: api_client["apiSecretKeys"].first["secret"],
-          shop: form.shop_domain,
+          shop: form_data.shop_domain,
           scopes: "write_products,write_customers,write_draft_orders",
         ).write(@ctx)
 
-        partners_url = ShopifyCLI::PartnersAPI.partners_url_for(form.organization_id, api_client["id"])
+        partners_url = ShopifyCLI::PartnersAPI.partners_url_for(form_data.organization_id, api_client["id"])
 
-        @ctx.puts(@ctx.message("apps.create.info.created", form.title, partners_url))
-        @ctx.puts(@ctx.message("apps.create.info.serve", form.name, ShopifyCLI::TOOL_NAME, "rails"))
+        @ctx.puts(@ctx.message("apps.create.info.created", form_data.title, partners_url))
+        @ctx.puts(@ctx.message("apps.create.info.serve", form_data.name, ShopifyCLI::TOOL_NAME, "rails"))
         unless ShopifyCLI::Shopifolk.acting_as_shopify_organization?
-          @ctx.puts(@ctx.message("apps.create.info.install", partners_url, form.title))
+          @ctx.puts(@ctx.message("apps.create.info.install", partners_url, form_data.title))
+        end
+      end
+
+      def form_data(args)
+        if ShopifyCLI::Environment.acceptance_test?
+          Struct.new(:title, :name, :organization_id, :type, :shop_domain, :db, keyword_init: true).new(
+            title: options.flags[:title],
+            name: options.flags[:title],
+            organization_id: "123",
+            shop_domain: "test.shopify.io",
+            type: "public",
+            db: options.flags[:db]
+          )
+        else
+          Forms::Create.ask(@ctx, args, options.flags)
         end
       end
 

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

@@ -2,19 +2,18 @@
 module Rails
   class Command
     class Serve < ShopifyCLI::SubCommand
+      include ShopifyCLI::CommandOptions::CommandServeOptions
+
       prerequisite_task ensure_project_type: :rails
       prerequisite_task :ensure_env, :ensure_dev_store
 
-      options do |parser, flags|
-        parser.on("--host=HOST") do |h|
-          flags[:host] = h.gsub('"', "")
-        end
-      end
+      parse_host_option
+      parse_port_option
 
       def call(*)
         project = ShopifyCLI::Project.current
-        url = options.flags[:host] || ShopifyCLI::Tunnel.start(@ctx)
-        @ctx.abort(@ctx.message("rails.serve.error.host_must_be_https")) if url.match(/^https/i).nil?
+        tunnel_port = port.to_s
+        url = host || ShopifyCLI::Tunnel.start(@ctx, port: tunnel_port)
         project.env.update(@ctx, :host, url)
         ShopifyCLI::Tasks::UpdateDashboardURLS.call(
           @ctx,
@@ -30,7 +29,7 @@ module Rails
         CLI::UI::Frame.open(@ctx.message("rails.serve.running_server")) do
           env = ShopifyCLI::Project.current.env.to_h
           env.delete("HOST")
-          env["PORT"] = ShopifyCLI::Tunnel::PORT.to_s
+          env["PORT"] = tunnel_port
           env["GEM_PATH"] = Gem.gem_path(@ctx)
           if @ctx.windows?
             @ctx.system("ruby bin\\rails server", env: env)

data/lib/project_types/rails/forms/create.rb

@@ -8,7 +8,6 @@ module Rails
       VALID_DB_TYPES = ["sqlite3",
                         "mysql",
                         "postgresql",
-                        "sqlite3",
                         "oracle",
                         "frontbase",
                         "ibm_db",

data/lib/project_types/rails/messages/messages.rb

@@ -170,12 +170,9 @@ module Rails
           extended_help: <<~HELP,
             {{bold:Options:}}
               {{cyan:--host=HOST}}: Bypass running tunnel and use custom host. HOST must be HTTPS url.
+              {{cyan:--port=PORT}}: Use custom port.
           HELP
 
-          error: {
-            host_must_be_https: "{{red:HOST must be a HTTPS url.}}",
-          },
-
           open_info: <<~MESSAGE,
             {{*}} To install and start using your app, open this URL in your browser:
             {{green:%s}}

data/lib/project_types/script/commands/create.rb

@@ -3,15 +3,15 @@
 module Script
   class Command
     class Create < ShopifyCLI::SubCommand
-      prerequisite_task :ensure_authenticated
+      unless ShopifyCLI::Environment.acceptance_test?
+        prerequisite_task :ensure_authenticated
+      end
 
       options do |parser, flags|
         parser.on("--name=NAME") { |name| flags[:name] = name }
-        parser.on("--extension_point=EP_NAME") { |ep_name| flags[:extension_point] = ep_name }
-        parser.on("--extension-point=EP_NAME") { |ep_name| flags[:extension_point] = ep_name }
+        parser.on("--api=API_NAME") { |ep_name| flags[:extension_point] = ep_name }
         parser.on("--language=LANGUAGE") { |language| flags[:language] = language }
         parser.on("--branch=BRANCH") { |branch| flags[:branch] = branch }
-        parser.on("--no-config-ui") { |no_config_ui| flags[:no_config_ui] = no_config_ui }
       end
 
       def call(args, _name)
@@ -28,7 +28,6 @@ module Script
           sparse_checkout_branch: options.flags[:branch] || "master",
           script_name: form.name,
           extension_point_type: form.extension_point,
-          no_config_ui: options.flags.key?(:no_config_ui)
         )
         @ctx.puts(@ctx.message("script.create.change_directory_notice", project.script_name))
       rescue StandardError => e

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

@@ -32,6 +32,7 @@ payment_methods:
       package: "@shopify/scripts-checkout-apis"
     typescript:
       beta: true
+      package: "@shopify/scripts-checkout-apis-temp"
       repo: "https://github.com/Shopify/scripts-apis-examples"
 shipping_methods:
   domain: 'checkout'
@@ -41,4 +42,13 @@ shipping_methods:
       package: "@shopify/scripts-checkout-apis"
     typescript:
       beta: true
+      package: "@shopify/scripts-checkout-apis-temp"
+      repo: "https://github.com/Shopify/scripts-apis-examples"
+discount_types:
+  beta: true
+  domain: 'discounts'
+  libraries:
+    typescript:
+      beta: true
+      package: "@shopify/scripts-discount-apis"
       repo: "https://github.com/Shopify/scripts-apis-examples"

data/lib/project_types/script/errors.rb

@@ -6,23 +6,5 @@ module Script
 
     class NoExistingAppsError < ScriptProjectError; end
     class NoExistingOrganizationsError < ScriptProjectError; end
-
-    class NoExistingStoresError < ScriptProjectError
-      attr_reader :organization_id
-      def initialize(organization_id)
-        super()
-        @organization_id = organization_id
-      end
-    end
-
-    class InvalidConfigProps < ScriptProjectError; end
-
-    class InvalidConfigYAMLError < ScriptProjectError
-      attr_reader :config_file
-      def initialize(config_file)
-        super()
-        @config_file = config_file
-      end
-    end
   end
 end

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

@@ -10,6 +10,7 @@ mutation AppScriptSet(
   $configurationUi: Boolean!,
   $configurationDefinition: String!,
   $moduleUploadUrl: String!,
+  $library: LibraryInput,
 ) {
   appScriptSet(
     uuid: $uuid
@@ -23,6 +24,7 @@ mutation AppScriptSet(
     configurationUi: $configurationUi,
     configurationDefinition: $configurationDefinition,
     moduleUploadUrl: $moduleUploadUrl,
+    library: $library,
 ) {
     userErrors {
       field

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

@@ -5,7 +5,7 @@ module Script
     module Application
       class BuildScript
         class << self
-          def call(ctx:, task_runner:, script_project:)
+          def call(ctx:, task_runner:, script_project:, library:)
             CLI::UI::Frame.open(ctx.message("script.application.building")) do
               begin
                 UI::StrictSpinner.spin(ctx.message("script.application.building_script")) do |spinner|
@@ -14,6 +14,7 @@ module Script
                     script_content: task_runner.build,
                     compiled_type: task_runner.compiled_type,
                     metadata: task_runner.metadata,
+                    library: library,
                   )
                   spinner.update_title(ctx.message("script.application.built"))
                 end

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

@@ -7,7 +7,7 @@ module Script
     module Application
       class CreateScript
         class << self
-          def call(ctx:, language:, sparse_checkout_branch:, script_name:, extension_point_type:, no_config_ui:)
+          def call(ctx:, language:, sparse_checkout_branch:, script_name:, extension_point_type:)
             raise Infrastructure::Errors::ScriptProjectAlreadyExistsError, script_name if ctx.dir_exist?(script_name)
 
             in_new_directory_context(ctx, script_name) do
@@ -36,7 +36,7 @@ module Script
               )
 
               install_dependencies(ctx, language, script_name, project_creator)
-              script_project_repo.update_or_create_script_json(title: script_name, configuration_ui: !no_config_ui)
+              script_project_repo.update_or_create_script_json(title: script_name)
               project
             end
           end

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

@@ -11,14 +11,27 @@ module Script
             task_runner = Infrastructure::Languages::TaskRunner
               .for(ctx, script_project.language, script_project.script_name)
 
+            extension_point = ExtensionPoints.get(type: script_project.extension_point_type)
+            library_name = extension_point.libraries.for(script_project.language)&.package
+            raise Infrastructure::Errors::LanguageLibraryForAPINotFoundError.new(
+              language: script_project.language,
+              api: script_project.extension_point_type
+            ) unless library_name
+
+            library = {
+              language: script_project.language,
+              version: task_runner.library_version(library_name),
+            }
+
             ProjectDependencies.install(ctx: ctx, task_runner: task_runner)
-            BuildScript.call(ctx: ctx, task_runner: task_runner, script_project: script_project)
+            BuildScript.call(ctx: ctx, task_runner: task_runner, script_project: script_project, library: library)
 
             UI::PrintingSpinner.spin(ctx, ctx.message("script.application.pushing")) do |p_ctx, spinner|
               package = Infrastructure::PushPackageRepository.new(ctx: p_ctx).get_push_package(
                 script_project: script_project,
                 compiled_type: task_runner.compiled_type,
                 metadata: task_runner.metadata,
+                library: library,
               )
               script_service = Infrastructure::ServiceLocator.script_service(
                 ctx: p_ctx,
@@ -32,6 +45,7 @@ module Script
                 metadata: package.metadata,
                 script_json: package.script_json,
                 module_upload_url: module_upload_url,
+                library: package.library,
               )
               script_project_repo.update_env(uuid: uuid)
               spinner.update_title(p_ctx.message("script.application.pushed"))

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

@@ -10,7 +10,8 @@ module Script
           :script_json,
           :script_content,
           :compiled_type,
-          :metadata
+          :metadata,
+          :library
 
         def initialize(
           id:,
@@ -19,7 +20,8 @@ module Script
           script_content:,
           compiled_type: nil,
           metadata:,
-          script_json:
+          script_json:,
+          library:
         )
           @id = id
           @uuid = uuid
@@ -28,6 +30,7 @@ module Script
           @compiled_type = compiled_type
           @metadata = metadata
           @script_json = script_json
+          @library = library
         end
       end
     end

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

@@ -15,7 +15,7 @@ module Script
           @version = @content["version"].to_s
           @title = @content["title"]
           @description = @content["description"]
-          @configuration_ui = @content["configurationUi"]
+          @configuration_ui = @content.fetch("configurationUi", true)
           @configuration = @content["configuration"]
         end
 

data/lib/project_types/script/layers/infrastructure/api_clients/partners_proxy_api_client.rb

@@ -27,10 +27,6 @@ module Script
             case error_code(response["errors"])
             when "forbidden"
               raise Errors::ForbiddenError
-            when "forbidden_on_shop"
-              raise Errors::ShopAuthenticationError
-            when "app_not_installed_on_shop"
-              raise Errors::AppNotInstalledError
             else
               raise Errors::GraphqlError, response["errors"]
             end