@shopify/cli-hydrogen 7.0.0 → 7.0.1

package/dist/commands/hydrogen/init.test.js

@@ -171,8 +171,8 @@ describe("init", () => {
         const examplePath = templatePath.replace("templates", "examples").replace("skeleton", exampleName);
         const ignore = ["**/node_modules/**", "**/dist/**"];
         const resultFiles = await glob("**/*", { ignore, cwd: tmpDir });
-        const templateFiles = await glob("**/*", { ignore, cwd: templatePath });
         const exampleFiles = await glob("**/*", { ignore, cwd: examplePath });
+        const templateFiles = (await glob("**/*", { ignore, cwd: templatePath })).filter((item) => !item.endsWith("CHANGELOG.md"));
         expect(resultFiles).toEqual(
           expect.arrayContaining([
             .../* @__PURE__ */ new Set([...templateFiles, ...exampleFiles])

package/dist/commands/hydrogen/setup.js

@@ -7,7 +7,7 @@ import { commonFlags, overrideFlag, flagsToCamelObject } from '../../lib/flags.j
 import { renderI18nPrompt, setupI18nStrategy } from '../../lib/setups/i18n/index.js';
 import { getRemixConfig } from '../../lib/remix-config.js';
 import { handleRouteGeneration, generateProjectEntries, handleCliShortcut, renderProjectReady } from '../../lib/onboarding/common.js';
-import { getCliCommand } from '../../lib/shell.js';
+import { getCliCommand, ALIAS_NAME } from '../../lib/shell.js';
 import { getTemplateAppFile } from '../../lib/build.js';
 
 class Setup extends Command {
@@ -89,24 +89,22 @@ async function runSetup(options) {
       () => setupI18nStrategy(i18n, remixConfig)
     );
   }
-  let hasCreatedShortcut = false;
-  const cliCommand = await cliCommandPromise;
-  const needsAlias = cliCommand !== "h2";
-  if (needsAlias) {
-    const { createShortcut, showShortcutBanner } = await handleCliShortcut(
-      controller,
-      await cliCommandPromise,
-      options.shortcut
-    );
-    if (createShortcut) {
-      backgroundWorkPromise = backgroundWorkPromise.then(async () => {
-        hasCreatedShortcut = await createShortcut();
-      });
-      showShortcutBanner();
-    }
-  }
-  if (!i18n && !needsRouteGeneration && !needsAlias)
+  let cliCommand = await Promise.resolve(cliCommandPromise);
+  const { createShortcut, showShortcutBanner } = await handleCliShortcut(
+    controller,
+    cliCommand,
+    options.shortcut
+  );
+  if (!i18n && !needsRouteGeneration && !createShortcut)
     return;
+  if (createShortcut) {
+    backgroundWorkPromise = backgroundWorkPromise.then(async () => {
+      if (await createShortcut()) {
+        cliCommand = ALIAS_NAME;
+      }
+    });
+    showShortcutBanner();
+  }
   await renderTasks(tasks);
   await renderProjectReady(
     {
@@ -115,7 +113,7 @@ async function runSetup(options) {
       directory: remixConfig.rootDirectory
     },
     {
-      hasCreatedShortcut,
+      cliCommand,
       depsInstalled: true,
       packageManager: "npm",
       i18n,

package/dist/generator-templates/starter/CHANGELOG.md

@@ -1,5 +1,15 @@
 # skeleton
 
+## 1.0.3
+
+### Patch Changes
+
+- ♻️ `CustomerClient` type is deprecated and replaced by `CustomerAccount` ([#1692](https://github.com/Shopify/hydrogen/pull/1692)) by [@michenly](https://github.com/michenly)
+
+- Updated dependencies [[`02798786`](https://github.com/Shopify/hydrogen/commit/02798786bf8ae5c53f6430723a86d62b8e94d120), [`52b15df4`](https://github.com/Shopify/hydrogen/commit/52b15df457ce723bbc83ad594ded73a7b06447d6), [`a2664362`](https://github.com/Shopify/hydrogen/commit/a2664362a7d89b34835553a9b0eb7af55ca70ae4), [`eee5d927`](https://github.com/Shopify/hydrogen/commit/eee5d9274b72404dfb0ffef30d5503fd553be5fe), [`c7b2017f`](https://github.com/Shopify/hydrogen/commit/c7b2017f11a2cb4d280dfd8f170e65a908b9ea02), [`06320ee4`](https://github.com/Shopify/hydrogen/commit/06320ee48b94dbfece945461031a252f454fd0a3)]:
+  - @shopify/hydrogen@2024.1.1
+  - @shopify/cli-hydrogen@7.0.1
+
 ## 1.0.2
 
 ### Patch Changes

package/dist/generator-templates/starter/package.json

@@ -2,7 +2,7 @@
   "name": "skeleton",
   "private": true,
   "sideEffects": false,
-  "version": "1.0.2",
+  "version": "1.0.3",
   "scripts": {
     "build": "shopify hydrogen build",
     "dev": "shopify hydrogen dev --codegen",
@@ -16,8 +16,8 @@
     "@remix-run/react": "^2.5.1",
     "@remix-run/server-runtime": "^2.5.1",
     "@shopify/cli": "3.52.0",
-    "@shopify/cli-hydrogen": "^7.0.0",
-    "@shopify/hydrogen": "~2024.1.0",
+    "@shopify/cli-hydrogen": "^7.0.1",
+    "@shopify/hydrogen": "~2024.1.1",
     "@shopify/remix-oxygen": "^2.0.3",
     "graphql": "^16.6.0",
     "graphql-tag": "^2.12.6",

package/dist/generator-templates/starter/remix.env.d.ts

@@ -5,7 +5,11 @@
 // Enhance TypeScript's built-in typings.
 import '@total-typescript/ts-reset';
 
-import type {Storefront, CustomerClient, HydrogenCart} from '@shopify/hydrogen';
+import type {
+  Storefront,
+  CustomerAccount,
+  HydrogenCart,
+} from '@shopify/hydrogen';
 import type {AppSession} from '~/lib/session';
 
 declare global {
@@ -36,7 +40,7 @@ declare module '@shopify/remix-oxygen' {
     env: Env;
     cart: HydrogenCart;
     storefront: Storefront;
-    customerAccount: CustomerClient;
+    customerAccount: CustomerAccount;
     session: AppSession;
     waitUntil: ExecutionContext['waitUntil'];
   }

package/dist/lib/codegen.js

@@ -63,14 +63,7 @@ function spawnCodegenProcess({
   });
   return child;
 }
-async function codegen(options) {
-  await import('@shopify/hydrogen-codegen/patch').catch((error) => {
-    throw new AbortError(
-      `Failed to patch dependencies for codegen.
-${error.stack}`,
-      "Please report this issue."
-    );
-  });
+function codegen(options) {
   return generateTypes(options).catch((error) => {
     const { message, details } = normalizeCodegenError(
       error.message,

package/dist/lib/file.js

@@ -84,7 +84,10 @@ async function mergePackageJson(sourceDir, targetDir, options) {
       }, {});
     }
   }
-  await writePackageJSON(targetDir, targetPkgJson);
+  await writePackageJSON(
+    targetDir,
+    options?.onResult?.(targetPkgJson) ?? targetPkgJson
+  );
 }
 
 export { findFileWithExtension, mergePackageJson, replaceFileContent };

package/dist/lib/graphiql-url.js

@@ -8,6 +8,9 @@ function getGraphiQLUrl({
     if (typeof variables !== "string")
       variables = JSON.stringify(variables);
     url += `?query=${encodeURIComponent(query)}${variables ? `&variables=${encodeURIComponent(variables)}` : ""}`;
+    if (graphql.schema) {
+      url += `&schema=${graphql.schema}`;
+    }
   }
   return url;
 }

package/dist/lib/mini-oxygen/assets.js

@@ -1,5 +1,6 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
+import { createRequire } from 'node:module';
 import { createServer } from 'node:http';
 import { lookupMimeType } from '@shopify/cli-kit/node/mimes';
 
@@ -10,13 +11,28 @@ function buildAssetsUrl(assetsPort) {
 }
 function createAssetsServer(buildPathClient) {
   return createServer(async (req, res) => {
+    if (req.method === "OPTIONS") {
+      res.setHeader("Access-Control-Allow-Origin", req.headers.origin || "*");
+      res.setHeader("Access-Control-Allow-Credentials", "true");
+      res.setHeader("Access-Control-Allow-Private-Network", "true");
+      res.setHeader("Access-Control-Max-Age", "86400");
+      res.writeHead(204);
+      res.end();
+      return;
+    }
     res.setHeader("Access-Control-Allow-Origin", "*");
     res.setHeader("X-Content-Type-Options", "nosniff");
     const pathname = req.url?.split("?")[0] || "";
     const isValidAssetPath = pathname.startsWith(`/${artificialAssetPrefix}/`) && !pathname.includes("..");
     const relativeAssetPath = isValidAssetPath ? pathname.replace(`/${artificialAssetPrefix}`, "") : pathname;
     if (isValidAssetPath) {
-      const filePath = path.join(buildPathClient, relativeAssetPath);
+      let filePath = path.join(buildPathClient, relativeAssetPath);
+      if (relativeAssetPath === "/graphiql/customer-account.schema.json") {
+        const require2 = createRequire(import.meta.url);
+        filePath = require2.resolve(
+          "@shopify/hydrogen/customer-account.schema.json"
+        );
+      }
       const file = await fs.open(filePath).catch(() => {
       });
       const stat = await file?.stat().catch(() => {

package/dist/lib/onboarding/common.js

@@ -11,7 +11,7 @@ import colors from '@shopify/cli-kit/node/colors';
 import { login, renderLoginSuccess } from '../auth.js';
 import { renderI18nPrompt, setupI18nStrategy, I18N_STRATEGY_NAME_MAP } from '../setups/i18n/index.js';
 import { titleize } from '../string.js';
-import { ALIAS_NAME, createPlatformShortcut, getCliCommand } from '../shell.js';
+import { ALIAS_NAME, createPlatformShortcut } from '../shell.js';
 import { transpileProject } from '../transpile/index.js';
 import { renderCssPrompt, setupCssStrategy, CSS_STRATEGY_NAME_MAP } from '../setups/css/index.js';
 import { renderRoutePrompt, generateRoutes, generateProjectFile } from '../setups/routes/generate.js';
@@ -75,6 +75,8 @@ function generateProjectEntries(options) {
   );
 }
 async function handleCliShortcut(controller, cliCommand, flagShortcut) {
+  if (cliCommand === ALIAS_NAME)
+    return {};
   const shouldCreateShortcut = flagShortcut ?? await renderConfirmationPrompt({
     confirmationMessage: "Yes",
     cancellationMessage: "No",
@@ -329,7 +331,7 @@ async function renderProjectReady(project, {
   packageManager,
   depsInstalled,
   cssStrategy,
-  hasCreatedShortcut,
+  cliCommand,
   routes,
   i18n,
   depsError,
@@ -369,7 +371,6 @@ async function renderProjectReady(project, {
     }
   }
   const padMin = 1 + bodyLines.reduce((max, [label]) => Math.max(max, label.length), 0);
-  const cliCommand = hasCreatedShortcut ? ALIAS_NAME : await getCliCommand(project.directory, packageManager);
   const render = hasErrors ? renderWarning : renderSuccess;
   render({
     headline: `Storefront setup complete` + (hasErrors ? " with errors (see warnings below)." : "!"),

package/dist/lib/onboarding/local.js

@@ -156,7 +156,7 @@ async function setupLocalStarterTemplate(options, controller) {
     packageManager,
     cssStrategy,
     depsInstalled: false,
-    hasCreatedShortcut: false
+    cliCommand: await getCliCommand("", packageManager)
   };
   if (shouldInstallDeps) {
     const installingDepsPromise = backgroundWorkPromise.then(async () => {
@@ -174,19 +174,19 @@ async function setupLocalStarterTemplate(options, controller) {
       }
     });
   }
-  const pkgManagerCommand = await getCliCommand("", packageManager);
   const { createShortcut, showShortcutBanner } = await handleCliShortcut(
     controller,
-    pkgManagerCommand,
+    setupSummary.cliCommand,
     options.shortcut
   );
   if (createShortcut) {
     backgroundWorkPromise = backgroundWorkPromise.then(async () => {
-      setupSummary.hasCreatedShortcut = await createShortcut();
+      if (await createShortcut()) {
+        setupSummary.cliCommand = ALIAS_NAME;
+      }
     });
     showShortcutBanner();
   }
-  const cliCommand = createShortcut ? ALIAS_NAME : pkgManagerCommand;
   renderSuccess({
     headline: [
       { userInput: storefrontInfo?.title ?? project.name },
@@ -196,13 +196,13 @@ async function setupLocalStarterTemplate(options, controller) {
   const continueWithSetup = (options.i18n ?? options.routes) !== void 0 || await renderConfirmationPrompt({
     message: "Do you want to scaffold routes and core functionality?",
     confirmationMessage: "Yes, set up now",
-    cancellationMessage: "No, set up later " + colors.dim(`(run \`${cliCommand} setup\`)`),
+    cancellationMessage: "No, set up later " + colors.dim(`(run \`${setupSummary.cliCommand} setup\`)`),
     abortSignal: controller.signal
   });
   if (continueWithSetup) {
     const { i18nStrategy, setupI18n } = await handleI18n(
       controller,
-      cliCommand,
+      setupSummary.cliCommand,
       options.i18n
     );
     const { setupRoutes } = await handleRouteGeneration(

package/dist/lib/onboarding/remote.js

@@ -5,6 +5,7 @@ import { joinPath } from '@shopify/cli-kit/node/path';
 import { renderTasks, renderInfo } from '@shopify/cli-kit/node/ui';
 import { getLatestTemplates } from '../template-downloader.js';
 import { applyTemplateDiff } from '../template-diff.js';
+import { getCliCommand } from '../shell.js';
 import { createAbortHandler, handleProjectLocation, handleLanguage, createInitialCommit, handleDependencies, commitAll, renderProjectReady } from './common.js';
 
 async function setupRemoteTemplate(options, controller) {
@@ -65,7 +66,7 @@ async function setupRemoteTemplate(options, controller) {
     language,
     packageManager,
     depsInstalled: false,
-    hasCreatedShortcut: false
+    cliCommand: await getCliCommand("", packageManager)
   };
   const tasks = [
     {

package/dist/lib/setups/i18n/replacers.test.js

@@ -50,7 +50,7 @@ describe("i18n replacers", () => {
 
         import type {
           Storefront,
-          CustomerClient,
+          CustomerAccount,
           HydrogenCart,
         } from "@shopify/hydrogen";
         import type {
@@ -92,7 +92,7 @@ describe("i18n replacers", () => {
             env: Env;
             cart: HydrogenCart;
             storefront: Storefront<I18nLocale>;
-            customerAccount: CustomerClient;
+            customerAccount: CustomerAccount;
             session: AppSession;
             waitUntil: ExecutionContext["waitUntil"];
           }

package/dist/lib/shell.js

@@ -155,7 +155,7 @@ async function createShortcutsForWindows() {
   return shells;
 }
 async function getCliCommand(directory = process.cwd(), forcePkgManager) {
-  if (!forcePkgManager && await hasCliAlias()) {
+  if (await hasCliAlias()) {
     return ALIAS_NAME;
   }
   let cli = "npx";

package/dist/lib/template-diff.js

@@ -67,15 +67,25 @@ ${colors.dim(
 async function applyTemplateDiff(targetDirectory, diffDirectory, templateDir = getStarterDir()) {
   const createFilter = (re) => (filepath) => !re.test(relativePath(templateDir, filepath));
   await copy(templateDir, targetDirectory, {
-    filter: createFilter(/[\/\\](dist|node_modules|\.cache)(\/|\\|$)/i)
+    filter: createFilter(
+      /(^|\/|\\)(dist|node_modules|\.cache|CHANGELOG\.md)(\/|\\|$)/i
+    )
   });
   await copy(diffDirectory, targetDirectory, {
     filter: createFilter(
-      /[\/\\](dist|node_modules|\.cache|package\.json|tsconfig\.json)(\/|\\|$)/i
+      /(^|\/|\\)(dist|node_modules|\.cache|package\.json|tsconfig\.json)(\/|\\|$)/i
     )
   });
   await mergePackageJson(diffDirectory, targetDirectory, {
-    ignoredKeys: ["scripts"]
+    onResult: (pkgJson) => {
+      for (const key of ["build", "dev"]) {
+        const scriptLine = pkgJson.scripts?.[key];
+        if (pkgJson.scripts?.[key] && typeof scriptLine === "string") {
+          pkgJson.scripts[key] = scriptLine.replace(/\s+--diff/, "");
+        }
+      }
+      return pkgJson;
+    }
   });
 }
 async function copyDiffBuild(targetDirectory, diffDirectory) {

package/dist/virtual-routes/components/RequestDetails.jsx

@@ -64,13 +64,13 @@ function RequestDetails({
       /* @__PURE__ */ jsx("div", { id: "tab1-panel", className: `tabPanel${activeTabClass(1)}`, children: /* @__PURE__ */ jsxs("div", { className: "grid-layout", children: [
         /* @__PURE__ */ jsx(DetailsRow, { rowName: "Name", value: requestInfo.displayName }),
         /* @__PURE__ */ jsx(DetailsRow, { rowName: "Request URL", value: requestInfo.url }),
-        /* @__PURE__ */ jsx(
+        requestInfo.responseInit ? /* @__PURE__ */ jsx(
           DetailsRow,
           {
             rowName: "Status",
             value: `${requestInfo.responseInit?.status} ${requestInfo.responseInit?.statusText}`
           }
-        ),
+        ) : null,
         /* @__PURE__ */ jsx(
           DetailsRow,
           {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "7.0.0",
+  "version": "7.0.1",
   "commands": {
     "hydrogen:build": {
       "id": "hydrogen:build",

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "@shopify:registry": "https://registry.npmjs.org"
   },
-  "version": "7.0.0",
+  "version": "7.0.1",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -34,10 +34,10 @@
   },
   "dependencies": {
     "@ast-grep/napi": "0.11.0",
-    "@graphql-codegen/cli": "5.0.0",
+    "@graphql-codegen/cli": "5.0.1",
     "@oclif/core": "2.11.7",
     "@shopify/cli-kit": "3.52.0",
-    "@shopify/hydrogen-codegen": "^0.2.0",
+    "@shopify/hydrogen-codegen": "^0.2.1",
     "@shopify/mini-oxygen": "^2.2.5",
     "@shopify/oxygen-cli": "^4.0.0",
     "ansi-escapes": "^6.2.0",