shopify-cli 2.1.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df03f65d3f06543a72fff5a777f93b7948aaa97c5ea10b42039d550cb82c0432
-  data.tar.gz: b0741e669b67f6a39e030d7dfb7aa252dcf79ff5b15fd4ad27d543a9ef6347d1
+  metadata.gz: 200674ac9337744994af930500ea30904f13292fba380ec0d58cf990f94c50f5
+  data.tar.gz: cb7f7b17ebbdbc430afe269d713e68cf9db00e71a7aa5026c1752ba8f2db9792
 SHA512:
-  metadata.gz: 8ab134a89911c7b4468253efc5798eae0552bcb38099fd8f8aa9aa0a5144efa52cb7cd62d7b4b064b6cf8618ca0dbc7d24572fd2f3e83bb1ffa320bfb7849ab9
-  data.tar.gz: 9db58f843181d955b76a7c48af7663b3ab2327b6884c25ffba9a36a4cf5b1b4d184740c42ee7e2dc6ba6eece85785aa15709df8c3d604610e58f2e5a320ba084
+  metadata.gz: eed6884b0ee2ec5dc30bfbd4927dedb13ac3a77088af02a24ada09b08d1341696c56c8ce01d177cffe7c67f5db262d2146c51a0f95345e628c1e8a477debe543
+  data.tar.gz: e5211bf92e8b8cab56a17e3714ffcc3d8a8bf8d63aa408c4621a1a65778d4ff0a0d3ae6c57613ee46661d19d9441246aa57388f58f46116acbb712c8f1841750

data/.github/ISSUE_TEMPLATE.md

@@ -24,10 +24,6 @@ Tip: include an error message (in a `<details></details>` tag) if your issue is
 1.
 1.
 
-## Reduced test case
-
-The best way to get your bug fixed is to provide a [reduced test case](https://developer.mozilla.org/en-US/docs/Mozilla/QA/Reducing_testcases).
-
 
 
 ## Specifications

data/CHANGELOG.md

@@ -1,6 +1,30 @@
 Unreleased
 ------
 
+Version 2.3.0
+------
+
+* [#1386](https://github.com/Shopify/shopify-cli/pull/1386): Update Theme-Check to 1.2
+* [#1457](https://github.com/Shopify/shopify-cli/pull/1457): Fix uploading of binary theme files under Windows
+* [#1480](https://github.com/Shopify/shopify-cli/pull/1480): Fix customers pages not working with `theme serve`
+* [#1479](https://github.com/Shopify/shopify-cli/pull/1479): Add theme push & pull option to ignore files per command
+
+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

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.1.0)
+    shopify-cli (2.3.0)
       listen (~> 3.5)
-      theme-check (~> 1.1)
+      theme-check (~> 1.2)
 
 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.1.0)
+    theme-check (1.2.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

@@ -40,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
 
@@ -63,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")
@@ -77,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")
@@ -88,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/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,

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