Remove deprecated flags (#1640)

* Remove deprecated flags * Changesets
Shopify · Jan 17, 2024 · 3e7b6e8 · 3e7b6e8
1 parent 9c44be4
commit 3e7b6e8
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 57 deletions.
diff --git a/.changeset/quick-apes-pump.md b/.changeset/quick-apes-pump.md
@@ -0,0 +1,5 @@
+---
+'@shopify/cli-hydrogen': major
+---
+
+Remove deprecated CLI flags.
diff --git a/packages/cli/oclif.manifest.json b/packages/cli/oclif.manifest.json
@@ -45,10 +45,7 @@
           "type": "boolean",
           "description": "Generate types for the Storefront API queries found in your project.",
           "required": false,
-          "allowNo": false,
-          "aliases": [
-            "codegen-unstable"
-          ]
+          "allowNo": false
         },
         "codegen-config-path": {
           "name": "codegen-config-path",
@@ -66,24 +63,6 @@
           "description": "Applies the current files on top of Hydrogen's starter template in a temporary directory.",
           "required": false,
           "allowNo": false
-        },
-        "base": {
-          "name": "base",
-          "type": "option",
-          "hidden": true,
-          "multiple": false
-        },
-        "entry": {
-          "name": "entry",
-          "type": "option",
-          "hidden": true,
-          "multiple": false
-        },
-        "target": {
-          "name": "target",
-          "type": "option",
-          "hidden": true,
-          "multiple": false
         }
       },
       "args": {}
@@ -122,41 +101,34 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginAlias": "@shopify/cli-hydrogen",
       "pluginType": "core",
-      "aliases": [
-        "codegen-unstable"
-      ],
-      "deprecateAliases": true,
+      "aliases": [],
       "flags": {
         "path": {
           "name": "path",
           "type": "option",
           "description": "The path to the directory of the Hydrogen storefront. The default is the current directory.",
-          "multiple": false,
-          "deprecateAliases": true
+          "multiple": false
         },
         "codegen-config-path": {
           "name": "codegen-config-path",
           "type": "option",
           "description": "Specify a path to a codegen configuration file. Defaults to `<root>/codegen.ts` if it exists.",
           "required": false,
-          "multiple": false,
-          "deprecateAliases": true
+          "multiple": false
         },
         "force-sfapi-version": {
           "name": "force-sfapi-version",
           "type": "option",
           "description": "Force generating Storefront API types for a specific version instead of using the one provided in Hydrogen. A token can also be provided with this format: `<version>:<token>`.",
           "hidden": true,
-          "multiple": false,
-          "deprecateAliases": true
+          "multiple": false
         },
         "watch": {
           "name": "watch",
           "type": "boolean",
           "description": "Watch the project for changes to update types on file save.",
           "required": false,
-          "allowNo": false,
-          "deprecateAliases": true
+          "allowNo": false
         }
       },
       "args": {}
@@ -292,10 +264,7 @@
           "type": "boolean",
           "description": "Generate types for the Storefront API queries found in your project. It updates the types on file save.",
           "required": false,
-          "allowNo": false,
-          "aliases": [
-            "codegen-unstable"
-          ]
+          "allowNo": false
         },
         "codegen-config-path": {
           "name": "codegen-config-path",
@@ -332,12 +301,6 @@
           "multiple": false,
           "default": 9229
         },
-        "host": {
-          "name": "host",
-          "type": "option",
-          "hidden": true,
-          "multiple": false
-        },
         "env-branch": {
           "name": "env-branch",
           "type": "option",

diff --git a/packages/cli/src/commands/hydrogen/build.ts b/packages/cli/src/commands/hydrogen/build.ts
@@ -26,7 +26,7 @@ import {
   RemixConfig,
   type ServerMode,
 } from '../../lib/remix-config.js';
-import {deprecated, commonFlags, flagsToCamelObject} from '../../lib/flags.js';
+import {commonFlags, flagsToCamelObject} from '../../lib/flags.js';
 import {checkLockfileStatus} from '../../lib/check-lockfile.js';
 import {findMissingRoutes} from '../../lib/missing-routes.js';
 import {createRemixLogger, muteRemixLogs} from '../../lib/log.js';
@@ -71,10 +71,6 @@ export default class Build extends Command {
     codegen: commonFlags.codegen,
     'codegen-config-path': commonFlags.codegenConfigPath,
     diff: commonFlags.diff,
-
-    base: deprecated('--base')(),
-    entry: deprecated('--entry')(),
-    target: deprecated('--target')(),
   };
 
   async run(): Promise<void> {

diff --git a/packages/cli/src/commands/hydrogen/codegen.ts b/packages/cli/src/commands/hydrogen/codegen.ts
@@ -30,9 +30,6 @@ export default class Codegen extends Command {
     }),
   };
 
-  static aliases = ['codegen-unstable'];
-  static deprecateAliases = true;
-
   async run(): Promise<void> {
     const {flags} = await this.parse(Codegen);
     const directory = flags.path ? path.resolve(flags.path) : process.cwd();

diff --git a/packages/cli/src/commands/hydrogen/dev.ts b/packages/cli/src/commands/hydrogen/dev.ts
@@ -14,7 +14,6 @@ import {
 } from '../../lib/remix-config.js';
 import {createRemixLogger, enhanceH2Logs, muteDevLogs} from '../../lib/log.js';
 import {
-  deprecated,
   commonFlags,
   flagsToCamelObject,
   overrideFlag,
@@ -62,7 +61,6 @@ export default class Dev extends Command {
     }),
     debug: commonFlags.debug,
     'inspector-port': commonFlags.inspectorPort,
-    host: deprecated('--host')(),
     ['env-branch']: commonFlags.envBranch,
     ['disable-version-check']: Flags.boolean({
       description: 'Skip the version check when running `hydrogen dev`',

diff --git a/packages/cli/src/lib/flags.ts b/packages/cli/src/lib/flags.ts
@@ -62,8 +62,6 @@ export const commonFlags = {
       'Generate types for the Storefront API queries found in your project.',
     required: false,
     default: false,
-    deprecateAliases: true,
-    aliases: ['codegen-unstable'],
   }),
   codegenConfigPath: Flags.string({
     description:

diff --git a/packages/cli/src/lib/transpile/project.ts b/packages/cli/src/lib/transpile/project.ts
@@ -135,7 +135,7 @@ export async function transpileProject(projectDir: string, keepTypes = true) {
         }
       }
 
-      const codegenFlag = /\s*--codegen(-unstable)?/;
+      const codegenFlag = /\s*--codegen/;
       if (pkgJson.scripts?.dev) {
         pkgJson.scripts.dev = pkgJson.scripts.dev.replace(codegenFlag, '');
       }