shopify-cli 2.24.0 → 2.26.0

data/lib/shopify_cli/theme/syncer.rb

@@ -7,7 +7,6 @@ require "forwardable"
 
 require_relative "syncer/checksums"
 require_relative "syncer/error_reporter"
-require_relative "syncer/ignore_helper"
 require_relative "syncer/json_delete_handler"
 require_relative "syncer/json_update_handler"
 require_relative "syncer/merger"
@@ -15,6 +14,7 @@ require_relative "syncer/operation"
 require_relative "syncer/standard_reporter"
 require_relative "syncer/unsupported_script_warning"
 require_relative "theme_admin_api"
+require_relative "ignore_helper"
 require_relative "theme_admin_api_throttler"
 
 module ShopifyCLI
@@ -22,7 +22,7 @@ module ShopifyCLI
     class Syncer
       extend Forwardable
 
-      include IgnoreHelper
+      include ShopifyCLI::Theme::IgnoreHelper
       include JsonDeleteHandler
       include JsonUpdateHandler
 
@@ -367,10 +367,16 @@ module ShopifyCLI
       end
 
       def parse_api_errors(operation, exception)
-        parsed_body = if exception&.response&.is_a?(Hash)
-          exception&.response&.[](:body)
-        else
-          JSON.parse(exception&.response&.body)
+        parsed_body = {}
+
+        if exception.respond_to?(:response)
+          response = exception.response
+
+          parsed_body = if response&.is_a?(Hash)
+            response&.[](:body)
+          else
+            JSON.parse(response&.body)
+          end
         end
 
         errors = parsed_body.dig("errors") # either nil or another type

data/lib/shopify_cli/theme/theme.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require_relative "file"
+require_relative "root"
 require_relative "theme_admin_api"
 
 require "pathname"
@@ -9,12 +10,11 @@ module ShopifyCLI
   module Theme
     class InvalidThemeRole < StandardError; end
 
-    class Theme
+    class Theme < Root
       attr_reader :root, :id
 
       def initialize(ctx, root: nil, id: nil, name: nil, role: nil)
-        @ctx = ctx
-        @root = Pathname.new(root) if root
+        super(ctx, root: root)
         @id = id
         @name = name
         @role = role
@@ -24,48 +24,10 @@ module ShopifyCLI
         (glob(["**/*.liquid", "**/*.json"]) + static_asset_files).uniq
       end
 
-      def static_asset_files
-        glob("assets/*", raise_on_dir: true).reject(&:liquid?)
-      end
-
-      def liquid_files
-        glob("**/*.liquid")
-      end
-
-      def json_files
-        glob("**/*.json")
-      end
-
-      def glob(pattern, raise_on_dir: false)
-        root
-          .glob(pattern)
-          .select { |path| file?(path, raise_on_dir) }
-          .map { |path| File.new(path, root) }
-      end
-
       def theme_file?(file)
         theme_files.include?(self[file])
       end
 
-      def static_asset_file?(file)
-        static_asset_files.include?(self[file])
-      end
-
-      def static_asset_paths
-        static_asset_files.map(&:relative_path)
-      end
-
-      def [](file)
-        case file
-        when File
-          file
-        when Pathname
-          File.new(file, root)
-        when String
-          File.new(root.join(file), root)
-        end
-      end
-
       def shop
         api_client.get_shop_or_abort
       end
@@ -124,9 +86,7 @@ module ShopifyCLI
       end
 
       def delete
-        api_client.delete(
-          path: "themes/#{id}.json"
-        )
+        delete_theme
       end
 
       def publish
@@ -231,6 +191,12 @@ module ShopifyCLI
         @api_client ||= ThemeAdminAPI.new(@ctx)
       end
 
+      def delete_theme
+        api_client.delete(
+          path: "themes/#{id}.json"
+        )
+      end
+
       def load_info_from_api
         _status, body = api_client.get(
           path: "themes/#{id}.json"
@@ -241,14 +207,6 @@ module ShopifyCLI
 
         self
       end
-
-      def file?(path, raise_on_dir = false)
-        if raise_on_dir && ::File.directory?(path)
-          @ctx.abort(@ctx.message("theme.serve.error.invalid_subdirectory", path.to_s))
-        end
-
-        ::File.file?(path)
-      end
     end
   end
 end

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.24.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.24.0
+  version: 2.26.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-29 00:00:00.000000000 Z
+date: 2022-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,7 +127,6 @@ files:
 - ".github/workflows/cla.yml"
 - ".github/workflows/shopify.yml"
 - ".github/workflows/stale.yml"
-- ".github/workflows/triage.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -305,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
@@ -432,6 +386,7 @@ files:
 - lib/shopify_cli/environment.rb
 - lib/shopify_cli/exception_reporter.rb
 - lib/shopify_cli/feature.rb
+- lib/shopify_cli/file_system_listener.rb
 - lib/shopify_cli/form.rb
 - lib/shopify_cli/git.rb
 - lib/shopify_cli/github.rb
@@ -504,16 +459,22 @@ files:
 - lib/shopify_cli/theme/dev_server.rb
 - lib/shopify_cli/theme/dev_server/cdn_fonts.rb
 - lib/shopify_cli/theme/dev_server/certificate_manager.rb
+- lib/shopify_cli/theme/dev_server/errors.rb
 - lib/shopify_cli/theme/dev_server/header_hash.rb
-- lib/shopify_cli/theme/dev_server/hot-reload-no-script.html
-- lib/shopify_cli/theme/dev_server/hot-reload.js
+- lib/shopify_cli/theme/dev_server/hooks/file_change_hook.rb
 - lib/shopify_cli/theme/dev_server/hot_reload.rb
 - lib/shopify_cli/theme/dev_server/hot_reload/remote_file_deleter.rb
 - lib/shopify_cli/theme/dev_server/hot_reload/remote_file_reloader.rb
+- lib/shopify_cli/theme/dev_server/hot_reload/resources/hot-reload-no-script.html
+- lib/shopify_cli/theme/dev_server/hot_reload/resources/hot_reload.js
+- lib/shopify_cli/theme/dev_server/hot_reload/resources/sse_client.js
+- lib/shopify_cli/theme/dev_server/hot_reload/resources/theme.js
+- lib/shopify_cli/theme/dev_server/hot_reload/resources/theme_extension.js
+- lib/shopify_cli/theme/dev_server/hot_reload/script_injector.rb
 - lib/shopify_cli/theme/dev_server/hot_reload/sections_index.rb
 - lib/shopify_cli/theme/dev_server/local_assets.rb
 - lib/shopify_cli/theme/dev_server/proxy.rb
-- lib/shopify_cli/theme/dev_server/proxy/template_param_builder.rb
+- lib/shopify_cli/theme/dev_server/proxy_param_builder.rb
 - lib/shopify_cli/theme/dev_server/reload_mode.rb
 - lib/shopify_cli/theme/dev_server/remote_watcher.rb
 - lib/shopify_cli/theme/dev_server/remote_watcher/json_files_update_job.rb
@@ -521,11 +482,26 @@ files:
 - lib/shopify_cli/theme/dev_server/watcher.rb
 - lib/shopify_cli/theme/dev_server/web_server.rb
 - lib/shopify_cli/theme/development_theme.rb
+- lib/shopify_cli/theme/extension/app_extension.rb
+- lib/shopify_cli/theme/extension/dev_server.rb
+- lib/shopify_cli/theme/extension/dev_server/hooks/file_change_hook.rb
+- lib/shopify_cli/theme/extension/dev_server/hot_reload.rb
+- lib/shopify_cli/theme/extension/dev_server/hot_reload/script_injector.rb
+- lib/shopify_cli/theme/extension/dev_server/local_assets.rb
+- lib/shopify_cli/theme/extension/dev_server/proxy_param_builder.rb
+- lib/shopify_cli/theme/extension/dev_server/watcher.rb
+- lib/shopify_cli/theme/extension/host_theme.rb
+- lib/shopify_cli/theme/extension/syncer.rb
+- lib/shopify_cli/theme/extension/syncer/extension_serve_job.rb
+- lib/shopify_cli/theme/extension/syncer/operation.rb
+- lib/shopify_cli/theme/extension/ui/host_theme_progress_bar.rb
 - lib/shopify_cli/theme/file.rb
 - lib/shopify_cli/theme/filter/path_matcher.rb
 - lib/shopify_cli/theme/ignore_filter.rb
+- lib/shopify_cli/theme/ignore_helper.rb
 - lib/shopify_cli/theme/include_filter.rb
 - lib/shopify_cli/theme/mime_type.rb
+- lib/shopify_cli/theme/root.rb
 - lib/shopify_cli/theme/syncer.rb
 - lib/shopify_cli/theme/syncer/checksums.rb
 - lib/shopify_cli/theme/syncer/error_reporter.rb
@@ -534,7 +510,6 @@ files:
 - lib/shopify_cli/theme/syncer/forms/base_strategy_form.rb
 - lib/shopify_cli/theme/syncer/forms/select_delete_strategy.rb
 - lib/shopify_cli/theme/syncer/forms/select_update_strategy.rb
-- lib/shopify_cli/theme/syncer/ignore_helper.rb
 - lib/shopify_cli/theme/syncer/json_delete_handler.rb
 - lib/shopify_cli/theme/syncer/json_update_handler.rb
 - lib/shopify_cli/theme/syncer/merger.rb

data/.github/workflows/triage.yml

@@ -1,22 +0,0 @@
-name: Triage new issues to DTE oncall project board ("Needs triage" column)
-
-on:
-  issues:
-    types: [opened, reopened]
-
-jobs:
-  triage-issue:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Extract issue id
-      id: issue
-      run: echo "::set-output name=id::$(jq -r '.issue.id' < "$GITHUB_EVENT_PATH")"
-
-    - name: Create card
-      env:
-        TOKEN: ${{ secrets.ACTIONS_TOKEN }}
-      run: |
-        curl -s -X POST -u "$GITHUB_ACTOR:$TOKEN" --retry 3 \
-          -H 'Accept: application/vnd.github.inertia-preview+json' \
-          -d "{\"content_type\": \"Issue\", \"content_id\": ${{ steps.issue.outputs.id }}}" \
-          "https://api.github.com/projects/columns/10507989/cards"

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