@shopify/cli-kit 3.48.6 → 3.49.0

package/README.md

@@ -9,6 +9,8 @@ With the Shopify command line interface (Shopify CLI 3.0), you can:
 - initialize, build, dev, and deploy Shopify apps, extensions, functions and themes
 - build custom storefronts and manage their hosting
 
+Learn more in the [commands docs](./packages/cli/README.md#commands).
+
 <p>&nbsp;</p>
 
 ### Before you begin ###
@@ -32,7 +34,7 @@ Learn more in the docs: [Create an app](https://shopify.dev/apps/getting-started
 
 ## Developing themes with Shopify CLI
 
-To work with themes, the CLI needs to be installed globally with: 
+To work with themes, the CLI needs to be installed globally with:
 
 - `npm install -g @shopify/cli @shopify/theme`
 

package/assets/cli-ruby/lib/project_types/theme/commands/console.rb

@@ -5,10 +5,16 @@ require "shopify_cli/theme/repl"
 module Theme
   class Command
     class Console < ShopifyCLI::Command::SubCommand
-      recommend_default_ruby_range
+      options do |parser, flags|
+        parser.on("--url=URL") { |url| flags[:url] = url }
+        parser.on("--port=PORT") { |port| flags[:port] = port }
+      end
+
+      def call(_args, _name)
+        url = options.flags[:url]
+        port = options.flags[:port]
 
-      def call(_args, *)
-        ShopifyCLI::Theme::Repl.new(@ctx).run
+        ShopifyCLI::Theme::Repl.new(@ctx, url, port).run
       end
     end
   end

package/assets/cli-ruby/lib/shopify_cli/theme/dev_server/proxy_param_builder.rb

@@ -55,6 +55,8 @@ module ShopifyCLI
 
         def cookie_sections
           CGI::Cookie.parse(cookie)["hot_reload_files"].join.split(",") || []
+        rescue StandardError
+          []
         end
 
         def core?(path)

package/assets/cli-ruby/lib/shopify_cli/theme/extension/dev_server.rb

@@ -156,7 +156,7 @@ module ShopifyCLI
 
         def preview_message
           if Shopifolk.acting_as_shopify_organization?
-            parsed_uri = URI.parse(extension.preview_message)
+            parsed_uri = URI.parse(extension.location)
             shopify_org_url = "#{parsed_uri.scheme}://#{parsed_uri.host}/9082/impersonate"
             if ShopifyCLI::Environment.unified_deployment?
               ctx.message("serve.preview_message_1p_unified", shopify_org_url, theme.editor_url, address)

package/assets/cli-ruby/lib/shopify_cli/theme/repl/api.rb

@@ -4,10 +4,11 @@ module ShopifyCLI
   module Theme
     class Repl
       class Api
-        attr_reader :ctx, :repl
+        attr_reader :ctx, :url, :repl
 
-        def initialize(ctx, repl)
+        def initialize(ctx, url, repl)
           @ctx = ctx
+          @url = url.start_with?("/") ? url : url.prepend("/")
           @repl = repl
         end
 
@@ -47,10 +48,9 @@ module ShopifyCLI
         end
 
         def form_data(liquid_snippet)
-          template = ["", "", liquid_snippet, "", liquid_template].join("\n")
-
           {
-            "replace_templates[sections/announcement-bar.liquid]" => template,
+            "replace_templates[snippets/eval.liquid]" => "\n#{liquid_snippet}\n",
+            "replace_templates[sections/announcement-bar.liquid]" => "\n{% render 'eval' %}#{liquid_template}",
             :_method => "GET",
           }
         end
@@ -92,9 +92,9 @@ module ShopifyCLI
           return @api_uri if @api_uri
 
           uri_address = if Environment.theme_access_password?
-            "https://#{ThemeAccessAPI::BASE_URL}/cli/sfr"
+            "https://#{ThemeAccessAPI::BASE_URL}/cli/sfr#{url}"
           else
-            "https://#{shop}"
+            "https://#{shop}#{url}"
           end
 
           @api_uri = URI(uri_address)

package/assets/cli-ruby/lib/shopify_cli/theme/repl/auth_dev_server.rb

@@ -38,11 +38,21 @@ module ShopifyCLI
             method: "PUT",
             body: JSON.generate({
               assets: [
-                { key: "sections/announcement-bar.liquid", value: "" },
-                { key: "config/settings_schema.json", value: "[]" },
                 { key: "config/settings_data.json", value: "{}" },
-                { key: "layout/theme.liquid", value: "{{ content_for_header }}{{ content_for_layout }}" },
+                { key: "config/settings_schema.json", value: "[]" },
+                { key: "snippets/eval.liquid", value: "" },
                 { key: "layout/password.liquid", value: "{{ content_for_header }}{{ content_for_layout }}" },
+                { key: "layout/theme.liquid", value: "{{ content_for_header }}{{ content_for_layout }}" },
+                { key: "sections/announcement-bar.liquid", value: "" },
+                {
+                  key: "templates/index.json",
+                  value: {
+                    sections: {
+                      a: { type: "announcement-bar", settings: {} },
+                    },
+                    order: ["a"],
+                  }.to_json,
+                },
               ],
             }),
           )
@@ -69,6 +79,11 @@ module ShopifyCLI
           @proxy ||= Proxy.new(ctx, theme, param_builder)
         end
 
+        def start_server
+          ctx.open_browser_url!(address)
+          super
+        end
+
         def frame_title; end
         def preview_message; end
         def setup_server; end

package/assets/cli-ruby/lib/shopify_cli/theme/repl/auth_middleware.rb

@@ -4,6 +4,8 @@ module ShopifyCLI
   module Theme
     class Repl
       class AuthMiddleware
+        PASSWORD_PAGE_PATH = "/password"
+
         def initialize(app, proxy, repl, &stop_dev_server)
           @app = app
           @proxy = proxy
@@ -13,11 +15,16 @@ module ShopifyCLI
 
         def call(env)
           @env = env
+          @env["PATH_INFO"] = PASSWORD_PAGE_PATH if redirect_to_password?(@env)
 
-          return @app.call(env) unless authenticated?
+          return @app.call(@env) if password_page?(@env)
 
           authenticate!
-          shutdown
+
+          # The authentication server only shuts down when the root page is
+          # loaded, preventing favicons or other assets on the /password page
+          # from shutting down the server.
+          shutdown if index_page?(@env)
 
           [
             200,
@@ -35,6 +42,14 @@ module ShopifyCLI
 
         private
 
+        def redirect_to_password?(env)
+          return false if defined?(@redirect_to_password)
+
+          code, _body, _resp = @proxy.call({ **env, "PATH_INFO" => "/" })
+
+          @redirect_to_password = code == "302"
+        end
+
         def storefront_session
           cookie["storefront_digest"]&.first
         end
@@ -43,14 +58,18 @@ module ShopifyCLI
           @proxy.secure_session_id
         end
 
-        def authenticated?
-          storefront_session && secure_session
-        end
-
         def authenticate!
           @repl.authenticate(storefront_session, secure_session)
         end
 
+        def password_page?(env)
+          env["PATH_INFO"]&.start_with?(PASSWORD_PAGE_PATH)
+        end
+
+        def index_page?(env)
+          env["PATH_INFO"] == "/"
+        end
+
         def shutdown
           Thread.new do
             # Web server answers the request and shutdown itself
@@ -66,6 +85,8 @@ module ShopifyCLI
 
         def cookie
           CGI::Cookie.parse(@env["HTTP_COOKIE"])
+        rescue StandardError
+          []
         end
       end
     end

package/assets/cli-ruby/lib/shopify_cli/theme/repl/remote_evaluator.rb

@@ -0,0 +1,158 @@
+# frozen_string_literal: true
+
+module ShopifyCLI
+  module Theme
+    class Repl
+      class RemoteEvaluator
+        extend Forwardable
+
+        attr_reader :snippet
+
+        def_delegators :snippet, :ctx, :api, :session, :input
+
+        def initialize(snippet)
+          @snippet = snippet
+        end
+
+        def evaluate
+          catch(:result) do
+            eval_result || eval_context || eval_assignment_context || eval_syntax_error
+          end
+        end
+
+        private
+
+        def eval_result
+          ctx.debug("Evaluating result")
+
+          json = <<~JSON
+            { "type": "display", "value": {{ #{input} | json }} }
+          JSON
+
+          response = json_request(json)
+
+          return nil unless success?(response)
+
+          json = json_from_response(response)
+          json.last["value"] if json
+        end
+
+        def eval_context
+          ctx.debug("Evaluating context")
+
+          json = <<~JSON
+            { "type": "context", "value": "{% #{input.gsub(/"/, "\\\"")} %}" }
+          JSON
+
+          response = json_request(json)
+          session << JSON.parse(json) if success?(response)
+
+          nil
+        end
+
+        def eval_assignment_context
+          ctx.debug("Evaluating assignment context")
+
+          return unless smart_assignment?(input)
+
+          input.prepend("assign ")
+          ctx.puts("{{gray:> #{input}}}")
+
+          eval_context
+        end
+
+        def eval_syntax_error
+          ctx.debug("Evaluating syntax error")
+
+          body = ""
+          body = extract_body(request("{{ #{input} }}")) unless standard_assignment?(input)
+          body = extract_body(request("{% #{input} %}")) unless has_liquid_error?(body)
+
+          return unless has_liquid_error?(body)
+
+          error = body.gsub(/ \(snippets\/eval line \d+\)/, "")
+
+          ctx.puts("{{red:#{error}}}")
+
+          nil
+        end
+
+        def json_from_response(response)
+          JSON.parse(
+            extract_body(response),
+          )
+        rescue StandardError
+          nil
+        end
+
+        def json_request(json)
+          request_body = <<~LIQUID
+            [
+              #{session.map(&:to_json).push(json).join(",").gsub('\"', '"')}
+            ]
+          LIQUID
+
+          request(request_body)
+        end
+
+        def request(request_body)
+          response = api.request(request_body)
+
+          expired_session_error if expired_session?(response)
+          too_many_requests_error if too_many_requests?(response)
+          not_found_error if not_found?(response)
+
+          response
+        end
+
+        def smart_assignment?(input)
+          /^\s*((?-mix:\(?[\w\-\.\[\]]\)?)+)\s*=\s*(.*)\s*/m.match?(input)
+        end
+
+        def standard_assignment?(input)
+          /^\s*assign\s*((?-mix:\(?[\w\-\.\[\]]\)?)+)\s*=\s*(.*)\s*/m.match?(input)
+        end
+
+        def has_liquid_error?(body)
+          body.match?(/\ALiquid (syntax )?error/)
+        end
+
+        def success?(response)
+          response.code == "200" && !has_liquid_error?(extract_body(response))
+        end
+
+        def expired_session?(response)
+          response.code == "401" || response.code == "403"
+        end
+
+        def too_many_requests?(response)
+          response.code == "430" || response.code == "429"
+        end
+
+        def extract_body(response)
+          response.body.lines[1..-2].join.strip
+        end
+
+        def not_found?(response)
+          # Section Rendering API returns 200 even on unknown paths.
+          response.header["server-timing"]&.include?("pageType;desc=\"404\"")
+        end
+
+        def expired_session_error
+          ctx.puts("{{red:Session expired. Please initiate a new one.}}")
+          raise ShopifyCLI::AbortSilent
+        end
+
+        def too_many_requests_error
+          ctx.puts("{{red:Evaluations limit reached. Try again later.}}")
+          raise ShopifyCLI::AbortSilent
+        end
+
+        def not_found_error
+          ctx.puts("{{red:Page not found. Please provide a valid --url value.}}")
+          raise ShopifyCLI::AbortSilent
+        end
+      end
+    end
+  end
+end

package/assets/cli-ruby/lib/shopify_cli/theme/repl/resources/success.html

@@ -65,7 +65,6 @@
         padding-left: 7.5em;
       }
     </style>
-    <link rel="icon" href="favicon.svg" sizes="any" type="image/svg+xml">
 </head>
 
 <body class="body-success">

package/assets/cli-ruby/lib/shopify_cli/theme/repl/snippet.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module ShopifyCLI
+  module Theme
+    class Repl
+      class Snippet
+        attr_reader :ctx, :api, :session, :input
+
+        def initialize(ctx, api, session, input)
+          @ctx = ctx
+          @api = api
+          @session = session
+          @input = input
+        end
+
+        def render
+          return delimiter_warning if has_delimiter?(input)
+
+          output = evaluator.evaluate
+          output = present(output)
+
+          ctx.puts(output)
+        end
+
+        private
+
+        def present(output)
+          return json_error if json_error?(output)
+          return empty if output.nil?
+
+          output = JSON.pretty_generate(output)
+
+          safe_cyan(output)
+        end
+
+        def evaluator
+          @evaluator ||= RemoteEvaluator.new(self)
+        end
+
+        def safe_cyan(str)
+          "\e[36m#{str}\e[0m"
+        end
+
+        def empty
+          safe_cyan("nil")
+        end
+
+        def has_delimiter?(input)
+          input.match?(/\{\{|\}\}|\{\%|\%\}/)
+        end
+
+        def delimiter_warning
+          ctx.puts("{{yellow:\n#{delimiter_warning_text}}}")
+        end
+
+        def delimiter_warning_text
+          <<~WARN
+            Liquid Console doesn't support Liquid delimiters such as '{{ ... }}' or '{% ... %}'.
+
+            Please use 'collections.first' instead of '{{ collections.first }}'.
+          WARN
+        end
+
+        def json_error?(output)
+          case output
+          when Hash
+            output["error"]&.include?("json not allowed for this object")
+          when Array
+            json_error?(output.first)
+          else
+            false
+          end
+        end
+
+        def json_error
+          "{{yellow:Object cannot be printed, but you can access its fields. Read more at https://shopify.dev/docs/api/liquid.}}"
+        end
+      end
+    end
+  end
+end

package/assets/cli-ruby/lib/shopify_cli/theme/repl.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require "readline"
-require "json"
 require "cgi"
+require "forwardable"
+require "json"
+require "readline"
 
 require "shopify_cli/theme/dev_server"
 
@@ -10,18 +11,18 @@ require_relative "theme_admin_api"
 require_relative "repl/api"
 require_relative "repl/auth_dev_server"
 require_relative "repl/auth_middleware"
+require_relative "repl/remote_evaluator"
+require_relative "repl/snippet"
 
 module ShopifyCLI
   module Theme
     class Repl
-      attr_reader :ctx, :api, :storefront_digest, :secure_session_id
+      attr_reader :ctx, :url, :port, :session, :storefront_digest, :secure_session_id
 
-      HOST = "localhost"
-      PORT = 9293
-
-      def initialize(ctx)
+      def initialize(ctx, url, port)
         @ctx = ctx
-        @api = Api.new(ctx, self)
+        @url = url
+        @port = port
         @session = []
       end
 
@@ -37,15 +38,7 @@ module ShopifyCLI
         trap("INT") { raise ShopifyCLI::AbortSilent }
         trap("TERM") { raise ShopifyCLI::AbortSilent }
 
-        loop do
-          input = Readline.readline("> ", true)
-          output = liquid_eval(input)
-
-          render(output)
-        rescue StandardError => error
-          ctx.puts("{{red:Shopify Liquid console error: #{error.message}}}")
-          ctx.debug(error.backtrace)
-        end
+        loop { repl }
       end
 
       def authenticate(storefront_digest, secure_session_id)
@@ -55,90 +48,39 @@ module ShopifyCLI
 
       private
 
-      def render(output)
-        output = output ? JSON.pretty_generate(output) : "nil"
-
-        ctx.puts("{{cyan:#{output}}}")
-      end
-
-      def url
-        "http://#{HOST}:#{PORT}"
-      end
-
-      def liquid_eval(liquid_snippet)
-        render_result(liquid_snippet) || render_context(liquid_snippet)
-      end
-
-      def render_result(liquid_snippet)
-        entry_str = as_rendered_json(liquid_snippet)
-        response = request(entry_str)
-
-        return nil unless success?(response)
-
-        json = json_from_response(response)
-        json.last["value"]
-      end
-
-      def render_context(liquid_snippet)
-        entry_str = as_context_json(liquid_snippet)
-        response = request(entry_str)
-
-        @session << JSON.parse(entry_str) if success?(response)
-
-        nil
-      end
-
-      def request(entry_str)
-        request_body = @session
-          .map(&:to_json)
-          .push(entry_str)
-          .join(",")
-
-        response = api.request("[#{request_body}]")
-
-        if unauthorized?(response) || forbidden?(response)
-          ctx.puts("{{red:Session expired.}}")
-          raise ShopifyCLI::AbortSilent
-        end
-
-        response
+      def repl
+        snippet.render
+      rescue StandardError => error
+        shutdown_session(error)
       end
 
-      def success?(response)
-        response.code == "200"
+      def snippet
+        Snippet.new(ctx, api, session, input)
       end
 
-      def unauthorized?(response)
-        response.code == "401"
+      def input
+        Readline.readline("> ", true)
       end
 
-      def forbidden?(response)
-        response.code == "403"
-      end
-
-      def json_from_response(response)
-        json_str = response.body.lines[1..-2].join.strip
-        JSON.parse(json_str)
-      end
-
-      def as_rendered_json(liquid_snippet)
-        as_json_str("render", "{{ #{liquid_snippet} | json }}")
-      end
+      def shutdown_session(error)
+        message = error.message
+        backtrace = error.backtrace
+        error_message = "{{red:Shopify Liquid console error: #{message}}}"
 
-      def as_context_json(liquid_snippet)
-        as_json_str("context", "\"{% #{liquid_snippet} %}\"")
-      end
+        ctx.puts(error_message)
+        ctx.debug(backtrace)
 
-      def as_json_str(type, value)
-        <<~JSON
-          { "type": "#{type}", "value": #{value} }
-        JSON
+        raise ShopifyCLI::AbortSilent
       end
 
       def authenticate!
         # Currently, Shopify CLI can't bypass the store password, so the
-        # `AuthDevServer` gets the session to perform  requests at the SFR.
-        ShopifyCLI::Theme::Repl::AuthDevServer.start(ctx, self, PORT)
+        # `AuthDevServer` gets the session to perform requests at the SFR.
+        ShopifyCLI::Theme::Repl::AuthDevServer.start(ctx, self, port)
+      end
+
+      def api
+        @api ||= Api.new(ctx, url, self)
       end
     end
   end

package/dist/private/node/analytics.js

@@ -1,5 +1,5 @@
 import { hashString } from '../../public/node/crypto.js';
-import { getPackageManager, packageManagerUsedForCreating } from '../../public/node/node-package-manager.js';
+import { getPackageManager, packageManagerFromUserAgent } from '../../public/node/node-package-manager.js';
 import * as metadata from '../../public/node/metadata.js';
 import { platformAndArch } from '../../public/node/os.js';
 import { ciPlatform, cloudEnvironment, macAddress } from '@shopify/cli-kit/node/context/local';
@@ -17,7 +17,7 @@ export async function startAnalytics({ commandContent, args, currentTime = new D
         },
     }));
     await metadata.addPublicMetadata(() => ({
-        cmd_all_launcher: packageManagerUsedForCreating(),
+        cmd_all_launcher: packageManagerFromUserAgent(),
         cmd_all_alias_used: commandContent.alias,
         cmd_all_topic: commandContent.topic,
         cmd_all_plugin: commandClass?.plugin?.name,

package/dist/private/node/analytics.js.map

@@ -1 +1 @@
-{"version":3,"file":"analytics.js","sourceRoot":"","sources":["../../../src/private/node/analytics.ts"],"names":[],"mappings":"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","sourcesContent":["import {hashString} from '../../public/node/crypto.js'\nimport {getPackageManager, packageManagerUsedForCreating} from '../../public/node/node-package-manager.js'\nimport BaseCommand from '../../public/node/base-command.js'\nimport {CommandContent} from '../../public/node/hooks/prerun.js'\nimport * as metadata from '../../public/node/metadata.js'\nimport {platformAndArch} from '../../public/node/os.js'\nimport {Command, Interfaces} from '@oclif/core'\nimport {ciPlatform, cloudEnvironment, macAddress} from '@shopify/cli-kit/node/context/local'\nimport {cwd} from '@shopify/cli-kit/node/path'\n\ninterface StartOptions {\n  commandContent: CommandContent\n  args: string[]\n  currentTime?: number\n  commandClass?: Command.Class | typeof BaseCommand\n}\n\nexport async function startAnalytics({\n  commandContent,\n  args,\n  currentTime = new Date().getTime(),\n  commandClass,\n}: StartOptions): Promise<void> {\n  let startCommand: string = commandContent.command\n  if (commandClass && Object.prototype.hasOwnProperty.call(commandClass, 'analyticsNameOverride')) {\n    startCommand = (commandClass as typeof BaseCommand).analyticsNameOverride() ?? commandContent.command\n  }\n\n  await metadata.addSensitiveMetadata(() => ({\n    commandStartOptions: {\n      startTime: currentTime,\n      startCommand,\n      startArgs: args,\n    },\n  }))\n\n  await metadata.addPublicMetadata(() => ({\n    cmd_all_launcher: packageManagerUsedForCreating(),\n    cmd_all_alias_used: commandContent.alias,\n    cmd_all_topic: commandContent.topic,\n    cmd_all_plugin: commandClass?.plugin?.name,\n  }))\n}\n\ninterface EnvironmentData {\n  uname: string\n  env_ci: boolean\n  env_ci_platform?: string\n  env_plugin_installed_any_custom: boolean\n  env_plugin_installed_shopify: string\n  env_shell: string\n  env_web_ide: string | undefined\n  env_device_id: string\n  env_cloud: string\n  env_package_manager: string\n}\n\nexport async function getEnvironmentData(config: Interfaces.Config): Promise<EnvironmentData> {\n  const ciplatform = ciPlatform()\n\n  const pluginNames = getPluginNames(config)\n  const shopifyPlugins = pluginNames.filter((plugin) => plugin.startsWith('@shopify/'))\n\n  const {platform, arch} = platformAndArch()\n\n  return {\n    uname: `${platform} ${arch}`,\n    env_ci: ciplatform.isCI,\n    env_ci_platform: ciplatform.name,\n    env_plugin_installed_any_custom: pluginNames.length !== shopifyPlugins.length,\n    env_plugin_installed_shopify: JSON.stringify(shopifyPlugins),\n    env_shell: config.shell,\n    env_web_ide: cloudEnvironment().editor ? cloudEnvironment().platform : undefined,\n    env_device_id: hashString(await macAddress()),\n    env_cloud: cloudEnvironment().platform,\n    env_package_manager: await getPackageManager(cwd()),\n  }\n}\n\nexport async function getSensitiveEnvironmentData(config: Interfaces.Config) {\n  return {\n    env_plugin_installed_all: JSON.stringify(getPluginNames(config)),\n  }\n}\n\nfunction getPluginNames(config: Interfaces.Config) {\n  return config.plugins\n    .map((plugin) => plugin.name)\n    .sort()\n    .filter((plugin) => !plugin.startsWith('@oclif/'))\n}\n"]}
+{"version":3,"file":"analytics.js","sourceRoot":"","sources":["../../../src/private/node/analytics.ts"],"names":[],"mappings":"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","sourcesContent":["import {hashString} from '../../public/node/crypto.js'\nimport {getPackageManager, packageManagerFromUserAgent} from '../../public/node/node-package-manager.js'\nimport BaseCommand from '../../public/node/base-command.js'\nimport {CommandContent} from '../../public/node/hooks/prerun.js'\nimport * as metadata from '../../public/node/metadata.js'\nimport {platformAndArch} from '../../public/node/os.js'\nimport {Command, Interfaces} from '@oclif/core'\nimport {ciPlatform, cloudEnvironment, macAddress} from '@shopify/cli-kit/node/context/local'\nimport {cwd} from '@shopify/cli-kit/node/path'\n\ninterface StartOptions {\n  commandContent: CommandContent\n  args: string[]\n  currentTime?: number\n  commandClass?: Command.Class | typeof BaseCommand\n}\n\nexport async function startAnalytics({\n  commandContent,\n  args,\n  currentTime = new Date().getTime(),\n  commandClass,\n}: StartOptions): Promise<void> {\n  let startCommand: string = commandContent.command\n  if (commandClass && Object.prototype.hasOwnProperty.call(commandClass, 'analyticsNameOverride')) {\n    startCommand = (commandClass as typeof BaseCommand).analyticsNameOverride() ?? commandContent.command\n  }\n\n  await metadata.addSensitiveMetadata(() => ({\n    commandStartOptions: {\n      startTime: currentTime,\n      startCommand,\n      startArgs: args,\n    },\n  }))\n\n  await metadata.addPublicMetadata(() => ({\n    cmd_all_launcher: packageManagerFromUserAgent(),\n    cmd_all_alias_used: commandContent.alias,\n    cmd_all_topic: commandContent.topic,\n    cmd_all_plugin: commandClass?.plugin?.name,\n  }))\n}\n\ninterface EnvironmentData {\n  uname: string\n  env_ci: boolean\n  env_ci_platform?: string\n  env_plugin_installed_any_custom: boolean\n  env_plugin_installed_shopify: string\n  env_shell: string\n  env_web_ide: string | undefined\n  env_device_id: string\n  env_cloud: string\n  env_package_manager: string\n}\n\nexport async function getEnvironmentData(config: Interfaces.Config): Promise<EnvironmentData> {\n  const ciplatform = ciPlatform()\n\n  const pluginNames = getPluginNames(config)\n  const shopifyPlugins = pluginNames.filter((plugin) => plugin.startsWith('@shopify/'))\n\n  const {platform, arch} = platformAndArch()\n\n  return {\n    uname: `${platform} ${arch}`,\n    env_ci: ciplatform.isCI,\n    env_ci_platform: ciplatform.name,\n    env_plugin_installed_any_custom: pluginNames.length !== shopifyPlugins.length,\n    env_plugin_installed_shopify: JSON.stringify(shopifyPlugins),\n    env_shell: config.shell,\n    env_web_ide: cloudEnvironment().editor ? cloudEnvironment().platform : undefined,\n    env_device_id: hashString(await macAddress()),\n    env_cloud: cloudEnvironment().platform,\n    env_package_manager: await getPackageManager(cwd()),\n  }\n}\n\nexport async function getSensitiveEnvironmentData(config: Interfaces.Config) {\n  return {\n    env_plugin_installed_all: JSON.stringify(getPluginNames(config)),\n  }\n}\n\nfunction getPluginNames(config: Interfaces.Config) {\n  return config.plugins\n    .map((plugin) => plugin.name)\n    .sort()\n    .filter((plugin) => !plugin.startsWith('@oclif/'))\n}\n"]}

package/dist/private/node/api/graphql.d.ts

@@ -1,5 +1,5 @@
 import { RequestDocument, Variables } from 'graphql-request';
-export declare function debugLogRequestInfo<T>(api: string, query: RequestDocument, variables?: Variables, headers?: {
+export declare function debugLogRequestInfo(api: string, query: RequestDocument, variables?: Variables, headers?: {
     [key: string]: string;
 }): void;
-export declare function errorHandler<T>(api: string): (error: unknown) => Error | unknown;
+export declare function errorHandler<T>(api: string): (error: unknown, requestId?: string) => Error | unknown;