@specific.dev/spectest 0.119.5 → 0.119.6

package/dist/next.js

@@ -4,36 +4,49 @@ import path from "node:path";
  * versions that do not apply outputFileTracingIncludes still emit these traces
  * before runAfterProductionCompile. No source files or generated code change. */
 async function includeTracedMaps(distDir) {
+    const traces = [];
+    const serverMaps = [];
     async function walk(dir) {
         for (const entry of await fs.readdir(dir, { withFileTypes: true })) {
             const file = path.join(dir, entry.name);
             if (entry.isDirectory() && entry.name !== "cache" && entry.name !== "standalone")
                 await walk(file);
-            else if (entry.isFile() && entry.name.endsWith(".nft.json")) {
-                const trace = JSON.parse(await fs.readFile(file, "utf8"));
-                if (!Array.isArray(trace.files))
-                    throw new Error(`Invalid Next trace: ${file}`);
-                const scripts = [entry.name.slice(0, -".nft.json".length), ...trace.files];
-                const maps = [];
-                for (const script of scripts) {
-                    if (typeof script !== "string" || !script.endsWith(".js"))
-                        continue;
-                    const map = script + ".map";
-                    try {
-                        if ((await fs.stat(path.resolve(dir, map))).isFile())
-                            maps.push(map);
-                    }
-                    catch (e) {
-                        if (e.code !== "ENOENT")
-                            throw e;
-                    }
-                }
-                trace.files = [...new Set([...trace.files, ...maps])];
-                await fs.writeFile(file, JSON.stringify(trace));
+            else if (entry.isFile()) {
+                if (entry.name.endsWith(".nft.json"))
+                    traces.push(file);
+                if (entry.name.endsWith(".js.map") && file.startsWith(path.join(distDir, "server") + path.sep))
+                    serverMaps.push(file);
             }
         }
     }
     await walk(distDir);
+    for (const file of traces) {
+        const dir = path.dirname(file);
+        const trace = JSON.parse(await fs.readFile(file, "utf8"));
+        if (!Array.isArray(trace.files))
+            throw new Error(`Invalid Next trace: ${file}`);
+        const scripts = [path.basename(file).slice(0, -".nft.json".length), ...trace.files];
+        // Edge bundles are copied through middleware-manifest, not NFT traces.
+        // The server trace is always copied into standalone output; retain
+        // their maps there without changing the middleware's executable files.
+        const maps = file === path.join(distDir, "next-server.js.nft.json")
+            ? serverMaps.map(map => path.relative(dir, map)) : [];
+        for (const script of scripts) {
+            if (typeof script !== "string" || !script.endsWith(".js"))
+                continue;
+            const map = script + ".map";
+            try {
+                if ((await fs.stat(path.resolve(dir, map))).isFile())
+                    maps.push(map);
+            }
+            catch (e) {
+                if (e.code !== "ENOENT")
+                    throw e;
+            }
+        }
+        trace.files = [...new Set([...trace.files, ...maps])];
+        await fs.writeFile(file, JSON.stringify(trace));
+    }
 }
 /** Build-time companion for coverage.next(). Import this lightweight module in
  * next.config; it does not load the Spectest harness or require Next at runtime.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@specific.dev/spectest",
-  "version": "0.119.5",
+  "version": "0.119.6",
   "description": "Spectest SDK for defining test environments in TypeScript.",
   "type": "module",
   "main": "./dist/index.js",

package/src/coverage-next.test.ts

@@ -92,18 +92,22 @@ describe("Next adapter", () => {
     loaderHook!(dependency, {resource: "/app/node_modules/next/dist/client/router.js"});
     expect(dependency.sourceMap).toBe(false);
   });
-  test("build hook retains traced maps and composes an existing compiler hook", async () => {
+  test("build hook retains traced and untraced Edge maps and composes an existing compiler hook", async () => {
     const dir=await fs.mkdtemp(path.join(os.tmpdir(),"next-trace-"));
     try {
       let called=false;
       const config=withCoverage({compiler:{runAfterProductionCompile:async()=>{
         called=true;
+        await fs.mkdir(path.join(dir,"server/edge"),{recursive:true});
+        await fs.writeFile(path.join(dir,"server/edge/middleware.js.map"),"{}");
+        await fs.writeFile(path.join(dir,"next-server.js.nft.json"),JSON.stringify({version:1,files:["runtime.js"]}));
         await fs.writeFile(path.join(dir,"page.js.map"),"{}");
         await fs.writeFile(path.join(dir,"chunk.js.map"),"{}");
         await fs.writeFile(path.join(dir,"page.js.nft.json"),JSON.stringify({version:1,files:["chunk.js","missing.js"]}));
       }}});
       await (config.compiler.runAfterProductionCompile as any)({projectDir:dir,distDir:dir});
       expect(called).toBe(true);
+      expect(JSON.parse(await fs.readFile(path.join(dir,"next-server.js.nft.json"),"utf8")).files).toEqual(["runtime.js","server/edge/middleware.js.map"]);
       expect(JSON.parse(await fs.readFile(path.join(dir,"page.js.nft.json"),"utf8")).files).toEqual(["chunk.js","missing.js","page.js.map","chunk.js.map"]);
     } finally {await fs.rm(dir,{recursive:true,force:true});}
   });

package/src/next.ts

@@ -5,27 +5,38 @@ import path from "node:path";
  * versions that do not apply outputFileTracingIncludes still emit these traces
  * before runAfterProductionCompile. No source files or generated code change. */
 async function includeTracedMaps(distDir: string): Promise<void> {
+  const traces: string[] = [];
+  const serverMaps: string[] = [];
   async function walk(dir: string): Promise<void> {
     for (const entry of await fs.readdir(dir, { withFileTypes: true })) {
       const file = path.join(dir, entry.name);
       if (entry.isDirectory() && entry.name !== "cache" && entry.name !== "standalone") await walk(file);
-      else if (entry.isFile() && entry.name.endsWith(".nft.json")) {
-        const trace = JSON.parse(await fs.readFile(file, "utf8"));
-        if (!Array.isArray(trace.files)) throw new Error(`Invalid Next trace: ${file}`);
-        const scripts = [entry.name.slice(0, -".nft.json".length), ...trace.files];
-        const maps: string[] = [];
-        for (const script of scripts) {
-          if (typeof script !== "string" || !script.endsWith(".js")) continue;
-          const map = script + ".map";
-          try { if ((await fs.stat(path.resolve(dir, map))).isFile()) maps.push(map); }
-          catch (e) { if ((e as NodeJS.ErrnoException).code !== "ENOENT") throw e; }
-        }
-        trace.files = [...new Set([...trace.files, ...maps])];
-        await fs.writeFile(file, JSON.stringify(trace));
+      else if (entry.isFile()) {
+        if (entry.name.endsWith(".nft.json")) traces.push(file);
+        if (entry.name.endsWith(".js.map") && file.startsWith(path.join(distDir, "server") + path.sep)) serverMaps.push(file);
       }
     }
   }
   await walk(distDir);
+  for (const file of traces) {
+    const dir = path.dirname(file);
+    const trace = JSON.parse(await fs.readFile(file, "utf8"));
+    if (!Array.isArray(trace.files)) throw new Error(`Invalid Next trace: ${file}`);
+    const scripts = [path.basename(file).slice(0, -".nft.json".length), ...trace.files];
+    // Edge bundles are copied through middleware-manifest, not NFT traces.
+    // The server trace is always copied into standalone output; retain
+    // their maps there without changing the middleware's executable files.
+    const maps = file === path.join(distDir, "next-server.js.nft.json")
+      ? serverMaps.map(map => path.relative(dir, map)) : [];
+    for (const script of scripts) {
+      if (typeof script !== "string" || !script.endsWith(".js")) continue;
+      const map = script + ".map";
+      try { if ((await fs.stat(path.resolve(dir, map))).isFile()) maps.push(map); }
+      catch (e) { if ((e as NodeJS.ErrnoException).code !== "ENOENT") throw e; }
+    }
+    trace.files = [...new Set([...trace.files, ...maps])];
+    await fs.writeFile(file, JSON.stringify(trace));
+  }
 }
 
 /** Build-time companion for coverage.next(). Import this lightweight module in