Skip to content

Revert "Merge pull request #6805 from Shopify/skip-local-console"#6846

Merged
ryancbahan merged 1 commit intostable/3.90from
revert-patches-for-dev-console
Feb 10, 2026
Merged

Revert "Merge pull request #6805 from Shopify/skip-local-console"#6846
ryancbahan merged 1 commit intostable/3.90from
revert-patches-for-dev-console

Conversation

@craigmichaelmartin
Copy link
Contributor

This reverts commit fe389da, reversing changes made to ea96a23.

We are not ready for this to be in the patch release.

This reverts commit fe389da, reversing
changes made to ea96a23.
@github-actions
Copy link
Contributor

Differences in type declarations

We 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:

  • Some seemingly private modules might be re-exported through public modules.
  • If the branch is behind main you might see odd diffs, rebase main into this branch.

New type declarations

We found no new type declarations in this PR

Existing type declarations

packages/cli-kit/dist/private/node/constants.d.ts
@@ -3,10 +3,10 @@ export declare const environmentVariables: {
     alwaysLogAnalytics: string;
     alwaysLogMetrics: string;
     deviceAuth: string;
-    doctor: string;
     enableCliRedirect: string;
     env: string;
     firstPartyDev: string;
+    skipLocalDevConsole: string;
     noAnalytics: string;
     partnersToken: string;
     runAsUser: string;
packages/cli-kit/dist/public/common/string.d.ts
@@ -60,13 +60,6 @@ export declare function escapeRegExp(str: string): string;
  * @returns The escaped string.
  */
 export declare function camelize(input: string): string;
-/**
- * Transform a string to capitalCase.
- *
- * @param input - String to transform.
- * @returns The transformed string.
- */
-export declare function capitalizeWords(input: string): string;
 /**
  * Transform a string to param-case.
  *
packages/cli-kit/dist/public/node/system.d.ts
@@ -30,50 +30,6 @@ export declare function openURL(url: string): Promise<boolean>;
  * @returns A promise that resolves with the aggregatted stdout of the command.
  */
 export declare function captureOutput(command: string, args: string[], options?: ExecOptions): Promise<string>;
-/**
- * Result from running a command with captureOutputWithExitCode.
- */
-export interface CaptureOutputResult {
-    /** Standard output. */
-    stdout: string;
-    /** Standard error. */
-    stderr: string;
-    /** Exit code (0 = success). */
-    exitCode: number;
-}
-/**
- * Runs a command asynchronously and returns stdout, stderr, and exit code.
- * Unlike captureOutput, this function does NOT throw on non-zero exit codes.
- *
- * @param command - Command to be executed.
- * @param args - Arguments to pass to the command.
- * @param options - Optional settings for how to run the command.
- * @returns A promise that resolves with stdout, stderr, and exitCode.
- *
- * @example
- * 
- */
-export declare function captureOutputWithExitCode(command: string, args: string[], options?: ExecOptions): Promise<CaptureOutputResult>;
-/**
- * Runs a command string asynchronously and returns stdout, stderr, and exit code.
- * Parses the command string into command and arguments (handles quoted strings).
- * Unlike captureOutput, this function does NOT throw on non-zero exit codes.
- *
- * @param command - Full command string to be executed (e.g., 'ls -la "my folder"').
- * @param options - Optional settings for how to run the command.
- * @returns A promise that resolves with stdout, stderr, and exitCode.
- *
- * @example
- * 
- */
-export declare function captureCommandWithExitCode(command: string, options?: ExecOptions): Promise<CaptureOutputResult>;
-/**
- * Runs a command string asynchronously (parses command and arguments from the string).
- *
- * @param command - Full command string to be executed (e.g., 'ls -la "my folder"').
- * @param options - Optional settings for how to run the command.
- */
-export declare function execCommand(command: string, options?: ExecOptions): Promise<void>;
 /**
  * Runs a command asynchronously.
  *
packages/cli-kit/dist/public/node/context/fqdn.d.ts
@@ -50,12 +50,4 @@ export declare function identityFqdn(): Promise<string>;
  * @param store - Store name.
  * @returns Normalized store name.
  */
-export declare function normalizeStoreFqdn(store: string): string;
-/**
- * Convert a store FQDN to the admin URL pattern for local development.
- * In local mode, transforms \{store\}.my.shop.dev to admin.shop.dev/store/\{store\}.
- *
- * @param storeFqdn - Normalized store FQDN.
- * @returns Store admin URL base (without protocol or path).
- */
-export declare function storeAdminUrl(storeFqdn: string): string;
\ No newline at end of file
+export declare function normalizeStoreFqdn(store: string): string;
\ No newline at end of file
packages/cli-kit/dist/public/node/context/local.d.ts
@@ -71,12 +71,12 @@ export declare function alwaysLogMetrics(env?: NodeJS.ProcessEnv): boolean;
  */
 export declare function firstPartyDev(env?: NodeJS.ProcessEnv): boolean;
 /**
- * Returns true if the CLI can run the "doctor-release" command.
+ * Returns true if the local dev console should be skipped.
  *
  * @param env - The environment variables from the environment of the current process.
- * @returns True if the CLI can run the "doctor-release" command.
+ * @returns True if SHOPIFY_SKIP_LOCAL_DEV_CONSOLE is truthy.
  */
-export declare function canRunDoctorRelease(env?: NodeJS.ProcessEnv): boolean;
+export declare function skipLocalDevConsole(env?: NodeJS.ProcessEnv): boolean;
 /**
  * Return gitpodURL if we are running in gitpod.
  * Https://www.gitpod.io/docs/environment-variables#default-environment-variables.
packages/cli-kit/dist/public/node/themes/types.d.ts
@@ -27,9 +27,8 @@ export interface ThemeFileSystemOptions {
         ignore?: string[];
         only?: string[];
     };
-    listing?: string;
-    noDelete?: boolean;
     notify?: string;
+    noDelete?: boolean;
 }
 /**
  * Represents a theme on the file system.

@github-actions
Copy link
Contributor

Coverage report

St.
Category Percentage Covered / Total
🟡 Statements 79.55% 14381/18079
🟡 Branches 73.84% 7114/9634
🟡 Functions 79.67% 3676/4614
🟡 Lines 79.9% 13594/17013

Test suite run success

3689 tests passing in 1431 suites.

Report generated by 🧪jest coverage report action from ce7f356

@ryancbahan ryancbahan merged commit e6ac2cd into stable/3.90 Feb 10, 2026
23 checks passed
@ryancbahan ryancbahan deleted the revert-patches-for-dev-console branch February 10, 2026 22:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants