fix bug for file paths in windows during componentization

.github/workflows/main.yml

@@ -132,7 +132,7 @@ jobs:
   ########
 
   test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     needs:
       - build
     strategy:
@@ -141,6 +141,10 @@ jobs:
         node-version:
           - '23.10.0'
           # - latest reenable when https://github.com/nodejs/node/issues/57172 is fixed
+        os:
+          - ubuntu-latest
+          - windows-latest
+          - macos-latest
         build-type:
           - 'release'
           - 'debug'
@@ -156,6 +160,7 @@ jobs:
         uses: actions/cache/restore@v4
         id: restore-starlingmonkey-jit-build
         with:
+          enableCrossOsArchive: true
           key: starlingmonkey-${{matrix.build-type}}-${{ steps.starlingmonkey-commit.outputs.STARLINGMONKEY_HASH }}
           path: lib
 

package.json

@@ -13,6 +13,7 @@
   },
   "devDependencies": {
     "@bytecodealliance/preview2-shim": "^0.17.1",
+    "cross-env": "^7.0.3",
     "mocha": "^11.1.0"
   },
   "dependencies": {
@@ -31,8 +32,8 @@
     "build:debug": "make debug",
     "test": "mocha -u tdd test/test.js --timeout 120000",
     "test:release": "mocha -u tdd test/test.js --timeout 120000",
-    "test:weval": "WEVAL_TEST=1 mocha -u tdd test/test.js --timeout 120000",
-    "test:debug": "DEBUG_TEST=1 mocha -u tdd test/test.js --timeout 120000",
+    "test:weval": "cross-env WEVAL_TEST=1 mocha -u tdd test/test.js --timeout 120000",
+    "test:debug": "cross-env DEBUG_TEST=1 mocha -u tdd test/test.js --timeout 120000",
     "prepublishOnly": "npm run build"
   },
   "files": [
@@ -48,4 +49,4 @@
   "workspaces": [
     "."
   ]
-}
+}

src/componentize.js

@@ -25,8 +25,17 @@ const isWindows = platform === 'win32';
 
 function maybeWindowsPath(path) {
   if (!path) return path;
-  if (!isWindows) return resolve(path);
-  return '//?/' + resolve(path).replace(/\\/g, '/');
+  const resolvedPath = resolve(path);
+  if (!isWindows) return resolvedPath;
+
+  // Strip any existing UNC prefix check both the format we add as well as what
+  //  the windows API returns when using path.resolve
+  let cleanPath = resolvedPath;
+  while (cleanPath.startsWith('\\\\?\\') || cleanPath.startsWith('//?/')) {
+    cleanPath = cleanPath.substring(4);
+  }
+
+  return '//?/' + cleanPath.replace(/\\/g, '/');
 }
 
 /**
@@ -108,7 +117,7 @@ export async function componentize(opts,
       .slice(0, 12)
   );
   await mkdir(tmpDir);
-  const sourceDir = join(tmpDir, 'sources');
+  const sourceDir = maybeWindowsPath(join(tmpDir, 'sources'));
   await mkdir(sourceDir);
 
   let {
@@ -223,7 +232,7 @@ export async function componentize(opts,
     console.log(env);
   }
 
-  let initializerPath = join(sourceDir, 'initializer.js');
+  let initializerPath = maybeWindowsPath(join(sourceDir, 'initializer.js'));
   sourcePath = maybeWindowsPath(sourcePath);
   let workspacePrefix = dirname(sourcePath);
 

test/cases/missing-export/test.js

@@ -1,8 +1,9 @@
-import { strictEqual } from 'node:assert';
+import { match } from 'node:assert';
 
+// use match instead of strictEqual to enable testing between linux and windows
+// Windows errors prefix the error with file path
 export function err(e) {
-  strictEqual(e.message, `Unable to extract expected exports list
-Error: "missing-export.js" does not export a "expected" function as expected by the world.
-  Try defining it:
-  export function expected() {};`);
+  match(e.message, /Error: "missing-export.js" does not export a "expected" function/);
+  match(e.message, /Try defining it:/);
+  match(e.message, /export function expected\(\) {};/);
 }