@shopify/cli-hydrogen 12.0.0 → 12.0.2

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

@@ -1,13 +1,13 @@
 import { createRequire } from 'node:module';
 import { resolvePath, dirname } from '@shopify/cli-kit/node/path';
-import { readFile, createFileReadStream } from '@shopify/cli-kit/node/fs';
+import { createFileReadStream, readFile } from '@shopify/cli-kit/node/fs';
 import { renderSuccess } from '@shopify/cli-kit/node/ui';
 import { outputNewline } from '@shopify/cli-kit/node/output';
 import { AbortError } from '@shopify/cli-kit/node/error';
 import colors from '@shopify/cli-kit/node/colors';
 import { handleMiniOxygenImportFail, SUBREQUEST_PROFILER_ENDPOINT, logRequestLine } from './common.js';
 import { TUNNEL_DOMAIN, getUtilityBannerlines, getDebugBannerLine } from '../dev-shared.js';
-import { setConstructors, handleDebugNetworkRequest, createLogRequestEvent, H2O_BINDING_NAME } from '../request-events.js';
+import { setConstructors, handleDebugNetworkRequest, H2O_BINDING_NAME, createLogRequestEvent } from '../request-events.js';
 import { importLocal } from '../import-utils.js';
 
 async function startWorkerdServer({
@@ -28,9 +28,7 @@ async function startWorkerdServer({
   setConstructors({ Response });
   async function handleCustomerAccountSchema() {
     const require2 = createRequire(import.meta.url);
-    const filePath = require2.resolve(
-      "@shopify/hydrogen/customer-account.schema.json"
-    );
+    const filePath = require2.resolve("@shopify/hydrogen/customer-account.schema.json");
     return new Response(createFileReadStream(filePath), {
       headers: { "Content-Type": "application/json" }
     });

package/dist/lib/onboarding/common.js

@@ -1,6 +1,6 @@
 import { symlink, readdir } from 'node:fs/promises';
 import { packageManagerFromUserAgent, installNodeModules } from '@shopify/cli-kit/node/node-package-manager';
-import { renderConfirmationPrompt, renderInfo, renderTextPrompt, renderSelectPrompt, renderWarning, renderSuccess, renderFatalError } from '@shopify/cli-kit/node/ui';
+import { renderConfirmationPrompt, renderInfo, renderTextPrompt, renderSelectPrompt, renderFatalError, renderWarning, renderSuccess } from '@shopify/cli-kit/node/ui';
 import { hyphenate, capitalize } from '@shopify/cli-kit/common/string';
 import { joinPath, resolvePath, basename } from '@shopify/cli-kit/node/path';
 import { initializeGitRepository, addAllToGitFromDirectory, createGitCommit } from '@shopify/cli-kit/node/git';
@@ -15,7 +15,7 @@ import { titleize } from '../string.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';
+import { generateRoutes, generateProjectFile } from '../setups/routes/generate.js';
 import { execAsync } from '../process.js';
 import { getStorefronts } from '../graphql/admin/link-storefront.js';
 import { isHydrogenMonorepo, getSkeletonSourceDir, getRepoNodeModules } from '../build.js';
@@ -42,32 +42,25 @@ async function handleI18n(controller, cliCommand, flagI18n) {
     }
   };
 }
-async function handleRouteGeneration(controller, flagRoutes) {
-  const routesToScaffold = flagRoutes === true ? "all" : flagRoutes === false ? [] : await renderRoutePrompt({
-    abortSignal: controller.signal
-  });
-  const needsRouteGeneration = routesToScaffold === "all" || routesToScaffold.length > 0;
+function handleRouteGeneration(controller) {
   return {
-    needsRouteGeneration,
     setupRoutes: async (directory, language, options) => {
-      if (needsRouteGeneration) {
-        const result = await generateRoutes(
-          {
-            routeName: routesToScaffold,
-            directory,
-            force: true,
-            typescript: language === "ts",
-            localePrefix: options?.i18nStrategy === "subfolders" ? "locale" : false,
-            signal: controller.signal,
-            ...options
-          },
-          {
-            rootDirectory: directory,
-            appDirectory: joinPath(directory, "app")
-          }
-        );
-        return result.routeGroups;
-      }
+      const result = await generateRoutes(
+        {
+          routeName: "all",
+          directory,
+          force: true,
+          typescript: language === "ts",
+          localePrefix: options?.i18nStrategy === "subfolders" ? "locale" : false,
+          signal: controller.signal,
+          ...options
+        },
+        {
+          rootDirectory: directory,
+          appDirectory: joinPath(directory, "app")
+        }
+      );
+      return result.routeGroups;
     }
   };
 }
@@ -284,6 +277,8 @@ async function handleDependencies(projectDir, controller, packageManagerFromFlag
         cancellationMessage: "No",
         abortSignal: controller.signal
       });
+    } else {
+      actualPackageManager = detectedPackageManager;
     }
   }
   if (isHydrogenMonorepo) {

package/dist/lib/onboarding/local.js

@@ -2,8 +2,7 @@ import { cp } from 'node:fs/promises';
 import { writeFile } from '@shopify/cli-kit/node/fs';
 import { relativePath, joinPath } from '@shopify/cli-kit/node/path';
 import { hyphenate } from '@shopify/cli-kit/common/string';
-import colors from '@shopify/cli-kit/node/colors';
-import { renderSelectPrompt, renderSuccess, renderConfirmationPrompt, renderTasks } from '@shopify/cli-kit/node/ui';
+import { renderSelectPrompt, renderSuccess, renderTasks } from '@shopify/cli-kit/node/ui';
 import { handleStorefrontLink, handleProjectLocation, createAbortHandler, generateProjectEntries, handleLanguage, createInitialCommit, handleCssStrategy, commitAll, handleDependencies, handleCliShortcut, handleI18n, handleRouteGeneration, renderProjectReady } from './common.js';
 import { createStorefront } from '../graphql/admin/create-storefront.js';
 import { waitForJob } from '../graphql/admin/fetch-job.js';
@@ -49,7 +48,7 @@ async function setupLocalStarterTemplate(options, controller) {
     {
       force: true,
       recursive: true,
-      filter: (filepath) => !/^(app\/|dist\/|node_modules\/|server\.ts|\.shopify\/)/i.test(
+      filter: (filepath) => !/^(app(\/|$)|dist(\/|$)|node_modules(\/|$)|server\.ts$|\.shopify(\/|$))/i.test(
         relativePath(templateDir, filepath)
       )
     }
@@ -217,65 +216,53 @@ 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 \`${setupSummary.cliCommand} setup\`)`),
-    abortSignal: controller.signal
-  });
-  if (continueWithSetup) {
-    const { i18nStrategy, setupI18n } = await handleI18n(
-      controller,
-      setupSummary.cliCommand,
-      options.i18n
-    );
-    const { setupRoutes } = await handleRouteGeneration(
-      controller,
-      options.routes ?? true
-      // TODO: Remove default value when multi-select UI component is available
-    );
-    setupSummary.i18n = i18nStrategy;
-    backgroundWorkPromise = backgroundWorkPromise.then(async () => {
-      await setupI18n({
-        rootDirectory: project.directory,
-        contextCreate: language === "ts" ? "app/lib/context.ts" : "app/lib/context.js"
-      }).then(
-        () => options.git ? commitAll(
-          project.directory,
-          `Setup markets support using ${i18nStrategy}`
-        ) : void 0
-      ).catch((error) => {
-        setupSummary.i18nError = error;
-      });
-      await setupRoutes(project.directory, language, {
-        i18nStrategy,
-        // The init process might have added and modified files. Do not overwrite them.
-        // E.g. CSS imports might have been added to the root.
-        overwriteFileDeps: false
-      }).then(async (routes) => {
-        setupSummary.routes = routes;
-        if (language === "ts" && setupSummary.depsInstalled) {
-          try {
-            await execAsync("npx react-router typegen", {
-              cwd: project.directory
-            });
-          } catch (error) {
-            outputWarn(
-              "Failed to generate React Router types after route generation. You may need to run `npx react-router typegen` manually."
-            );
-          }
-        }
-        if (options.git && routes) {
-          return commitAll(
-            project.directory,
-            `Generate routes for core functionality`
+  const { i18nStrategy, setupI18n } = await handleI18n(
+    controller,
+    setupSummary.cliCommand,
+    options.i18n
+  );
+  const { setupRoutes } = handleRouteGeneration(controller);
+  setupSummary.i18n = i18nStrategy;
+  backgroundWorkPromise = backgroundWorkPromise.then(async () => {
+    await setupI18n({
+      rootDirectory: project.directory,
+      contextCreate: language === "ts" ? "app/lib/context.ts" : "app/lib/context.js"
+    }).then(
+      () => options.git ? commitAll(
+        project.directory,
+        `Setup markets support using ${i18nStrategy}`
+      ) : void 0
+    ).catch((error) => {
+      setupSummary.i18nError = error;
+    });
+    await setupRoutes(project.directory, language, {
+      i18nStrategy,
+      // The init process might have added and modified files. Do not overwrite them.
+      // E.g. CSS imports might have been added to the root.
+      overwriteFileDeps: false
+    }).then(async (routes) => {
+      setupSummary.routes = routes;
+      if (language === "ts" && setupSummary.depsInstalled) {
+        try {
+          await execAsync("npx react-router typegen", {
+            cwd: project.directory
+          });
+        } catch (error) {
+          outputWarn(
+            "Failed to generate React Router types after route generation. You may need to run `npx react-router typegen` manually."
           );
         }
-      }).catch((error) => {
-        setupSummary.routesError = error;
-      });
+      }
+      if (options.git && routes) {
+        return commitAll(
+          project.directory,
+          `Generate routes for core functionality`
+        );
+      }
+    }).catch((error) => {
+      setupSummary.routesError = error;
     });
-  }
+  });
   await renderTasks(tasks);
   if (options.git) {
     await commitAll(project.directory, "Lockfile");

package/dist/lib/package-managers.js

@@ -2,6 +2,7 @@ const packageManagers = [
   {
     name: "npm",
     lockfile: "package-lock.json",
+    alternativeLockfiles: ["npm-shrinkwrap.json"],
     installCommand: "npm ci"
   },
   {
@@ -17,6 +18,7 @@ const packageManagers = [
   {
     name: "bun",
     lockfile: "bun.lockb",
+    alternativeLockfiles: ["bun.lock"],
     installCommand: "bun install --frozen-lockfile"
   }
 ];

package/dist/lib/patch-cli.js

@@ -0,0 +1,198 @@
+import { readFileSync, existsSync, writeFileSync, unlinkSync } from 'node:fs';
+import { resolve } from 'node:path';
+
+function isErrnoException(err) {
+  return err instanceof Error && "code" in err;
+}
+const MARKER = "// [hydrogen-monorepo-patch]";
+function getRunJsPath(root) {
+  return resolve(root, "node_modules", "@shopify", "cli", "bin", "run.js");
+}
+function isPatchApplied(content) {
+  return content.includes(MARKER);
+}
+function generatePatchedContent() {
+  return `#!/usr/bin/env node
+${MARKER}
+
+// Mirrors upstream @shopify/cli/bin/run.js behavior.
+// This is not introduced by the patch \u2014 @shopify/cli ships with this line.
+// Changing it here would create a behavioral divergence between dev and production.
+process.removeAllListeners('warning')
+
+// --- Monorepo detection ---
+// Walk up from cwd to find the hydrogen monorepo root.
+// We look for packages/cli/package.json with the correct package name \u2014
+// if it matches, we know we're inside the monorepo and should load the
+// local @shopify/cli-hydrogen
+const {existsSync, readFileSync} = await import('node:fs');
+const {resolve, dirname} = await import('node:path');
+
+let monorepoRoot = null;
+let dir = process.cwd();
+while (true) {
+  const candidate = resolve(dir, 'packages', 'cli', 'package.json');
+  if (existsSync(candidate)) {
+    try {
+      const pkg = JSON.parse(readFileSync(candidate, 'utf8'));
+      if (pkg.name === '@shopify/cli-hydrogen') {
+        monorepoRoot = dir;
+        break;
+      }
+    } catch {
+      // Ignore malformed package.json and keep walking
+    }
+  }
+  const parent = dirname(dir);
+  if (parent === dir) break; // reached filesystem root
+  dir = parent;
+}
+
+if (monorepoRoot) {
+  // We're in the hydrogen monorepo. Start @shopify/cli normally but
+  // inject pluginAdditions so oclif loads @shopify/cli-hydrogen from
+  // the monorepo's workspace (packages/cli) instead of the version
+  // bundled inside @shopify/cli/dist.
+  //
+  // This uses the same pluginAdditions mechanism that ShopifyConfig
+  // uses internally
+  const {fileURLToPath} = await import('node:url');
+  const {Config, run, flush} = await import('@oclif/core');
+
+  // root must point to @shopify/cli's installed location so oclif
+  // can find its package.json, oclif config, and bundled commands.
+  const cliRoot = resolve(dirname(fileURLToPath(import.meta.url)), '..');
+
+  const c = '\\x1b[38;5;209m';
+  const d = '\\x1b[2m';
+  const r = '\\x1b[0m';
+  console.log('');
+  console.log(c + '  \u250C\u2500\u2500 hydrogen-monorepo \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510' + r);
+  console.log(c + '  \u2502' + r + '                                                          ' + c + '\u2502' + r);
+  console.log(c + '  \u2502' + r + '  Using local cli-hydrogen plugin from packages/cli       ' + c + '\u2502' + r);
+  console.log(c + '  \u2502' + r + d + '  Bundled commands replaced with local source             ' + r + c + '\u2502' + r);
+  console.log(c + '  \u2502' + r + '                                                          ' + c + '\u2502' + r);
+  console.log(c + '  \u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518' + r);
+  console.log('');
+
+  // Tell ShopifyConfig to skip its own monorepo detection since we
+  // are handling pluginAdditions ourselves.
+  process.env.IGNORE_HYDROGEN_MONOREPO = '1';
+
+  const config = new Config({
+    root: cliRoot,
+    // pluginAdditions tells oclif's plugin loader to read the
+    // monorepo root's package.json, find @shopify/cli-hydrogen in
+    // its dependencies (workspace:*), and load that as a core plugin.
+    // Because workspace:* symlinks to packages/cli, oclif loads the
+    // local source code \u2014 exactly what we want for development.
+    pluginAdditions: {
+      core: ['@shopify/cli-hydrogen'],
+      path: monorepoRoot,
+    },
+    // Skip the oclif manifest cache so commands are loaded fresh from
+    // disk rather than from a potentially stale oclif.manifest.json.
+    ignoreManifest: true,
+  });
+
+  await config.load();
+
+  // --- Post-load command replacement ---
+  // After loading, both the bundled hydrogen commands (from @shopify/cli's
+  // root plugin) and the local ones (from pluginAdditions) are registered.
+  // Since @shopify/cli@3.83.0 (which upgraded to oclif v4),
+  // determinePriority is no longer an overridable instance method, so we
+  // manually replace the bundled commands with the external plugin's
+  // versions using oclif's private _commands Map.
+  const externalPlugin = Array.from(config.plugins.values()).find(
+    (p) => p.name === '@shopify/cli-hydrogen' && !p.isRoot,
+  );
+
+  if (!externalPlugin) {
+    throw new Error(
+      '[hydrogen-monorepo] Could not find local @shopify/cli-hydrogen plugin. ' +
+      'The patch may need updating for the current @shopify/cli version.'
+    );
+  }
+
+  const cmds = config._commands;
+  if (!cmds || !(cmds instanceof Map)) {
+    throw new Error(
+      '[hydrogen-monorepo] Cannot replace bundled commands \u2014 oclif internals changed. ' +
+      'The patch may need updating for the current oclif version.'
+    );
+  }
+
+  // Delete bundled hydrogen commands (canonical IDs + aliases + hidden aliases)
+  for (const command of externalPlugin.commands) {
+    if (!command.id.startsWith('hydrogen')) continue;
+    cmds.delete(command.id);
+    for (const alias of [...(command.aliases ?? []), ...(command.hiddenAliases ?? [])]) {
+      cmds.delete(alias);
+    }
+  }
+  // Re-insert commands from the local plugin. loadCommands handles
+  // alias registration and command permutations correctly.
+  config.loadCommands(externalPlugin);
+
+  await run(process.argv.slice(2), config);
+  await flush();
+} else {
+  // Not in the monorepo \u2014 run the standard @shopify/cli entrypoint.
+  const {default: runCLI} = await import('../dist/index.js');
+  runCLI({development: false});
+}
+`;
+}
+function generateOriginalContent() {
+  return `#!/usr/bin/env node
+
+process.removeAllListeners('warning')
+
+import runCLI from '../dist/index.js'
+
+runCLI({development: false})
+`;
+}
+function applyPatch(runJsPath) {
+  let current;
+  try {
+    current = readFileSync(runJsPath, "utf8");
+  } catch (err) {
+    if (isErrnoException(err) && err.code === "ENOENT") {
+      throw new Error(
+        `@shopify/cli is not installed (${runJsPath} not found). Run 'pnpm install' first.`
+      );
+    }
+    throw err;
+  }
+  if (isPatchApplied(current)) return false;
+  const backupPath = runJsPath + ".backup";
+  if (!existsSync(backupPath)) {
+    writeFileSync(backupPath, current);
+  }
+  writeFileSync(runJsPath, generatePatchedContent());
+  return true;
+}
+function removePatch(runJsPath) {
+  let current;
+  try {
+    current = readFileSync(runJsPath, "utf8");
+  } catch (err) {
+    if (isErrnoException(err) && err.code === "ENOENT") {
+      return false;
+    }
+    throw err;
+  }
+  if (!isPatchApplied(current)) return false;
+  const backupPath = runJsPath + ".backup";
+  const hasBackup = existsSync(backupPath);
+  const original = hasBackup ? readFileSync(backupPath, "utf8") : generateOriginalContent();
+  writeFileSync(runJsPath, original);
+  if (hasBackup) {
+    unlinkSync(backupPath);
+  }
+  return true;
+}
+
+export { MARKER, applyPatch, generateOriginalContent, generatePatchedContent, getRunJsPath, isPatchApplied, removePatch };

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

@@ -22,8 +22,7 @@ const ROUTE_MAP = {
   account: "account*",
   search: ["search", "api.predictive-search"],
   robots: "[robots.txt]",
-  sitemap: ["[sitemap.xml]", "sitemap.$type.$page[.xml]"],
-  tokenlessApi: "api.$version.[graphql.json]"
+  sitemap: ["[sitemap.xml]", "sitemap.$type.$page[.xml]"]
 };
 let allRouteTemplateFiles = [];
 async function getResolvedRoutes(routeKeys = Object.keys(ROUTE_MAP)) {
@@ -187,7 +186,10 @@ async function generateProjectFile(routeFrom, {
   return result;
 }
 function replaceAdapters(templateContent, adapter) {
-  return templateContent.replace(/@shopify\/remix-oxygen/g, adapter);
+  return templateContent.replace(
+    /(from\s+['"])react-router(['"])/g,
+    `$1${adapter}$2`
+  );
 }
 function getDestinationRoute(routeFrom, localePrefix, options) {
   const routePath = routeFrom.replace(ASSETS_STARTER_DIR_ROUTES + "/", "");

package/dist/lib/template-pack.js

@@ -0,0 +1,93 @@
+import { createReadStream } from 'node:fs';
+import { execFileSync } from 'node:child_process';
+import { readFile, writeFile, mkdtemp, rm } from 'node:fs/promises';
+import { join, isAbsolute } from 'node:path';
+import { pipeline } from 'node:stream/promises';
+import { tmpdir } from 'node:os';
+import gunzipMaybe from 'gunzip-maybe';
+import { extract } from 'tar-fs';
+
+const WINDOWS_SHELL_OPTS = process.platform === "win32" ? { shell: true } : {};
+const PNPM_PACK_TIMEOUT_IN_MS = 6e4;
+const DEPENDENCY_SECTIONS = [
+  "dependencies",
+  "devDependencies",
+  "peerDependencies",
+  "optionalDependencies"
+];
+function hasReplaceableProtocol(version) {
+  return version.startsWith("workspace:") || version.startsWith("catalog:");
+}
+async function getPackedTemplatePackageJson(sourceTemplateDir) {
+  const tempDir = await mkdtemp(join(tmpdir(), "hydrogen-template-pack-"));
+  try {
+    const rawPackResult = execFileSync(
+      "pnpm",
+      ["pack", "--pack-destination", tempDir, "--json"],
+      {
+        cwd: sourceTemplateDir,
+        encoding: "utf8",
+        timeout: PNPM_PACK_TIMEOUT_IN_MS,
+        ...WINDOWS_SHELL_OPTS
+      }
+    );
+    const parsedResult = JSON.parse(rawPackResult.trim());
+    const packedTarball = Array.isArray(parsedResult) ? parsedResult[0]?.filename : parsedResult.filename;
+    if (!packedTarball) {
+      throw new Error("pnpm pack did not return a tarball filename.");
+    }
+    const tarballPath = isAbsolute(packedTarball) ? packedTarball : join(tempDir, packedTarball);
+    await pipeline(
+      createReadStream(tarballPath),
+      gunzipMaybe(),
+      extract(tempDir)
+    );
+    const packedManifestRaw = await readFile(
+      join(tempDir, "package", "package.json"),
+      "utf8"
+    );
+    return JSON.parse(packedManifestRaw);
+  } finally {
+    await rm(tempDir, { recursive: true, force: true });
+  }
+}
+function replaceWorkspaceProtocolVersionsInPackageJson({
+  packedManifest,
+  targetPackageJson
+}) {
+  for (const section of DEPENDENCY_SECTIONS) {
+    const targetDeps = targetPackageJson[section];
+    if (!targetDeps) continue;
+    for (const [name, version] of Object.entries(targetDeps)) {
+      if (!hasReplaceableProtocol(version)) continue;
+      const packedVersion = packedManifest[section]?.[name];
+      if (!packedVersion) {
+        throw new Error(
+          `Unable to resolve ${name} from ${section} in packed template manifest.`
+        );
+      }
+      targetDeps[name] = packedVersion;
+    }
+  }
+}
+async function replaceWorkspaceProtocolVersions({
+  sourceTemplateDir,
+  targetTemplateDir
+}) {
+  const packedManifest = await getPackedTemplatePackageJson(sourceTemplateDir);
+  const targetPackageJsonPath = join(targetTemplateDir, "package.json");
+  const targetPackageJson = JSON.parse(
+    await readFile(targetPackageJsonPath, "utf8")
+  );
+  replaceWorkspaceProtocolVersionsInPackageJson({
+    packedManifest,
+    targetPackageJson
+  });
+  await writeFile(
+    targetPackageJsonPath,
+    `${JSON.stringify(targetPackageJson, null, 2)}
+`
+  );
+}
+
+export { WINDOWS_SHELL_OPTS, replaceWorkspaceProtocolVersions };

package/dist/lib/transpile/morph/functions.js

@@ -35,7 +35,7 @@ function isAnnotableType(type) {
 }
 function normalizeType(type) {
   const normalizedType = type.replace(/^\(\)\s+=>\s+/, "").replace(/typeof import\("[^"]+"\)\./, "typeof ");
-  return normalizedType === "SerializeFrom<any>" ? `{SerializeFrom<loader>}` : `{${normalizedType}}`;
+  return normalizedType === "SerializeFrom<any>" ? `{ReturnType<typeof useLoaderData<typeof loader>>}` : `{${normalizedType}}`;
 }
 function generateParameterDocumentation(functionNode, docNode) {
   const params = functionNode.getParameters();

package/dist/lib/transpile/morph/typedefs.js

@@ -28,7 +28,6 @@ function generateTypeDefs(sourceFile, code) {
   typedefs.push("");
   const knownGenerics = {
     MetaFunction: "T",
-    SerializeFrom: "T",
     Fetcher: "T",
     PartialPredictiveSearchResult: "ItemType, ExtraProps",
     PartialSearchResult: "ItemType"
@@ -52,7 +51,7 @@ function generateTypeDefs(sourceFile, code) {
     }
     if (/(function loader\(|const loader =)/.test(source)) {
       typedefs.push(
-        `/** @typedef {import('@shopify/remix-oxygen').SerializeFrom<typeof loader>} LoaderReturnData */`
+        `/** @typedef {ReturnType<typeof useLoaderData<typeof loader>>} LoaderReturnData */`
       );
       code = code.replace(
         /^\s+?const\s+([\w\d]+|\{[\w\d\s,.]+\})\s+?=\s+?useLoaderData\(\)/gms,
@@ -72,7 +71,7 @@ function generateTypeDefs(sourceFile, code) {
     }
     if (/(function action\(|const action =)/.test(source)) {
       typedefs.push(
-        `/** @typedef {import('@shopify/remix-oxygen').SerializeFrom<typeof action>} ActionReturnData */`
+        `/** @typedef {ReturnType<typeof useActionData<typeof action>>} ActionReturnData */`
       );
       code = code.replace(
         /^\s+?const\s+([\w\d]+|\{[\w\d\s,.]+\})\s+?=\s+?useActionData\(\)/gms,

package/dist/lib/upgrade-e2e-utils.js

@@ -0,0 +1,50 @@
+const DEPENDENCY_SECTIONS = [
+  "dependencies",
+  "devDependencies"
+];
+function parseCatalogFromWorkspaceYaml(yamlContent) {
+  const catalogVersions = {};
+  const catalogMatch = yamlContent.match(/^catalog:\s*\n((?:[ \t]+.+\n?)*)/m);
+  const catalogSection = catalogMatch?.[1];
+  if (!catalogSection) return catalogVersions;
+  for (const line of catalogSection.split("\n")) {
+    const match = line.match(
+      /^\s+['"]?([^'":]+?)['"]?\s*:\s*['"]?([^'"]+?)['"]?\s*$/
+    );
+    if (match?.[1] && match[2]) {
+      catalogVersions[match[1].trim()] = match[2].trim();
+    }
+  }
+  return catalogVersions;
+}
+function parseWorkspacePackagesFromYaml(yamlContent) {
+  const packagesMatch = yamlContent.match(
+    /^packages:\s*\n((?:[ \t]+-.+\n?)*)/m
+  );
+  const packagesSection = packagesMatch?.[1];
+  if (!packagesSection) return [];
+  return packagesSection.split("\n").map((line) => line.match(/^\s+-\s+(.+)/)?.[1]?.trim()).filter((path) => Boolean(path));
+}
+async function resolveWorkspaceProtocols({
+  packageJson,
+  catalogVersions,
+  resolveWorkspaceVersion,
+  fallbackVersion
+}) {
+  const resolved = JSON.parse(JSON.stringify(packageJson));
+  for (const section of DEPENDENCY_SECTIONS) {
+    const deps = resolved[section];
+    if (!deps) continue;
+    for (const [name, version] of Object.entries(deps)) {
+      if (version.startsWith("workspace:")) {
+        const resolvedVersion = await resolveWorkspaceVersion(name);
+        deps[name] = resolvedVersion ?? fallbackVersion;
+      } else if (version === "catalog:" && catalogVersions[name]) {
+        deps[name] = catalogVersions[name];
+      }
+    }
+  }
+  return resolved;
+}
+
+export { parseCatalogFromWorkspaceYaml, parseWorkspacePackagesFromYaml, resolveWorkspaceProtocols };