@shopify/cli-hydrogen 10.1.0 → 11.0.1

package/dist/lib/classic-compiler/dev.js

@@ -1,280 +0,0 @@
-import fs from 'node:fs/promises';
-import { outputInfo, outputDebug } from '@shopify/cli-kit/node/output';
-import { fileExists } from '@shopify/cli-kit/node/fs';
-import { renderFatalError } from '@shopify/cli-kit/node/ui';
-import { relativePath, resolvePath } from '@shopify/cli-kit/node/path';
-import { copyPublicFiles } from './build.js';
-import { getProjectPaths, assertOxygenChecks, handleRemixImportFail, getRemixConfig } from '../remix-config.js';
-import { setH2OVerbose, isH2Verbose, muteDevLogs, createRemixLogger, enhanceH2Logs } from '../log.js';
-import { DEFAULT_APP_PORT } from '../flags.js';
-import { buildAssetsUrl, startMiniOxygen } from '../mini-oxygen/index.js';
-import { addVirtualRoutes } from '../virtual-routes.js';
-import { spawnCodegenProcess } from '../codegen.js';
-import { getAllEnvironmentVariables } from '../environment-variables.js';
-import { setupLiveReload } from '../live-reload.js';
-import { checkRemixVersions } from '../remix-version-check.js';
-import { displayDevUpgradeNotice } from '../../commands/hydrogen/upgrade.js';
-import { findPort } from '../find-port.js';
-import { getDevConfigInBackground, startTunnelAndPushConfig, isMockShop, notifyIssueWithTunnelAndMockShop } from '../dev-shared.js';
-import { getCliCommand } from '../shell.js';
-import { importLocal } from '../import-utils.js';
-
-const LOG_REBUILDING = "\u{1F9F1} Rebuilding...";
-const LOG_REBUILT = "\u{1F680} Rebuilt";
-function filterOutVirtualRoutes(config) {
-  let routes = {};
-  Object.entries(config.routes).forEach(([key, value]) => {
-    if (!key.includes("virtual-routes")) {
-      routes[key] = value;
-    }
-  });
-  return {
-    ...config,
-    routes
-  };
-}
-async function runClassicCompilerDev({
-  port: appPort,
-  path: appPath,
-  codegen: useCodegen = false,
-  legacyRuntime = false,
-  codegenConfigPath,
-  disableVirtualRoutes,
-  env: envHandle,
-  envBranch,
-  debug = false,
-  sourcemap = true,
-  disableVersionCheck = false,
-  inspectorPort,
-  customerAccountPush: customerAccountPushFlag = false,
-  shouldLiveReload = true,
-  envFile,
-  cliConfig,
-  verbose
-}) {
-  if (!process.env.NODE_ENV) process.env.NODE_ENV = "development";
-  if (verbose) setH2OVerbose();
-  if (!isH2Verbose()) muteDevLogs();
-  const { root, publicPath, buildPathClient, buildPathWorkerFile } = getProjectPaths(appPath);
-  const copyFilesPromise = copyPublicFiles(publicPath, buildPathClient);
-  const cliCommandPromise = getCliCommand(root);
-  const reloadConfig = async () => {
-    const config = await getRemixConfig(root);
-    return disableVirtualRoutes ? filterOutVirtualRoutes(config) : addVirtualRoutes(config).catch((error) => {
-      outputDebug(
-        "Could not add virtual routes: " + (error?.stack ?? error?.message ?? error)
-      );
-      return config;
-    });
-  };
-  const getFilePaths = (file) => {
-    const fileRelative = relativePath(root, file);
-    return [fileRelative, resolvePath(root, fileRelative)];
-  };
-  const serverBundleExists = () => fileExists(buildPathWorkerFile);
-  if (!appPort) {
-    appPort = await findPort(DEFAULT_APP_PORT);
-  }
-  const assetsPort = legacyRuntime ? 0 : await findPort(appPort + 100);
-  if (assetsPort) {
-    process.env.HYDROGEN_ASSET_BASE_URL = await buildAssetsUrl(
-      assetsPort,
-      root
-    );
-  }
-  const backgroundPromise = getDevConfigInBackground(
-    root,
-    customerAccountPushFlag,
-    envFile
-  );
-  const tunnelPromise = cliConfig && backgroundPromise.then(({ customerAccountPush, storefrontId }) => {
-    if (customerAccountPush) {
-      return startTunnelAndPushConfig(
-        root,
-        cliConfig,
-        appPort,
-        storefrontId
-      );
-    }
-  });
-  const remixConfig = await reloadConfig();
-  assertOxygenChecks(remixConfig);
-  const envPromise = backgroundPromise.then(
-    ({ fetchRemote, localVariables }) => getAllEnvironmentVariables({
-      root,
-      fetchRemote,
-      envBranch,
-      envHandle,
-      localVariables,
-      envFile
-    })
-  );
-  const [{ watch }, { createFileWatchCache }] = await Promise.all([
-    importLocal("@remix-run/dev/dist/compiler/watch.js", root),
-    importLocal(
-      "@remix-run/dev/dist/compiler/fileWatchCache.js",
-      root
-    )
-  ]).catch(handleRemixImportFail);
-  let isInitialBuild = true;
-  let initialBuildDurationMs = 0;
-  let initialBuildStartTimeMs = Date.now();
-  const liveReload = shouldLiveReload ? await setupLiveReload(remixConfig.dev?.port ?? 8002, root) : void 0;
-  let miniOxygen;
-  let codegenProcess;
-  async function safeStartMiniOxygen() {
-    if (miniOxygen) return;
-    const { allVariables, logInjectedVariables } = await envPromise;
-    miniOxygen = await startMiniOxygen(
-      {
-        root,
-        debug,
-        appPort,
-        assetsPort,
-        inspectorPort,
-        watch: !liveReload,
-        buildPathWorkerFile,
-        buildPathClient,
-        env: allVariables
-      },
-      legacyRuntime
-    );
-    logInjectedVariables();
-    const host = (await tunnelPromise)?.host ?? miniOxygen.listeningAt;
-    const cliCommand = await cliCommandPromise;
-    enhanceH2Logs({ host, cliCommand, ...remixConfig });
-    const { storefrontTitle } = await backgroundPromise;
-    miniOxygen.showBanner({
-      appName: storefrontTitle,
-      headlinePrefix: initialBuildDurationMs > 0 ? `Initial build: ${initialBuildDurationMs}ms
-` : "",
-      host
-    });
-    if (useCodegen) {
-      codegenProcess = spawnCodegenProcess({
-        ...remixConfig,
-        configFilePath: codegenConfigPath
-      });
-    }
-    checkRemixVersions(root);
-    if (!disableVersionCheck) {
-      displayDevUpgradeNotice({ targetPath: appPath });
-    }
-    if (customerAccountPushFlag && isMockShop(allVariables)) {
-      notifyIssueWithTunnelAndMockShop(cliCommand);
-    }
-  }
-  const fileWatchCache = createFileWatchCache();
-  let skipRebuildLogs = false;
-  const closeWatcher = await watch(
-    {
-      config: remixConfig,
-      options: {
-        mode: process.env.NODE_ENV,
-        sourcemap
-      },
-      fileWatchCache,
-      logger: createRemixLogger()
-    },
-    {
-      reloadConfig,
-      onBuildStart(ctx) {
-        if (!isInitialBuild && !skipRebuildLogs) {
-          outputInfo(LOG_REBUILDING);
-          console.time(LOG_REBUILT);
-        }
-        liveReload?.onBuildStart(ctx);
-      },
-      onBuildManifest: liveReload?.onBuildManifest,
-      async onBuildFinish(context, duration, succeeded) {
-        if (isInitialBuild) {
-          await copyFilesPromise;
-          initialBuildDurationMs = Date.now() - initialBuildStartTimeMs;
-          isInitialBuild = false;
-        } else if (!skipRebuildLogs) {
-          skipRebuildLogs = false;
-          console.timeEnd(LOG_REBUILT);
-          if (!miniOxygen) console.log("");
-        }
-        if (!miniOxygen && !await serverBundleExists()) {
-          return renderFatalError({
-            name: "BuildError",
-            type: 0,
-            message: "MiniOxygen cannot start because the server bundle has not been generated.",
-            skipOclifErrorHandling: true,
-            tryMessage: "This is likely due to an error in your app and Remix is unable to compile. Try fixing the app and MiniOxygen will start."
-          });
-        }
-        if (succeeded) {
-          if (!miniOxygen) {
-            await safeStartMiniOxygen();
-          } else if (liveReload) {
-            await miniOxygen.reload();
-          }
-          liveReload?.onAppReady(context);
-        }
-      },
-      async onFileCreated(file) {
-        const [relative, absolute] = getFilePaths(file);
-        outputInfo(`
-\u{1F4C4} File created: ${relative}`);
-        if (absolute.startsWith(publicPath)) {
-          await copyPublicFiles(
-            absolute,
-            absolute.replace(publicPath, buildPathClient)
-          );
-        }
-      },
-      async onFileChanged(file) {
-        fileWatchCache.invalidateFile(file);
-        const [relative, absolute] = getFilePaths(file);
-        outputInfo(`
-\u{1F4C4} File changed: ${relative}`);
-        if (relative.endsWith(envFile)) {
-          skipRebuildLogs = true;
-          const { fetchRemote } = await backgroundPromise;
-          const { allVariables, logInjectedVariables } = await getAllEnvironmentVariables({
-            root,
-            fetchRemote,
-            envBranch,
-            envHandle,
-            envFile
-          });
-          logInjectedVariables();
-          await miniOxygen.reload({
-            env: allVariables
-          });
-        }
-        if (absolute.startsWith(publicPath)) {
-          await copyPublicFiles(
-            absolute,
-            absolute.replace(publicPath, buildPathClient)
-          );
-        }
-      },
-      async onFileDeleted(file) {
-        fileWatchCache.invalidateFile(file);
-        const [relative, absolute] = getFilePaths(file);
-        outputInfo(`
-\u{1F4C4} File deleted: ${relative}`);
-        if (absolute.startsWith(publicPath)) {
-          await fs.unlink(absolute.replace(publicPath, buildPathClient));
-        }
-      }
-    }
-  );
-  return {
-    getUrl: () => miniOxygen.listeningAt,
-    async close() {
-      codegenProcess?.removeAllListeners("close");
-      codegenProcess?.kill("SIGINT");
-      await Promise.allSettled([
-        closeWatcher(),
-        miniOxygen?.close(),
-        Promise.resolve(tunnelPromise).then((tunnel) => tunnel?.cleanup?.())
-      ]);
-    }
-  };
-}
-
-export { runClassicCompilerDev };

package/dist/lib/virtual-routes.js

@@ -1,49 +0,0 @@
-import { glob } from '@shopify/cli-kit/node/fs';
-import { joinPath, relativePath } from '@shopify/cli-kit/node/path';
-import { hydrogenPackagesPath, getAssetsDir } from './build.js';
-
-const VIRTUAL_ROUTES_DIR = "virtual-routes/routes";
-const VIRTUAL_ROOT = "virtual-routes/virtual-root";
-async function addVirtualRoutes(config) {
-  const distPath = process.env.SHOPIFY_UNIT_TEST && hydrogenPackagesPath ? joinPath(hydrogenPackagesPath, "hydrogen", "src", "vite") : await getAssetsDir();
-  const userRouteList = Object.values(config.routes);
-  const virtualRoutesPath = joinPath(distPath, VIRTUAL_ROUTES_DIR);
-  for (const absoluteFilePath of await glob(
-    joinPath(virtualRoutesPath, "**", "*")
-  )) {
-    const relativeFilePath = relativePath(virtualRoutesPath, absoluteFilePath);
-    const routePath = relativeFilePath.replace(/\.[jt]sx?$/, "").replaceAll("\\", "/");
-    const isIndex = /(^|\/)index$/.test(routePath);
-    const normalizedVirtualRoutePath = isIndex ? routePath.slice(0, -"index".length).replace(/\/$/, "") || void 0 : (
-      // TODO: support v2 flat routes?
-      routePath.replace(/\$/g, ":").replace(/[\[\]]/g, "")
-    );
-    const hasUserRoute = userRouteList.some(
-      (r) => r.parentId === "root" && r.path === normalizedVirtualRoutePath
-    );
-    if (!hasUserRoute) {
-      const id = VIRTUAL_ROUTES_DIR + "/" + routePath;
-      config.routes[id] = {
-        id,
-        parentId: VIRTUAL_ROOT,
-        path: normalizedVirtualRoutePath,
-        index: isIndex || void 0,
-        caseSensitive: void 0,
-        file: relativePath(config.appDirectory, absoluteFilePath)
-      };
-      if (!config.routes[VIRTUAL_ROOT]) {
-        config.routes[VIRTUAL_ROOT] = {
-          id: VIRTUAL_ROOT,
-          path: "",
-          file: relativePath(
-            config.appDirectory,
-            joinPath(distPath, VIRTUAL_ROOT + ".jsx")
-          )
-        };
-      }
-    }
-  }
-  return config;
-}
-
-export { VIRTUAL_ROOT, VIRTUAL_ROUTES_DIR, addVirtualRoutes };