@shopify/cli-hydrogen 12.0.2 → 13.0.0

package/dist/assets/hydrogen/starter/package.json

@@ -32,7 +32,7 @@
     "@react-router/fs-routes": "7.16.0",
     "@shopify/cli": "3.93.2",
     "@shopify/hydrogen-codegen": "0.3.3",
-    "@shopify/mini-oxygen": "4.1.0",
+    "@shopify/mini-oxygen": "4.2.0",
     "@shopify/oxygen-workers-types": "^4.1.6",
     "@shopify/prettier-config": "^1.1.2",
     "@total-typescript/ts-reset": "^0.6.1",

package/dist/commands/hydrogen/deploy.js

@@ -21,6 +21,7 @@ import { isClassicProject, getProjectPaths } from '../../lib/remix-config.js';
 import { packageManagers } from '../../lib/package-managers.js';
 
 const DEPLOY_OUTPUT_FILE_HANDLE = "h2_deploy_log.json";
+const DEFAULT_BUILD_COMMAND = "node --run build";
 const deploymentLogger = (message, level = "info") => {
   if (level === "error" || level === "warn") {
     outputWarn(message);
@@ -69,7 +70,17 @@ class Deploy extends Command {
       dependsOn: ["auth-bypass-token"]
     }),
     "build-command": Flags.string({
-      description: "Specify a build command to run before deploying. If not specified, `shopify hydrogen build` will be used.",
+      description: "Specify a build command to run before deploying. If not specified, the Hydrogen build pipeline will be used. When custom output directories are configured, defaults to `node --run build`.",
+      required: false
+    }),
+    "assets-dir": Flags.string({
+      description: "Directory containing the client assets to deploy, relative to the project root. Defaults to the detected Vite client output directory, then falls back to `dist/client`.",
+      env: "SHOPIFY_HYDROGEN_FLAG_ASSETS_DIR",
+      required: false
+    }),
+    "worker-dir": Flags.string({
+      description: "Directory containing the Oxygen worker entry point (`index.js` or `index.mjs`), relative to the project root. Defaults to the detected Vite server output directory, then falls back to `dist/server`.",
+      env: "SHOPIFY_HYDROGEN_FLAG_WORKER_DIR",
       required: false
     }),
     ...commonFlags.lockfileCheck,
@@ -162,10 +173,12 @@ async function runDeploy(options) {
     jsonOutput,
     path: root,
     shop,
+    assetsDir: assetsDirFlag,
     metadataUrl,
     metadataUser,
     metadataVersion,
-    entry: ssrEntry
+    entry: ssrEntry,
+    workerDir: workerDirFlag
   } = options;
   let { metadataDescription } = options;
   let isCleanGit = true;
@@ -335,16 +348,22 @@ ${changedFiles.trimEnd()}`;
   let assetsDir = "dist/client";
   let workerDir = "dist/worker";
   const isClassicCompiler = await isClassicProject(root);
-  if (!isClassicCompiler) {
+  const metadataHydrogenVersion = getHydrogenVersion({ appPath: root });
+  const shouldUseDefaultBuildCommand = !buildCommand && !isClassicCompiler && (assetsDirFlag || workerDirFlag || isHydrogenPreviewVersion(metadataHydrogenVersion));
+  if (isClassicCompiler) {
+    assetsDir = assetsDirFlag ?? assetsDir;
+    workerDir = workerDirFlag ?? workerDir;
+  } else {
     const viteConfig = await getViteConfig(root, ssrEntry).catch(() => null);
-    if (viteConfig) {
-      assetsDir = relativePath(root, viteConfig.clientOutDir);
-      workerDir = relativePath(root, viteConfig.serverOutDir);
-    } else {
-      workerDir = "dist/server";
-    }
+    const outputDirs = await resolveDeploymentOutputDirs({
+      root,
+      viteConfig,
+      assetsDir: assetsDirFlag,
+      workerDir: workerDirFlag
+    });
+    assetsDir = outputDirs.assetsDir;
+    workerDir = outputDirs.workerDir;
   }
-  const metadataHydrogenVersion = await getHydrogenVersion({ appPath: root });
   const config = {
     assetsDir,
     bugsnag: true,
@@ -436,7 +455,7 @@ Continue?`.value
       );
     }
   };
-  if (buildCommand) {
+  if (buildCommand || shouldUseDefaultBuildCommand) {
     if (forceClientSourcemap) {
       console.log("");
       renderInfo({
@@ -444,7 +463,7 @@ Continue?`.value
         body: "Client sourcemaps will not be generated."
       });
     }
-    config.buildCommand = buildCommand;
+    config.buildCommand = buildCommand ?? DEFAULT_BUILD_COMMAND;
   } else {
     hooks.buildFunction = async (assetPath) => {
       outputInfo(
@@ -527,15 +546,41 @@ Continue?`.value
   });
   return deployPromise;
 }
-async function getHydrogenVersion({ appPath }) {
+async function resolveDeploymentOutputDirs({
+  root,
+  viteConfig,
+  assetsDir,
+  workerDir
+}) {
+  const fallbackOutputDirs = {
+    assetsDir: "dist/client",
+    workerDir: "dist/server"
+  };
+  const viteOutputDirs = viteConfig ? {
+    assetsDir: relativePath(root, viteConfig.clientOutDir),
+    workerDir: relativePath(root, viteConfig.serverOutDir)
+  } : void 0;
+  return {
+    assetsDir: assetsDir ?? viteOutputDirs?.assetsDir ?? fallbackOutputDirs.assetsDir,
+    workerDir: workerDir ?? viteOutputDirs?.workerDir ?? fallbackOutputDirs.workerDir
+  };
+}
+function isHydrogenPreviewVersion(version) {
+  return version?.startsWith("0.0.0-preview-") ?? false;
+}
+function getHydrogenVersion({ appPath }) {
   const { root } = getProjectPaths(appPath);
-  const require2 = createRequire(import.meta.url);
-  const { version } = require2(
-    require2.resolve("@shopify/hydrogen/package.json", {
-      paths: [root]
-    })
-  );
-  return version;
+  try {
+    const require2 = createRequire(import.meta.url);
+    const packageJson = require2(
+      require2.resolve("@shopify/hydrogen/package.json", {
+        paths: [root]
+      })
+    );
+    return typeof packageJson.version === "string" ? packageJson.version : void 0;
+  } catch {
+    return void 0;
+  }
 }
 
-export { Deploy as default, deploymentLogger, getHydrogenVersion, runDeploy };
+export { Deploy as default, deploymentLogger, getHydrogenVersion, resolveDeploymentOutputDirs, runDeploy };

package/dist/lib/vite-config.js

@@ -38,8 +38,8 @@ async function getViteConfig(root, ssrEntryFlag) {
     mode
   );
   const { appDirectory, serverBuildFile, routes } = getReactRouterOrRemixConfigFromVite(resolvedViteConfig);
-  const serverOutDir = resolvedViteConfig.build.outDir;
-  const clientOutDir = serverOutDir.replace(/server$/, "client");
+  const serverOutDir = resolvedViteConfig.environments.ssr?.build.outDir ?? resolvedViteConfig.build.outDir;
+  const clientOutDir = resolvedViteConfig.environments.client?.build.outDir ?? serverOutDir.replace(/server$/, "client");
   const rollupOutput = resolvedViteConfig.build.rollupOptions.output;
   const { entryFileNames } = (Array.isArray(rollupOutput) ? rollupOutput[0] : rollupOutput) ?? {};
   const serverOutFile = joinPath(

package/oclif.manifest.json

@@ -388,13 +388,31 @@
           "type": "option"
         },
         "build-command": {
-          "description": "Specify a build command to run before deploying. If not specified, `shopify hydrogen build` will be used.",
+          "description": "Specify a build command to run before deploying. If not specified, the Hydrogen build pipeline will be used. When custom output directories are configured, defaults to `node --run build`.",
           "name": "build-command",
           "required": false,
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
+        "assets-dir": {
+          "description": "Directory containing the client assets to deploy, relative to the project root. Defaults to the detected Vite client output directory, then falls back to `dist/client`.",
+          "env": "SHOPIFY_HYDROGEN_FLAG_ASSETS_DIR",
+          "name": "assets-dir",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "worker-dir": {
+          "description": "Directory containing the Oxygen worker entry point (`index.js` or `index.mjs`), relative to the project root. Defaults to the detected Vite server output directory, then falls back to `dist/server`.",
+          "env": "SHOPIFY_HYDROGEN_FLAG_WORKER_DIR",
+          "name": "worker-dir",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "lockfile-check": {
           "description": "Checks that there is exactly one valid lockfile in the project. Defaults to `true`. Deactivate with `--no-lockfile-check`.",
           "env": "SHOPIFY_HYDROGEN_FLAG_LOCKFILE_CHECK",
@@ -1675,5 +1693,5 @@
       ]
     }
   },
-  "version": "12.0.2"
+  "version": "13.0.0"
 }

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "@shopify:registry": "https://registry.npmjs.org"
   },
-  "version": "12.0.2",
+  "version": "13.0.0",
   "license": "MIT",
   "type": "module",
   "repository": {
@@ -59,7 +59,7 @@
     "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.1.0"
+    "@shopify/mini-oxygen": "4.2.0"
   },
   "peerDependenciesMeta": {
     "@graphql-codegen/cli": {
@@ -98,7 +98,7 @@
     "oclif.manifest.json"
   ],
   "engines": {
-    "node": "^20 || ^22 || ^24"
+    "node": "^22 || ^24"
   },
   "oclif": {
     "commands": "dist/commands",