@shopify/cli-hydrogen 7.0.0 → 7.1.0

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"];
           }
@@ -192,6 +192,7 @@ describe("i18n replacers", () => {
                */
               const cart = createCartHandler({
                 storefront,
+                customerAccount,
                 getCartId: cartGetIdDefault(request.headers),
                 setCartId: cartSetIdDefault(),
                 cartQueryFragment: CART_QUERY_FRAGMENT,

package/dist/lib/setups/routes/generate.js

@@ -1,4 +1,5 @@
-import { readdir } from 'fs/promises';
+import { readdir } from 'node:fs/promises';
+import { fileURLToPath } from 'node:url';
 import { fileExists, mkdir, copyFile, readFile, writeFile } from '@shopify/cli-kit/node/fs';
 import { joinPath, relativizePath, dirname, relativePath, resolvePath, basename } from '@shopify/cli-kit/node/path';
 import { AbortError } from '@shopify/cli-kit/node/error';
@@ -58,7 +59,8 @@ async function generateRoutes(options, remixConfig) {
     (item) => GENERATOR_ROUTE_DIR + "/" + item
   );
   const formatOptions = await getCodeFormatOptions(rootDirectory);
-  const localePrefix = await getLocalePrefix(appDirectory, options);
+  const routesDirectory = joinPath(appDirectory, GENERATOR_ROUTE_DIR);
+  const localePrefix = await getLocalePrefix(routesDirectory, options);
   const typescript = !!(options.typescript ?? await fileExists(joinPath(rootDirectory, "tsconfig.json")));
   const routes = [];
   for (const route of routesArray) {
@@ -73,6 +75,15 @@ async function generateRoutes(options, remixConfig) {
       })
     );
   }
+  if (localePrefix) {
+    await copyLocaleNamelessRoute({
+      typescript,
+      localePrefix,
+      routesDirectory,
+      formatOptions,
+      adapter: options.adapter
+    });
+  }
   return {
     routes,
     routeGroups,
@@ -80,14 +91,12 @@ async function generateRoutes(options, remixConfig) {
     formatOptions
   };
 }
-async function getLocalePrefix(appDirectory, { localePrefix, routeName, v1RouteConvention }) {
+async function getLocalePrefix(routesDirectory, { localePrefix, routeName, v1RouteConvention }) {
   if (localePrefix)
     return localePrefix;
   if (localePrefix !== void 0 || routeName === "all")
     return;
-  const existingFiles = await readdir(joinPath(appDirectory, "routes")).catch(
-    () => []
-  );
+  const existingFiles = await readdir(routesDirectory).catch(() => []);
   const coreRouteWithLocaleRE = v1RouteConvention ? /^\(\$(\w+)\)$/ : /^\(\$(\w+)\)\.(_index|\$|cart).[jt]sx?$/;
   const coreRouteWithLocale = existingFiles.find(
     (file) => coreRouteWithLocaleRE.test(file)
@@ -161,10 +170,7 @@ async function generateProjectFile(routeFrom, {
       );
     }
     if (adapter) {
-      templateContent = templateContent.replace(
-        /@shopify\/remix-oxygen/g,
-        adapter
-      );
+      templateContent = replaceAdapters(templateContent, adapter);
     }
     templateContent = await formatCode(
       templateContent,
@@ -175,6 +181,9 @@ async function generateProjectFile(routeFrom, {
   }
   return result;
 }
+function replaceAdapters(templateContent, adapter) {
+  return templateContent.replace(/@shopify\/remix-oxygen/g, adapter);
+}
 function getDestinationRoute(routeFrom, localePrefix, options) {
   const routePath = routeFrom.replace(GENERATOR_ROUTE_DIR + "/", "");
   const filePrefix = localePrefix && !NO_LOCALE_PATTERNS.some((pattern) => pattern.test(routePath)) ? `($${localePrefix})` + (options.v1RouteConvention ? "/" : ".") : "";
@@ -219,5 +228,44 @@ async function renderRoutePrompt(options) {
   });
   return generateAll ? "all" : [];
 }
+function copyLocaleNamelessRoute({
+  typescript,
+  localePrefix,
+  ...options
+}) {
+  return copyRouteTemplate({
+    ...options,
+    typescript,
+    templateName: "locale-check.ts",
+    routeName: `($${localePrefix})${typescript ? ".tsx" : ".jsx"}`
+  });
+}
+async function copyRouteTemplate({
+  templateName,
+  routeName,
+  routesDirectory,
+  formatOptions,
+  typescript,
+  adapter
+}) {
+  const routePath = joinPath(routesDirectory, routeName);
+  if (await fileExists(routePath))
+    return;
+  const templatePath = fileURLToPath(
+    new URL(`./templates/${templateName}`, import.meta.url)
+  );
+  if (!await fileExists(templatePath)) {
+    throw new Error("Unknown strategy");
+  }
+  let templateContent = await readFile(templatePath);
+  if (adapter) {
+    templateContent = replaceAdapters(templateContent, adapter);
+  }
+  if (!typescript) {
+    templateContent = await transpileFile(templateContent, templatePath);
+  }
+  templateContent = await formatCode(templateContent, formatOptions, routePath);
+  await writeFile(routePath, templateContent);
+}
 
 export { ALL_ROUTE_CHOICES, generateProjectFile, generateRoutes, getResolvedRoutes, renderRoutePrompt };

package/dist/lib/setups/routes/templates/locale-check.js

@@ -0,0 +1,9 @@
+async function loader({ params, context }) {
+  const { language, country } = context.storefront.i18n;
+  if (params.locale && params.locale.toLowerCase() !== `${language}-${country}`.toLowerCase()) {
+    throw new Response(null, { status: 404 });
+  }
+  return null;
+}
+
+export { loader };

package/dist/lib/setups/routes/templates/locale-check.ts

@@ -0,0 +1,16 @@
+import type {LoaderFunctionArgs} from '@shopify/remix-oxygen';
+
+export async function loader({params, context}: LoaderFunctionArgs) {
+  const {language, country} = context.storefront.i18n;
+
+  if (
+    params.locale &&
+    params.locale.toLowerCase() !== `${language}-${country}`.toLowerCase()
+  ) {
+    // If the locale URL param is defined, yet we still are still at the default locale
+    // then the the locale param must be invalid, send to the 404 page
+    throw new Response(null, {status: 404});
+  }
+
+  return null;
+}

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.1.0",
   "commands": {
     "hydrogen:build": {
       "id": "hydrogen:build",
@@ -19,19 +19,19 @@
         "sourcemap": {
           "name": "sourcemap",
           "type": "boolean",
-          "description": "Generate sourcemaps for the build.",
+          "description": "Controls whether sourcemaps are generated. Default to true, use `--no-sourcemaps` to disable.",
           "allowNo": true
         },
         "bundle-stats": {
           "name": "bundle-stats",
           "type": "boolean",
-          "description": "Show a bundle size summary after building.",
+          "description": "Show a bundle size summary after building. Defaults to true, use `--no-bundle-stats` to disable.",
           "allowNo": true
         },
         "lockfile-check": {
           "name": "lockfile-check",
           "type": "boolean",
-          "description": "Checks that there is exactly 1 valid lockfile in the project.",
+          "description": "Checks that there is exactly 1 valid lockfile in the project. Defaults to true, use `--no-lockfile-check` to disable.",
           "allowNo": true
         },
         "disable-route-warning": {
@@ -149,6 +149,13 @@
           "required": false,
           "multiple": false
         },
+        "env-file": {
+          "name": "env-file",
+          "type": "option",
+          "description": "Path to an environment file to override existing environment variables for the deployment.",
+          "required": false,
+          "multiple": false
+        },
         "preview": {
           "name": "preview",
           "type": "boolean",
@@ -164,6 +171,13 @@
           "required": false,
           "allowNo": false
         },
+        "no-verify": {
+          "name": "no-verify",
+          "type": "boolean",
+          "description": "Skip the routability verification step after deployment.",
+          "required": false,
+          "allowNo": false
+        },
         "auth-bypass-token": {
           "name": "auth-bypass-token",
           "type": "boolean",
@@ -171,6 +185,19 @@
           "required": false,
           "allowNo": false
         },
+        "build-command": {
+          "name": "build-command",
+          "type": "option",
+          "description": "Specify a build command to run before deploying. If not specified, `shopify hydrogen build` will be used.",
+          "required": false,
+          "multiple": false
+        },
+        "lockfile-check": {
+          "name": "lockfile-check",
+          "type": "boolean",
+          "description": "Checks that there is exactly 1 valid lockfile in the project. Defaults to true, use `--no-lockfile-check` to disable.",
+          "allowNo": true
+        },
         "path": {
           "name": "path",
           "type": "option",
@@ -184,12 +211,12 @@
           "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).",
           "multiple": false
         },
-        "no-json-output": {
-          "name": "no-json-output",
+        "json-output": {
+          "name": "json-output",
           "type": "boolean",
-          "description": "Prevents the command from creating a JSON file containing the deployment URL in CI environments.",
+          "description": "Create a JSON file containing the deployment details in CI environments. Defaults to true, use `--no-json-output` to disable.",
           "required": false,
-          "allowNo": false
+          "allowNo": true
         },
         "token": {
           "name": "token",
@@ -777,6 +804,12 @@
           "description": "Generate TypeScript files",
           "allowNo": false
         },
+        "locale-param": {
+          "name": "locale-param",
+          "type": "option",
+          "description": "The param name in Remix routes for the i18n locale, if any. Example: `locale` becomes ($locale).",
+          "multiple": false
+        },
         "force": {
           "name": "force",
           "type": "boolean",
@@ -834,6 +867,12 @@
           "description": "Generate TypeScript files",
           "allowNo": false
         },
+        "locale-param": {
+          "name": "locale-param",
+          "type": "option",
+          "description": "The param name in Remix routes for the i18n locale, if any. Example: `locale` becomes ($locale).",
+          "multiple": false
+        },
         "force": {
           "name": "force",
           "type": "boolean",

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "@shopify:registry": "https://registry.npmjs.org"
   },
-  "version": "7.0.0",
+  "version": "7.1.0",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -16,7 +16,7 @@
     "test:watch": "cross-env SHOPIFY_UNIT_TEST=1 vitest --test-timeout=20000"
   },
   "devDependencies": {
-    "@remix-run/dev": "^2.5.1",
+    "@remix-run/dev": "^2.6.0",
     "@types/diff": "^5.0.2",
     "@types/fs-extra": "^11.0.1",
     "@types/gunzip-maybe": "^1.4.0",
@@ -34,12 +34,12 @@
   },
   "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",
+    "@shopify/oxygen-cli": "^4.1.0",
     "ansi-escapes": "^6.2.0",
     "cli-truncate": "^4.0.0",
     "diff": "^5.1.0",