@shopify/cli 3.59.0 → 3.59.1

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

@@ -25,8 +25,8 @@ module ShopifyCLI
       ]
 
       class Proxy
-        SESSION_COOKIE_NAME = "_secure_session_id"
-        SESSION_COOKIE_REGEXP = /#{SESSION_COOKIE_NAME}=(\h+)/
+        SESSION_COOKIE_NAME = "_shopify_essential"
+        SESSION_COOKIE_REGEXP = /#{SESSION_COOKIE_NAME}=([^;]*)(;|$)/
         SESSION_COOKIE_MAX_AGE = 60 * 60 * 23 # 1 day - leeway of 1h
         IGNORED_ENDPOINTS = %w[
           shopify/monorail
@@ -58,7 +58,8 @@ module ShopifyCLI
           query = URI.decode_www_form(env["QUERY_STRING"])
           replace_templates = build_replacement_param(env)
 
-          clean_sfr_cache(env, query, headers)
+          response = set_preview_theme_id(env, query, headers)
+          return serve_response(response, env) if response
 
           response = if replace_templates.any?
             # Pass to SFR the recently modified templates in `replace_templates` or
@@ -87,16 +88,14 @@ module ShopifyCLI
             @core_endpoints << env["PATH_INFO"]
           end
 
-          body = patch_body(env, response.body)
-          body = [body] unless body.respond_to?(:each)
-          [response.code, headers, body]
+          serve_response(response, env, headers)
         end
 
         def secure_session_id
           if secure_session_id_expired?
-            @ctx.debug("Refreshing preview _secure_session_id cookie")
+            @ctx.debug("Refreshing preview _shopify_essential cookie")
             response = request("HEAD", "/", query: [[:preview_theme_id, theme_id]])
-            @secure_session_id = extract_secure_session_id_from_response_headers(response)
+            @secure_session_id = extract_shopify_essential_from_response_headers(response)
             @last_session_cookie_refresh = Time.now
           end
 
@@ -105,7 +104,13 @@ module ShopifyCLI
 
         private
 
-        def clean_sfr_cache(env, query, headers)
+        def serve_response(response, env, headers = get_response_headers(response, env))
+          body = patch_body(env, response.body)
+          body = [body] unless body.respond_to?(:each)
+          [response.code, headers, body]
+        end
+
+        def set_preview_theme_id(env, query, headers)
           if env["PATH_INFO"].start_with?("/password")
             @cache_cleaned = false
             return
@@ -215,7 +220,7 @@ module ShopifyCLI
           Time.now - @last_session_cookie_refresh >= SESSION_COOKIE_MAX_AGE
         end
 
-        def extract_secure_session_id_from_response_headers(headers)
+        def extract_shopify_essential_from_response_headers(headers)
           return unless headers["set-cookie"]
 
           headers["set-cookie"][SESSION_COOKIE_REGEXP, 1]
@@ -235,9 +240,9 @@ module ShopifyCLI
             response_headers["location"].gsub!(%r{(https://#{shop})}, "http://#{host(env)}")
           end
 
-          new_session_id = extract_secure_session_id_from_response_headers(response_headers)
+          new_session_id = extract_shopify_essential_from_response_headers(response_headers)
           if new_session_id
-            @ctx.debug("New _secure_session_id cookie from response")
+            @ctx.debug("New _shopify_essential cookie from response")
             @secure_session_id = new_session_id
             @last_session_cookie_refresh = Time.now
           end

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

@@ -4,6 +4,8 @@ module ShopifyCLI
   module Theme
     class Repl
       class Api
+        SESSION_COOKIE_NAME = DevServer::Proxy::SESSION_COOKIE_NAME
+
         attr_reader :ctx, :url, :repl
 
         def initialize(ctx, url, repl)
@@ -60,7 +62,7 @@ module ShopifyCLI
         end
 
         def cookie
-          @cookie ||= "storefront_digest=#{repl.storefront_digest}; _secure_session_id=#{repl.secure_session_id}"
+          @cookie ||= "storefront_digest=#{repl.storefront_digest}; #{SESSION_COOKIE_NAME}=#{repl.secure_session_id}"
         end
 
         def shop

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

@@ -17,7 +17,7 @@ module ShopifyCLI
           @env = env
           @env["PATH_INFO"] = PASSWORD_PAGE_PATH if redirect_to_password?(@env)
 
-          return @app.call(@env) if password_page?(@env)
+          return @app.call(@env) if password_page?(@env) || (storefront_session.nil? || secure_session.nil?)
 
           authenticate!
 

package/dist/assets/cli-ruby/test/shopify-cli/theme/dev_server/integration_test.rb

@@ -49,7 +49,7 @@ module ShopifyCLI
             .to_return(
               status: 200,
               headers: {
-                "Set-Cookie" => "_secure_session_id=abcd1234",
+                "Set-Cookie" => "_shopify_essential=abcd1234",
               }
             )
           stub_sfr = stub_request(:get, "https://dev-theme-server-store.myshopify.com/?_fd=0&pb=0")

package/dist/assets/cli-ruby/test/shopify-cli/theme/dev_server/proxy_test.rb

@@ -104,13 +104,13 @@ module ShopifyCLI
             .with(headers: { "X-Shopify-Shop" => store })
             .to_return(
               status: 200,
-              headers: { "Set-Cookie" => "_secure_session_id=#{SECURE_SESSION_ID}" },
+              headers: { "Set-Cookie" => "_shopify_essential=#{SECURE_SESSION_ID}" },
             )
           stub_request(:get, "https://theme-kit-access.shopifyapps.com/cli/sfr/?_fd=0&pb=0")
             .with(
               headers: {
                 "Content-Length" => "0",
-                "Cookie" => "_secure_session_id=deadbeef",
+                "Cookie" => "_shopify_essential=deadbeef",
                 "X-Shopify-Shop" => store,
               },
             )
@@ -163,20 +163,20 @@ module ShopifyCLI
 
         def test_update_session_cookie_when_returned_from_backend
           stub_session_id_request
-          new_secure_session_id = "#{SECURE_SESSION_ID}2"
+          new_shopify_essential = "#{SECURE_SESSION_ID}2"
 
           # POST response returning a new session cookie (Set-Cookie)
           stub_request(:post, "https://dev-theme-server-store.myshopify.com/account/login?_fd=0&pb=0")
             .with(
               headers: {
-                "Cookie" => "_secure_session_id=#{SECURE_SESSION_ID}",
+                "Cookie" => "_shopify_essential=#{SECURE_SESSION_ID}",
               },
             )
             .to_return(
               status: 200,
               body: "",
               headers: {
-                "Set-Cookie" => "_secure_session_id=#{new_secure_session_id}",
+                "Set-Cookie" => "_shopify_essential=#{new_shopify_essential}",
               },
             )
 
@@ -184,7 +184,7 @@ module ShopifyCLI
           stub_request(:get, "https://dev-theme-server-store.myshopify.com/?_fd=0&pb=0")
             .with(
               headers: {
-                "Cookie" => "_secure_session_id=#{new_secure_session_id}",
+                "Cookie" => "_shopify_essential=#{new_shopify_essential}",
               },
             )
             .to_return(status: 200)
@@ -319,24 +319,24 @@ module ShopifyCLI
           end
         end
 
-        def test_replaces_secure_session_id_cookie
+        def test_replaces_shopify_essential_cookie
           stub_request(:get, "https://dev-theme-server-store.myshopify.com/?_fd=0&pb=0")
             .with(
               headers: {
-                "Cookie" => "_secure_session_id=#{SECURE_SESSION_ID}",
+                "Cookie" => "_shopify_essential=#{SECURE_SESSION_ID}",
               },
             )
 
           stub_session_id_request
           request.get("/",
-            "HTTP_COOKIE" => "_secure_session_id=a12cef")
+            "HTTP_COOKIE" => "_shopify_essential=a12cef")
         end
 
-        def test_appends_secure_session_id_cookie
+        def test_appends_shopify_essential_cookie
           stub_request(:get, "https://dev-theme-server-store.myshopify.com/?_fd=0&pb=0")
             .with(
               headers: {
-                "Cookie" => "cart_currency=CAD; secure_customer_sig=; _secure_session_id=#{SECURE_SESSION_ID}",
+                "Cookie" => "cart_currency=CAD; secure_customer_sig=; _shopify_essential=#{SECURE_SESSION_ID}",
               },
             )
 
@@ -373,7 +373,7 @@ module ShopifyCLI
                 "Accept-Encoding" => "none",
                 "Authorization" => "Bearer TOKEN",
                 "Content-Type" => "application/x-www-form-urlencoded",
-                "Cookie" => "_secure_session_id=#{SECURE_SESSION_ID}",
+                "Cookie" => "_shopify_essential=#{SECURE_SESSION_ID}",
                 "Host" => "dev-theme-server-store.myshopify.com",
                 "X-Forwarded-For" => "",
                 "User-Agent" => "Shopify CLI",
@@ -597,7 +597,7 @@ module ShopifyCLI
         def default_proxy_headers(domain = "myshopify.com")
           {
             "Accept-Encoding" => "none",
-            "Cookie" => "_secure_session_id=#{SECURE_SESSION_ID}",
+            "Cookie" => "_shopify_essential=#{SECURE_SESSION_ID}",
             "Host" => "dev-theme-server-store.#{domain}",
             "X-Forwarded-For" => "",
             "User-Agent" => "Shopify CLI",
@@ -614,7 +614,7 @@ module ShopifyCLI
             .to_return(
               status: 200,
               headers: {
-                "Set-Cookie" => "_secure_session_id=#{SECURE_SESSION_ID}",
+                "Set-Cookie" => "_shopify_essential=#{SECURE_SESSION_ID}",
               },
             )
         end

package/dist/assets/cli-ruby/test/shopify-cli/theme/repl/api_test.rb

@@ -2,6 +2,7 @@
 
 require "test_helper"
 
+require "shopify_cli/theme/dev_server/proxy"
 require "shopify_cli/theme/theme_admin_api"
 require "shopify_cli/theme/repl/api"
 
@@ -31,7 +32,7 @@ module ShopifyCLI
               headers: {
                 "Authorization" => "Bearer",
                 "Content-Type" => "application/x-www-form-urlencoded",
-                "Cookie" => "storefront_digest=storefront_session_5678; _secure_session_id=secure_session_id_1234",
+                "Cookie" => "storefront_digest=storefront_session_5678; _shopify_essential=secure_session_id_1234",
                 "User-Agent" => "Shopify CLI",
               },
             )
@@ -57,7 +58,7 @@ module ShopifyCLI
               },
               headers: {
                 "Content-Type" => "application/x-www-form-urlencoded",
-                "Cookie" => "storefront_digest=storefront_session_5678; _secure_session_id=secure_session_id_1234",
+                "Cookie" => "storefront_digest=storefront_session_5678; _shopify_essential=secure_session_id_1234",
                 "X-Shopify-Shop" => "store.myshopify.com",
               },
             )

package/dist/{chunk-HYTSORDJ.js → chunk-46VGUYHL.js}

@@ -4,13 +4,13 @@ import {
 import {
   fanoutHooks,
   reportAnalyticsEvent
-} from "./chunk-LKVSWZE2.js";
+} from "./chunk-W7UHREAK.js";
 import {
   getEnvironmentData
-} from "./chunk-MALZ76OP.js";
+} from "./chunk-5FVTOE7H.js";
 import {
   CLI_KIT_VERSION
-} from "./chunk-A3PWVEGU.js";
+} from "./chunk-474I4TNL.js";
 import {
   AbortSilentError,
   CancelExecution,
@@ -24,7 +24,7 @@ import {
   printEventsJson,
   require_stacktracey,
   shouldReportError
-} from "./chunk-3N5TYEOJ.js";
+} from "./chunk-6VZG567Q.js";
 import {
   bugsnagApiKey
 } from "./chunk-QI5VKSMW.js";

package/dist/{chunk-A3PWVEGU.js → chunk-474I4TNL.js}

@@ -4,7 +4,7 @@ import {
 
 // ../cli-kit/src/public/common/version.ts
 init_cjs_shims();
-var CLI_KIT_VERSION = "3.59.0";
+var CLI_KIT_VERSION = "3.59.1";
 
 export {
   CLI_KIT_VERSION

package/dist/{chunk-MALZ76OP.js → chunk-5FVTOE7H.js}

@@ -1,10 +1,10 @@
 import {
   platformAndArch
-} from "./chunk-O54SR2VW.js";
+} from "./chunk-VU576BU3.js";
 import {
   getPackageManager,
   packageManagerFromUserAgent
-} from "./chunk-OK52H3G3.js";
+} from "./chunk-RJ2SJHQV.js";
 import {
   addPublicMetadata,
   addSensitiveMetadata,
@@ -12,7 +12,7 @@ import {
   cloudEnvironment,
   currentProcessIsGlobal,
   macAddress
-} from "./chunk-3N5TYEOJ.js";
+} from "./chunk-6VZG567Q.js";
 import {
   cwd
 } from "./chunk-M336AND6.js";

package/dist/{chunk-24HS7TWV.js → chunk-5PRVQL5W.js}

@@ -7,7 +7,7 @@ import {
   renderSuccess,
   renderTable,
   renderWarning
-} from "./chunk-3N5TYEOJ.js";
+} from "./chunk-6VZG567Q.js";
 import {
   init_cjs_shims
 } from "./chunk-BVGYIZ3O.js";

package/dist/{chunk-PIMN67IT.js → chunk-5Q5JPLAQ.js}

@@ -1,14 +1,14 @@
 import {
   base_command_default
-} from "./chunk-5RO6P4KC.js";
+} from "./chunk-WF3T42FP.js";
 import {
   packageManagerFromUserAgent
-} from "./chunk-OK52H3G3.js";
+} from "./chunk-RJ2SJHQV.js";
 import {
   currentProcessIsGlobal,
   inferPackageManagerForGlobalCLI,
   renderInfo
-} from "./chunk-3N5TYEOJ.js";
+} from "./chunk-6VZG567Q.js";
 import {
   init_cjs_shims
 } from "./chunk-BVGYIZ3O.js";

package/dist/{chunk-3N5TYEOJ.js → chunk-6VZG567Q.js}

@@ -43238,7 +43238,7 @@ function createRuntimeMetadataContainer(defaultPublicMetadata = {}) {
       try {
         await getAndSet();
       } catch (error) {
-        const { sendErrorToBugsnag } = await import("./error-handler-MZEB7CLD.js");
+        const { sendErrorToBugsnag } = await import("./error-handler-RT4TFLRY.js");
         await sendErrorToBugsnag(error, "unexpected_error");
       }
     }

package/dist/{chunk-5Y3PYHUV.js → chunk-AIMRWD2B.js}

@@ -1,7 +1,7 @@
 import {
   renderConcurrent,
   renderTasks
-} from "./chunk-3N5TYEOJ.js";
+} from "./chunk-6VZG567Q.js";
 import {
   init_cjs_shims
 } from "./chunk-BVGYIZ3O.js";

package/dist/{chunk-3FAYPDRE.js → chunk-BQPGK47Z.js}

@@ -1,16 +1,16 @@
 import {
   CLI_KIT_VERSION
-} from "./chunk-A3PWVEGU.js";
+} from "./chunk-474I4TNL.js";
 import {
   checkForNewVersion,
   packageManagerFromUserAgent
-} from "./chunk-OK52H3G3.js";
+} from "./chunk-RJ2SJHQV.js";
 import {
   getOutputUpdateCLIReminder,
   outputContent,
   outputInfo,
   outputToken
-} from "./chunk-3N5TYEOJ.js";
+} from "./chunk-6VZG567Q.js";
 import {
   init_cjs_shims
 } from "./chunk-BVGYIZ3O.js";

package/dist/{chunk-VRVCUORY.js → chunk-DNXLPUNM.js}

@@ -1,6 +1,6 @@
 import {
   openURL
-} from "./chunk-3N5TYEOJ.js";
+} from "./chunk-6VZG567Q.js";
 import {
   init_cjs_shims
 } from "./chunk-BVGYIZ3O.js";

package/dist/{chunk-LX5XSNJA.js → chunk-E5SJTLHV.js}

@@ -1,9 +1,9 @@
 import {
   searchService
-} from "./chunk-VRVCUORY.js";
+} from "./chunk-DNXLPUNM.js";
 import {
   base_command_default
-} from "./chunk-5RO6P4KC.js";
+} from "./chunk-WF3T42FP.js";
 import {
   require_lib
 } from "./chunk-3MMF34G4.js";

package/dist/{chunk-WOXAXDMN.js → chunk-EEBRWEML.js}

@@ -1,9 +1,9 @@
 import {
   prompts
-} from "./chunk-VQ7HIBHK.js";
+} from "./chunk-YIDMIL55.js";
 import {
   base_command_default
-} from "./chunk-5RO6P4KC.js";
+} from "./chunk-WF3T42FP.js";
 import {
   init_cjs_shims
 } from "./chunk-BVGYIZ3O.js";

package/dist/{chunk-IQHXR2SR.js → chunk-GUG5KVQ6.js}

@@ -1,9 +1,9 @@
 import {
   staticService
-} from "./chunk-24HS7TWV.js";
+} from "./chunk-5PRVQL5W.js";
 import {
   base_command_default
-} from "./chunk-5RO6P4KC.js";
+} from "./chunk-WF3T42FP.js";
 import {
   init_cjs_shims
 } from "./chunk-BVGYIZ3O.js";

package/dist/{chunk-RY6HWBIC.js → chunk-JSBTYUEY.js}

@@ -1,9 +1,9 @@
 import {
   asyncTasks
-} from "./chunk-5Y3PYHUV.js";
+} from "./chunk-AIMRWD2B.js";
 import {
   base_command_default
-} from "./chunk-5RO6P4KC.js";
+} from "./chunk-WF3T42FP.js";
 import {
   init_cjs_shims
 } from "./chunk-BVGYIZ3O.js";

package/dist/{chunk-IEB4F2KL.js → chunk-KHNWSWRU.js}

@@ -1,15 +1,15 @@
 import {
   staticService
-} from "./chunk-24HS7TWV.js";
+} from "./chunk-5PRVQL5W.js";
 import {
   asyncTasks
-} from "./chunk-5Y3PYHUV.js";
+} from "./chunk-AIMRWD2B.js";
 import {
   prompts
-} from "./chunk-VQ7HIBHK.js";
+} from "./chunk-YIDMIL55.js";
 import {
   base_command_default
-} from "./chunk-5RO6P4KC.js";
+} from "./chunk-WF3T42FP.js";
 import {
   init_cjs_shims
 } from "./chunk-BVGYIZ3O.js";

package/dist/{chunk-W6C6L4NU.js → chunk-KVSDXR4N.js}

@@ -1,12 +1,12 @@
 import {
   base_command_default
-} from "./chunk-5RO6P4KC.js";
+} from "./chunk-WF3T42FP.js";
 import {
   mkdir,
   outputInfo,
   rmdir,
   writeFile
-} from "./chunk-3N5TYEOJ.js";
+} from "./chunk-6VZG567Q.js";
 import {
   cwd,
   joinPath

package/dist/{chunk-VIZQZ55O.js → chunk-M4KCCI7R.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-WBWFZ6IT.js";
 import {
   base_command_default
-} from "./chunk-5RO6P4KC.js";
+} from "./chunk-WF3T42FP.js";
 import {
   ClientError,
   GraphQLClient,
@@ -21,16 +21,16 @@ import {
   httpsAgent,
   sanitizedHeadersOutput,
   shopifyFetch
-} from "./chunk-LKVSWZE2.js";
+} from "./chunk-W7UHREAK.js";
 import {
   base64URLEncode,
   randomBytes,
   randomHex,
   sha256
-} from "./chunk-MALZ76OP.js";
+} from "./chunk-5FVTOE7H.js";
 import {
   require_semver
-} from "./chunk-OK52H3G3.js";
+} from "./chunk-RJ2SJHQV.js";
 import {
   AbortError,
   BugError,
@@ -57,7 +57,7 @@ import {
   spinFqdn,
   stringifyMessage,
   useDeviceAuth
-} from "./chunk-3N5TYEOJ.js";
+} from "./chunk-6VZG567Q.js";
 import {
   envPaths,
   sessionConstants

package/dist/{chunk-X6A6KRIL.js → chunk-NEHSJUDS.js}

@@ -1,7 +1,7 @@
 import {
   clearCollectedLogs,
   collectedLogs
-} from "./chunk-3N5TYEOJ.js";
+} from "./chunk-6VZG567Q.js";
 import {
   init_cjs_shims
 } from "./chunk-BVGYIZ3O.js";

package/dist/{chunk-AL5Y74NR.js → chunk-OPMRCCAR.js}

@@ -17,7 +17,7 @@ import {
   renderTextPrompt,
   renderWarning,
   sleep
-} from "./chunk-3N5TYEOJ.js";
+} from "./chunk-6VZG567Q.js";
 import {
   init_cjs_shims
 } from "./chunk-BVGYIZ3O.js";

package/dist/{chunk-UNHOUSEY.js → chunk-Q4XYWLXO.js}

@@ -1,14 +1,14 @@
 import {
   demo
-} from "./chunk-AL5Y74NR.js";
+} from "./chunk-OPMRCCAR.js";
 import {
   base_command_default
-} from "./chunk-5RO6P4KC.js";
+} from "./chunk-WF3T42FP.js";
 import {
   outputInfo,
   readFile,
   renderAutocompletePrompt
-} from "./chunk-3N5TYEOJ.js";
+} from "./chunk-6VZG567Q.js";
 import {
   joinPath
 } from "./chunk-M336AND6.js";

package/dist/{chunk-5INB6W36.js → chunk-QL4CKEQX.js}

@@ -4,7 +4,7 @@ import {
   findUpAndReadPackageJson,
   getPackageManager,
   usesWorkspaces
-} from "./chunk-OK52H3G3.js";
+} from "./chunk-RJ2SJHQV.js";
 import {
   AbortError,
   exec,
@@ -15,7 +15,7 @@ import {
   outputSuccess,
   outputToken,
   outputWarn
-} from "./chunk-3N5TYEOJ.js";
+} from "./chunk-6VZG567Q.js";
 import {
   dirname,
   joinPath,

package/dist/{chunk-4B2YUKUA.js → chunk-QUG53NP3.js}

@@ -3,14 +3,14 @@ import {
 } from "./chunk-CXG2USMP.js";
 import {
   demoStepsSchema
-} from "./chunk-AL5Y74NR.js";
+} from "./chunk-OPMRCCAR.js";
 import {
   base_command_default
-} from "./chunk-5RO6P4KC.js";
+} from "./chunk-WF3T42FP.js";
 import {
   outputInfo,
   renderInfo
-} from "./chunk-3N5TYEOJ.js";
+} from "./chunk-6VZG567Q.js";
 import {
   __toESM,
   init_cjs_shims

package/dist/{chunk-S7GFY3LX.js → chunk-RDH73H62.js}

@@ -1,10 +1,10 @@
 import {
   base_command_default
-} from "./chunk-5RO6P4KC.js";
+} from "./chunk-WF3T42FP.js";
 import {
   exec,
   outputInfo
-} from "./chunk-3N5TYEOJ.js";
+} from "./chunk-6VZG567Q.js";
 import {
   init_cjs_shims
 } from "./chunk-BVGYIZ3O.js";

package/dist/{chunk-OK52H3G3.js → chunk-RJ2SJHQV.js}

@@ -13,7 +13,7 @@ import {
   require_get_stream,
   runWithTimer,
   writeFile
-} from "./chunk-3N5TYEOJ.js";
+} from "./chunk-6VZG567Q.js";
 import {
   dirname,
   joinPath

package/dist/{chunk-O54SR2VW.js → chunk-VU576BU3.js}

@@ -2,7 +2,7 @@ import {
   execa,
   outputContent,
   outputDebug
-} from "./chunk-3N5TYEOJ.js";
+} from "./chunk-6VZG567Q.js";
 import {
   init_cjs_shims
 } from "./chunk-BVGYIZ3O.js";

package/dist/{chunk-YFA2TIGX.js → chunk-VZSOGTSS.js}

@@ -1,9 +1,9 @@
 import {
   versionService
-} from "./chunk-3FAYPDRE.js";
+} from "./chunk-BQPGK47Z.js";
 import {
   base_command_default
-} from "./chunk-5RO6P4KC.js";
+} from "./chunk-WF3T42FP.js";
 import {
   init_cjs_shims
 } from "./chunk-BVGYIZ3O.js";