@shopify/cli-kit 3.46.0-pre.1 → 3.46.0-pre.3

package/assets/cli-ruby/Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 
 gem "bugsnag", "~> 6.22"
 gem "listen", "~> 3.7.0"
-gem "theme-check", "~> 1.14.0"
+gem "theme-check", "~> 1.15.0"
 gem "nokogiri", "~> 1.14.0"
 
 # None of these can actually be used in a development copy of dev

package/assets/cli-ruby/lib/graphql/get_variant_id.graphql

@@ -1,5 +1,5 @@
 query {
-  products(first: 1) {
+  products(first: 1, query:"published_status:published") {
     edges {
       node {
         id

package/assets/cli-ruby/lib/project_types/extension/commands/serve.rb

@@ -38,6 +38,7 @@ module Extension
         parser.on("--extension-type=EXTENSION_TYPE", "The type of the extension") do |extension_type|
           flags[:extension_type] = extension_type.gsub('"', "")
         end
+        parser.on("-n", "--notify=PATH") { |path| flags[:notify] = path }
       end
 
       class RuntimeConfiguration
@@ -54,6 +55,7 @@ module Extension
         property :registration_id, accepts: String, default: nil
         property :extension_title, accepts: String, default: nil
         property :extension_type, accepts: String, default: nil
+        property :notify, accepts: String, default: nil
       end
 
       def call(args, _command_name)
@@ -70,6 +72,7 @@ module Extension
           registration_id: options.flags[:registration_id],
           extension_title: options.flags[:extension_title],
           extension_type: options.flags[:extension_type],
+          notify: options.flags[:notify],
         )
 
         ShopifyCLI::Result
@@ -152,6 +155,7 @@ module Extension
           registration_id: runtime_configuration.registration_id,
           resource_url: runtime_configuration.resource_url,
           project: project,
+          notify: runtime_configuration.notify,
         )
         runtime_configuration
       end

package/assets/cli-ruby/lib/project_types/extension/messages/messages.rb

@@ -123,6 +123,19 @@ module Extension
           Setup your theme app extension in the host theme:
           {{green:%s}}
 
+          Preview your theme app extension:
+          {{green:%s}}
+        PREVIEW_MESSAGE
+        preview_message_1p: <<~PREVIEW_MESSAGE,
+          Access Shopify Organization:
+            {{green:%s}}
+
+          Enable your theme app extension:
+          {{green:%s}}
+
+          Setup your theme app extension in the host theme:
+          {{green:%s}}
+
           Preview your theme app extension:
           {{green:%s}}
         PREVIEW_MESSAGE

package/assets/cli-ruby/lib/project_types/extension/models/specification_handlers/theme_app_extension.rb

@@ -77,12 +77,14 @@ module Extension
           @ctx = options[:context]
           root = options[:context]&.root
           project = options[:project]
+          notify = options[:notify]
           properties = options
             .slice(:port, :theme, :generate_tmp_theme)
             .compact
             .merge({
               project: project,
               specification_handler: self,
+              notify: notify,
             })
 
           ShopifyCLI::Theme::Extension::DevServer.start(@ctx, root, **properties)

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

@@ -36,6 +36,7 @@ module Theme
         end
         parser.on("-f", "--force") { flags[:force] = true }
         parser.on("--overwrite-json") { flags[:overwrite_json] = true }
+        parser.on("-n", "--notify=PATH") { |path| flags[:notify] = path }
       end
 
       def call(_args, name)

package/assets/cli-ruby/lib/project_types/theme/messages/messages.rb

@@ -161,6 +161,9 @@ module Theme
               fixed: "Fixed",
             },
           },
+          notifier: {
+            error: "Error while notifying webhook {{blue:%s}}: %s",
+          },
           syncer: {
             forms: {
               apply_to_all: {

package/assets/cli-ruby/lib/shopify_cli/context.rb

@@ -262,6 +262,22 @@ module ShopifyCLI
       File.binwrite(ctx_path(fname), content)
     end
 
+    # will update the Access and Modified times of a file, relative to the context root
+    # unless the file path is absolute.
+    #
+    # #### Parameters
+    # * `atime` - the access time
+    # * `mtime` - the modified time
+    # * `fname` - filename of the file that you are writing, relative to root unless it is absolute.
+    #
+    # #### Example
+    #
+    #   @ctx.utime(Time.now, Time.now, '/tmp/file.txt')
+    #
+    def utime(atime, mtime, fname)
+      File.utime(atime, mtime, ctx_path(fname))
+    end
+
     # will change directories and update the root, the filepath is relative to the command root unless absolute
     #
     # #### Parameters

package/assets/cli-ruby/lib/shopify_cli/shopifolk.rb

@@ -32,7 +32,8 @@ module ShopifyCLI
 
       def acting_as_shopify_organization?
         !!(DB.get(:acting_as_shopify_organization) ||
-        (Project.has_current? && Project.current.config["shopify_organization"]))
+        (Project.has_current? && Project.current.config["shopify_organization"])) ||
+        ENV.fetch("SHOPIFY_CLI_1P_DEV", "0") == "1"
       end
 
       def reset

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

@@ -10,13 +10,14 @@ module ShopifyCLI
         class FileChangeHook
           include ShopifyCLI::Theme::IgnoreHelper
 
-          attr_reader :include_filter, :ignore_filter
+          attr_reader :include_filter, :ignore_filter, :notifier
 
-          def initialize(ctx, theme:, include_filter: nil, ignore_filter: nil)
+          def initialize(ctx, theme:, include_filter: nil, ignore_filter: nil, notifier: nil)
             @ctx = ctx
             @theme = theme
             @include_filter = include_filter
             @ignore_filter = ignore_filter
+            @notifier = notifier
           end
 
           def call(modified, added, removed, streams: nil)
@@ -34,6 +35,8 @@ module ShopifyCLI
 
             hot_reload(files) unless files.empty?
             remote_reload(liquid_css_files)
+
+            notifier.notify_updates(modified + added + removed) unless (modified + added + removed).empty?
           end
 
           private

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

@@ -5,6 +5,7 @@ module ShopifyCLI
     class DevServer
       class LocalAssets
         THEME_REGEX = %r{//cdn\.shopify\.com/s/.+?/(assets/.+?\.(?:css|js))}
+        VANITY_THEME_REGEX = %r{/cdn/shop/.+?/(assets/.+?\.(?:css|js))}
 
         class FileBody
           def initialize(path)
@@ -44,12 +45,11 @@ module ShopifyCLI
         private
 
         def replace_asset_urls(body)
-          replaced_body = body.join.gsub(THEME_REGEX) do |match|
-            path = Regexp.last_match[1]
-            if @target.static_asset_paths.include?(path)
-              "/#{path}"
-            else
-              match
+          replaced_body = body.join
+          [THEME_REGEX, VANITY_THEME_REGEX].each do |regex|
+            replaced_body = replaced_body.gsub(regex) do |match|
+              path = Regexp.last_match[1]
+              @target.static_asset_paths.include?(path) ? "/#{path}" : match
             end
           end
 

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

@@ -23,6 +23,7 @@ require_relative "development_theme"
 require_relative "ignore_filter"
 require_relative "include_filter"
 require_relative "syncer"
+require_relative "notifier"
 
 module ShopifyCLI
   module Theme
@@ -30,7 +31,7 @@ module ShopifyCLI
       include Singleton
 
       attr_reader :app, :stopped, :ctx, :root, :host, :theme_identifier, :port, :poll, :editor_sync, :stable, :mode,
-        :block, :includes, :ignores
+        :block, :includes, :ignores, :notify
 
       class << self
         def start(
@@ -46,6 +47,7 @@ module ShopifyCLI
           mode: ReloadMode.default,
           includes: nil,
           ignores: nil,
+          notify: nil,
           &block
         )
           instance.setup(
@@ -61,6 +63,7 @@ module ShopifyCLI
             mode,
             includes,
             ignores,
+            notify,
             &block
           )
           instance.start
@@ -85,6 +88,7 @@ module ShopifyCLI
         mode,
         includes,
         ignores,
+        notify,
         &block
       )
         @ctx = ctx
@@ -99,6 +103,7 @@ module ShopifyCLI
         @mode = mode
         @includes = includes
         @ignores = ignores
+        @notify = notify
         @block = block
       end
 
@@ -202,6 +207,10 @@ module ShopifyCLI
         )
       end
 
+      def notifier
+        @notifier ||= Notifier.new(ctx, path: notify)
+      end
+
       def watcher
         @watcher ||= Watcher.new(
           ctx,
@@ -248,7 +257,7 @@ module ShopifyCLI
 
       def broadcast_hooks
         file_handler = Hooks::FileChangeHook.new(ctx, theme: theme, include_filter: include_filter,
-          ignore_filter: ignore_filter)
+          ignore_filter: ignore_filter, notifier: notifier)
         [file_handler]
       end
 

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

@@ -6,12 +6,13 @@ module ShopifyCLI
       class DevServer
         module Hooks
           class FileChangeHook
-            attr_reader :ctx, :extension, :syncer, :streams
+            attr_reader :ctx, :extension, :syncer, :streams, :notifier
 
-            def initialize(ctx, extension:, syncer:)
+            def initialize(ctx, extension:, syncer:, notifier:)
               @ctx = ctx
               @extension = extension
               @syncer = syncer
+              @notifier = notifier
             end
 
             def call(modified, added, removed, streams: nil)
@@ -23,6 +24,8 @@ module ShopifyCLI
 
               hot_reload(modified) unless modified.empty?
               reload_page(added, removed) unless (added + removed).empty?
+
+              notifier.notify_updates(modified + added + removed) unless (modified + added + removed).empty?
             end
 
             private

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

@@ -6,6 +6,7 @@ require "shopify_cli/theme/extension/app_extension"
 require "shopify_cli/theme/dev_server"
 require "shopify_cli/theme/extension/host_theme"
 require "shopify_cli/theme/syncer"
+require "shopify_cli/theme/notifier"
 
 require_relative "dev_server/local_assets"
 require_relative "dev_server/proxy_param_builder"
@@ -29,12 +30,13 @@ module ShopifyCLI
         attr_accessor :project, :specification_handler, :generate_tmp_theme
 
         class << self
-          def start(ctx, root, port: 9292, theme: nil, generate_tmp_theme: false, project:, specification_handler:)
+          def start(ctx, root, port: 9292, theme: nil, generate_tmp_theme: false, project:, specification_handler:,
+            notify: nil)
             instance.project = project
             instance.specification_handler = specification_handler
             instance.generate_tmp_theme = generate_tmp_theme
 
-            super(ctx, root, port: port, theme: theme)
+            super(ctx, root, port: port, theme: theme, notify: notify)
           end
         end
 
@@ -65,6 +67,10 @@ module ShopifyCLI
           )
         end
 
+        def notifier
+          @notifier ||= ShopifyCLI::Theme::Notifier.new(ctx, path: notify)
+        end
+
         def theme
           @theme ||= if theme_identifier
             theme = HostTheme.find_by_identifier(ctx, identifier: theme_identifier)
@@ -130,7 +136,7 @@ module ShopifyCLI
         # Hooks
 
         def broadcast_hooks
-          file_handler = Hooks::FileChangeHook.new(ctx, extension: extension, syncer: syncer)
+          file_handler = Hooks::FileChangeHook.new(ctx, extension: extension, syncer: syncer, notifier: notifier)
           [file_handler]
         end
 
@@ -145,7 +151,13 @@ module ShopifyCLI
         end
 
         def preview_message
-          ctx.message("serve.preview_message", extension.location, theme.editor_url, address)
+          if Shopifolk.acting_as_shopify_organization?
+            parsed_uri = URI.parse(extension.location)
+            shopify_org_url = "#{parsed_uri.scheme}://#{parsed_uri.host}/9082/impersonate"
+            ctx.message("serve.preview_message_1p", shopify_org_url, extension.location, theme.editor_url, address)
+          else
+            ctx.message("serve.preview_message", extension.location, theme.editor_url, address)
+          end
         end
       end
     end

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

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require "uri"
+require "net/http"
+
+module ShopifyCLI
+  module Theme
+    class Notifier
+      attr_reader :ctx, :path
+
+      def initialize(ctx, path: nil)
+        @ctx = ctx
+        @path = path
+      end
+
+      def notify_updates(files)
+        return if path.nil? || path.empty? || !path.is_a?(String)
+
+        unless valid_url?(path)
+          return notify_file(path)
+        end
+
+        response = notify_url(files)
+
+        unless response.is_a?(Net::HTTPSuccess)
+          ctx.puts(ctx.message("theme.serve.notifier.error", path, response.message))
+        end
+
+      rescue => error
+        ctx.puts(ctx.message("theme.serve.notifier.error", path, error.message))
+      end
+
+      private
+
+      def notify_url(files)
+        Net::HTTP.post(URI(path), { "files" => files }.to_json, "Content-Type" => "application/json")
+      end
+
+      def notify_file(fname)
+        ctx.write(fname, "")
+        ctx.utime(Time.now, Time.now, fname)
+      end
+
+      def valid_url?(url)
+        uri = URI.parse(url)
+        uri.is_a?(URI::HTTP) || uri.is_a?(URI::HTTPS)
+      rescue URI::InvalidURIError
+        false
+      end
+    end
+  end
+end

package/dist/private/node/constants.d.ts

@@ -17,9 +17,16 @@ export declare const environmentVariables: {
     codespaceName: string;
     codespaces: string;
     gitpod: string;
+    cloudShell: string;
     spin: string;
     spinAppPort: string;
     spinAppHost: string;
+    organization: string;
+    identityToken: string;
+    refreshToken: string;
+};
+export declare const systemEnvironmentVariables: {
+    backendPort: string;
 };
 export declare const pathConstants: {
     executables: {

package/dist/private/node/constants.js

@@ -26,9 +26,16 @@ export const environmentVariables = {
     codespaceName: 'CODESPACE_NAME',
     codespaces: 'CODESPACES',
     gitpod: 'GITPOD_WORKSPACE_URL',
+    cloudShell: 'CLOUD_SHELL',
     spin: 'SPIN',
     spinAppPort: 'SERVER_PORT',
     spinAppHost: 'SPIN_APP_HOST',
+    organization: 'SHOPIFY_CLI_ORGANIZATION',
+    identityToken: 'SHOPIFY_CLI_IDENTITY_TOKEN',
+    refreshToken: 'SHOPIFY_CLI_REFRESH_TOKEN',
+};
+export const systemEnvironmentVariables = {
+    backendPort: 'BACKEND_PORT',
 };
 export const pathConstants = {
     executables: {

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/private/node/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,2BAA2B,CAAA;AAClD,OAAO,QAAQ,MAAM,WAAW,CAAA;AAEhC,MAAM,UAAU,GAAG,aAAa,CAAA;AAEhC,MAAM,WAAW,GAAG,GAAG,EAAE;IACvB,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc;QAAE,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,CAAA;IACjE,OAAO,QAAQ,CAAC,UAAU,CAAC,CAAC,KAAK,CAAA;AACnC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,kBAAkB,EAAE,kCAAkC;IACtD,UAAU,EAAE,yBAAyB;IACrC,iBAAiB,EAAE,iCAAiC;IACpD,GAAG,EAAE,iBAAiB;IACtB,aAAa,EAAE,oBAAoB;IACnC,WAAW,EAAE,0BAA0B;IACvC,aAAa,EAAE,4BAA4B;IAC3C,SAAS,EAAE,qBAAqB;IAChC,UAAU,EAAE,qBAAqB;IACjC,eAAe,EAAE,+BAA+B;IAChD,YAAY,EAAE,eAAe;IAC7B,UAAU,EAAE,yBAAyB;IACrC,QAAQ,EAAE,mBAAmB;IAC7B,OAAO,EAAE,sBAAsB;IAC/B,aAAa,EAAE,4BAA4B;IAC3C,mEAAmE;IACnE,aAAa,EAAE,gBAAgB;IAC/B,UAAU,EAAE,YAAY;IACxB,MAAM,EAAE,sBAAsB;IAC9B,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,aAAa;IAC1B,WAAW,EAAE,eAAe;CAC7B,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,WAAW,EAAE;QACX,GAAG,EAAE,kBAAkB;KACxB;IACD,WAAW,EAAE;QACX,KAAK,EAAE;YACL,IAAI,EAAE,GAAG,EAAE;gBACT,OAAO,WAAW,EAAE,CAAA;YACtB,CAAC;YACD,MAAM,EAAE;gBACN,IAAI,EAAE,GAAG,EAAE;oBACT,OAAO,QAAQ,CAAC,WAAW,EAAE,EAAE,QAAQ,CAAC,CAAA;gBAC1C,CAAC;gBACD,QAAQ,EAAE,GAAG,EAAE;oBACb,OAAO,QAAQ,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAA;gBACtD,CAAC;aACF;SACF;KACF;CACF,CAAA;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,OAAO,EAAE,aAAa;CACvB,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,6BAA6B,EAAE,CAAC;CACjC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,kCAAkC,CAAA","sourcesContent":["import {joinPath} from '../../public/node/path.js'\nimport envPaths from 'env-paths'\n\nconst identifier = 'shopify-cli'\n\nconst cacheFolder = () => {\n  if (process.env.XDG_CACHE_HOME) return process.env.XDG_CACHE_HOME\n  return envPaths(identifier).cache\n}\n\nexport const environmentVariables = {\n  alwaysLogAnalytics: 'SHOPIFY_CLI_ALWAYS_LOG_ANALYTICS',\n  deviceAuth: 'SHOPIFY_CLI_DEVICE_AUTH',\n  enableCliRedirect: 'SHOPIFY_CLI_ENABLE_CLI_REDIRECT',\n  env: 'SHOPIFY_CLI_ENV',\n  firstPartyDev: 'SHOPIFY_CLI_1P_DEV',\n  noAnalytics: 'SHOPIFY_CLI_NO_ANALYTICS',\n  partnersToken: 'SHOPIFY_CLI_PARTNERS_TOKEN',\n  runAsUser: 'SHOPIFY_RUN_AS_USER',\n  serviceEnv: 'SHOPIFY_SERVICE_ENV',\n  skipCliRedirect: 'SHOPIFY_CLI_SKIP_CLI_REDIRECT',\n  spinInstance: 'SPIN_INSTANCE',\n  themeToken: 'SHOPIFY_CLI_THEME_TOKEN',\n  unitTest: 'SHOPIFY_UNIT_TEST',\n  verbose: 'SHOPIFY_FLAG_VERBOSE',\n  themeBundling: 'SHOPIFY_CLI_THEME_BUNDLING',\n  // Variables to detect if the CLI is running in a cloud environment\n  codespaceName: 'CODESPACE_NAME',\n  codespaces: 'CODESPACES',\n  gitpod: 'GITPOD_WORKSPACE_URL',\n  spin: 'SPIN',\n  spinAppPort: 'SERVER_PORT',\n  spinAppHost: 'SPIN_APP_HOST',\n}\n\nexport const pathConstants = {\n  executables: {\n    dev: '/opt/dev/bin/dev',\n  },\n  directories: {\n    cache: {\n      path: () => {\n        return cacheFolder()\n      },\n      vendor: {\n        path: () => {\n          return joinPath(cacheFolder(), 'vendor')\n        },\n        binaries: () => {\n          return joinPath(cacheFolder(), 'vendor', 'binaries')\n        },\n      },\n    },\n  },\n}\n\nexport const keychainConstants = {\n  service: 'shopify-cli',\n}\n\nexport const sessionConstants = {\n  expirationTimeMarginInMinutes: 4,\n}\n\nexport const bugsnagApiKey = '9e1e6889176fd0c795d5c659225e0fae'\n"]}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/private/node/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,2BAA2B,CAAA;AAClD,OAAO,QAAQ,MAAM,WAAW,CAAA;AAEhC,MAAM,UAAU,GAAG,aAAa,CAAA;AAEhC,MAAM,WAAW,GAAG,GAAG,EAAE;IACvB,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc;QAAE,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,CAAA;IACjE,OAAO,QAAQ,CAAC,UAAU,CAAC,CAAC,KAAK,CAAA;AACnC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,kBAAkB,EAAE,kCAAkC;IACtD,UAAU,EAAE,yBAAyB;IACrC,iBAAiB,EAAE,iCAAiC;IACpD,GAAG,EAAE,iBAAiB;IACtB,aAAa,EAAE,oBAAoB;IACnC,WAAW,EAAE,0BAA0B;IACvC,aAAa,EAAE,4BAA4B;IAC3C,SAAS,EAAE,qBAAqB;IAChC,UAAU,EAAE,qBAAqB;IACjC,eAAe,EAAE,+BAA+B;IAChD,YAAY,EAAE,eAAe;IAC7B,UAAU,EAAE,yBAAyB;IACrC,QAAQ,EAAE,mBAAmB;IAC7B,OAAO,EAAE,sBAAsB;IAC/B,aAAa,EAAE,4BAA4B;IAC3C,mEAAmE;IACnE,aAAa,EAAE,gBAAgB;IAC/B,UAAU,EAAE,YAAY;IACxB,MAAM,EAAE,sBAAsB;IAC9B,UAAU,EAAE,aAAa;IACzB,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,aAAa;IAC1B,WAAW,EAAE,eAAe;IAC5B,YAAY,EAAE,0BAA0B;IACxC,aAAa,EAAE,4BAA4B;IAC3C,YAAY,EAAE,2BAA2B;CAC1C,CAAA;AAED,MAAM,CAAC,MAAM,0BAA0B,GAAG;IACxC,WAAW,EAAE,cAAc;CAC5B,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,WAAW,EAAE;QACX,GAAG,EAAE,kBAAkB;KACxB;IACD,WAAW,EAAE;QACX,KAAK,EAAE;YACL,IAAI,EAAE,GAAG,EAAE;gBACT,OAAO,WAAW,EAAE,CAAA;YACtB,CAAC;YACD,MAAM,EAAE;gBACN,IAAI,EAAE,GAAG,EAAE;oBACT,OAAO,QAAQ,CAAC,WAAW,EAAE,EAAE,QAAQ,CAAC,CAAA;gBAC1C,CAAC;gBACD,QAAQ,EAAE,GAAG,EAAE;oBACb,OAAO,QAAQ,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAA;gBACtD,CAAC;aACF;SACF;KACF;CACF,CAAA;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,OAAO,EAAE,aAAa;CACvB,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,6BAA6B,EAAE,CAAC;CACjC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,kCAAkC,CAAA","sourcesContent":["import {joinPath} from '../../public/node/path.js'\nimport envPaths from 'env-paths'\n\nconst identifier = 'shopify-cli'\n\nconst cacheFolder = () => {\n  if (process.env.XDG_CACHE_HOME) return process.env.XDG_CACHE_HOME\n  return envPaths(identifier).cache\n}\n\nexport const environmentVariables = {\n  alwaysLogAnalytics: 'SHOPIFY_CLI_ALWAYS_LOG_ANALYTICS',\n  deviceAuth: 'SHOPIFY_CLI_DEVICE_AUTH',\n  enableCliRedirect: 'SHOPIFY_CLI_ENABLE_CLI_REDIRECT',\n  env: 'SHOPIFY_CLI_ENV',\n  firstPartyDev: 'SHOPIFY_CLI_1P_DEV',\n  noAnalytics: 'SHOPIFY_CLI_NO_ANALYTICS',\n  partnersToken: 'SHOPIFY_CLI_PARTNERS_TOKEN',\n  runAsUser: 'SHOPIFY_RUN_AS_USER',\n  serviceEnv: 'SHOPIFY_SERVICE_ENV',\n  skipCliRedirect: 'SHOPIFY_CLI_SKIP_CLI_REDIRECT',\n  spinInstance: 'SPIN_INSTANCE',\n  themeToken: 'SHOPIFY_CLI_THEME_TOKEN',\n  unitTest: 'SHOPIFY_UNIT_TEST',\n  verbose: 'SHOPIFY_FLAG_VERBOSE',\n  themeBundling: 'SHOPIFY_CLI_THEME_BUNDLING',\n  // Variables to detect if the CLI is running in a cloud environment\n  codespaceName: 'CODESPACE_NAME',\n  codespaces: 'CODESPACES',\n  gitpod: 'GITPOD_WORKSPACE_URL',\n  cloudShell: 'CLOUD_SHELL',\n  spin: 'SPIN',\n  spinAppPort: 'SERVER_PORT',\n  spinAppHost: 'SPIN_APP_HOST',\n  organization: 'SHOPIFY_CLI_ORGANIZATION',\n  identityToken: 'SHOPIFY_CLI_IDENTITY_TOKEN',\n  refreshToken: 'SHOPIFY_CLI_REFRESH_TOKEN',\n}\n\nexport const systemEnvironmentVariables = {\n  backendPort: 'BACKEND_PORT',\n}\n\nexport const pathConstants = {\n  executables: {\n    dev: '/opt/dev/bin/dev',\n  },\n  directories: {\n    cache: {\n      path: () => {\n        return cacheFolder()\n      },\n      vendor: {\n        path: () => {\n          return joinPath(cacheFolder(), 'vendor')\n        },\n        binaries: () => {\n          return joinPath(cacheFolder(), 'vendor', 'binaries')\n        },\n      },\n    },\n  },\n}\n\nexport const keychainConstants = {\n  service: 'shopify-cli',\n}\n\nexport const sessionConstants = {\n  expirationTimeMarginInMinutes: 4,\n}\n\nexport const bugsnagApiKey = '9e1e6889176fd0c795d5c659225e0fae'\n"]}

package/dist/private/node/context/utilities.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" resolution-mode="require"/>
 /**
  * Returns whether an environment variable value represents a truthy value.
  */
@@ -6,3 +7,16 @@ export declare function isTruthy(variable: string | undefined): boolean;
  * Returns whether an environment variable has been set and is non-empty
  */
 export declare function isSet(variable: string | undefined): boolean;
+/**
+ * Returns an object with environment variables from the specified CI environment.
+ */
+export declare function getCIMetadata(envName: string, envs: NodeJS.ProcessEnv): Metadata;
+export interface Metadata {
+    actor?: string;
+    branch?: string;
+    build?: string;
+    commitMessage?: string;
+    commitSha?: string;
+    run?: string;
+    url?: string;
+}

package/dist/private/node/context/utilities.js

@@ -16,4 +16,51 @@ export function isSet(variable) {
     }
     return true;
 }
+/**
+ * Returns an object with environment variables from the specified CI environment.
+ */
+export function getCIMetadata(envName, envs) {
+    switch (envName) {
+        case 'bitbucket':
+            return {
+                actor: envs.BITBUCKET_COMMIT_AUTHOR,
+                branch: envs.BITBUCKET_BRANCH,
+                build: envs.BITBUCKET_BUILD_NUMBER,
+                commitSha: envs.BITBUCKET_COMMIT,
+                run: envs.BITBUCKET_BUILD_NUMBER,
+                url: envs.BITBUCKET_BUILD_URL,
+            };
+        case 'circleci':
+            return {
+                actor: envs.CIRCLE_USERNAME,
+                branch: envs.CIRCLE_BRANCH,
+                build: envs.CIRCLE_BUILD_NUM,
+                commitSha: envs.CIRCLE_SHA1,
+                run: envs.CIRCLE_WORKFLOW_ID,
+                url: envs.CIRCLE_BUILD_URL,
+            };
+        case 'github':
+            return {
+                actor: envs.GITHUB_ACTOR,
+                branch: envs.GITHUB_REF_NAME,
+                build: envs.GITHUB_RUN_ID,
+                commitMessage: envs.GITHUB_COMMIT_MESSAGE,
+                commitSha: envs.GITHUB_SHA,
+                run: envs.GITHUB_RUN_ID,
+                url: `${envs.GITHUB_SERVER_URL}${envs.GITHUB_REPOSITORY}/actions/runs/${envs.GITHUB_RUN_ID}`,
+            };
+        case 'gitlab':
+            return {
+                actor: envs.GITLAB_USER_LOGIN,
+                branch: envs.CI_COMMIT_REF_NAME,
+                build: envs.CI_PIPELINE_ID,
+                commitSha: envs.CI_COMMIT_SHA,
+                commitMessage: envs.CI_COMMIT_MESSAGE,
+                run: envs.CI_RUNNER_ID,
+                url: envs.CI_PROJECT_URL,
+            };
+        default:
+            return {};
+    }
+}
 //# sourceMappingURL=utilities.js.map

package/dist/private/node/context/utilities.js.map

@@ -1 +1 @@
-{"version":3,"file":"utilities.js","sourceRoot":"","sources":["../../../../src/private/node/context/utilities.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,UAAU,QAAQ,CAAC,QAA4B;IACnD,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,KAAK,CAAA;KACb;IACD,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;AAC/D,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,KAAK,CAAC,QAA4B;IAChD,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACpD,OAAO,KAAK,CAAA;KACb;IACD,OAAO,IAAI,CAAA;AACb,CAAC","sourcesContent":["/**\n * Returns whether an environment variable value represents a truthy value.\n */\nexport function isTruthy(variable: string | undefined): boolean {\n  if (!variable) {\n    return false\n  }\n  return ['1', 'true', 'TRUE', 'yes', 'YES'].includes(variable)\n}\n\n/**\n * Returns whether an environment variable has been set and is non-empty\n */\nexport function isSet(variable: string | undefined): boolean {\n  if (variable === undefined || variable.trim() === '') {\n    return false\n  }\n  return true\n}\n"]}
+{"version":3,"file":"utilities.js","sourceRoot":"","sources":["../../../../src/private/node/context/utilities.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,UAAU,QAAQ,CAAC,QAA4B;IACnD,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,KAAK,CAAA;KACb;IACD,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;AAC/D,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,KAAK,CAAC,QAA4B;IAChD,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACpD,OAAO,KAAK,CAAA;KACb;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,OAAe,EAAE,IAAuB;IACpE,QAAQ,OAAO,EAAE;QACf,KAAK,WAAW;YACd,OAAO;gBACL,KAAK,EAAE,IAAI,CAAC,uBAAuB;gBACnC,MAAM,EAAE,IAAI,CAAC,gBAAgB;gBAC7B,KAAK,EAAE,IAAI,CAAC,sBAAsB;gBAClC,SAAS,EAAE,IAAI,CAAC,gBAAgB;gBAChC,GAAG,EAAE,IAAI,CAAC,sBAAsB;gBAChC,GAAG,EAAE,IAAI,CAAC,mBAAmB;aAC9B,CAAA;QACH,KAAK,UAAU;YACb,OAAO;gBACL,KAAK,EAAE,IAAI,CAAC,eAAe;gBAC3B,MAAM,EAAE,IAAI,CAAC,aAAa;gBAC1B,KAAK,EAAE,IAAI,CAAC,gBAAgB;gBAC5B,SAAS,EAAE,IAAI,CAAC,WAAW;gBAC3B,GAAG,EAAE,IAAI,CAAC,kBAAkB;gBAC5B,GAAG,EAAE,IAAI,CAAC,gBAAgB;aAC3B,CAAA;QACH,KAAK,QAAQ;YACX,OAAO;gBACL,KAAK,EAAE,IAAI,CAAC,YAAY;gBACxB,MAAM,EAAE,IAAI,CAAC,eAAe;gBAC5B,KAAK,EAAE,IAAI,CAAC,aAAa;gBACzB,aAAa,EAAE,IAAI,CAAC,qBAAqB;gBACzC,SAAS,EAAE,IAAI,CAAC,UAAU;gBAC1B,GAAG,EAAE,IAAI,CAAC,aAAa;gBACvB,GAAG,EAAE,GAAG,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,iBAAiB,IAAI,CAAC,aAAa,EAAE;aAC7F,CAAA;QACH,KAAK,QAAQ;YACX,OAAO;gBACL,KAAK,EAAE,IAAI,CAAC,iBAAiB;gBAC7B,MAAM,EAAE,IAAI,CAAC,kBAAkB;gBAC/B,KAAK,EAAE,IAAI,CAAC,cAAc;gBAC1B,SAAS,EAAE,IAAI,CAAC,aAAa;gBAC7B,aAAa,EAAE,IAAI,CAAC,iBAAiB;gBACrC,GAAG,EAAE,IAAI,CAAC,YAAY;gBACtB,GAAG,EAAE,IAAI,CAAC,cAAc;aACzB,CAAA;QACH;YACE,OAAO,EAAE,CAAA;KACZ;AACH,CAAC","sourcesContent":["/**\n * Returns whether an environment variable value represents a truthy value.\n */\nexport function isTruthy(variable: string | undefined): boolean {\n  if (!variable) {\n    return false\n  }\n  return ['1', 'true', 'TRUE', 'yes', 'YES'].includes(variable)\n}\n\n/**\n * Returns whether an environment variable has been set and is non-empty\n */\nexport function isSet(variable: string | undefined): boolean {\n  if (variable === undefined || variable.trim() === '') {\n    return false\n  }\n  return true\n}\n\n/**\n * Returns an object with environment variables from the specified CI environment.\n */\nexport function getCIMetadata(envName: string, envs: NodeJS.ProcessEnv): Metadata {\n  switch (envName) {\n    case 'bitbucket':\n      return {\n        actor: envs.BITBUCKET_COMMIT_AUTHOR,\n        branch: envs.BITBUCKET_BRANCH,\n        build: envs.BITBUCKET_BUILD_NUMBER,\n        commitSha: envs.BITBUCKET_COMMIT,\n        run: envs.BITBUCKET_BUILD_NUMBER,\n        url: envs.BITBUCKET_BUILD_URL,\n      }\n    case 'circleci':\n      return {\n        actor: envs.CIRCLE_USERNAME,\n        branch: envs.CIRCLE_BRANCH,\n        build: envs.CIRCLE_BUILD_NUM,\n        commitSha: envs.CIRCLE_SHA1,\n        run: envs.CIRCLE_WORKFLOW_ID,\n        url: envs.CIRCLE_BUILD_URL,\n      }\n    case 'github':\n      return {\n        actor: envs.GITHUB_ACTOR,\n        branch: envs.GITHUB_REF_NAME,\n        build: envs.GITHUB_RUN_ID,\n        commitMessage: envs.GITHUB_COMMIT_MESSAGE,\n        commitSha: envs.GITHUB_SHA,\n        run: envs.GITHUB_RUN_ID,\n        url: `${envs.GITHUB_SERVER_URL}${envs.GITHUB_REPOSITORY}/actions/runs/${envs.GITHUB_RUN_ID}`,\n      }\n    case 'gitlab':\n      return {\n        actor: envs.GITLAB_USER_LOGIN,\n        branch: envs.CI_COMMIT_REF_NAME,\n        build: envs.CI_PIPELINE_ID,\n        commitSha: envs.CI_COMMIT_SHA,\n        commitMessage: envs.CI_COMMIT_MESSAGE,\n        run: envs.CI_RUNNER_ID,\n        url: envs.CI_PROJECT_URL,\n      }\n    default:\n      return {}\n  }\n}\n\nexport interface Metadata {\n  actor?: string\n  branch?: string\n  build?: string\n  commitMessage?: string\n  commitSha?: string\n  run?: string\n  url?: string\n}\n"]}

package/dist/private/node/session.js

@@ -13,7 +13,7 @@ import { partnersRequest } from '../../public/node/api/partners.js';
 import { normalizeStoreFqdn, partnersFqdn, identityFqdn } from '../../public/node/context/fqdn.js';
 import { openURL } from '../../public/node/system.js';
 import { keypress } from '../../public/node/ui.js';
-import { getPartnersToken } from '../../public/node/environment.js';
+import { getIdentityTokenInformation, getPartnersToken } from '../../public/node/environment.js';
 import { gql } from 'graphql-request';
 import { outputCompleted, outputInfo, outputWarn } from '@shopify/cli-kit/node/output';
 /**
@@ -95,7 +95,11 @@ async function executeCompleteFlow(applications, identityFqdn) {
         scopes.push('employee');
     }
     let identityToken;
-    if (useDeviceAuth()) {
+    const identityTokenInformation = getIdentityTokenInformation();
+    if (identityTokenInformation) {
+        identityToken = buildIdentityTokenFromEnv(scopes, identityTokenInformation);
+    }
+    else if (useDeviceAuth()) {
         // Request a device code to authorize without a browser redirect.
         outputDebug(outputContent `Requesting device authorization code...`);
         const deviceAuth = await requestDeviceAuthorization(scopes);
@@ -256,4 +260,11 @@ function getExchangeScopes(apps) {
         storefront: apiScopes('storefront-renderer', storefrontScopes),
     };
 }
+function buildIdentityTokenFromEnv(scopes, identityTokenInformation) {
+    return {
+        ...identityTokenInformation,
+        expiresAt: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000),
+        scopes,
+    };
+}
 //# sourceMappingURL=session.js.map