Normalize import paths in dev and make sure rewritten build manifest paths are correct on windows as well

Author: ericallam

packages/cli-v3/e2e/e2e.test.ts

@@ -3,7 +3,7 @@ import * as fs from "node:fs";
 import { mkdir, rename, rm } from "node:fs/promises";
 import * as path from "node:path";
 import { rimraf } from "rimraf";
-import { buildWorker } from "../src/build/buildWorker.js";
+import { buildWorker, rewriteBuildManifestPaths } from "../src/build/buildWorker.js";
 import { loadConfig } from "../src/config.js";
 import { indexWorkerManifest } from "../src/indexing/indexWorkerManifest.js";
 import { writeJSONFile } from "../src/utilities/fileSystem.js";
@@ -201,6 +201,13 @@ describe.concurrent("buildWorker", async () => {
 
         logger.debug("Build manifest", buildManifest!);
 
+        const rewrittenManifest = rewriteBuildManifestPaths(buildManifest!, destination.path);
+
+        expect(rewrittenManifest.loaderEntryPoint).toBe("/app/src/entryPoints/loader.mjs");
+        expect(rewrittenManifest.indexWorkerEntryPoint).toBe(
+          "/app/src/entryPoints/deploy-index-worker.mjs"
+        );
+
         const stdout: string[] = [];
         const stderr: string[] = [];
 

packages/cli-v3/src/build/buildWorker.ts

@@ -19,12 +19,14 @@ import {
   deployRunWorker,
   telemetryEntryPoint,
 } from "./packageModules.js";
-import { join, relative } from "node:path";
+import { join, relative, sep } from "node:path";
 import { generateContainerfile } from "../deploy/buildImage.js";
 import { writeFile } from "node:fs/promises";
 import { buildManifestToJSON } from "../utilities/buildManifest.js";
 import { readPackageJSON, writePackageJSON } from "pkg-types";
 import { writeJSONFile } from "../utilities/fileSystem.js";
+import { isWindows } from "std-env";
+import { pathToFileURL } from "node:url";
 
 export type BuildWorkerEventListener = {
   onBundleStart?: () => void;
@@ -109,7 +111,7 @@ export async function buildWorker(options: BuildWorkerOptions) {
   return buildManifest;
 }
 
-function rewriteBuildManifestPaths(
+export function rewriteBuildManifestPaths(
   buildManifest: BuildManifest,
   destinationDir: string
 ): BuildManifest {
@@ -142,7 +144,16 @@ function cleanEntryPath(entry: string): string {
 }
 
 function rewriteOutputPath(destinationDir: string, filePath: string) {
-  return `/app/${relative(destinationDir, filePath)}`;
+  if (isWindows) {
+    return `/app/${relative(
+      pathToFileURL(destinationDir).pathname,
+      pathToFileURL(filePath).pathname
+    )
+      .split(sep)
+      .join("/")}`;
+  } else {
+    return `/app/${relative(destinationDir, filePath)}`;
+  }
 }
 
 async function writeDeployFiles(

packages/cli-v3/src/entryPoints/dev-index-worker.ts

@@ -15,6 +15,7 @@ import { readFile } from "node:fs/promises";
 import sourceMapSupport from "source-map-support";
 import { registerTasks } from "../indexing/registerTasks.js";
 import { env } from "std-env";
+import { normalizeImportPath } from "../utilities/normalizeImportPath.js";
 
 sourceMapSupport.install({
   handleUncaughtExceptions: false,
@@ -54,7 +55,7 @@ taskCatalog.setGlobalTaskCatalog(new StandardTaskCatalog());
 async function importConfig(
   configPath: string
 ): Promise<{ config: TriggerConfig; handleError?: HandleErrorFunction }> {
-  const configModule = await import(configPath);
+  const configModule = await import(normalizeImportPath(configPath));
 
   const config = configModule?.default ?? configModule?.config;
 

packages/cli-v3/src/entryPoints/dev-run-worker.ts

@@ -34,6 +34,7 @@ import { readFile } from "node:fs/promises";
 import sourceMapSupport from "source-map-support";
 import { VERSION } from "../version.js";
 import { env } from "std-env";
+import { normalizeImportPath } from "../utilities/normalizeImportPath.js";
 
 sourceMapSupport.install({
   handleUncaughtExceptions: false,
@@ -80,7 +81,7 @@ const triggerLogLevel = getEnvVar("TRIGGER_LOG_LEVEL");
 async function importConfig(
   configPath: string
 ): Promise<{ config: TriggerConfig; handleError?: HandleErrorFunction }> {
-  const configModule = await import(configPath);
+  const configModule = await import(normalizeImportPath(configPath));
 
   const config = configModule?.default ?? configModule?.config;
 
@@ -206,7 +207,7 @@ const zodIpc = new ZodIpcConnection({
       }
 
       try {
-        await import(taskManifest.entryPoint);
+        await import(normalizeImportPath(taskManifest.entryPoint));
       } catch (err) {
         console.error(`Failed to import task ${execution.task.id}`, err);