shopify-cli 2.25.0 → 2.26.0

data/lib/project_types/theme/commands/pull.rb

@@ -5,12 +5,14 @@ require "shopify_cli/theme/ignore_filter"
 require "shopify_cli/theme/include_filter"
 require "shopify_cli/theme/syncer"
 require "project_types/theme/commands/common/root_helper"
+require "project_types/theme/commands/common/shop_helper"
 require "project_types/theme/conversions/include_glob"
 require "project_types/theme/conversions/ignore_glob"
 
 module Theme
   class Command
     class Pull < ShopifyCLI::Command::SubCommand
+      include Common::ShopHelper
       include Common::RootHelper
 
       recommend_default_ruby_range
@@ -97,7 +99,7 @@ module Theme
         form = Forms::Select.ask(
           @ctx,
           [],
-          title: @ctx.message("theme.pull.select"),
+          title: @ctx.message("theme.pull.select", shop),
           root: root,
         )
         form&.theme

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

@@ -5,12 +5,14 @@ require "shopify_cli/theme/ignore_filter"
 require "shopify_cli/theme/include_filter"
 require "shopify_cli/theme/syncer"
 require "project_types/theme/commands/common/root_helper"
+require "project_types/theme/commands/common/shop_helper"
 require "project_types/theme/conversions/include_glob"
 require "project_types/theme/conversions/ignore_glob"
 
 module Theme
   class Command
     class Push < ShopifyCLI::Command::SubCommand
+      include Common::ShopHelper
       include Common::RootHelper
 
       recommend_default_ruby_range
@@ -134,7 +136,7 @@ module Theme
         form = Forms::Select.ask(
           @ctx,
           [],
-          title: @ctx.message("theme.push.select"),
+          title: @ctx.message("theme.push.select", shop),
           root: root,
         )
         form&.theme

data/lib/project_types/theme/messages/messages.rb

@@ -47,7 +47,7 @@ module Theme
           not_found: "Theme #%s does not exist",
           no_themes_error: "You don't have any theme to be published.",
           no_themes_resolution: "Try to create an unpublished theme with {{command:theme push -u -t <theme_name>}}.",
-          select: "Select theme to push to",
+          select: "Select theme to push to %s",
           confirm: "Are you sure you want to make %s the new live theme on %s?",
         },
         forms: {
@@ -87,7 +87,7 @@ module Theme
             pushing: "Pushing theme files to %s (#%s) on %s",
           },
           push: "Pushing theme files to Shopify",
-          select: "Select theme to push to",
+          select: "Select theme to push to %s",
           live: "Are you sure you want to push to your live theme?",
           theme: "\n  Theme: {{blue:%s #%s}} {{green:[live]}}",
           deprecated_themeid: <<~WARN,
@@ -285,7 +285,7 @@ module Theme
 
             Run without options to select the theme to delete from a list.
           HELP
-          select: "Select theme to delete",
+          select: "Select theme to delete from %s",
           done: "%s theme(s) deleted",
           no_themes_error: "You don't have any theme to be deleted.",
           no_themes_resolution: "Try to create an unpublished theme with {{command:theme push -u -t <theme_name>}}.",
@@ -330,7 +330,7 @@ module Theme
 
             Run without options to select theme from a list.
           HELP
-          select: "Select a theme to pull from",
+          select: "Select a theme to pull from %s",
           pulling: "Pulling theme files from %s (#%s) on %s",
           done: "Theme pulled successfully.",
           done_with_errors: "{{warning:Your theme was pulled with errors.}}",
@@ -340,7 +340,7 @@ module Theme
           theme_not_found: "Theme \"%s\" doesn't exist",
         },
         open: {
-          select: "Select a theme to open",
+          select: "Select a theme to open in %s",
           theme_not_found: "Theme \"%s\" doesn't exist",
           details: <<~DETAILS,
             {{*}} {{bold:%s}}

data/lib/shopify_cli/messages/messages.rb

@@ -788,7 +788,7 @@ module ShopifyCLI
             {{*}} {{yellow:A new version of Shopify CLI is available! You have version %s and the latest version is %s.
 
               To upgrade, follow the instructions for the package manager you’re using:
-              {{underline:https://shopify.dev/tools/cli/troubleshooting#upgrade-shopify-cli}}}}
+              {{underline:https://shopify.dev/themes/tools/cli/upgrade-uninstall}}}}
 
           MESSAGE
 

data/lib/shopify_cli/packager.rb

@@ -70,9 +70,10 @@ module ShopifyCLI
       root_dir = File.join(PACKAGING_DIR, "homebrew")
 
       build_path = File.join(BUILDS_DIR, "shopify-cli.rb")
-      puts "\nBuilding Homebrew package"
+      build_path_2 = File.join(BUILDS_DIR, "shopify-cli@2.rb")
+      puts "\nBuilding Homebrew packages"
 
-      puts "Generating formula…"
+      puts "Generating formulae…"
       File.delete(build_path) if File.exist?(build_path)
 
       spec_contents = File.read(File.join(root_dir, "shopify-cli.base.rb"))
@@ -89,7 +90,15 @@ module ShopifyCLI
       spec_contents = spec_contents.gsub("SHOPIFY_CLI_GEM_CHECKSUM", gem_checksum)
 
       puts "Writing generated formula\n  To: #{build_path}\n\n"
-      File.write(build_path, spec_contents)
+      File.write(build_path, spec_contents.gsub("SHOPIFY_CLI_BINSTUB_SUFFIX", ""))
+
+      puts "Writing generated formula\n  To: #{build_path_2}\n\n"
+      File.write(
+        build_path_2,
+        spec_contents
+          .sub("class ShopifyCli < Formula", "class ShopifyCliAT2 < Formula")
+          .sub("SHOPIFY_CLI_BINSTUB_SUFFIX", "2")
+      )
     end
 
     private

data/lib/shopify_cli/release.rb

@@ -120,8 +120,10 @@ module ShopifyCLI
     end
 
     def update_homebrew_repo
-      source_file = File.join(package_dir, "shopify-cli.rb")
-      FileUtils.copy(source_file, homebrew_path)
+      %w(shopify-cli.rb shopify-cli@2.rb).each do |source_filename|
+        source_file = File.join(package_dir, source_filename)
+        FileUtils.copy(source_file, homebrew_path)
+      end
       Dir.chdir(homebrew_path) do
         system_or_fail("git commit -am '#{homebrew_update_message}'", "commit homebrew update")
         system_or_fail("git push -u origin #{homebrew_release_branch}", "push homebrew branch")

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.25.0"
+  VERSION = "2.26.0"
 end

data/vendor/deps/cli-ui/lib/cli/ui/prompt/interactive_options.rb

@@ -339,7 +339,7 @@ module CLI
           else
             $stdin.getc
           end
-        rescue IOError
+        rescue Errno::EIO, Errno::EPIPE, IOError
           "\e"
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.25.0
+  version: 2.26.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-15 00:00:00.000000000 Z
+date: 2022-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -304,58 +304,13 @@ files:
 - lib/project_types/script/commands/create.rb
 - lib/project_types/script/commands/javy.rb
 - lib/project_types/script/commands/push.rb
-- lib/project_types/script/config/extension_points.yml
-- lib/project_types/script/errors.rb
-- lib/project_types/script/forms/ask_app.rb
-- lib/project_types/script/forms/ask_org.rb
-- lib/project_types/script/forms/ask_script_uuid.rb
-- lib/project_types/script/forms/create.rb
-- lib/project_types/script/forms/run_against_shopify_org.rb
-- lib/project_types/script/graphql/app_script_set.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/connect_app.rb
-- lib/project_types/script/layers/application/create_script.rb
-- lib/project_types/script/layers/application/extension_points.rb
-- lib/project_types/script/layers/application/project_dependencies.rb
-- lib/project_types/script/layers/application/push_script.rb
-- lib/project_types/script/layers/domain/app_bridge.rb
-- lib/project_types/script/layers/domain/errors.rb
-- lib/project_types/script/layers/domain/extension_point.rb
-- lib/project_types/script/layers/domain/metadata.rb
-- lib/project_types/script/layers/domain/push_package.rb
-- lib/project_types/script/layers/domain/script_config.rb
-- lib/project_types/script/layers/domain/script_project.rb
-- lib/project_types/script/layers/infrastructure/api_clients/partners_proxy_api_client.rb
-- lib/project_types/script/layers/infrastructure/api_clients/script_service_api_client.rb
-- lib/project_types/script/layers/infrastructure/command_runner.rb
-- lib/project_types/script/layers/infrastructure/errors.rb
-- lib/project_types/script/layers/infrastructure/extension_point_repository.rb
-- lib/project_types/script/layers/infrastructure/languages/project_creator.rb
-- lib/project_types/script/layers/infrastructure/languages/task_runner.rb
-- lib/project_types/script/layers/infrastructure/languages/tool_version_checker.rb
-- lib/project_types/script/layers/infrastructure/languages/typescript_project_creator.rb
-- lib/project_types/script/layers/infrastructure/languages/typescript_task_runner.rb
-- lib/project_types/script/layers/infrastructure/languages/wasm_project_creator.rb
-- lib/project_types/script/layers/infrastructure/languages/wasm_task_runner.rb
-- lib/project_types/script/layers/infrastructure/metadata_repository.rb
-- lib/project_types/script/layers/infrastructure/push_package_repository.rb
-- lib/project_types/script/layers/infrastructure/script_project_repository.rb
-- lib/project_types/script/layers/infrastructure/script_service.rb
-- lib/project_types/script/layers/infrastructure/script_uploader.rb
-- lib/project_types/script/layers/infrastructure/service_locator.rb
-- lib/project_types/script/layers/infrastructure/sparse_checkout_details.rb
 - lib/project_types/script/loaders/project.rb
 - lib/project_types/script/loaders/specification_handler.rb
 - lib/project_types/script/messages/messages.rb
-- lib/project_types/script/ui/error_handler.rb
-- lib/project_types/script/ui/printing_spinner.rb
-- lib/project_types/script/ui/strict_spinner.rb
 - lib/project_types/theme/cli.rb
 - lib/project_types/theme/commands/check.rb
 - lib/project_types/theme/commands/common/root_helper.rb
+- lib/project_types/theme/commands/common/shop_helper.rb
 - lib/project_types/theme/commands/delete.rb
 - lib/project_types/theme/commands/init.rb
 - lib/project_types/theme/commands/language_server.rb

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

@@ -1,45 +0,0 @@
-payment_customization:
-  beta: true
-  domain: 'checkout'
-  libraries:
-    wasm:
-      repo: "https://github.com/Shopify/function-examples"
-    rust:
-      repo: "https://github.com/Shopify/function-examples"
-shipping_methods:
-  domain: 'checkout'
-  libraries:
-    wasm:
-      repo: "https://github.com/Shopify/function-examples"
-    rust:
-      repo: "https://github.com/Shopify/function-examples"
-product_discounts:
-  beta: true
-  domain: 'discounts'
-  libraries:
-    wasm:
-      repo: "https://github.com/Shopify/function-examples"
-    rust:
-      repo: "https://github.com/Shopify/function-examples"
-order_discounts:
-  beta: true
-  domain: 'discounts'
-  libraries:
-    wasm:
-      repo: "https://github.com/Shopify/function-examples"
-    rust:
-      repo: "https://github.com/Shopify/function-examples"
-shipping_discounts:
-  beta: true
-  domain: 'discounts'
-  libraries:
-    wasm:
-      repo: "https://github.com/Shopify/function-examples"
-    rust:
-      repo: "https://github.com/Shopify/function-examples"
-shipping_rates_consolidation:
-  beta: true
-  domain: 'checkout'
-  libraries:
-    wasm:
-      repo: "https://github.com/Shopify/function-examples"

data/lib/project_types/script/errors.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module Script
-  module Errors
-    class InvalidScriptTitleError < ScriptProjectError; end
-
-    class NoExistingAppsError < ScriptProjectError; end
-    class NoExistingOrganizationsError < ScriptProjectError; end
-  end
-end

data/lib/project_types/script/forms/ask_app.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Script
-  module Forms
-    class AskApp < ShopifyCLI::Form
-      attr_reader :app
-
-      def ask
-        apps = @xargs.fetch(:apps)
-        raise Errors::NoExistingAppsError if apps.empty?
-
-        @app =
-          if apps.count > 1
-            CLI::UI::Prompt.ask(ctx.message("script.application.ensure_env.app_select")) do |handler|
-              apps.each do |app|
-                handler.option(app["title"]) { app }
-              end
-            end
-          else
-            apps.first.tap do |app|
-              ctx.puts(ctx.message("script.application.ensure_env.app", app["title"]))
-            end
-          end
-      end
-    end
-  end
-end

data/lib/project_types/script/forms/ask_org.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module Script
-  module Forms
-    class AskOrg < ShopifyCLI::Form
-      attr_reader :org
-
-      BUSINESS_NAME = "businessName"
-      ID = "id"
-
-      def ask
-        orgs = @xargs
-        @org =
-          if orgs.count == 1
-            orgs.first.tap do |org|
-              ctx.puts(ctx.message("script.application.ensure_env.organization", org[BUSINESS_NAME], org[ID]))
-            end
-          elsif orgs.count > 0
-            CLI::UI::Prompt.ask(ctx.message("script.application.ensure_env.organization_select")) do |handler|
-              orgs.each do |org|
-                handler.option("#{org[BUSINESS_NAME]} (#{org[ID]})") { org }
-              end
-            end
-          else
-            raise Errors::NoExistingOrganizationsError
-          end
-      end
-    end
-  end
-end

data/lib/project_types/script/forms/ask_script_uuid.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Script
-  module Forms
-    class AskScriptUuid < ShopifyCLI::Form
-      attr_reader :uuid
-      def ask
-        scripts = @xargs
-
-        return if scripts.empty? ||
-          !CLI::UI::Prompt.confirm(ctx.message("script.application.ensure_env.ask_connect_to_existing_script"))
-
-        @uuid =
-          CLI::UI::Prompt.ask(ctx.message("script.application.ensure_env.ask_which_script_to_connect_to")) do |handler|
-            scripts.each do |script|
-              handler.option("#{script["title"]} (#{script["uuid"]})") { script["uuid"] }
-            end
-          end
-      end
-    end
-  end
-end

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

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module Script
-  module Forms
-    class Create < ShopifyCLI::Form
-      flag_arguments :extension_point, :title
-
-      def ask
-        self.title = valid_name
-        self.extension_point ||= ask_extension_point
-      end
-
-      private
-
-      def ask_extension_point
-        CLI::UI::Prompt.ask(
-          @ctx.message("script.forms.create.select_extension_point"),
-          options: Layers::Application::ExtensionPoints.available_types
-        )
-      end
-
-      def ask_title
-        CLI::UI::Prompt.ask(@ctx.message("script.forms.create.script_title"))
-      end
-
-      def valid_name
-        normalized_title = (title || ask_title).downcase.gsub(" ", "_")
-        return normalized_title if normalized_title.match?(/^[0-9A-Za-z_-]*$/)
-        raise Errors::InvalidScriptTitleError
-      end
-    end
-  end
-end

data/lib/project_types/script/forms/run_against_shopify_org.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Script
-  module Forms
-    class RunAgainstShopifyOrg < ShopifyCLI::Form
-      attr_reader :response
-      def ask
-        @ctx.puts(@ctx.message("core.tasks.select_org_and_shop.identified_as_shopify"))
-        message = @ctx.message("core.tasks.select_org_and_shop.first_party")
-        @response = CLI::UI::Prompt.confirm(message, default: false)
-      end
-    end
-  end
-end

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

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

data/lib/project_types/script/graphql/get_app_scripts.graphql

@@ -1,6 +0,0 @@
-query GetAppScripts($appKey: String!, $extensionPointName: ExtensionPointName!) {
-  appScripts(appKeys: [$appKey], extensionPointName: $extensionPointName) {
-    uuid
-    title
-  }
-}

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

@@ -1,13 +0,0 @@
-mutation moduleUploadUrlGenerate {
-  moduleUploadUrlGenerate {
-    details {
-      url
-      headers
-      humanizedMaxSize
-    }
-    userErrors {
-      field
-      message
-    }
-  }
-}

data/lib/project_types/script/graphql/script_service_proxy.graphql

@@ -1,7 +0,0 @@
-query ProxyRequest($api_key: String, $query: String!, $variables: String) {
-  scriptServiceProxy(
-    apiKey: $api_key
-    query: $query
-    variables: $variables
-  )
-}

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

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Script
-  module Layers
-    module Application
-      class BuildScript
-        class << self
-          def call(ctx:, task_runner:)
-            CLI::UI::Frame.open(ctx.message("script.application.building")) do
-              UI::StrictSpinner.spin(ctx.message("script.application.building_script")) do |spinner|
-                task_runner.build
-                spinner.update_title(ctx.message("script.application.built"))
-              end
-            rescue Infrastructure::Errors::BuildError => e
-              CLI::UI::Frame.with_frame_color_override(:red) do
-                ctx.puts("\n{{red:#{e.message}}}")
-              end
-              raise
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-require "shopify_cli"
-
-module Script
-  module Layers
-    module Application
-      class ConnectApp
-        class << self
-          def call(ctx:, force: false)
-            script_project_repo = Layers::Infrastructure::ScriptProjectRepository.new(ctx: ctx)
-            script_project = script_project_repo.get
-
-            return false if script_project.env_valid? && !force
-
-            if ShopifyCLI::Shopifolk.check && Forms::RunAgainstShopifyOrg.ask(ctx, nil, nil).response
-              ShopifyCLI::Shopifolk.act_as_shopify_organization
-            end
-
-            org =
-              if partner_proxy_bypass
-                stubbed_org
-              else
-                orgs = ShopifyCLI::PartnersAPI::Organizations.fetch_all_with_apps(ctx)
-                Forms::AskOrg.ask(ctx, orgs, nil).org
-              end
-
-            app = Forms::AskApp.ask(
-              ctx,
-              {
-                apps: org["apps"],
-                acting_as_shopify_organization: ShopifyCLI::Shopifolk.acting_as_shopify_organization?,
-              },
-              nil
-            ).app
-
-            script_service = Layers::Infrastructure::ServiceLocator.script_service(ctx: ctx, api_key: app["apiKey"])
-            extension_point_type = script_project.extension_point_type
-            scripts = script_service.get_app_scripts(extension_point_type: extension_point_type)
-
-            uuid = Forms::AskScriptUuid.ask(ctx, scripts, nil)&.uuid
-
-            script_project_repo.create_env(
-              api_key: app["apiKey"],
-              secret: app["apiSecretKeys"].first["secret"],
-              uuid: uuid
-            )
-            ctx.done(ctx.message("script.connect.connected", app["title"]))
-
-            true
-          rescue SmartProperties::InitializationError, SmartProperties::InvalidValueError => error
-            handle_error(error, context: ctx)
-          end
-
-          def handle_error(error, context:)
-            properties_hash = { api_key: "SHOPIFY_API_KEY", secret: "SHOPIFY_API_SECRET" }
-            missing_env_variables = error.properties.map { |p| properties_hash[p.name] }.compact.join(", ")
-            message = context.message("script.error.missing_env_file_variables", missing_env_variables)
-            message += context.message("script.error.missing_env_file_variables_solution", ShopifyCLI::TOOL_NAME)
-            raise ShopifyCLI::Abort,
-              message
-          end
-
-          private
-
-          def partner_proxy_bypass
-            !ENV["BYPASS_PARTNERS_PROXY"].nil?
-          end
-
-          def stubbed_org
-            {
-              "apps" => [
-                {
-                  "appType" => "custom",
-                  "apiKey" => "stubbed-api-key",
-                  "apiSecretKeys" => [{ "secret" => "stubbed-api-secret" }],
-                  "title" => "Fake App (Not connected to Partners)",
-                },
-              ],
-            }
-          end
-        end
-      end
-    end
-  end
-end