@shopify/cli-hydrogen 13.0.1 → 13.0.2

package/dist/commands/hydrogen/link.js

@@ -3,7 +3,7 @@ import Command from '@shopify/cli-kit/node/base-command';
 import { basename } from '@shopify/cli-kit/node/path';
 import { renderSuccess, renderConfirmationPrompt, renderWarning, renderTextPrompt, renderTasks } from '@shopify/cli-kit/node/ui';
 import { AbortError } from '@shopify/cli-kit/node/error';
-import { commonFlags } from '../../lib/flags.js';
+import { commonFlags, flagsToCamelObject } from '../../lib/flags.js';
 import { getStorefronts } from '../../lib/graphql/admin/link-storefront.js';
 import { setStorefront } from '../../lib/shopify-config.js';
 import { createStorefront } from '../../lib/graphql/admin/create-storefront.js';
@@ -23,28 +23,45 @@ class Link extends Command {
   static flags = {
     ...commonFlags.force,
     ...commonFlags.path,
+    ...commonFlags.shop,
     storefront: Flags.string({
       description: `The name of a Hydrogen Storefront (e.g. "Jane's Apparel")`,
-      env: "SHOPIFY_HYDROGEN_STOREFRONT"
+      env: "SHOPIFY_HYDROGEN_STOREFRONT",
+      exclusive: ["create-storefront", "name"]
+    }),
+    "create-storefront": Flags.boolean({
+      description: "Create a new Hydrogen storefront.",
+      env: "SHOPIFY_HYDROGEN_FLAG_CREATE_STOREFRONT",
+      exclusive: ["storefront"]
+    }),
+    name: Flags.string({
+      description: "The name to use when creating a new Hydrogen storefront.",
+      env: "SHOPIFY_HYDROGEN_FLAG_NAME",
+      exclusive: ["storefront"]
     })
   };
   async run() {
     const { flags } = await this.parse(Link);
-    await runLink(flags);
+    await runLink(flagsToCamelObject(flags));
   }
 }
 async function runLink({
+  createStorefront: flagCreateStorefront,
   force,
   path: root = process.cwd(),
-  storefront: flagStorefront
+  shop,
+  storefront: flagStorefront,
+  name
 }) {
   const [{ session, config }, cliCommand] = await Promise.all([
-    login(root),
+    login(root, shop),
     getCliCommand()
   ]);
   const linkedStore = await linkStorefront(root, session, config, {
     force,
+    flagCreateStorefront,
     flagStorefront,
+    storefrontName: name,
     cliCommand
   });
   if (!linkedStore) return;
@@ -61,10 +78,19 @@ async function runLink({
 }
 async function linkStorefront(root, session, config, {
   force = false,
+  flagCreateStorefront,
   flagStorefront,
+  storefrontName,
   cliCommand,
   storefronts
 }) {
+  storefrontName = storefrontName?.trim() || void 0;
+  if (flagStorefront && (flagCreateStorefront || storefrontName)) {
+    throw new AbortError(
+      "`--storefront` cannot be used with storefront creation flags.",
+      "Use `--storefront` to link an existing storefront or `--name` to create a new one."
+    );
+  }
   if (!config.shop) {
     throw new AbortError("No shop found in local config, login first.");
   }
@@ -100,6 +126,13 @@ async function linkStorefront(root, session, config, {
       });
       return;
     }
+  } else if (flagCreateStorefront || storefrontName) {
+    selectedStorefront = await createNewStorefront(
+      root,
+      session,
+      storefronts,
+      storefrontName
+    );
   } else {
     selectedStorefront = await handleStorefrontSelection(storefronts);
     if (!selectedStorefront) {
@@ -113,7 +146,7 @@ async function linkStorefront(root, session, config, {
   await setStorefront(root, selectedStorefront);
   return selectedStorefront;
 }
-async function createNewStorefront(root, session, storefronts) {
+async function createNewStorefront(root, session, storefronts, storefrontName) {
   const projectDirectory = basename(root);
   let defaultProjectName = titleize(projectDirectory);
   const nameAlreadyUsed = storefronts.some(
@@ -122,7 +155,7 @@ async function createNewStorefront(root, session, storefronts) {
   if (nameAlreadyUsed) {
     defaultProjectName = generateRandomName();
   }
-  const projectName = await renderTextPrompt({
+  const projectName = storefrontName ?? await renderTextPrompt({
     message: "New storefront name",
     defaultValue: defaultProjectName
   });

package/dist/commands/hydrogen/upgrade.js

@@ -49,7 +49,7 @@ let CACHED_CHANGELOG = null;
 async function runUpgrade({
   appPath,
   version: targetVersion,
-  force
+  force = false
 }) {
   if (targetVersion === "next") {
     const isInTests = process.env.SHOPIFY_UNIT_TEST === "1";
@@ -115,7 +115,7 @@ async function runUpgrade({
       currentDependencies,
       selectedRelease
     });
-    confirmed = await displayConfirmation({
+    confirmed = force || await displayConfirmation({
       cumulativeRelease,
       selectedRelease,
       targetVersion
@@ -125,7 +125,8 @@ async function runUpgrade({
     appPath,
     cumulativeRelease,
     currentVersion,
-    selectedRelease
+    selectedRelease,
+    force
   });
   await upgradeNodeModules({
     appPath,
@@ -880,7 +881,8 @@ async function generateUpgradeInstructionsFile({
   appPath,
   cumulativeRelease,
   currentVersion,
-  selectedRelease
+  selectedRelease,
+  force = false
 }) {
   let filename = "";
   const { featuresMd, breakingChangesMd } = cumulativeRelease.features.filter((feature) => feature.steps).reduce(
@@ -955,7 +957,7 @@ The following packages have been removed as part of this upgrade:
   if (!await fileExists(filePath)) {
     await touchFile(filePath);
   } else {
-    const overwriteMdFile = await renderConfirmationPrompt({
+    const overwriteMdFile = force || await renderConfirmationPrompt({
       message: `A previous upgrade instructions file already exists for this version.
 Do you want to overwrite it?`,
       defaultValue: false

package/dist/index.d.ts

@@ -177,6 +177,9 @@ declare class Link extends Command {
     static description: string;
     static flags: {
         storefront: _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
+        'create-storefront': _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
+        name: _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
+        shop: _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         path: _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         force: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
     };

package/oclif.manifest.json

@@ -1150,13 +1150,47 @@
           "multiple": false,
           "type": "option"
         },
+        "shop": {
+          "char": "s",
+          "description": "Shop URL. It can be the shop prefix (janes-apparel) or the full myshopify.com URL (janes-apparel.myshopify.com, https://janes-apparel.myshopify.com).",
+          "env": "SHOPIFY_SHOP",
+          "name": "shop",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "storefront": {
           "description": "The name of a Hydrogen Storefront (e.g. \"Jane's Apparel\")",
           "env": "SHOPIFY_HYDROGEN_STOREFRONT",
+          "exclusive": [
+            "create-storefront",
+            "name"
+          ],
           "name": "storefront",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "create-storefront": {
+          "description": "Create a new Hydrogen storefront.",
+          "env": "SHOPIFY_HYDROGEN_FLAG_CREATE_STOREFRONT",
+          "exclusive": [
+            "storefront"
+          ],
+          "name": "create-storefront",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "name": {
+          "description": "The name to use when creating a new Hydrogen storefront.",
+          "env": "SHOPIFY_HYDROGEN_FLAG_NAME",
+          "exclusive": [
+            "storefront"
+          ],
+          "name": "name",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -1711,5 +1745,5 @@
       ]
     }
   },
-  "version": "13.0.1"
+  "version": "13.0.2"
 }

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "@shopify:registry": "https://registry.npmjs.org"
   },
-  "version": "13.0.1",
+  "version": "13.0.2",
   "license": "MIT",
   "type": "module",
   "repository": {
@@ -58,8 +58,8 @@
     "@react-router/dev": "~7.16.0",
     "graphql-config": "^5.0.3",
     "vite": "^5.1.0 || ^6.2.0 || ^7.0.0 || ^8.0.0",
-    "@shopify/hydrogen-codegen": "0.3.3",
-    "@shopify/mini-oxygen": "4.2.0"
+    "@shopify/mini-oxygen": "4.2.0",
+    "@shopify/hydrogen-codegen": "0.3.3"
   },
   "peerDependenciesMeta": {
     "@graphql-codegen/cli": {