Repository navigation
Fix Cloudflare tunnel shutdown errors on Windows (5.0) - #9066
Merged
Merged
Conversation
Contributor
Differences in type declarationsWe detected differences in the type declarations generated by Typescript for this branch compared to the baseline ('main' branch). Please, review them to ensure they are backward-compatible. Here are some important things to keep in mind:
New type declarationsWe found no new type declarations in this PR Existing type declarationspackages/cli-kit/dist/public/common/json-output-schema.d.ts@@ -1,5 +1,4 @@
import { z } from 'zod';
-export declare const jsonOutputStoreDomainSchema: z.ZodString;
/** UTC instants in CLI-owned JSON use whole seconds and the Z timezone marker. */
export declare const jsonOutputTimestampSchema: z.ZodString;
/**
packages/cli-kit/dist/private/node/conf-store.d.ts@@ -73,7 +73,7 @@ export declare function cacheStore(key: ExportedKey, value: string, config?: Loc
/**
* Fetch from cache if already populated, otherwise return undefined.
* @param key - The key to use for the cache.
- * @returns The cache element.
+ * @returns The chache element.
*/
export declare function cacheRetrieve(key: ExportedKey, config?: LocalStorage<ConfSchema>): CacheValue<string> | undefined;
export declare function cacheClear(config?: LocalStorage<ConfSchema>): void;
packages/cli-kit/dist/private/node/constants.d.ts@@ -8,7 +8,6 @@ export declare const environmentVariables: {
env: string;
noAnalytics: string;
optOutInstrumentation: string;
- doNotTrack: string;
serviceAccountToken: string;
appAutomationToken: string;
partnersToken: string;
packages/cli-kit/dist/public/node/base-command.d.ts@@ -13,7 +13,7 @@ export interface NonTTYFlagRequirement {
declare abstract class BaseCommand extends Command {
static baseFlags: FlagInput<{}>;
static descriptionWithMarkdown?: string;
- static jsonOutputSchema?: JsonOutputSchema;
+ static get jsonOutputSchema(): JsonOutputSchema | undefined;
static get requiresSyncAnalytics(): boolean;
static nonTTYFlagRequirements(_flags: FlagOutput): NonTTYFlagRequirement[];
static descriptionForHelp(): string | undefined;
packages/cli-kit/dist/public/node/json-output-schema.d.ts@@ -1,6 +1,6 @@
import { zodToJsonSchema } from 'zod-to-json-schema';
import type { ZodTypeAny, z } from 'zod';
-export { formatJsonOutputTimestamp, jsonOutputTimestampSchema, jsonOutputStoreDomainSchema, } from '../common/json-output-schema.js';
+export { formatJsonOutputTimestamp, jsonOutputTimestampSchema } from '../common/json-output-schema.js';
interface JsonOutputSchemaDefinition<TSchema extends ZodTypeAny = ZodTypeAny> {
readonly name: string;
readonly schema: TSchema;
packages/cli-kit/dist/public/node/notifications-system.d.ts@@ -172,7 +172,7 @@ export declare function showNotificationsIfNeeded(currentSurfaces?: string[], en
*/
export declare function getNotifications(): Promise<Notifications>;
/**
- * Fetch notifications from the CDN and cache them.
+ * Fetch notifications from the CDN and chache them.
*
* @returns A string with the notifications.
*/
packages/cli-kit/dist/public/node/context/local.d.ts@@ -52,7 +52,7 @@ export declare function isUnitTest(env?: NodeJS.ProcessEnv): boolean;
* Returns true if reporting analytics is enabled.
*
* @param env - The environment variables from the environment of the current process.
- * @returns True unless SHOPIFY_CLI_NO_ANALYTICS, OPT_OUT_INSTRUMENTATION or DO_NOT_TRACK is truthy, or debug mode is enabled.
+ * @returns True unless SHOPIFY_CLI_NO_ANALYTICS or OPT_OUT_INSTRUMENTATION is truthy, or debug mode is enabled.
*/
export declare function analyticsDisabled(env?: NodeJS.ProcessEnv): boolean;
/**
packages/cli-kit/dist/public/node/graphiql/server.d.ts@@ -27,14 +27,13 @@ export declare function resolveGraphiQLKey(providedKey: string | undefined, apiS
* - `getToken` may return a cached token; the proxy calls it for every request.
* - `refreshToken` (optional) is invoked when the upstream Admin API returns 401.
* When omitted, the proxy falls back to calling `getToken` again on 401.
- * - Both operations receive a cancellation signal to pass to token requests.
*
* Implementations must throw `TokenRefreshError` (or any thrown error) when the
* token cannot be obtained; the proxy renders the unauthorized template in that case.
*/
export interface TokenProvider {
- getToken: (signal?: AbortSignal) => Promise<string>;
- refreshToken?: (signal?: AbortSignal) => Promise<string>;
+ getToken: () => Promise<string>;
+ refreshToken?: () => Promise<string>;
}
/**
* Optional app-specific context, used to render the app pill and scopes note in the
@@ -66,10 +65,6 @@ export interface SetupGraphiQLServerOptions {
* interactive UI.
*/
protectMutations?: boolean;
- /** Called for request failures that leave the server available for subsequent requests. */
- onRequestError?: (message: string) => void;
- /** Routes diagnostics through command events and leaves readiness output to the session. */
- json?: boolean;
}
export declare const MUTATIONS_BLOCKED_MESSAGE = "Mutations are disabled. Re-run with --allow-mutations to enable mutations.";
/**
packages/cli-kit/dist/public/node/graphiql/session.d.ts@@ -22,7 +22,6 @@ export interface RunGraphiQLSessionOptions {
additionalReadyMessages?: OutputMessage[];
abortSignal?: AbortSignal;
stdout?: Writable;
- outputFormat?: 'text' | 'json';
}
/**
* Generates a random key suitable for authenticating a single local GraphiQL session.
|
Contributor
Author
|
/snapit |
Contributor
|
🫰✨ Thanks @isaacroldan! Your snapshot has been published to npm. Built from Test the snapshot by installing your package globally: pnpm i -g --@shopify:registry=https://registry.npmjs.org @shopify/[email protected]Caution After installing, validate the version by running |
isaacroldan
marked this pull request as ready for review
November 4, 2026 11:47
jplhomer
approved these changes
Nov 4, 2026
dmerand
approved these changes
Nov 4, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
WHY are these changes introduced?
Stopping a working
app devsession on Windows can report that the Cloudflare tunnel crashed. The final process-tree cleanup kills the tunnel without marking its exit as an expected stop.WHAT is this pull request doing?
Apply the same fix as #9065 to
stable/5.0: stop the managed tunnel through the dev session's abort signal before process-tree cleanup, and release it when preparation, process setup, or the session fails. Keep reporting unexpected tunnel failures.Include a patch changeset for
@shopify/appin this stable PR only.How to manually test your changes?
pnpm shopify app dev --path <app-directory>from this checkout with a linked app.q. Confirm that the session stops without the Cloudflare "process crashed after stablishing a connection" error.Validation
Checklist