shopify-cli 2.0.2 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e891dd1947743de4abbd7ef4e2c7e40a60e313eed78e33e5813c1fbb72369b22
-  data.tar.gz: 2af5852d53518d1089fabd4420cc6a432bccf99585d935812f8c347d9ad42d45
+  metadata.gz: c6192e829e79c4cfe8a1e6fe1214d17f57da63bcf3802de71a7171a0037a2c1a
+  data.tar.gz: 11f3a7167a24c5b011f930de1a9554176c6371c1a63350ea3a94d9965f521336
 SHA512:
-  metadata.gz: 02fa4e4ed76dc0576474246772e332d7a21d0242807ceb407244a0af8dfe3c21c9e1eced54283a11ed304c0ae74ae81becc040c7f9c0242c9b35e8171f3182a4
-  data.tar.gz: 5c587408bffbb49a09c087f2810b5b65b754de6fb2c3c8c158996446198817c7e2c0a21143544d7e7bc8ef74e4407fd4389d805ed298432c64656d202745fe86
+  metadata.gz: e35ac5b91dea19c5c443616063d1993eefe787b702a9813c4598361f264967baf09d6f4f34a54456b67c6c226cc96b032d3a2bb742ea5425c49fcd3ab843b1fe
+  data.tar.gz: c27174aeaf83c67b292a0374b591833f87be66df912e85389148d008e7df0d3c83252b81034d14e1388be2e9a34112f6e9bf925e26359fb11fbfe84cdd8bb875

data/CHANGELOG.md

@@ -1,6 +1,28 @@
 Unreleased
 ------
 
+Version 2.2.2
+------
+* [1382](https://github.com/Shopify/shopify-cli/pull/1382): Client side module upload for Scripts
+
+Version 2.2.1
+------
+
+* [1432](https://github.com/Shopify/shopify-cli/pull/1432) New method for determining renderer package name
+
+Version 2.2.0
+------
+* [#1424](https://github.com/Shopify/shopify-cli/pull/1424/): Add `--resourceUrl` flag to extension serve command
+* [#1419](https://github.com/Shopify/shopify-cli/pull/1419): Remove analytics prompt when used in CI
+* [#1418](https://github.com/Shopify/shopify-cli/pull/1418): Auto configure resource URL for Checkout Extensions
+* [#1399](https://github.com/Shopify/shopify-cli/pull/1399): Fix error when running `shopify extension serve` in a theme app extension project
+
+Version 2.1.0
+-------------
+* [#1357](https://github.com/Shopify/shopify-cli/pull/1357): Update Theme-Check to 1.1
+* [#1352](https://github.com/Shopify/shopify-cli/pull/1352): Add `shopify extension check` for checking theme app extensions
+* [#1304](https://github.com/Shopify/shopify-cli/pull/1304): Prompt user to run `shopify extension connect` if .env file is missing
+
 Version 2.0.2
 -------------
 * [#1305](https://github.com/Shopify/shopify-cli/pull/1305): Fix `Uninitialized constant Net::WriteTimeout` error

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.0.2)
+    shopify-cli (2.2.2)
       listen (~> 3.5)
-      theme-check (~> 1.0)
+      theme-check (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
@@ -76,7 +76,7 @@ GEM
     rubocop-shopify (2.0.1)
       rubocop (~> 1.11)
     ruby-progressbar (1.11.0)
-    theme-check (1.0.0)
+    theme-check (1.1.0)
       liquid (>= 5.0.1)
       nokogumbo
     timecop (0.9.2)
@@ -108,4 +108,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.1.4
+   2.2.22

data/lib/graphql/get_variant_id.graphql

@@ -0,0 +1,16 @@
+query {
+  products(first: 1) {
+    edges {
+      node {
+        id
+        variants(first: 1) {
+          edges {
+            node {
+              id
+            }
+          }
+        }
+      }
+    }
+  }
+}

data/lib/project_types/extension/cli.rb

@@ -24,6 +24,7 @@ module Extension
     subcommand :Serve, "serve", Project.project_filepath("commands/serve")
     subcommand :Push, "push", Project.project_filepath("commands/push")
     subcommand :Tunnel, "tunnel", Project.project_filepath("commands/tunnel")
+    subcommand :Check, "check", Project.project_filepath("commands/check")
   end
   ShopifyCli::Commands.register("Extension::Command", "extension")
 
@@ -39,12 +40,14 @@ module Extension
     autoload :ChooseNextAvailablePort, Project.project_filepath("tasks/choose_next_available_port")
     autoload :FindNpmPackages, Project.project_filepath("tasks/find_npm_packages")
     autoload :GetExtensions, Project.project_filepath("tasks/get_extensions")
+    autoload :GetProduct, Project.project_filepath("tasks/get_product")
 
     module Converters
       autoload :RegistrationConverter, Project.project_filepath("tasks/converters/registration_converter")
       autoload :VersionConverter, Project.project_filepath("tasks/converters/version_converter")
       autoload :ValidationErrorConverter, Project.project_filepath("tasks/converters/validation_error_converter")
       autoload :AppConverter, Project.project_filepath("tasks/converters/app_converter")
+      autoload :ProductConverter, Project.project_filepath("tasks/converters/product_converter")
     end
   end
 
@@ -62,6 +65,12 @@ module Extension
   end
 
   module Features
+    module Runtimes
+      autoload :Admin, Project.project_filepath("features/runtimes/admin")
+      autoload :Base, Project.project_filepath("features/runtimes/base")
+      autoload :CheckoutPostPurchase, Project.project_filepath("features/runtimes/checkout_post_purchase")
+      autoload :CheckoutUiExtension, Project.project_filepath("features/runtimes/checkout_ui_extension")
+    end
     autoload :ArgoServe, Project.project_filepath("features/argo_serve")
     autoload :ArgoServeOptions, Project.project_filepath("features/argo_serve_options")
     autoload :ArgoSetup, Project.project_filepath("features/argo_setup")
@@ -76,7 +85,6 @@ module Extension
   module Models
     module SpecificationHandlers
       autoload :Default, Project.project_filepath("models/specification_handlers/default")
-      autoload :CheckoutArgoExtension, Project.project_filepath("models/specification_handlers/checkout_ui_extension")
     end
 
     autoload :App, Project.project_filepath("models/app")
@@ -87,6 +95,7 @@ module Extension
     autoload :Specifications, Project.project_filepath("models/specifications")
     autoload :LazySpecificationHandler, Project.project_filepath("models/lazy_specification_handler")
     autoload :NpmPackage, Project.project_filepath("models/npm_package")
+    autoload :Product, Project.project_filepath("models/product")
   end
 
   autoload :ExtensionProjectKeys, Project.project_filepath("extension_project_keys")

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+require "theme_check"
+
+module Extension
+  class Command
+    class Check < ExtensionCommand
+      class CheckOptions < ShopifyCli::Options
+        def initialize(ctx, theme_check)
+          super()
+          @theme_check = theme_check
+          @ctx = ctx
+        end
+
+        def parse(_options_block, args)
+          # Check if .theme-check.yml exists, or if another -C has been passed on the command line
+          unless args.include?("-C") || @ctx.file_exist?(".theme-check.yml")
+            args += ["-C", ":theme_app_extension"]
+          end
+          @theme_check.parse(args)
+        end
+      end
+
+      def initialize(*)
+        super
+        if project.specification_identifier == "THEME_APP_EXTENSION"
+          @theme_check = ThemeCheck::Cli.new
+          self.options = CheckOptions.new(@ctx, @theme_check)
+        end
+      end
+
+      def call(*)
+        if project.specification_identifier == "THEME_APP_EXTENSION"
+          @theme_check.run
+        else
+          @ctx.abort(@ctx.message("check.unsupported", project.specification_identifier))
+        end
+      end
+
+      def self.help
+        ShopifyCli::Context.message("check.help", ShopifyCli::TOOL_NAME)
+      end
+    end
+  end
+end

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

@@ -11,7 +11,6 @@ module Extension
       def call(args, name)
         Command::Register.new(@ctx).call(args, name) unless project.registered?
         Command::Build.new(@ctx).call(args, name) unless specification_handler.specification.options[:skip_build]
-
         CLI::UI::Frame.open(@ctx.message("push.frame_title")) do
           updated_draft_version = update_draft
           show_message(updated_draft_version)

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

@@ -9,19 +9,24 @@ module Extension
 
       options do |parser, flags|
         parser.on("-t", "--[no-]tunnel", "Establish an ngrok tunnel") { |tunnel| flags[:tunnel] = tunnel }
+        parser.on("--resourceUrl=RESOURCE_URL", "Provide a resource URL") do |resource_url|
+          flags[:resource_url] = resource_url
+        end
       end
 
       class RuntimeConfiguration
         include SmartProperties
 
         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
       end
 
       def call(_args, _command_name)
         config = RuntimeConfiguration.new(
-          tunnel_requested: tunnel_requested?
+          tunnel_requested: tunnel_requested?,
+          resource_url: options.flags[:resource_url]
         )
 
         ShopifyCli::Result
@@ -74,7 +79,8 @@ module Extension
         specification_handler.serve(
           context: @ctx,
           tunnel_url: runtime_configuration.tunnel_url,
-          port: runtime_configuration.port
+          port: runtime_configuration.port,
+          resource_url: runtime_configuration.resource_url
         )
         runtime_configuration
       end

data/lib/project_types/extension/extension_project.rb

@@ -14,6 +14,24 @@ module Extension
         )
       end
 
+      def update_env_file(context:, **updates)
+        current_config = {
+          title: current.title,
+          shop: current.env.shop,
+          api_key: current.app.api_key,
+          api_secret: current.app.secret,
+          registration_id: current.registration_id,
+          registration_uuid: current.registration_uuid,
+          resource_url: current.resource_url,
+        }
+
+        write_env_file(
+          context: context,
+          **current_config,
+          **updates
+        )
+      end
+
       def write_env_file(
         context:,
         title:,
@@ -21,11 +39,13 @@ module Extension
         api_secret: "",
         registration_id: nil,
         registration_uuid: nil,
-        resource_url: nil
+        resource_url: nil,
+        shop: nil
       )
         ShopifyCli::Resources::EnvFile.new(
           api_key: api_key,
           secret: api_secret,
+          shop: shop,
           extra: {
             ExtensionProjectKeys::TITLE_KEY => title,
             ExtensionProjectKeys::REGISTRATION_ID_KEY => registration_id,
@@ -49,6 +69,7 @@ module Extension
     end
 
     def app
+      validate_env_present
       Models::App.new(api_key: env["api_key"], secret: env["secret"])
     end
 
@@ -107,9 +128,15 @@ module Extension
     end
 
     def property_present?(key)
+      validate_env_present
       !env[key].nil? && !env[key].strip.empty?
     end
 
+    def validate_env_present
+      return if env
+      raise ShopifyCli::Abort, "Missing .env file. Run `shopify extension connect` to generate an .env file."
+    end
+
     def integer?(value)
       value.to_i.to_s == value.to_s
     end

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

@@ -19,16 +19,6 @@ module Extension
       YARN_RUN_SCRIPT_NAME = %w(build).freeze
       private_constant :YARN_INSTALL_COMMAND, :YARN_INSTALL_PARAMETERS, :YARN_RUN_COMMAND, :YARN_RUN_SCRIPT_NAME
 
-      UI_EXTENSIONS_CHECKOUT = "@shopify/checkout-ui-extensions"
-      UI_EXTENSIONS_ADMIN = "@shopify/admin-ui-extensions"
-      UI_EXTENSIONS_POST_PURCHASE = "@shopify/post-purchase-ui-extensions"
-
-      PACKAGE_NAMES = [
-        UI_EXTENSIONS_CHECKOUT,
-        UI_EXTENSIONS_ADMIN,
-        UI_EXTENSIONS_POST_PURCHASE,
-      ].freeze
-
       def create(directory_name, identifier, context)
         Features::ArgoSetup.new(git_template: git_template).call(directory_name, identifier, context)
       end
@@ -54,7 +44,7 @@ module Extension
       def renderer_package(context)
         js_system = ShopifyCli::JsSystem.new(ctx: context)
         Tasks::FindNpmPackages
-          .exactly_one_of(*PACKAGE_NAMES, js_system: js_system)
+          .exactly_one_of(renderer_package_name, js_system: js_system)
           .unwrap { |err| raise err }
       rescue Extension::PackageResolutionFailed
         context.abort(

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

@@ -1,46 +1,14 @@
 module Extension
   module Features
     class ArgoRuntime
-      include SmartProperties
-
-      UI_EXTENSIONS_CHECKOUT_RUN = "@shopify/checkout-ui-extensions-run"
-      UI_EXTENSIONS_ADMIN_RUN = "@shopify/admin-ui-extensions-run"
-
-      ADMIN_RUN_FLAGS = [
-        :api_key,
-        :name,
-        :port,
-        :public_url,
-        :renderer_version,
-        :shop,
-        :uuid,
+      RUNTIMES = [
+        Runtimes::Admin.new,
+        Runtimes::CheckoutPostPurchase.new,
+        Runtimes::CheckoutUiExtension.new,
       ]
 
-      CHECKOUT_RUN_FLAGS = [
-        :port,
-        :public_url,
-      ]
-
-      property! :renderer, accepts: Models::NpmPackage
-      property! :cli, accepts: Models::NpmPackage
-
-      def supports?(flag)
-        case cli
-        when admin?
-          ADMIN_RUN_FLAGS.include?(flag.to_sym)
-        when checkout?
-          CHECKOUT_RUN_FLAGS.include?(flag.to_sym)
-        end
-      end
-
-      private
-
-      def admin?
-        ->(cli) { cli.name == UI_EXTENSIONS_ADMIN_RUN }
-      end
-
-      def checkout?
-        ->(cli) { cli.name == UI_EXTENSIONS_CHECKOUT_RUN }
+      def self.find(cli_package:, identifier:)
+        RUNTIMES.find { |runtime| runtime.active_runtime?(cli_package, identifier) }
       end
     end
   end

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

@@ -7,11 +7,12 @@ module Extension
       NPM_SERVE_COMMAND = %w(run-script server)
 
       property! :specification_handler, accepts: Extension::Models::SpecificationHandlers::Default
-      property! :argo_runtime, accepts: Features::ArgoRuntime
+      property! :argo_runtime, accepts: -> (runtime) { runtime.class < Features::Runtimes::Base }
       property! :context, accepts: ShopifyCli::Context
       property! :port, accepts: Integer, default: 39351
       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
 
       def call
         validate_env!
@@ -22,6 +23,10 @@ module Extension
         end
       end
 
+      def resource_url
+        super || ExtensionProject.current(force_reload: true).resource_url
+      end
+
       private
 
       def start_server
@@ -57,6 +62,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?
 
         return if required_fields.all? do |field|
           value = project.env.public_send(field)
@@ -77,8 +83,31 @@ module Extension
           options << "--uuid=#{project.registration_uuid}" if argo_runtime.supports?(:uuid)
           options << "--publicUrl=#{tunnel_url}" if !tunnel_url.nil? && argo_runtime.supports?(:public_url)
           options << "--name=#{project.title}" if argo_runtime.supports?(:name)
+          options << "--resourceUrl=#{resource_url}" if !resource_url.nil? && argo_runtime.supports?(:resource_url)
         end
       end
+
+      def ensure_resource_resource_url!
+        project = ExtensionProject.current(force_reload: true)
+
+        ShopifyCli::Result
+          .wrap(project.resource_url)
+          .rescue { specification_handler.build_resource_url(shop: project.env.shop, context: context) }
+          .then(&method(:persist_resource_url))
+          .unwrap do |nil_or_exception|
+            case nil_or_exception
+            when nil
+              context.warn(context.message("warnings.resource_url_auto_generation_failed", project.env.shop))
+            else
+              context.abort(nil_or_exception)
+            end
+          end
+      end
+
+      def persist_resource_url(resource_url)
+        ExtensionProject.update_env_file(context: context, resource_url: resource_url)
+        resource_url
+      end
     end
   end
 end

data/lib/project_types/extension/features/runtimes/admin.rb

@@ -0,0 +1,29 @@
+module Extension
+  module Features
+    module Runtimes
+      class Admin < Base
+        ADMIN_UI_EXTENSIONS_RUN = "@shopify/admin-ui-extensions-run"
+        PRODUCT_SUBSCRIPTION = "PRODUCT_SUBSCRIPTION"
+
+        AVAILABLE_FLAGS = [
+          :api_key,
+          :name,
+          :port,
+          :public_url,
+          :renderer_version,
+          :resource_url,
+          :shop,
+          :uuid,
+        ]
+
+        def available_flags
+          AVAILABLE_FLAGS
+        end
+
+        def active_runtime?(cli_package, identifier)
+          cli_package.name == ADMIN_UI_EXTENSIONS_RUN && identifier == PRODUCT_SUBSCRIPTION
+        end
+      end
+    end
+  end
+end

data/lib/project_types/extension/features/runtimes/base.rb

@@ -0,0 +1,19 @@
+module Extension
+  module Features
+    module Runtimes
+      class Base
+        def available_flags
+          []
+        end
+
+        def supports?(flag)
+          available_flags.include?(flag)
+        end
+
+        def active_runtime?(cli_package, identifier)
+          raise NotImplementedError
+        end
+      end
+    end
+  end
+end

data/lib/project_types/extension/features/runtimes/checkout_post_purchase.rb

@@ -0,0 +1,23 @@
+module Extension
+  module Features
+    module Runtimes
+      class CheckoutPostPurchase < Base
+        CHECKOUT_UI_EXTENSIONS_RUN = "@shopify/checkout-ui-extensions-run"
+        CHECKOUT_POST_PURCHASE = "CHECKOUT_POST_PURCHASE"
+
+        AVAILABLE_FLAGS = [
+          :port,
+          :public_url,
+        ]
+
+        def available_flags
+          AVAILABLE_FLAGS
+        end
+
+        def active_runtime?(cli_package, identifier)
+          cli_package.name == CHECKOUT_UI_EXTENSIONS_RUN && identifier == CHECKOUT_POST_PURCHASE
+        end
+      end
+    end
+  end
+end

data/lib/project_types/extension/features/runtimes/checkout_ui_extension.rb

@@ -0,0 +1,29 @@
+module Extension
+  module Features
+    module Runtimes
+      class CheckoutUiExtension < Base
+        CHECKOUT_UI_EXTENSIONS_RUN = "@shopify/checkout-ui-extensions-run"
+
+        IDENTIFIERS = [
+          "CHECKOUT_ARGO_EXTENSION",
+          "CHECKOUT_UI_EXTENSION",
+        ]
+
+        AVAILABLE_FLAGS = [
+          :port,
+          :public_url,
+          :resource_url,
+          :shop,
+        ]
+
+        def available_flags
+          AVAILABLE_FLAGS
+        end
+
+        def active_runtime?(cli_package, identifier)
+          cli_package.name == CHECKOUT_UI_EXTENSIONS_RUN && IDENTIFIERS.include?(identifier)
+        end
+      end
+    end
+  end
+end

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

@@ -139,6 +139,10 @@ module Extension
               Usage: {{command:%1$s extension tunnel status}}
         HELP
       },
+      check: {
+        help: "Check your extension for errors, suggestions, and best practices.",
+        unsupported: "{{red:%s projects are not supported for `extension check`}}",
+      },
       features: {
         argo: {
           missing_file_error: "Could not find built extension file.",
@@ -162,12 +166,18 @@ module Extension
       tasks: {
         errors: {
           parse_error: "Unable to parse response from Partners Dashboard.",
+          store_error: "There was an error getting store data. Try again later.",
         },
       },
       errors: {
         unknown_type: "Unknown extension type %s",
         package_not_found: "`%s` package not found.",
       },
+      warnings: {
+        resource_url_auto_generation_failed: "{{*}} {{yellow:Warning:}} Unable to auto generate " \
+        "the extension resource URL because %s does not have any products. " \
+        "Please run {{bold:shopify populate products}} to generate sample products.",
+      },
     }
 
     TYPES = {
@@ -196,6 +206,9 @@ module Extension
               {{*}} You’re ready to start building {{green:%s}}!
             MESSAGE
           },
+          serve: {
+            unsupported: "shopify extension serve is not supported for theme app extensions",
+          },
         },
       },
     }

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Extension
+  module Models
+    class Product
+      include SmartProperties
+
+      property :variant_id, accepts: Integer, converts: :to_i
+      property :quantity, accepts: Integer, default: 1
+    end
+  end
+end

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

@@ -6,6 +6,7 @@ module Extension
     module SpecificationHandlers
       class CheckoutPostPurchase < Default
         PERMITTED_CONFIG_KEYS = [:metafields]
+        RENDERER_PACKAGE_NAME = "@shopify/post-purchase-ui-extensions"
 
         def config(context)
           {
@@ -13,6 +14,15 @@ module Extension
             **argo.config(context),
           }
         end
+
+        protected
+
+        def argo
+          Features::Argo.new(
+            git_template: specification.features.argo.git_template,
+            renderer_package_name: RENDERER_PACKAGE_NAME
+          )
+        end
       end
     end
   end

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

@@ -12,9 +12,17 @@ module Extension
             **argo.config(context),
           }
         end
-      end
 
-      CheckoutArgoExtension = CheckoutUiExtension
+        def supplies_resource_url?
+          true
+        end
+
+        def build_resource_url(context:, shop:)
+          product = Tasks::GetProduct.call(context, shop)
+          return unless product
+          format("/cart/%<variant_id>d:%<quantity>d", variant_id: product.variant_id, quantity: 1)
+        end
+      end
     end
   end
 end

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

@@ -50,13 +50,14 @@ module Extension
           argo_runtime(context).supports?(:public_url)
         end
 
-        def serve(context:, port:, tunnel_url:)
+        def serve(context:, port:, tunnel_url:, resource_url:)
           Features::ArgoServe.new(
             specification_handler: self,
             argo_runtime: argo_runtime(context),
             context: context,
             port: port,
             tunnel_url: tunnel_url,
+            resource_url: resource_url
           ).call
         end
 
@@ -65,9 +66,9 @@ module Extension
         end
 
         def argo_runtime(context)
-          @argo_runtime ||= Features::ArgoRuntime.new(
-            renderer: renderer_package(context),
-            cli: cli_package(context),
+          @argo_runtime ||= Features::ArgoRuntime.find(
+            cli_package: cli_package(context),
+            identifier: identifier
           )
         end
 
@@ -90,6 +91,14 @@ module Extension
           end
         end
 
+        def supplies_resource_url?
+          false
+        end
+
+        def build_resource_url(shop)
+          raise NotImplementedError
+        end
+
         protected
 
         def argo

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

@@ -60,6 +60,18 @@ module Extension
           "Theme App Extension"
         end
 
+        def choose_port?(ctx)
+          ctx.abort(ctx.message("serve.unsupported"))
+        end
+
+        def establish_tunnel?(ctx)
+          ctx.abort(ctx.message("serve.unsupported"))
+        end
+
+        def serve(ctx)
+          ctx.abort(ctx.message("serve.unsupported"))
+        end
+
         private
 
         def validate(filename)

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

@@ -46,6 +46,7 @@ module Extension
           checkout: {
             git_template: "https://github.com/Shopify/checkout-ui-extensions-template",
             renderer_package_name: "@shopify/checkout-ui-extensions",
+            required_fields: [:shop],
             cli_package_name: "@shopify/checkout-ui-extensions-run",
           },
         }

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+require "shopify_cli"
+
+module Extension
+  module Tasks
+    module Converters
+      module ProductConverter
+        VARIANT_PATH = ["data", "products", "edges", 0, "node", "variants", "edges", 0, "node", "id"]
+
+        def self.from_hash(hash)
+          return nil if hash.nil?
+          variant = hash.dig(*VARIANT_PATH)
+          return unless variant
+          Models::Product.new(
+            variant_id: ShopifyCli::API.gid_to_id(variant)
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+require "shopify_cli"
+
+module Extension
+  module Tasks
+    class GetProduct < ShopifyCli::Task
+      API_VERSION = "2021-07"
+      GRAPHQL_FILE = "get_variant_id"
+
+      def call(context, shop)
+        response = ShopifyCli::AdminAPI.query(
+          context,
+          GRAPHQL_FILE,
+          shop: shop,
+          api_version: API_VERSION
+        )
+        context.abort(context.message("tasks.errors.store_error")) if response.nil?
+        Converters::ProductConverter.from_hash(response)
+      end
+    end
+  end
+end

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

@@ -34,7 +34,7 @@ module Script
       end
 
       def self.help
-        allowed_values = Script::Layers::Application::ExtensionPoints.types.map { |type| "{{cyan:#{type}}}" }
+        allowed_values = Script::Layers::Application::ExtensionPoints.available_types.map { |type| "{{cyan:#{type}}}" }
         ShopifyCli::Context.message("script.create.help", ShopifyCli::TOOL_NAME, allowed_values.join(", "))
       end
     end

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

@@ -0,0 +1,40 @@
+mutation AppScriptSet(
+  $uuid: String
+  $extensionPointName: ExtensionPointName!,
+  $title: String!,
+  $description: String,
+  $force: Boolean,
+  $schemaMajorVersion: String,
+  $schemaMinorVersion: String,
+  $scriptJsonVersion: String!,
+  $configurationUi: Boolean!,
+  $configurationDefinition: String!,
+  $moduleUploadUrl: String!,
+) {
+  appScriptSet(
+    uuid: $uuid
+    extensionPointName: $extensionPointName
+    title: $title
+    description: $description
+    force: $force
+    schemaMajorVersion: $schemaMajorVersion
+    schemaMinorVersion: $schemaMinorVersion,
+    scriptJsonVersion: $scriptJsonVersion,
+    configurationUi: $configurationUi,
+    configurationDefinition: $configurationDefinition,
+    moduleUploadUrl: $moduleUploadUrl,
+) {
+    userErrors {
+      field
+      message
+      tag
+    }
+    appScript {
+      uuid
+      appKey
+      configSchema
+      extensionPointName
+      title
+    }
+  }
+}

data/lib/project_types/script/graphql/app_script_update_or_create.graphql

@@ -1,44 +0,0 @@
-mutation AppScriptUpdateOrCreate(
-  $extensionPointName: ExtensionPointName!,
-  $title: String,
-  $description: String,
-  $sourceCode: String,
-  $language: String,
-  $force: Boolean,
-  $schemaMajorVersion: String,
-  $schemaMinorVersion: String,
-  $useMsgpack: Boolean,
-  $uuid: String,
-  $configurationUi: Boolean!,
-  $scriptJsonVersion: String!,
-  $configurationDefinition: String!,
-) {
-  appScriptUpdateOrCreate(
-    extensionPointName: $extensionPointName
-    title: $title
-    description: $description
-    sourceCode: $sourceCode
-    language: $language
-    force: $force
-    schemaMajorVersion: $schemaMajorVersion
-    schemaMinorVersion: $schemaMinorVersion
-    useMsgpack: $useMsgpack,
-    uuid: $uuid
-    configurationUi: $configurationUi
-    scriptJsonVersion: $scriptJsonVersion
-    configurationDefinition: $configurationDefinition
-) {
-    userErrors {
-      field
-      message
-      tag
-    }
-    appScript {
-      uuid
-      appKey
-      configSchema
-      extensionPointName
-      title
-    }
-  }
-}

data/lib/project_types/script/graphql/module_upload_url_generate.graphql

@@ -0,0 +1,9 @@
+mutation moduleUploadUrlGenerate {
+  moduleUploadUrlGenerate {
+    url
+    userErrors {
+      field
+      message
+    }
+  }
+}

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

@@ -17,7 +17,7 @@ module Script
           uuid:,
           extension_point_type:,
           script_content:,
-          compiled_type:,
+          compiled_type: nil,
           metadata:,
           script_json:
         )
@@ -35,7 +35,6 @@ module Script
             uuid: @uuid,
             extension_point_type: @extension_point_type,
             script_content: @script_content,
-            compiled_type: @compiled_type,
             api_key: api_key,
             force: force,
             metadata: @metadata,

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

@@ -93,6 +93,8 @@ module Script
             super("WebAssembly binary not found")
           end
         end
+
+        class ScriptUploadError < ScriptProjectError; end
       end
     end
   end

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

@@ -32,7 +32,6 @@ module Script
             uuid: script_project.uuid,
             extension_point_type: script_project.extension_point_type,
             script_content: script_content,
-            compiled_type: compiled_type,
             metadata: metadata,
             script_json: script_project.script_json,
           )

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

@@ -14,32 +14,31 @@ module Script
           uuid:,
           extension_point_type:,
           script_content:,
-          compiled_type:,
           api_key: nil,
           force: false,
           metadata:,
           script_json:
         )
-          query_name = "app_script_update_or_create"
+          url = UploadScript.new(ctx).call(api_key, script_content)
+
+          query_name = "app_script_set"
           variables = {
             uuid: uuid,
             extensionPointName: extension_point_type.upcase,
             title: script_json.title,
             description: script_json.description,
-            sourceCode: Base64.encode64(script_content),
-            language: compiled_type,
             force: force,
             schemaMajorVersion: metadata.schema_major_version.to_s, # API expects string value
             schemaMinorVersion: metadata.schema_minor_version.to_s, # API expects string value
-            useMsgpack: metadata.use_msgpack,
             scriptJsonVersion: script_json.version,
             configurationUi: script_json.configuration_ui,
             configurationDefinition: script_json.configuration&.to_json,
+            moduleUploadUrl: url,
           }
-          resp_hash = script_service_request(query_name: query_name, api_key: api_key, variables: variables)
-          user_errors = resp_hash["data"]["appScriptUpdateOrCreate"]["userErrors"]
+          resp_hash = MakeRequest.new(ctx).call(query_name: query_name, api_key: api_key, variables: variables)
+          user_errors = resp_hash["data"]["appScriptSet"]["userErrors"]
 
-          return resp_hash["data"]["appScriptUpdateOrCreate"]["appScript"]["uuid"] if user_errors.empty?
+          return resp_hash["data"]["appScriptSet"]["appScript"]["uuid"] if user_errors.empty?
 
           if user_errors.any? { |e| e["tag"] == "already_exists_error" }
             raise Errors::ScriptRepushError, uuid
@@ -67,11 +66,14 @@ module Script
         def get_app_scripts(api_key:, extension_point_type:)
           query_name = "get_app_scripts"
           variables = { appKey: api_key, extensionPointName: extension_point_type.upcase }
-          script_service_request(query_name: query_name, api_key: api_key, variables: variables)["data"]["appScripts"]
+          response = MakeRequest.new(ctx).call(
+            query_name: query_name,
+            api_key: api_key,
+            variables: variables
+          )
+          response["data"]["appScripts"]
         end
 
-        private
-
         class ScriptServiceAPI < ShopifyCli::API
           property(:api_key, accepts: String)
 
@@ -114,47 +116,95 @@ module Script
         end
         private_constant(:PartnersProxyAPI)
 
-        def script_service_request(query_name:, variables: nil, **options)
-          resp = if bypass_partners_proxy
-            ScriptServiceAPI.query(ctx, query_name, variables: variables, **options)
-          else
-            proxy_through_partners(query_name: query_name, variables: variables, **options)
+        class MakeRequest
+          attr_reader :ctx
+
+          def initialize(ctx)
+            @ctx = ctx
           end
-          raise_if_graphql_failed(resp)
-          resp
-        end
 
-        def bypass_partners_proxy
-          !ENV["BYPASS_PARTNERS_PROXY"].nil?
-        end
+          def self.bypass_partners_proxy
+            !ENV["BYPASS_PARTNERS_PROXY"].nil?
+          end
 
-        def proxy_through_partners(query_name:, variables: nil, **options)
-          options[:variables] = variables.to_json if variables
-          resp = PartnersProxyAPI.query(ctx, query_name, **options)
-          raise_if_graphql_failed(resp)
-          JSON.parse(resp["data"]["scriptServiceProxy"])
-        end
+          def call(query_name:, variables: nil, **options)
+            resp = if MakeRequest.bypass_partners_proxy
+              ScriptServiceAPI.query(ctx, query_name, variables: variables, **options)
+            else
+              proxy_through_partners(query_name: query_name, variables: variables, **options)
+            end
+            raise_if_graphql_failed(resp)
+            resp
+          end
 
-        def raise_if_graphql_failed(response)
-          raise Errors::EmptyResponseError if response.nil?
-
-          return unless response.key?("errors")
-          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"]
+          def proxy_through_partners(query_name:, variables: nil, **options)
+            options[:variables] = variables.to_json if variables
+            resp = PartnersProxyAPI.query(ctx, query_name, **options)
+            raise_if_graphql_failed(resp)
+            JSON.parse(resp["data"]["scriptServiceProxy"])
+          end
+
+          def raise_if_graphql_failed(response)
+            raise Errors::EmptyResponseError if response.nil?
+
+            return unless response.key?("errors")
+            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
+          end
+
+          def error_code(errors)
+            errors.map do |e|
+              code = e.dig("extensions", "code")
+              return code if code
+            end
           end
         end
 
-        def error_code(errors)
-          errors.map do |e|
-            code = e.dig("extensions", "code")
-            return code if code
+        class UploadScript
+          attr_reader :ctx
+
+          def initialize(ctx)
+            @ctx = ctx
+          end
+
+          def call(api_key, script_content)
+            apply_module_upload_url(api_key).tap do |url|
+              upload(url, script_content)
+            end
+          end
+
+          private
+
+          def apply_module_upload_url(api_key)
+            query_name = "module_upload_url_generate"
+            variables = {}
+            resp_hash = MakeRequest.new(ctx).call(query_name: query_name, api_key: api_key, variables: variables)
+            user_errors = resp_hash["data"]["moduleUploadUrlGenerate"]["userErrors"]
+
+            raise Errors::GraphqlError, user_errors if user_errors.any?
+            resp_hash["data"]["moduleUploadUrlGenerate"]["url"]
+          end
+
+          def upload(url, script_content)
+            url = URI(url)
+
+            https = Net::HTTP.new(url.host, url.port)
+            https.use_ssl = true
+
+            request = Net::HTTP::Put.new(url)
+            request["Content-Type"] = "application/wasm"
+            request.body = script_content
+
+            response = https.request(request)
+            raise Errors::ScriptUploadError unless response.code == "200"
           end
         end
       end

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

@@ -141,6 +141,9 @@ module Script
           web_assembly_binary_not_found_suggestion: "No WebAssembly binary found." \
             "Check that your build npm script outputs the generated binary to the root of the directory." \
             "Generated binary should match the script name: <script_name>.wasm",
+
+          script_upload_cause: "Fail to upload script.",
+          script_upload_help: "Try again.",
         },
 
         create: {

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

@@ -237,6 +237,11 @@ module Script
             cause_of_error: ShopifyCli::Context.message("script.error.web_assembly_binary_not_found"),
             help_suggestion: ShopifyCli::Context.message("script.error.web_assembly_binary_not_found_suggestion"),
           }
+        when Layers::Infrastructure::Errors::ScriptUploadError
+          {
+            cause_of_error: ShopifyCli::Context.message("script.error.script_upload_cause"),
+            help_suggestion: ShopifyCli::Context.message("script.error.script_upload_help"),
+          }
         end
       end
     end

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

@@ -43,7 +43,7 @@ module Theme
         when "development"
           "blue"
         else
-          "grey"
+          "italic"
         end
 
         tags = ["{{#{color}:[#{theme.role}]}}"]

data/lib/shopify-cli/core/monorail.rb

@@ -46,7 +46,7 @@ module ShopifyCli
 
         # we only want to send Monorail events in production or when explicitly developing
         def enabled?
-          Context.new.system? || ENV["MONORAIL_REAL_EVENTS"] == "1"
+          (Context.new.system? || ENV["MONORAIL_REAL_EVENTS"] == "1") && !Context.new.ci?
         end
 
         def consented?
@@ -54,6 +54,7 @@ module ShopifyCli
         end
 
         def prompt_for_consent
+          return if Context.new.ci?
           return unless enabled?
           return if ShopifyCli::Config.get_section("analytics").key?("enabled")
           msg = Context.message("core.monorail.consent_prompt")

data/lib/shopify-cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCli
-  VERSION = "2.0.2"
+  VERSION = "2.2.2"
 end

data/shopify-cli.gemspec

@@ -44,5 +44,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency("minitest", "~> 5.0")
 
   spec.add_dependency("listen", "~> 3.5")
-  spec.add_dependency("theme-check", "~> 1.0")
+  spec.add_dependency("theme-check", "~> 1.1")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.2.2
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-07 00:00:00.000000000 Z
+date: 2021-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 description: |
   Shopify CLI helps you build Shopify apps faster. It quickly scaffolds Node.js
   and Ruby on Rails embedded apps. It also automates many common tasks in the
@@ -159,9 +159,11 @@ files:
 - lib/graphql/find_organization.graphql
 - lib/graphql/get_app_by_api_key.graphql
 - lib/graphql/get_app_urls.graphql
+- lib/graphql/get_variant_id.graphql
 - lib/graphql/update_dashboard_urls.graphql
 - lib/project_types/extension/cli.rb
 - lib/project_types/extension/commands/build.rb
+- lib/project_types/extension/commands/check.rb
 - lib/project_types/extension/commands/connect.rb
 - lib/project_types/extension/commands/create.rb
 - lib/project_types/extension/commands/extension_command.rb
@@ -181,6 +183,10 @@ files:
 - lib/project_types/extension/features/argo_setup.rb
 - lib/project_types/extension/features/argo_setup_step.rb
 - lib/project_types/extension/features/argo_setup_steps.rb
+- lib/project_types/extension/features/runtimes/admin.rb
+- lib/project_types/extension/features/runtimes/base.rb
+- lib/project_types/extension/features/runtimes/checkout_post_purchase.rb
+- lib/project_types/extension/features/runtimes/checkout_ui_extension.rb
 - lib/project_types/extension/forms/connect.rb
 - lib/project_types/extension/forms/create.rb
 - lib/project_types/extension/forms/questions/ask_app.rb
@@ -192,6 +198,7 @@ files:
 - lib/project_types/extension/models/app.rb
 - lib/project_types/extension/models/lazy_specification_handler.rb
 - lib/project_types/extension/models/npm_package.rb
+- lib/project_types/extension/models/product.rb
 - lib/project_types/extension/models/registration.rb
 - lib/project_types/extension/models/specification.rb
 - lib/project_types/extension/models/specification_handlers/checkout_post_purchase.rb
@@ -205,6 +212,7 @@ files:
 - lib/project_types/extension/tasks/configure_features.rb
 - lib/project_types/extension/tasks/configure_options.rb
 - lib/project_types/extension/tasks/converters/app_converter.rb
+- lib/project_types/extension/tasks/converters/product_converter.rb
 - lib/project_types/extension/tasks/converters/registration_converter.rb
 - lib/project_types/extension/tasks/converters/validation_error_converter.rb
 - lib/project_types/extension/tasks/converters/version_converter.rb
@@ -214,6 +222,7 @@ files:
 - lib/project_types/extension/tasks/get_app.rb
 - lib/project_types/extension/tasks/get_apps.rb
 - lib/project_types/extension/tasks/get_extensions.rb
+- lib/project_types/extension/tasks/get_product.rb
 - lib/project_types/extension/tasks/update_draft.rb
 - lib/project_types/extension/tasks/user_errors.rb
 - lib/project_types/node/cli.rb
@@ -247,8 +256,10 @@ files:
 - lib/project_types/script/config/extension_points.yml
 - lib/project_types/script/errors.rb
 - lib/project_types/script/forms/create.rb
+- lib/project_types/script/graphql/app_script_set.graphql
 - lib/project_types/script/graphql/app_script_update_or_create.graphql
 - lib/project_types/script/graphql/get_app_scripts.graphql
+- lib/project_types/script/graphql/module_upload_url_generate.graphql
 - lib/project_types/script/graphql/script_service_proxy.graphql
 - lib/project_types/script/layers/application/build_script.rb
 - lib/project_types/script/layers/application/create_script.rb