@shopify/cli-hydrogen 5.1.0 → 5.1.1

package/dist/commands/hydrogen/build.js

@@ -5,11 +5,11 @@ import { rmdir, fileSize, glob, removeFile, copyFile } from '@shopify/cli-kit/no
 import { resolvePath, relativePath, joinPath } from '@shopify/cli-kit/node/path';
 import { getPackageManager } from '@shopify/cli-kit/node/node-package-manager';
 import colors from '@shopify/cli-kit/node/colors';
-import { getProjectPaths, getRemixConfig } from '../../lib/config.js';
+import { getProjectPaths, getRemixConfig, assertOxygenChecks } from '../../lib/remix-config.js';
 import { commonFlags, deprecated, flagsToCamelObject } from '../../lib/flags.js';
 import { checkLockfileStatus } from '../../lib/check-lockfile.js';
 import { findMissingRoutes } from '../../lib/missing-routes.js';
-import { warnOnce } from '../../lib/log.js';
+import { muteRemixLogs, createRemixLogger } from '../../lib/log.js';
 import { codegen } from '../../lib/codegen.js';
 
 const LOG_WORKER_BUILT = "\u{1F4E6} Worker built";
@@ -57,7 +57,7 @@ async function runBuild({
     process.env.NODE_ENV = "production";
   }
   const { root, buildPath, buildPathClient, buildPathWorkerFile, publicPath } = getProjectPaths(appPath);
-  await checkLockfileStatus(root);
+  await Promise.all([checkLockfileStatus(root), muteRemixLogs()]);
   console.time(LOG_WORKER_BUILT);
   outputInfo(`
 \u{1F3D7}\uFE0F  Building in ${process.env.NODE_ENV} mode...`);
@@ -68,15 +68,16 @@ async function runBuild({
     import('@remix-run/dev/dist/compiler/fileWatchCache.js'),
     rmdir(buildPath, { force: true })
   ]);
+  assertOxygenChecks(remixConfig);
   await Promise.all([
     copyPublicFiles(publicPath, buildPathClient),
     build({
       config: remixConfig,
       options: {
         mode: process.env.NODE_ENV,
-        onWarning: warnOnce,
         sourcemap
       },
+      logger: createRemixLogger(),
       fileWatchCache: createFileWatchCache()
     }).catch((thrown) => {
       logThrown(thrown);

package/dist/commands/hydrogen/check.js

@@ -1,7 +1,7 @@
 import Command from '@shopify/cli-kit/node/base-command';
 import { resolvePath } from '@shopify/cli-kit/node/path';
 import { commonFlags } from '../../lib/flags.js';
-import { getRemixConfig } from '../../lib/config.js';
+import { getRemixConfig } from '../../lib/remix-config.js';
 import { logMissingRoutes, findMissingRoutes } from '../../lib/missing-routes.js';
 import { Args } from '@oclif/core';
 
@@ -29,7 +29,7 @@ class GenerateRoute extends Command {
   }
 }
 async function runCheckRoutes({ directory }) {
-  const remixConfig = await getRemixConfig(directory, true);
+  const remixConfig = await getRemixConfig(directory);
   logMissingRoutes(findMissingRoutes(remixConfig));
 }
 

package/dist/commands/hydrogen/codegen-unstable.js

@@ -2,7 +2,7 @@ import path from 'path';
 import Command from '@shopify/cli-kit/node/base-command';
 import { renderSuccess } from '@shopify/cli-kit/node/ui';
 import { Flags } from '@oclif/core';
-import { getProjectPaths, getRemixConfig } from '../../lib/config.js';
+import { getProjectPaths, getRemixConfig } from '../../lib/remix-config.js';
 import { commonFlags, flagsToCamelObject } from '../../lib/flags.js';
 import { codegen } from '../../lib/codegen.js';
 

package/dist/commands/hydrogen/dev.js

@@ -5,8 +5,8 @@ import { fileExists } from '@shopify/cli-kit/node/fs';
 import { renderFatalError } from '@shopify/cli-kit/node/ui';
 import colors from '@shopify/cli-kit/node/colors';
 import { copyPublicFiles } from './build.js';
-import { getProjectPaths, getRemixConfig } from '../../lib/config.js';
-import { muteDevLogs, warnOnce, enhanceH2Logs } from '../../lib/log.js';
+import { getProjectPaths, assertOxygenChecks, getRemixConfig } from '../../lib/remix-config.js';
+import { muteDevLogs, muteRemixLogs, createRemixLogger, enhanceH2Logs } from '../../lib/log.js';
 import { commonFlags, deprecated, flagsToCamelObject } from '../../lib/flags.js';
 import Command from '@shopify/cli-kit/node/base-command';
 import { Flags } from '@oclif/core';
@@ -16,6 +16,7 @@ import { addVirtualRoutes } from '../../lib/virtual-routes.js';
 import { spawnCodegenProcess } from '../../lib/codegen.js';
 import { getAllEnvironmentVariables } from '../../lib/environment-variables.js';
 import { getConfig } from '../../lib/shopify-config.js';
+import { checkRemixVersions } from '../../lib/remix-version-check.js';
 
 const LOG_REBUILDING = "\u{1F9F1} Rebuilding...";
 const LOG_REBUILT = "\u{1F680} Rebuilt";
@@ -67,6 +68,7 @@ async function runDev({
   if (!process.env.NODE_ENV)
     process.env.NODE_ENV = "development";
   muteDevLogs();
+  await muteRemixLogs();
   if (debug)
     (await import('node:inspector')).open();
   const { root, publicPath, buildPathClient, buildPathWorkerFile } = getProjectPaths(appPath);
@@ -86,7 +88,11 @@ async function runDev({
     return [fileRelative, path.resolve(root, fileRelative)];
   };
   const serverBundleExists = () => fileExists(buildPathWorkerFile);
-  const { shop, storefront } = await getConfig(root);
+  const [remixConfig, { shop, storefront }] = await Promise.all([
+    reloadConfig(),
+    getConfig(root)
+  ]);
+  assertOxygenChecks(remixConfig);
   const fetchRemote = !!shop && !!storefront?.id;
   const envPromise = getAllEnvironmentVariables({ root, fetchRemote, envBranch });
   const [{ watch }, { createFileWatchCache }] = await Promise.all([
@@ -120,11 +126,11 @@ View GraphiQL API browser: ${graphiqlUrl}`)]
     if (useCodegen) {
       spawnCodegenProcess({ ...remixConfig, configFilePath: codegenConfigPath });
     }
+    checkRemixVersions();
     const showUpgrade = await checkingHydrogenVersion;
     if (showUpgrade)
       showUpgrade();
   }
-  const remixConfig = await reloadConfig();
   const fileWatchCache = createFileWatchCache();
   let skipRebuildLogs = false;
   await watch(
@@ -132,10 +138,10 @@ View GraphiQL API browser: ${graphiqlUrl}`)]
       config: remixConfig,
       options: {
         mode: process.env.NODE_ENV,
-        onWarning: warnOnce,
         sourcemap
       },
-      fileWatchCache
+      fileWatchCache,
+      logger: createRemixLogger()
     },
     {
       reloadConfig,

package/dist/commands/hydrogen/preview.js

@@ -1,6 +1,6 @@
 import Command from '@shopify/cli-kit/node/base-command';
 import { muteDevLogs } from '../../lib/log.js';
-import { getProjectPaths } from '../../lib/config.js';
+import { getProjectPaths } from '../../lib/remix-config.js';
 import { commonFlags } from '../../lib/flags.js';
 import { startMiniOxygen } from '../../lib/mini-oxygen.js';
 

package/dist/commands/hydrogen/setup/css.js

@@ -4,7 +4,7 @@ import Command from '@shopify/cli-kit/node/base-command';
 import { renderTasks, renderSuccess } from '@shopify/cli-kit/node/ui';
 import { getPackageManager, installNodeModules } from '@shopify/cli-kit/node/node-package-manager';
 import { Args } from '@oclif/core';
-import { getRemixConfig } from '../../../lib/config.js';
+import { getRemixConfig } from '../../../lib/remix-config.js';
 import { SETUP_CSS_STRATEGIES, renderCssPrompt, setupCssStrategy, CSS_STRATEGY_NAME_MAP } from '../../../lib/setups/css/index.js';
 
 class SetupCSS extends Command {

package/dist/commands/hydrogen/setup/markets.js

@@ -3,7 +3,7 @@ import { commonFlags, flagsToCamelObject } from '../../../lib/flags.js';
 import Command from '@shopify/cli-kit/node/base-command';
 import { renderTasks, renderSuccess } from '@shopify/cli-kit/node/ui';
 import { Args } from '@oclif/core';
-import { getRemixConfig } from '../../../lib/config.js';
+import { getRemixConfig } from '../../../lib/remix-config.js';
 import { SETUP_I18N_STRATEGIES, renderI18nPrompt, setupI18nStrategy, I18N_STRATEGY_NAME_MAP } from '../../../lib/setups/i18n/index.js';
 
 class SetupMarkets extends Command {

package/dist/commands/hydrogen/setup.js

@@ -5,7 +5,7 @@ import { resolvePath, basename } from '@shopify/cli-kit/node/path';
 import { copyFile } from '@shopify/cli-kit/node/fs';
 import { commonFlags, overrideFlag, flagsToCamelObject } from '../../lib/flags.js';
 import { renderI18nPrompt, setupI18nStrategy } from '../../lib/setups/i18n/index.js';
-import { getRemixConfig } from '../../lib/config.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 { generateProjectFile } from '../../lib/setups/routes/generate.js';

package/dist/generator-templates/starter/app/root.tsx

@@ -1,21 +1,15 @@
-import {
-  isRouteErrorResponse,
-  useCatch,
-  useMatches,
-  useRouteError,
-} from '@remix-run/react';
-import {
-  defer,
-  type LoaderArgs,
-  type ErrorBoundaryComponent,
-} from '@shopify/remix-oxygen';
+import {defer, type LoaderArgs} from '@shopify/remix-oxygen';
 import {
   Links,
   Meta,
   Outlet,
   Scripts,
-  ScrollRestoration,
+  useCatch,
+  useMatches,
+  useRouteError,
   useLoaderData,
+  ScrollRestoration,
+  isRouteErrorResponse,
 } from '@remix-run/react';
 import type {CustomerAccessToken} from '@shopify/hydrogen-react/storefront-api-types';
 import type {HydrogenSession} from '../server';
@@ -144,7 +138,7 @@ export function ErrorBoundary() {
   );
 }
 
-export const ErrorBoundaryV1: ErrorBoundaryComponent = ({error}) => {
+export const ErrorBoundaryV1 = ({error}: {error: Error}) => {
   // eslint-disable-next-line no-console
   console.error(error);
 

package/dist/generator-templates/starter/app/styles/app.css

@@ -79,7 +79,7 @@ aside li {
   left: 0;
   opacity: 0;
   pointer-events: none;
-  position: absolute;
+  position: fixed;
   right: 0;
   top: 0;
   transition: opacity 400ms ease-in-out;

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

@@ -13,11 +13,11 @@
   },
   "prettier": "@shopify/prettier-config",
   "dependencies": {
-    "@remix-run/react": "1.17.1",
-    "@shopify/cli": "3.47.5",
-    "@shopify/cli-hydrogen": "^5.1.0",
-    "@shopify/hydrogen": "^2023.7.0",
-    "@shopify/remix-oxygen": "^1.1.1",
+    "@remix-run/react": "1.19.1",
+    "@shopify/cli": "3.48.0",
+    "@shopify/cli-hydrogen": "^5.1.1",
+    "@shopify/hydrogen": "^2023.7.1",
+    "@shopify/remix-oxygen": "^1.1.2",
     "graphql": "^16.6.0",
     "graphql-tag": "^2.12.6",
     "isbot": "^3.6.6",
@@ -25,7 +25,7 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "1.17.1",
+    "@remix-run/dev": "1.19.1",
     "@shopify/oxygen-workers-types": "^3.17.2",
     "@shopify/prettier-config": "^1.1.2",
     "@total-typescript/ts-reset": "^0.4.2",

package/dist/lib/log.js

@@ -199,5 +199,36 @@ const warnOnce = (string) => {
     warnings.add(string);
   }
 };
+function createRemixLogger() {
+  const noop = () => {
+  };
+  const buildMessageBody = (message, details) => `In Remix:
+
+` + colors.bold(message) + (details ? "\n\n" + details.join("\n") : "");
+  return {
+    dev: noop,
+    info: noop,
+    debug: noop,
+    warn: (message, options) => {
+      renderWarning({ body: buildMessageBody(message, options?.details) });
+    },
+    error: (message, options) => {
+      renderFatalError({
+        name: "error",
+        type: 0,
+        message: buildMessageBody(message, options?.details),
+        tryMessage: ""
+      });
+    }
+  };
+}
+async function muteRemixLogs() {
+  try {
+    const { logger } = await import('@remix-run/dev/dist/tux/logger.js');
+    logger.warn = logger.debug = logger.info = () => {
+    };
+  } catch {
+  }
+}
 
-export { addMessageReplacers, enhanceH2Logs, muteAuthLogs, muteDevLogs, resetAllLogs, warnOnce };
+export { addMessageReplacers, createRemixLogger, enhanceH2Logs, muteAuthLogs, muteDevLogs, muteRemixLogs, resetAllLogs, warnOnce };

package/dist/lib/remix-config.js

@@ -0,0 +1,135 @@
+import { createRequire } from 'node:module';
+import { fileURLToPath } from 'node:url';
+import path from 'node:path';
+import { readdir } from 'node:fs/promises';
+import { AbortError } from '@shopify/cli-kit/node/error';
+import { outputWarn } from '@shopify/cli-kit/node/output';
+import { fileExists } from '@shopify/cli-kit/node/fs';
+
+const BUILD_DIR = "dist";
+const CLIENT_SUBDIR = "client";
+const WORKER_SUBDIR = "worker";
+const oxygenServerMainFields = ["browser", "module", "main"];
+function getProjectPaths(appPath, entry) {
+  const root = appPath ?? process.cwd();
+  const publicPath = path.join(root, "public");
+  const buildPath = path.join(root, BUILD_DIR);
+  const buildPathClient = path.join(buildPath, CLIENT_SUBDIR);
+  const buildPathWorkerFile = path.join(buildPath, WORKER_SUBDIR, "index.js");
+  return {
+    root,
+    buildPath,
+    buildPathClient,
+    buildPathWorkerFile,
+    publicPath
+  };
+}
+async function getRemixConfig(root, mode = process.env.NODE_ENV) {
+  const { readConfig } = await import('@remix-run/dev/dist/config.js');
+  const config = await readConfig(root, mode);
+  if (process.env.LOCAL_DEV) {
+    const packagesPath = fileURLToPath(new URL("../../..", import.meta.url));
+    config.watchPaths ??= [];
+    config.watchPaths.push(
+      ...(await readdir(packagesPath)).map(
+        (pkg) => pkg === "hydrogen-react" ? path.resolve(packagesPath, pkg, "dist", "browser-dev", "index.mjs") : path.resolve(packagesPath, pkg, "dist", "development", "index.js")
+      )
+    );
+    config.watchPaths.push(
+      path.join(packagesPath, "cli", "dist", "virtual-routes", "**", "*")
+    );
+  }
+  return config;
+}
+function assertOxygenChecks(config) {
+  try {
+    createRequire(import.meta.url).resolve("@shopify/remix-oxygen");
+  } catch {
+    return;
+  }
+  if (!config.serverEntryPoint) {
+    throw new AbortError(
+      "Could not find a server entry point.",
+      "Please add a server option to your remix.config.js pointing to an Oxygen worker entry file."
+    );
+  } else {
+    assertEntryFileExists(config.rootDirectory, config.serverEntryPoint);
+  }
+  if (config.serverPlatform !== "neutral") {
+    throw new AbortError(
+      'The serverPlatform in remix.config.js must be "neutral".'
+    );
+  }
+  if (config.serverModuleFormat !== "esm") {
+    throw new AbortError(
+      'The serverModuleFormat in remix.config.js must be "esm".'
+    );
+  }
+  if (config.serverDependenciesToBundle !== "all") {
+    throw new AbortError(
+      'The serverDependenciesToBundle in remix.config.js must be "all".'
+    );
+  }
+  if (!config.serverConditions?.includes("worker")) {
+    throw new AbortError(
+      'The serverConditions in remix.config.js must include "worker".'
+    );
+  }
+  if (process.env.NODE_ENV === "development" && !config.serverConditions?.includes("development")) {
+    outputWarn(
+      "Add `process.env.NODE_ENV` value to serverConditions in remix.config.js to enable debugging features in development."
+    );
+  }
+  if (!config.serverMainFields || !oxygenServerMainFields.every((v, i) => config.serverMainFields?.[i] === v)) {
+    throw new AbortError(
+      `The serverMainFields in remix.config.js must be ${JSON.stringify(
+        oxygenServerMainFields
+      )}.`
+    );
+  }
+  const cdnUrl = process.env.HYDROGEN_ASSET_BASE_URL;
+  if (cdnUrl && !config.publicPath.startsWith(cdnUrl)) {
+    throw new AbortError(
+      "The publicPath in remix.config.js must be prepended with the value of `process.env.HYDROGEN_ASSET_BASE_URL`."
+    );
+  }
+  const expectedServerBuildPath = path.join(
+    BUILD_DIR,
+    WORKER_SUBDIR,
+    "index.js"
+  );
+  if (config.serverBuildPath !== path.resolve(config.rootDirectory, expectedServerBuildPath)) {
+    throw new AbortError(
+      `The serverBuildPath in remix.config.js must be "${expectedServerBuildPath}".`
+    );
+  }
+  const expectedAssetsBuildDirectory = path.join(BUILD_DIR, CLIENT_SUBDIR);
+  if (!config.assetsBuildDirectory.startsWith(
+    path.resolve(config.rootDirectory, expectedAssetsBuildDirectory)
+  )) {
+    throw new AbortError(
+      `The assetsBuildDirectory in remix.config.js must be in "${expectedAssetsBuildDirectory}".`
+    );
+  }
+}
+async function assertEntryFileExists(root, fileRelative) {
+  const fileAbsolute = path.resolve(root, fileRelative);
+  const exists = await fileExists(fileAbsolute);
+  if (!exists) {
+    if (!path.extname(fileAbsolute)) {
+      const files = await readdir(path.dirname(fileAbsolute));
+      const exists2 = files.some((file) => {
+        const { name, ext } = path.parse(file);
+        return name === path.basename(fileAbsolute) && /^\.[jt]s$/.test(ext);
+      });
+      if (exists2)
+        return;
+    }
+    throw new AbortError(
+      `Entry file "${fileRelative}" not found.`,
+      "Please ensure the file exists and that the path is correctly added to the `server` property in remix.config.js."
+    );
+  }
+}
+
+export { assertOxygenChecks, getProjectPaths, getRemixConfig };

package/dist/lib/remix-version-check.js

@@ -0,0 +1,51 @@
+import { createRequire } from 'node:module';
+import { fileURLToPath } from 'node:url';
+import { renderWarning } from '@shopify/cli-kit/node/ui';
+
+function checkRemixVersions() {
+  const require2 = createRequire(import.meta.url);
+  const hydrogenPkgJson = require2(fileURLToPath(
+    new URL("../../package.json", import.meta.url)
+  ));
+  const requiredVersionInHydrogen = hydrogenPkgJson.dependencies["@remix-run/dev"];
+  const pkgs = [
+    "dev",
+    "react",
+    "server-runtime",
+    "css-bundle",
+    "node",
+    "express",
+    "eslint-config"
+  ].map((name) => getRemixPackageVersion(require2, name));
+  const outOfSyncPkgs = pkgs.filter(
+    (pkg) => pkg.version && pkg.version !== requiredVersionInHydrogen
+  );
+  if (outOfSyncPkgs.length === 0)
+    return;
+  const items = outOfSyncPkgs.reduce((acc, item) => {
+    if (item.version) {
+      acc.push(`${item.name}@${item.version}`);
+    }
+    return acc;
+  }, []);
+  renderWarning({
+    headline: `The current version of Hydrogen requires Remix @${requiredVersionInHydrogen}. The following packages are out of sync:`,
+    body: [
+      { list: { items } },
+      "\nPlease ensure your Remix packages have the same version and are in sync with Hydrogen."
+    ]
+  });
+}
+function getRemixPackageVersion(require2, name) {
+  const pkgName = "@remix-run/" + name;
+  const result = { name: pkgName, version: "" };
+  try {
+    const pkgJsonPath = require2.resolve(`${pkgName}/package.json`);
+    const pkgJson = require2(pkgJsonPath);
+    result.version = pkgJson.version;
+  } catch {
+  }
+  return result;
+}
+
+export { checkRemixVersions };

package/dist/lib/remix-version-check.test.js

@@ -0,0 +1,38 @@
+import { vi, describe, it, expect } from 'vitest';
+import { mockAndCaptureOutput } from '@shopify/cli-kit/node/testing/output';
+import { checkRemixVersions } from './remix-version-check.js';
+
+const requireMock = vi.fn();
+vi.mock("node:module", async () => {
+  const { createRequire } = await vi.importActual(
+    "node:module"
+  );
+  return {
+    createRequire: (url) => {
+      const actualRequire = createRequire(url);
+      requireMock.mockImplementation((mod) => actualRequire(mod));
+      const require2 = requireMock;
+      require2.resolve = actualRequire.resolve.bind(actualRequire);
+      return require2;
+    }
+  };
+});
+describe("remix-version-check", () => {
+  it("does nothing when versions are in sync", () => {
+    const outputMock = mockAndCaptureOutput();
+    checkRemixVersions();
+    expect(outputMock.warn()).toBe("");
+  });
+  it("warns when versions are out of sync", () => {
+    const expectedVersion = "42.0.0-test";
+    vi.mocked(requireMock).mockReturnValueOnce({
+      dependencies: { "@remix-run/dev": expectedVersion }
+    });
+    const outputMock = mockAndCaptureOutput();
+    checkRemixVersions();
+    const output = outputMock.warn();
+    expect(output).toMatch(`Hydrogen requires Remix @${expectedVersion}`);
+    expect(output).toMatch(`@remix-run/dev@`);
+    expect(output).toMatch(`@remix-run/react@`);
+  });
+});

package/dist/lib/remix-version-interop.js

@@ -1,5 +1,5 @@
 import { createRequire } from 'module';
-import { getRemixConfig } from './config.js';
+import { getRemixConfig } from './remix-config.js';
 
 function isRemixV2() {
   try {
@@ -13,7 +13,7 @@ function isRemixV2() {
 async function getV2Flags(root, remixConfigFuture) {
   const isV2 = isRemixV2();
   const futureFlags = {
-    ...!isV2 && (remixConfigFuture ?? (await getRemixConfig(root, true)).future)
+    ...!isV2 && (remixConfigFuture ?? (await getRemixConfig(root)).future)
   };
   return {
     isV2Meta: isV2 || !!futureFlags.v2_meta,

package/dist/lib/remix-version-interop.test.js

@@ -58,7 +58,7 @@ describe("remix-version-interop", () => {
       return <div>stuff</div>;
     }
 
-    export const ErrorBoundaryV1: ErrorBoundaryComponent = ({error}) => {
+    export const ErrorBoundaryV1 = ({error}: {error: Error}) => {
       console.error(error);
     
       return <div>There was an error.</div>;

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

@@ -7,7 +7,7 @@ import { transpileFile } from '../../../lib/transpile-ts.js';
 import { getCodeFormatOptions, formatCode } from '../../../lib/format-code.js';
 import { getTemplateAppFile, GENERATOR_ROUTE_DIR, getStarterDir } from '../../../lib/build.js';
 import { getV2Flags, convertTemplateToRemixVersion, convertRouteToV1 } from '../../../lib/remix-version-interop.js';
-import { getRemixConfig } from '../../../lib/config.js';
+import { getRemixConfig } from '../../remix-config.js';
 import { findFileWithExtension } from '../../file.js';
 
 const NO_LOCALE_PATTERNS = [/robots\.txt/];

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

@@ -5,7 +5,7 @@ import { renderConfirmationPrompt } from '@shopify/cli-kit/node/ui';
 import { fileExists, readFile, mkdir, writeFile } from '@shopify/cli-kit/node/fs';
 import { joinPath, dirname } from '@shopify/cli-kit/node/path';
 import { getTemplateAppFile } from '../../../lib/build.js';
-import { getRemixConfig } from '../../../lib/config.js';
+import { getRemixConfig } from '../../remix-config.js';
 
 const readProjectFile = (dirs, fileBasename, ext = "tsx") => readFile(joinPath(dirs.appDirectory, `${fileBasename}.${ext}`));
 describe("generate/route", () => {
@@ -13,7 +13,7 @@ describe("generate/route", () => {
     vi.resetAllMocks();
     vi.mock("@shopify/cli-kit/node/output");
     vi.mock("@shopify/cli-kit/node/ui");
-    vi.mock("../../config.js", async () => ({ getRemixConfig: vi.fn() }));
+    vi.mock("../../remix-config.js", async () => ({ getRemixConfig: vi.fn() }));
   });
   describe("generateRoutes", () => {
     it("generates all routes with correct configuration", async () => {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.1.0",
+  "version": "5.1.1",
   "commands": {
     "hydrogen:build": {
       "id": "hydrogen:build",

package/package.json

@@ -4,14 +4,14 @@
     "access": "public",
     "@shopify:registry": "https://registry.npmjs.org"
   },
-  "version": "5.1.0",
+  "version": "5.1.1",
   "license": "MIT",
   "type": "module",
   "scripts": {
-    "build": "tsup --config ./tsup.config.ts && node scripts/build-check.mjs",
-    "dev": "tsup --watch --config ./tsup.config.ts",
+    "build": "rm -rf dist && tsup --config ./tsup.config.ts && node scripts/build-check.mjs",
+    "dev": "rm -rf dist && tsup --watch --config ./tsup.config.ts",
     "typecheck": "tsc --noEmit",
-    "generate:manifest": "oclif manifest",
+    "generate:manifest": "node scripts/generate-manifest.mjs",
     "test": "cross-env SHOPIFY_UNIT_TEST=1 vitest run --test-timeout=15000",
     "test:watch": "cross-env SHOPIFY_UNIT_TEST=1 vitest --test-timeout=15000"
   },
@@ -22,22 +22,21 @@
     "@types/prettier": "^2.7.2",
     "@types/recursive-readdir": "^2.2.1",
     "@types/tar-fs": "^2.0.1",
-    "oclif": "3.9.1",
     "tempy": "^3.0.0",
     "type-fest": "^3.6.0",
     "vitest": "^0.33.0"
   },
   "peerDependencies": {
-    "@remix-run/react": "^1.17.1",
+    "@remix-run/react": "1.19.1",
     "@shopify/hydrogen-react": "^2023.7.0",
-    "@shopify/remix-oxygen": "^1.1.1"
+    "@shopify/remix-oxygen": "^1.1.2"
   },
   "dependencies": {
     "@ast-grep/napi": "^0.5.3",
     "@graphql-codegen/cli": "3.3.1",
-    "@oclif/core": "2.8.5",
-    "@remix-run/dev": "1.17.1",
-    "@shopify/cli-kit": "3.47.5",
+    "@oclif/core": "2.8.11",
+    "@remix-run/dev": "1.19.1",
+    "@shopify/cli-kit": "3.48.0",
     "@shopify/hydrogen-codegen": "^0.0.2",
     "@shopify/mini-oxygen": "^1.7.0",
     "ansi-escapes": "^6.2.0",

package/dist/lib/config.js

@@ -1,141 +0,0 @@
-import { renderFatalError } from '@shopify/cli-kit/node/ui';
-import { outputWarn } from '@shopify/cli-kit/node/output';
-import { fileExists } from '@shopify/cli-kit/node/fs';
-import { fileURLToPath } from 'url';
-import path from 'path';
-import fs from 'fs/promises';
-
-const BUILD_DIR = "dist";
-const CLIENT_SUBDIR = "client";
-const WORKER_SUBDIR = "worker";
-const oxygenServerMainFields = ["browser", "module", "main"];
-function getProjectPaths(appPath, entry) {
-  const root = appPath ?? process.cwd();
-  const publicPath = path.join(root, "public");
-  const buildPath = path.join(root, BUILD_DIR);
-  const buildPathClient = path.join(buildPath, CLIENT_SUBDIR);
-  const buildPathWorkerFile = path.join(buildPath, WORKER_SUBDIR, "index.js");
-  return {
-    root,
-    buildPath,
-    buildPathClient,
-    buildPathWorkerFile,
-    publicPath
-  };
-}
-async function getRemixConfig(root, skipOxygenChecks = false, mode = process.env.NODE_ENV) {
-  const { readConfig } = await import('@remix-run/dev/dist/config.js');
-  const config = await readConfig(root, mode);
-  if (!skipOxygenChecks) {
-    if (!config.serverEntryPoint) {
-      throwConfigError(
-        "Could not find a server entry point.",
-        "Please add a server option to your remix.config.js pointing to an Oxygen worker entry file."
-      );
-    } else {
-      assertEntryFileExists(config.rootDirectory, config.serverEntryPoint);
-    }
-    if (config.serverPlatform !== "neutral") {
-      throwConfigError(
-        'The serverPlatform in remix.config.js must be "neutral".'
-      );
-    }
-    if (config.serverModuleFormat !== "esm") {
-      throwConfigError(
-        'The serverModuleFormat in remix.config.js must be "esm".'
-      );
-    }
-    if (config.serverDependenciesToBundle !== "all") {
-      throwConfigError(
-        'The serverDependenciesToBundle in remix.config.js must be "all".'
-      );
-    }
-    if (!config.serverConditions?.includes("worker")) {
-      throwConfigError(
-        'The serverConditions in remix.config.js must include "worker".'
-      );
-    }
-    if (process.env.NODE_ENV === "development" && !config.serverConditions?.includes("development")) {
-      outputWarn(
-        "Add `process.env.NODE_ENV` value to serverConditions in remix.config.js to enable debugging features in development."
-      );
-    }
-    if (!config.serverMainFields || !oxygenServerMainFields.every(
-      (v, i) => config.serverMainFields?.[i] === v
-    )) {
-      throwConfigError(
-        `The serverMainFields in remix.config.js must be ${JSON.stringify(
-          oxygenServerMainFields
-        )}.`
-      );
-    }
-    const cdnUrl = process.env.HYDROGEN_ASSET_BASE_URL;
-    if (cdnUrl && !config.publicPath.startsWith(cdnUrl)) {
-      throwConfigError(
-        "The publicPath in remix.config.js must be prepended with the value of `process.env.HYDROGEN_ASSET_BASE_URL`."
-      );
-    }
-    const expectedServerBuildPath = path.join(
-      BUILD_DIR,
-      WORKER_SUBDIR,
-      "index.js"
-    );
-    if (config.serverBuildPath !== path.resolve(root, expectedServerBuildPath)) {
-      throwConfigError(
-        `The serverBuildPath in remix.config.js must be "${expectedServerBuildPath}".`
-      );
-    }
-    const expectedAssetsBuildDirectory = path.join(BUILD_DIR, CLIENT_SUBDIR);
-    if (!config.assetsBuildDirectory.startsWith(
-      path.resolve(root, expectedAssetsBuildDirectory)
-    )) {
-      throwConfigError(
-        `The assetsBuildDirectory in remix.config.js must be in "${expectedAssetsBuildDirectory}".`
-      );
-    }
-  }
-  if (process.env.LOCAL_DEV) {
-    const packagesPath = fileURLToPath(new URL("../../..", import.meta.url));
-    config.watchPaths ??= [];
-    config.watchPaths.push(
-      ...(await fs.readdir(packagesPath)).map(
-        (pkg) => pkg === "hydrogen-react" ? path.resolve(packagesPath, pkg, "dist", "browser-dev", "index.mjs") : path.resolve(packagesPath, pkg, "dist", "development", "index.js")
-      )
-    );
-    config.watchPaths.push(
-      path.join(packagesPath, "cli", "dist", "virtual-routes", "**", "*")
-    );
-  }
-  return config;
-}
-function throwConfigError(message, tryMessage = null) {
-  renderFatalError({
-    name: "ConfigError",
-    type: 0,
-    message,
-    tryMessage
-  });
-  process.exit(1);
-}
-async function assertEntryFileExists(root, fileRelative) {
-  const fileAbsolute = path.resolve(root, fileRelative);
-  const exists = await fileExists(fileAbsolute);
-  if (!exists) {
-    if (!path.extname(fileAbsolute)) {
-      const { readdir } = await import('fs/promises');
-      const files = await readdir(path.dirname(fileAbsolute));
-      const exists2 = files.some((file) => {
-        const { name, ext } = path.parse(file);
-        return name === path.basename(fileAbsolute) && /^\.[jt]s$/.test(ext);
-      });
-      if (exists2)
-        return;
-    }
-    throwConfigError(
-      `Entry file "${fileRelative}" not found.`,
-      "Please ensure the file exists and that the path is correctly added to the `server` property in remix.config.js."
-    );
-  }
-}
-
-export { assertEntryFileExists, getProjectPaths, getRemixConfig };