npm - next - Versions diffs - 15.2.2-canary.5 → 15.2.2-canary.7 - Mend

next 15.2.2-canary.5 → 15.2.2-canary.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of next might be problematic. Click here for more details.

Files changed (75) hide show

package/dist/esm/build/handle-entrypoints.js CHANGED Viewed

@@ -1,32 +1,27 @@
-import * as Log from './output/log';
 import { getEntryKey } from '../shared/lib/turbopack/entry-key';
-import { processIssues } from '../shared/lib/turbopack/utils';
-export async function handleEntrypoints({ entrypoints, currentEntrypoints, currentEntryIssues, manifestLoader, productionRewrites, logErrors }) {
-    currentEntrypoints.global.app = entrypoints.pagesAppEndpoint;
-    currentEntrypoints.global.document = entrypoints.pagesDocumentEndpoint;
-    currentEntrypoints.global.error = entrypoints.pagesErrorEndpoint;
-    currentEntrypoints.global.instrumentation = entrypoints.instrumentation;
-    currentEntrypoints.page.clear();
-    currentEntrypoints.app.clear();
-    for (const [pathname, route] of entrypoints.routes){
+import * as Log from './output/log';
+export async function rawEntrypointsToEntrypoints(entrypointsOp) {
+    const page = new Map();
+    const app = new Map();
+    for (const [pathname, route] of entrypointsOp.routes){
         switch(route.type){
             case 'page':
             case 'page-api':
-                currentEntrypoints.page.set(pathname, route);
+                page.set(pathname, route);
                 break;
             case 'app-page':
                 {
-                    route.pages.forEach((page)=>{
-                        currentEntrypoints.app.set(page.originalName, {
+                    for (const p of route.pages){
+                        app.set(p.originalName, {
                             type: 'app-page',
-                            ...page
+                            ...p
                         });
-                    });
+                    }
                     break;
                 }
             case 'app-route':
                 {
-                    currentEntrypoints.app.set(route.originalName, route);
+                    app.set(route.originalName, route);
                     break;
                 }
             default:
@@ -34,99 +29,28 @@ export async function handleEntrypoints({ entrypoints, currentEntrypoints, curre
                 break;
         }
     }
-    const { middleware, instrumentation } = entrypoints;
-    // We check for explicit true/false, since it's initialized to
-    // undefined during the first loop (middlewareChanges event is
-    // unnecessary during the first serve)
-    if (currentEntrypoints.global.middleware && !middleware) {
-        const key = getEntryKey('root', 'server', 'middleware');
-        // Went from middleware to no middleware
-        currentEntryIssues.delete(key);
-    }
-    currentEntrypoints.global.middleware = middleware;
-    if (instrumentation) {
-        const processInstrumentation = async (name, prop)=>{
-            const key = getEntryKey('root', 'server', name);
-            const writtenEndpoint = await instrumentation[prop].writeToDisk();
-            processIssues(currentEntryIssues, key, writtenEndpoint, false, logErrors);
-        };
-        await processInstrumentation('instrumentation.nodeJs', 'nodeJs');
-        await processInstrumentation('instrumentation.edge', 'edge');
-        await manifestLoader.loadMiddlewareManifest('instrumentation', 'instrumentation');
-        await manifestLoader.writeManifests({
-            devRewrites: undefined,
-            productionRewrites,
-            entrypoints: currentEntrypoints
-        });
-    }
-    if (middleware) {
-        const key = getEntryKey('root', 'server', 'middleware');
-        const endpoint = middleware.endpoint;
-        async function processMiddleware() {
-            const writtenEndpoint = await endpoint.writeToDisk();
-            processIssues(currentEntryIssues, key, writtenEndpoint, false, logErrors);
-            await manifestLoader.loadMiddlewareManifest('middleware', 'middleware');
-        }
-        await processMiddleware();
-    } else {
-        manifestLoader.deleteMiddlewareManifest(getEntryKey('root', 'server', 'middleware'));
-    }
-}
-export async function handlePagesErrorRoute({ currentEntryIssues, entrypoints, manifestLoader, productionRewrites, logErrors }) {
-    if (entrypoints.global.app) {
-        const key = getEntryKey('pages', 'server', '_app');
-        const writtenEndpoint = await entrypoints.global.app.writeToDisk();
-        processIssues(currentEntryIssues, key, writtenEndpoint, false, logErrors);
-    }
-    await manifestLoader.loadBuildManifest('_app');
-    await manifestLoader.loadPagesManifest('_app');
-    await manifestLoader.loadFontManifest('_app');
-    if (entrypoints.global.document) {
-        const key = getEntryKey('pages', 'server', '_document');
-        const writtenEndpoint = await entrypoints.global.document.writeToDisk();
-        processIssues(currentEntryIssues, key, writtenEndpoint, false, logErrors);
-    }
-    await manifestLoader.loadPagesManifest('_document');
-    if (entrypoints.global.error) {
-        const key = getEntryKey('pages', 'server', '_error');
-        const writtenEndpoint = await entrypoints.global.error.writeToDisk();
-        processIssues(currentEntryIssues, key, writtenEndpoint, false, logErrors);
-    }
-    await manifestLoader.loadBuildManifest('_error');
-    await manifestLoader.loadPagesManifest('_error');
-    await manifestLoader.loadFontManifest('_error');
-    await manifestLoader.writeManifests({
-        devRewrites: undefined,
-        productionRewrites,
-        entrypoints
-    });
+    return {
+        global: {
+            app: entrypointsOp.pagesAppEndpoint,
+            document: entrypointsOp.pagesDocumentEndpoint,
+            error: entrypointsOp.pagesErrorEndpoint,
+            instrumentation: entrypointsOp.instrumentation,
+            middleware: entrypointsOp.middleware
+        },
+        page,
+        app
+    };
 }
-export async function handleRouteType({ page, route, currentEntryIssues, entrypoints, manifestLoader, productionRewrites, logErrors }) {
+export async function handleRouteType({ page, route, manifestLoader }) {
     const shouldCreateWebpackStats = process.env.TURBOPACK_STATS != null;
     switch(route.type){
         case 'page':
             {
                 const serverKey = getEntryKey('pages', 'server', page);
-                if (entrypoints.global.app) {
-                    const key = getEntryKey('pages', 'server', '_app');
-                    const writtenEndpoint = await entrypoints.global.app.writeToDisk();
-                    processIssues(currentEntryIssues, key, writtenEndpoint, false, logErrors);
-                }
-                await manifestLoader.loadBuildManifest('_app');
-                await manifestLoader.loadPagesManifest('_app');
-                if (entrypoints.global.document) {
-                    const key = getEntryKey('pages', 'server', '_document');
-                    const writtenEndpoint = await entrypoints.global.document.writeToDisk();
-                    processIssues(currentEntryIssues, key, writtenEndpoint, false, logErrors);
-                }
-                await manifestLoader.loadPagesManifest('_document');
-                const writtenEndpoint = await route.htmlEndpoint.writeToDisk();
-                const type = writtenEndpoint == null ? void 0 : writtenEndpoint.type;
                 await manifestLoader.loadBuildManifest(page);
                 await manifestLoader.loadPagesManifest(page);
-                if (type === 'edge') {
-                    await manifestLoader.loadMiddlewareManifest(page, 'pages');
-                } else {
+                const middlewareManifestWritten = await manifestLoader.loadMiddlewareManifest(page, 'pages');
+                if (!middlewareManifestWritten) {
                     manifestLoader.deleteMiddlewareManifest(serverKey);
                 }
                 await manifestLoader.loadFontManifest('/_app', 'pages');
@@ -134,41 +58,23 @@ export async function handleRouteType({ page, route, currentEntryIssues, entrypo
                 if (shouldCreateWebpackStats) {
                     await manifestLoader.loadWebpackStats(page, 'pages');
                 }
-                await manifestLoader.writeManifests({
-                    devRewrites: undefined,
-                    productionRewrites,
-                    entrypoints
-                });
-                processIssues(currentEntryIssues, serverKey, writtenEndpoint, false, logErrors);
                 break;
             }
         case 'page-api':
             {
                 const key = getEntryKey('pages', 'server', page);
-                const writtenEndpoint = await route.endpoint.writeToDisk();
-                const type = writtenEndpoint.type;
                 await manifestLoader.loadPagesManifest(page);
-                if (type === 'edge') {
-                    await manifestLoader.loadMiddlewareManifest(page, 'pages');
-                } else {
+                const middlewareManifestWritten = await manifestLoader.loadMiddlewareManifest(page, 'pages');
+                if (!middlewareManifestWritten) {
                     manifestLoader.deleteMiddlewareManifest(key);
                 }
-                await manifestLoader.writeManifests({
-                    devRewrites: undefined,
-                    productionRewrites,
-                    entrypoints
-                });
-                processIssues(currentEntryIssues, key, writtenEndpoint, true, logErrors);
                 break;
             }
         case 'app-page':
             {
                 const key = getEntryKey('app', 'server', page);
-                const writtenEndpoint = await route.htmlEndpoint.writeToDisk();
-                const type = writtenEndpoint.type;
-                if (type === 'edge') {
-                    await manifestLoader.loadMiddlewareManifest(page, 'app');
-                } else {
+                const middlewareManifestWritten = await manifestLoader.loadMiddlewareManifest(page, 'app');
+                if (!middlewareManifestWritten) {
                     manifestLoader.deleteMiddlewareManifest(key);
                 }
                 await manifestLoader.loadAppBuildManifest(page);
@@ -179,31 +85,16 @@ export async function handleRouteType({ page, route, currentEntryIssues, entrypo
                 if (shouldCreateWebpackStats) {
                     await manifestLoader.loadWebpackStats(page, 'app');
                 }
-                await manifestLoader.writeManifests({
-                    devRewrites: undefined,
-                    productionRewrites,
-                    entrypoints
-                });
-                processIssues(currentEntryIssues, key, writtenEndpoint, false, logErrors);
                 break;
             }
         case 'app-route':
             {
                 const key = getEntryKey('app', 'server', page);
-                const writtenEndpoint = await route.endpoint.writeToDisk();
-                const type = writtenEndpoint.type;
                 await manifestLoader.loadAppPathsManifest(page);
-                if (type === 'edge') {
-                    await manifestLoader.loadMiddlewareManifest(page, 'app');
-                } else {
+                const middlewareManifestWritten = await manifestLoader.loadMiddlewareManifest(page, 'app');
+                if (!middlewareManifestWritten) {
                     manifestLoader.deleteMiddlewareManifest(key);
                 }
-                await manifestLoader.writeManifests({
-                    devRewrites: undefined,
-                    productionRewrites,
-                    entrypoints
-                });
-                processIssues(currentEntryIssues, key, writtenEndpoint, true, logErrors);
                 break;
             }
         default:

package/dist/esm/build/handle-entrypoints.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../../src/build/handle-entrypoints.ts"],"sourcesContent":["import type { CustomRoutes } from '../lib/load-custom-routes'\nimport type { TurbopackManifestLoader } from '../shared/lib/turbopack/manifest-loader'\nimport type {\n TurbopackResult,\n RawEntrypoints,\n Entrypoints,\n PageRoute,\n AppRoute,\n} from './swc/types'\nimport * as Log from './output/log'\nimport { getEntryKey } from '../shared/lib/turbopack/entry-key'\nimport {\n processIssues,\n type EntryIssuesMap,\n} from '../shared/lib/turbopack/utils'\n\nexport async function handleEntrypoints({\n entrypoints,\n currentEntrypoints,\n currentEntryIssues,\n manifestLoader,\n productionRewrites,\n logErrors,\n}: {\n entrypoints: TurbopackResult<RawEntrypoints>\n currentEntrypoints: Entrypoints\n currentEntryIssues: EntryIssuesMap\n manifestLoader: TurbopackManifestLoader\n productionRewrites: CustomRoutes['rewrites'] \| undefined\n logErrors: boolean\n}) {\n currentEntrypoints.global.app = entrypoints.pagesAppEndpoint\n currentEntrypoints.global.document = entrypoints.pagesDocumentEndpoint\n currentEntrypoints.global.error = entrypoints.pagesErrorEndpoint\n\n currentEntrypoints.global.instrumentation = entrypoints.instrumentation\n\n currentEntrypoints.page.clear()\n currentEntrypoints.app.clear()\n\n for (const [pathname, route] of entrypoints.routes) {\n switch (route.type) {\n case 'page':\n case 'page-api':\n currentEntrypoints.page.set(pathname, route)\n break\n case 'app-page': {\n route.pages.forEach((page) => {\n currentEntrypoints.app.set(page.originalName, {\n type: 'app-page',\n ...page,\n })\n })\n break\n }\n case 'app-route': {\n currentEntrypoints.app.set(route.originalName, route)\n break\n }\n default:\n Log.info(`skipping ${pathname} (${route.type})`)\n break\n }\n }\n\n const { middleware, instrumentation } = entrypoints\n\n // We check for explicit true/false, since it's initialized to\n // undefined during the first loop (middlewareChanges event is\n // unnecessary during the first serve)\n if (currentEntrypoints.global.middleware && !middleware) {\n const key = getEntryKey('root', 'server', 'middleware')\n // Went from middleware to no middleware\n currentEntryIssues.delete(key)\n }\n\n currentEntrypoints.global.middleware = middleware\n\n if (instrumentation) {\n const processInstrumentation = async (\n name: string,\n prop: 'nodeJs' \| 'edge'\n ) => {\n const key = getEntryKey('root', 'server', name)\n\n const writtenEndpoint = await instrumentation[prop].writeToDisk()\n processIssues(currentEntryIssues, key, writtenEndpoint, false, logErrors)\n }\n await processInstrumentation('instrumentation.nodeJs', 'nodeJs')\n await processInstrumentation('instrumentation.edge', 'edge')\n await manifestLoader.loadMiddlewareManifest(\n 'instrumentation',\n 'instrumentation'\n )\n await manifestLoader.writeManifests({\n devRewrites: undefined,\n productionRewrites,\n entrypoints: currentEntrypoints,\n })\n }\n\n if (middleware) {\n const key = getEntryKey('root', 'server', 'middleware')\n\n const endpoint = middleware.endpoint\n\n async function processMiddleware() {\n const writtenEndpoint = await endpoint.writeToDisk()\n processIssues(currentEntryIssues, key, writtenEndpoint, false, logErrors)\n await manifestLoader.loadMiddlewareManifest('middleware', 'middleware')\n }\n await processMiddleware()\n } else {\n manifestLoader.deleteMiddlewareManifest(\n getEntryKey('root', 'server', 'middleware')\n )\n }\n}\n\nexport async function handlePagesErrorRoute({\n currentEntryIssues,\n entrypoints,\n manifestLoader,\n productionRewrites,\n logErrors,\n}: {\n currentEntryIssues: EntryIssuesMap\n entrypoints: Entrypoints\n manifestLoader: TurbopackManifestLoader\n productionRewrites: CustomRoutes['rewrites'] \| undefined\n logErrors: boolean\n}) {\n if (entrypoints.global.app) {\n const key = getEntryKey('pages', 'server', '_app')\n const writtenEndpoint = await entrypoints.global.app.writeToDisk()\n processIssues(currentEntryIssues, key, writtenEndpoint, false, logErrors)\n }\n await manifestLoader.loadBuildManifest('_app')\n await manifestLoader.loadPagesManifest('_app')\n await manifestLoader.loadFontManifest('_app')\n\n if (entrypoints.global.document) {\n const key = getEntryKey('pages', 'server', '_document')\n const writtenEndpoint = await entrypoints.global.document.writeToDisk()\n processIssues(currentEntryIssues, key, writtenEndpoint, false, logErrors)\n }\n await manifestLoader.loadPagesManifest('_document')\n\n if (entrypoints.global.error) {\n const key = getEntryKey('pages', 'server', '_error')\n const writtenEndpoint = await entrypoints.global.error.writeToDisk()\n processIssues(currentEntryIssues, key, writtenEndpoint, false, logErrors)\n }\n\n await manifestLoader.loadBuildManifest('_error')\n await manifestLoader.loadPagesManifest('_error')\n await manifestLoader.loadFontManifest('_error')\n\n await manifestLoader.writeManifests({\n devRewrites: undefined,\n productionRewrites,\n entrypoints,\n })\n}\n\nexport async function handleRouteType({\n page,\n route,\n currentEntryIssues,\n entrypoints,\n manifestLoader,\n productionRewrites,\n logErrors,\n}: {\n page: string\n route: PageRoute \| AppRoute\n\n currentEntryIssues: EntryIssuesMap\n entrypoints: Entrypoints\n manifestLoader: TurbopackManifestLoader\n productionRewrites: CustomRoutes['rewrites'] \| undefined\n logErrors: boolean\n}) {\n const shouldCreateWebpackStats = process.env.TURBOPACK_STATS != null\n\n switch (route.type) {\n case 'page': {\n const serverKey = getEntryKey('pages', 'server', page)\n\n if (entrypoints.global.app) {\n const key = getEntryKey('pages', 'server', '_app')\n\n const writtenEndpoint = await entrypoints.global.app.writeToDisk()\n processIssues(\n currentEntryIssues,\n key,\n writtenEndpoint,\n false,\n logErrors\n )\n }\n await manifestLoader.loadBuildManifest('_app')\n await manifestLoader.loadPagesManifest('_app')\n\n if (entrypoints.global.document) {\n const key = getEntryKey('pages', 'server', '_document')\n\n const writtenEndpoint = await entrypoints.global.document.writeToDisk()\n processIssues(\n currentEntryIssues,\n key,\n writtenEndpoint,\n false,\n logErrors\n )\n }\n await manifestLoader.loadPagesManifest('_document')\n\n const writtenEndpoint = await route.htmlEndpoint.writeToDisk()\n\n const type = writtenEndpoint?.type\n\n await manifestLoader.loadBuildManifest(page)\n await manifestLoader.loadPagesManifest(page)\n if (type === 'edge') {\n await manifestLoader.loadMiddlewareManifest(page, 'pages')\n } else {\n manifestLoader.deleteMiddlewareManifest(serverKey)\n }\n await manifestLoader.loadFontManifest('/_app', 'pages')\n await manifestLoader.loadFontManifest(page, 'pages')\n\n if (shouldCreateWebpackStats) {\n await manifestLoader.loadWebpackStats(page, 'pages')\n }\n\n await manifestLoader.writeManifests({\n devRewrites: undefined,\n productionRewrites,\n entrypoints,\n })\n\n processIssues(\n currentEntryIssues,\n serverKey,\n writtenEndpoint,\n false,\n logErrors\n )\n\n break\n }\n case 'page-api': {\n const key = getEntryKey('pages', 'server', page)\n\n const writtenEndpoint = await route.endpoint.writeToDisk()\n\n const type = writtenEndpoint.type\n\n await manifestLoader.loadPagesManifest(page)\n if (type === 'edge') {\n await manifestLoader.loadMiddlewareManifest(page, 'pages')\n } else {\n manifestLoader.deleteMiddlewareManifest(key)\n }\n\n await manifestLoader.writeManifests({\n devRewrites: undefined,\n productionRewrites,\n entrypoints,\n })\n\n processIssues(currentEntryIssues, key, writtenEndpoint, true, logErrors)\n\n break\n }\n case 'app-page': {\n const key = getEntryKey('app', 'server', page)\n const writtenEndpoint = await route.htmlEndpoint.writeToDisk()\n const type = writtenEndpoint.type\n\n if (type === 'edge') {\n await manifestLoader.loadMiddlewareManifest(page, 'app')\n } else {\n manifestLoader.deleteMiddlewareManifest(key)\n }\n\n await manifestLoader.loadAppBuildManifest(page)\n await manifestLoader.loadBuildManifest(page, 'app')\n await manifestLoader.loadAppPathsManifest(page)\n await manifestLoader.loadActionManifest(page)\n await manifestLoader.loadFontManifest(page, 'app')\n\n if (shouldCreateWebpackStats) {\n await manifestLoader.loadWebpackStats(page, 'app')\n }\n\n await manifestLoader.writeManifests({\n devRewrites: undefined,\n productionRewrites,\n entrypoints,\n })\n\n processIssues(currentEntryIssues, key, writtenEndpoint, false, logErrors)\n\n break\n }\n case 'app-route': {\n const key = getEntryKey('app', 'server', page)\n const writtenEndpoint = await route.endpoint.writeToDisk()\n const type = writtenEndpoint.type\n\n await manifestLoader.loadAppPathsManifest(page)\n\n if (type === 'edge') {\n await manifestLoader.loadMiddlewareManifest(page, 'app')\n } else {\n manifestLoader.deleteMiddlewareManifest(key)\n }\n\n await manifestLoader.writeManifests({\n devRewrites: undefined,\n productionRewrites,\n entrypoints,\n })\n processIssues(currentEntryIssues, key, writtenEndpoint, true, logErrors)\n\n break\n }\n default: {\n throw new Error(`unknown route type ${(route as any).type} for ${page}`)\n }\n }\n}\n"],"names":["Log","getEntryKey","processIssues","handleEntrypoints","entrypoints","currentEntrypoints","currentEntryIssues","manifestLoader","productionRewrites","logErrors","global","app","pagesAppEndpoint","document","pagesDocumentEndpoint","error","pagesErrorEndpoint","instrumentation","page","clear","pathname","route","routes","type","set","pages","forEach","originalName","info","middleware","key","delete","processInstrumentation","name","prop","writtenEndpoint","writeToDisk","loadMiddlewareManifest","writeManifests","devRewrites","undefined","endpoint","processMiddleware","deleteMiddlewareManifest","handlePagesErrorRoute","loadBuildManifest","loadPagesManifest","loadFontManifest","handleRouteType","shouldCreateWebpackStats","process","env","TURBOPACK_STATS","serverKey","htmlEndpoint","loadWebpackStats","loadAppBuildManifest","loadAppPathsManifest","loadActionManifest","Error"],"mappings":"AASA,YAAYA,SAAS,eAAc;AACnC,SAASC,WAAW,QAAQ,oCAAmC;AAC/D,SACEC,aAAa,QAER,gCAA+B;AAEtC,OAAO,eAAeC,kBAAkB,EACtCC,WAAW,EACXC,kBAAkB,EAClBC,kBAAkB,EAClBC,cAAc,EACdC,kBAAkB,EAClBC,SAAS,EAQV;IACCJ,mBAAmBK,MAAM,CAACC,GAAG,GAAGP,YAAYQ,gBAAgB;IAC5DP,mBAAmBK,MAAM,CAACG,QAAQ,GAAGT,YAAYU,qBAAqB;IACtET,mBAAmBK,MAAM,CAACK,KAAK,GAAGX,YAAYY,kBAAkB;IAEhEX,mBAAmBK,MAAM,CAACO,eAAe,GAAGb,YAAYa,eAAe;IAEvEZ,mBAAmBa,IAAI,CAACC,KAAK;IAC7Bd,mBAAmBM,GAAG,CAACQ,KAAK;IAE5B,KAAK,MAAM,CAACC,UAAUC,MAAM,IAAIjB,YAAYkB,MAAM,CAAE;QAClD,OAAQD,MAAME,IAAI;YAChB,KAAK;YACL,KAAK;gBACHlB,mBAAmBa,IAAI,CAACM,GAAG,CAACJ,UAAUC;gBACtC;YACF,KAAK;gBAAY;oBACfA,MAAMI,KAAK,CAACC,OAAO,CAAC,CAACR;wBACnBb,mBAAmBM,GAAG,CAACa,GAAG,CAACN,KAAKS,YAAY,EAAE;4BAC5CJ,MAAM;4BACN,GAAGL,IAAI;wBACT;oBACF;oBACA;gBACF;YACA,KAAK;gBAAa;oBAChBb,mBAAmBM,GAAG,CAACa,GAAG,CAACH,MAAMM,YAAY,EAAEN;oBAC/C;gBACF;YACA;gBACErB,IAAI4B,IAAI,CAAC,CAAC,SAAS,EAAER,SAAS,EAAE,EAAEC,MAAME,IAAI,CAAC,CAAC,CAAC;gBAC/C;QACJ;IACF;IAEA,MAAM,EAAEM,UAAU,EAAEZ,eAAe,EAAE,GAAGb;IAExC,8DAA8D;IAC9D,8DAA8D;IAC9D,sCAAsC;IACtC,IAAIC,mBAAmBK,MAAM,CAACmB,UAAU,IAAI,CAACA,YAAY;QACvD,MAAMC,MAAM7B,YAAY,QAAQ,UAAU;QAC1C,wCAAwC;QACxCK,mBAAmByB,MAAM,CAACD;IAC5B;IAEAzB,mBAAmBK,MAAM,CAACmB,UAAU,GAAGA;IAEvC,IAAIZ,iBAAiB;QACnB,MAAMe,yBAAyB,OAC7BC,MACAC;YAEA,MAAMJ,MAAM7B,YAAY,QAAQ,UAAUgC;YAE1C,MAAME,kBAAkB,MAAMlB,eAAe,CAACiB,KAAK,CAACE,WAAW;YAC/DlC,cAAcI,oBAAoBwB,KAAKK,iBAAiB,OAAO1B;QACjE;QACA,MAAMuB,uBAAuB,0BAA0B;QACvD,MAAMA,uBAAuB,wBAAwB;QACrD,MAAMzB,eAAe8B,sBAAsB,CACzC,mBACA;QAEF,MAAM9B,eAAe+B,cAAc,CAAC;YAClCC,aAAaC;YACbhC;YACAJ,aAAaC;QACf;IACF;IAEA,IAAIwB,YAAY;QACd,MAAMC,MAAM7B,YAAY,QAAQ,UAAU;QAE1C,MAAMwC,WAAWZ,WAAWY,QAAQ;QAEpC,eAAeC;YACb,MAAMP,kBAAkB,MAAMM,SAASL,WAAW;YAClDlC,cAAcI,oBAAoBwB,KAAKK,iBAAiB,OAAO1B;YAC/D,MAAMF,eAAe8B,sBAAsB,CAAC,cAAc;QAC5D;QACA,MAAMK;IACR,OAAO;QACLnC,eAAeoC,wBAAwB,CACrC1C,YAAY,QAAQ,UAAU;IAElC;AACF;AAEA,OAAO,eAAe2C,sBAAsB,EAC1CtC,kBAAkB,EAClBF,WAAW,EACXG,cAAc,EACdC,kBAAkB,EAClBC,SAAS,EAOV;IACC,IAAIL,YAAYM,MAAM,CAACC,GAAG,EAAE;QAC1B,MAAMmB,MAAM7B,YAAY,SAAS,UAAU;QAC3C,MAAMkC,kBAAkB,MAAM/B,YAAYM,MAAM,CAACC,GAAG,CAACyB,WAAW;QAChElC,cAAcI,oBAAoBwB,KAAKK,iBAAiB,OAAO1B;IACjE;IACA,MAAMF,eAAesC,iBAAiB,CAAC;IACvC,MAAMtC,eAAeuC,iBAAiB,CAAC;IACvC,MAAMvC,eAAewC,gBAAgB,CAAC;IAEtC,IAAI3C,YAAYM,MAAM,CAACG,QAAQ,EAAE;QAC/B,MAAMiB,MAAM7B,YAAY,SAAS,UAAU;QAC3C,MAAMkC,kBAAkB,MAAM/B,YAAYM,MAAM,CAACG,QAAQ,CAACuB,WAAW;QACrElC,cAAcI,oBAAoBwB,KAAKK,iBAAiB,OAAO1B;IACjE;IACA,MAAMF,eAAeuC,iBAAiB,CAAC;IAEvC,IAAI1C,YAAYM,MAAM,CAACK,KAAK,EAAE;QAC5B,MAAMe,MAAM7B,YAAY,SAAS,UAAU;QAC3C,MAAMkC,kBAAkB,MAAM/B,YAAYM,MAAM,CAACK,KAAK,CAACqB,WAAW;QAClElC,cAAcI,oBAAoBwB,KAAKK,iBAAiB,OAAO1B;IACjE;IAEA,MAAMF,eAAesC,iBAAiB,CAAC;IACvC,MAAMtC,eAAeuC,iBAAiB,CAAC;IACvC,MAAMvC,eAAewC,gBAAgB,CAAC;IAEtC,MAAMxC,eAAe+B,cAAc,CAAC;QAClCC,aAAaC;QACbhC;QACAJ;IACF;AACF;AAEA,OAAO,eAAe4C,gBAAgB,EACpC9B,IAAI,EACJG,KAAK,EACLf,kBAAkB,EAClBF,WAAW,EACXG,cAAc,EACdC,kBAAkB,EAClBC,SAAS,EAUV;IACC,MAAMwC,2BAA2BC,QAAQC,GAAG,CAACC,eAAe,IAAI;IAEhE,OAAQ/B,MAAME,IAAI;QAChB,KAAK;YAAQ;gBACX,MAAM8B,YAAYpD,YAAY,SAAS,UAAUiB;gBAEjD,IAAId,YAAYM,MAAM,CAACC,GAAG,EAAE;oBAC1B,MAAMmB,MAAM7B,YAAY,SAAS,UAAU;oBAE3C,MAAMkC,kBAAkB,MAAM/B,YAAYM,MAAM,CAACC,GAAG,CAACyB,WAAW;oBAChElC,cACEI,oBACAwB,KACAK,iBACA,OACA1B;gBAEJ;gBACA,MAAMF,eAAesC,iBAAiB,CAAC;gBACvC,MAAMtC,eAAeuC,iBAAiB,CAAC;gBAEvC,IAAI1C,YAAYM,MAAM,CAACG,QAAQ,EAAE;oBAC/B,MAAMiB,MAAM7B,YAAY,SAAS,UAAU;oBAE3C,MAAMkC,kBAAkB,MAAM/B,YAAYM,MAAM,CAACG,QAAQ,CAACuB,WAAW;oBACrElC,cACEI,oBACAwB,KACAK,iBACA,OACA1B;gBAEJ;gBACA,MAAMF,eAAeuC,iBAAiB,CAAC;gBAEvC,MAAMX,kBAAkB,MAAMd,MAAMiC,YAAY,CAAClB,WAAW;gBAE5D,MAAMb,OAAOY,mCAAAA,gBAAiBZ,IAAI;gBAElC,MAAMhB,eAAesC,iBAAiB,CAAC3B;gBACvC,MAAMX,eAAeuC,iBAAiB,CAAC5B;gBACvC,IAAIK,SAAS,QAAQ;oBACnB,MAAMhB,eAAe8B,sBAAsB,CAACnB,MAAM;gBACpD,OAAO;oBACLX,eAAeoC,wBAAwB,CAACU;gBAC1C;gBACA,MAAM9C,eAAewC,gBAAgB,CAAC,SAAS;gBAC/C,MAAMxC,eAAewC,gBAAgB,CAAC7B,MAAM;gBAE5C,IAAI+B,0BAA0B;oBAC5B,MAAM1C,eAAegD,gBAAgB,CAACrC,MAAM;gBAC9C;gBAEA,MAAMX,eAAe+B,cAAc,CAAC;oBAClCC,aAAaC;oBACbhC;oBACAJ;gBACF;gBAEAF,cACEI,oBACA+C,WACAlB,iBACA,OACA1B;gBAGF;YACF;QACA,KAAK;YAAY;gBACf,MAAMqB,MAAM7B,YAAY,SAAS,UAAUiB;gBAE3C,MAAMiB,kBAAkB,MAAMd,MAAMoB,QAAQ,CAACL,WAAW;gBAExD,MAAMb,OAAOY,gBAAgBZ,IAAI;gBAEjC,MAAMhB,eAAeuC,iBAAiB,CAAC5B;gBACvC,IAAIK,SAAS,QAAQ;oBACnB,MAAMhB,eAAe8B,sBAAsB,CAACnB,MAAM;gBACpD,OAAO;oBACLX,eAAeoC,wBAAwB,CAACb;gBAC1C;gBAEA,MAAMvB,eAAe+B,cAAc,CAAC;oBAClCC,aAAaC;oBACbhC;oBACAJ;gBACF;gBAEAF,cAAcI,oBAAoBwB,KAAKK,iBAAiB,MAAM1B;gBAE9D;YACF;QACA,KAAK;YAAY;gBACf,MAAMqB,MAAM7B,YAAY,OAAO,UAAUiB;gBACzC,MAAMiB,kBAAkB,MAAMd,MAAMiC,YAAY,CAAClB,WAAW;gBAC5D,MAAMb,OAAOY,gBAAgBZ,IAAI;gBAEjC,IAAIA,SAAS,QAAQ;oBACnB,MAAMhB,eAAe8B,sBAAsB,CAACnB,MAAM;gBACpD,OAAO;oBACLX,eAAeoC,wBAAwB,CAACb;gBAC1C;gBAEA,MAAMvB,eAAeiD,oBAAoB,CAACtC;gBAC1C,MAAMX,eAAesC,iBAAiB,CAAC3B,MAAM;gBAC7C,MAAMX,eAAekD,oBAAoB,CAACvC;gBAC1C,MAAMX,eAAemD,kBAAkB,CAACxC;gBACxC,MAAMX,eAAewC,gBAAgB,CAAC7B,MAAM;gBAE5C,IAAI+B,0BAA0B;oBAC5B,MAAM1C,eAAegD,gBAAgB,CAACrC,MAAM;gBAC9C;gBAEA,MAAMX,eAAe+B,cAAc,CAAC;oBAClCC,aAAaC;oBACbhC;oBACAJ;gBACF;gBAEAF,cAAcI,oBAAoBwB,KAAKK,iBAAiB,OAAO1B;gBAE/D;YACF;QACA,KAAK;YAAa;gBAChB,MAAMqB,MAAM7B,YAAY,OAAO,UAAUiB;gBACzC,MAAMiB,kBAAkB,MAAMd,MAAMoB,QAAQ,CAACL,WAAW;gBACxD,MAAMb,OAAOY,gBAAgBZ,IAAI;gBAEjC,MAAMhB,eAAekD,oBAAoB,CAACvC;gBAE1C,IAAIK,SAAS,QAAQ;oBACnB,MAAMhB,eAAe8B,sBAAsB,CAACnB,MAAM;gBACpD,OAAO;oBACLX,eAAeoC,wBAAwB,CAACb;gBAC1C;gBAEA,MAAMvB,eAAe+B,cAAc,CAAC;oBAClCC,aAAaC;oBACbhC;oBACAJ;gBACF;gBACAF,cAAcI,oBAAoBwB,KAAKK,iBAAiB,MAAM1B;gBAE9D;YACF;QACA;YAAS;gBACP,MAAM,qBAAkE,CAAlE,IAAIkD,MAAM,CAAC,mBAAmB,EAAE,AAACtC,MAAcE,IAAI,CAAC,KAAK,EAAEL,MAAM,GAAjE,qBAAA;2BAAA;gCAAA;kCAAA;gBAAiE;YACzE;IACF;AACF"}
1	+ {"version":3,"sources":["../../src/build/handle-entrypoints.ts"],"sourcesContent":["import type { TurbopackManifestLoader } from '../shared/lib/turbopack/manifest-loader'\nimport type {\n Entrypoints,\n PageRoute,\n AppRoute,\n RawEntrypoints,\n} from './swc/types'\nimport { getEntryKey } from '../shared/lib/turbopack/entry-key'\nimport * as Log from './output/log'\n\nexport async function rawEntrypointsToEntrypoints(\n entrypointsOp: RawEntrypoints\n): Promise<Entrypoints> {\n const page = new Map()\n const app = new Map()\n\n for (const [pathname, route] of entrypointsOp.routes) {\n switch (route.type) {\n case 'page':\n case 'page-api':\n page.set(pathname, route)\n break\n case 'app-page': {\n for (const p of route.pages) {\n app.set(p.originalName, {\n type: 'app-page',\n ...p,\n })\n }\n break\n }\n case 'app-route': {\n app.set(route.originalName, route)\n break\n }\n default:\n Log.info(`skipping ${pathname} (${route.type})`)\n break\n }\n }\n\n return {\n global: {\n app: entrypointsOp.pagesAppEndpoint,\n document: entrypointsOp.pagesDocumentEndpoint,\n error: entrypointsOp.pagesErrorEndpoint,\n instrumentation: entrypointsOp.instrumentation,\n middleware: entrypointsOp.middleware,\n },\n page,\n app,\n }\n}\n\nexport async function handleRouteType({\n page,\n route,\n manifestLoader,\n}: {\n page: string\n route: PageRoute \| AppRoute\n manifestLoader: TurbopackManifestLoader\n}) {\n const shouldCreateWebpackStats = process.env.TURBOPACK_STATS != null\n\n switch (route.type) {\n case 'page': {\n const serverKey = getEntryKey('pages', 'server', page)\n\n await manifestLoader.loadBuildManifest(page)\n await manifestLoader.loadPagesManifest(page)\n\n const middlewareManifestWritten =\n await manifestLoader.loadMiddlewareManifest(page, 'pages')\n if (!middlewareManifestWritten) {\n manifestLoader.deleteMiddlewareManifest(serverKey)\n }\n\n await manifestLoader.loadFontManifest('/_app', 'pages')\n await manifestLoader.loadFontManifest(page, 'pages')\n\n if (shouldCreateWebpackStats) {\n await manifestLoader.loadWebpackStats(page, 'pages')\n }\n\n break\n }\n case 'page-api': {\n const key = getEntryKey('pages', 'server', page)\n\n await manifestLoader.loadPagesManifest(page)\n const middlewareManifestWritten =\n await manifestLoader.loadMiddlewareManifest(page, 'pages')\n if (!middlewareManifestWritten) {\n manifestLoader.deleteMiddlewareManifest(key)\n }\n\n break\n }\n case 'app-page': {\n const key = getEntryKey('app', 'server', page)\n\n const middlewareManifestWritten =\n await manifestLoader.loadMiddlewareManifest(page, 'app')\n if (!middlewareManifestWritten) {\n manifestLoader.deleteMiddlewareManifest(key)\n }\n\n await manifestLoader.loadAppBuildManifest(page)\n await manifestLoader.loadBuildManifest(page, 'app')\n await manifestLoader.loadAppPathsManifest(page)\n await manifestLoader.loadActionManifest(page)\n await manifestLoader.loadFontManifest(page, 'app')\n\n if (shouldCreateWebpackStats) {\n await manifestLoader.loadWebpackStats(page, 'app')\n }\n\n break\n }\n case 'app-route': {\n const key = getEntryKey('app', 'server', page)\n\n await manifestLoader.loadAppPathsManifest(page)\n\n const middlewareManifestWritten =\n await manifestLoader.loadMiddlewareManifest(page, 'app')\n\n if (!middlewareManifestWritten) {\n manifestLoader.deleteMiddlewareManifest(key)\n }\n\n break\n }\n default: {\n throw new Error(`unknown route type ${(route as any).type} for ${page}`)\n }\n }\n}\n"],"names":["getEntryKey","Log","rawEntrypointsToEntrypoints","entrypointsOp","page","Map","app","pathname","route","routes","type","set","p","pages","originalName","info","global","pagesAppEndpoint","document","pagesDocumentEndpoint","error","pagesErrorEndpoint","instrumentation","middleware","handleRouteType","manifestLoader","shouldCreateWebpackStats","process","env","TURBOPACK_STATS","serverKey","loadBuildManifest","loadPagesManifest","middlewareManifestWritten","loadMiddlewareManifest","deleteMiddlewareManifest","loadFontManifest","loadWebpackStats","key","loadAppBuildManifest","loadAppPathsManifest","loadActionManifest","Error"],"mappings":"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"}

package/dist/esm/build/index.js CHANGED Viewed

@@ -296,7 +296,7 @@ export default async function build(dir, reactProductionProfiling = false, debug
         const nextBuildSpan = trace('next-build', undefined, {
             buildMode: experimentalBuildMode,
             isTurboBuild: String(turboNextBuild),
-            version: "15.2.2-canary.5"
+            version: "15.2.2-canary.7"
         });
         NextBuildContext.nextBuildSpan = nextBuildSpan;
         NextBuildContext.dir = dir;
@@ -655,7 +655,7 @@ export default async function build(dir, reactProductionProfiling = false, debug
             // Files outside of the distDir can be "type": "module"
             await writeFileUtf8(path.join(distDir, 'package.json'), '{"type": "commonjs"}');
             // These are written to distDir, so they need to come after creating and cleaning distDr.
-            await recordFrameworkVersion("15.2.2-canary.5");
+            await recordFrameworkVersion("15.2.2-canary.7");
             await updateBuildDiagnostics({
                 buildStage: 'start'
             });

package/dist/esm/build/swc/generated-native.d.ts CHANGED Viewed

@@ -254,6 +254,10 @@ export interface NapiEntrypoints {
   pagesAppEndpoint: ExternalObject<ExternalEndpoint>
   pagesErrorEndpoint: ExternalObject<ExternalEndpoint>
 }
+export declare function projectWriteAllEntrypointsToDisk(
+  project: { __napiType: 'Project' },
+  appDirOnly: boolean
+): Promise<TurbopackResult>
 export declare function projectEntrypointsSubscribe(
   project: { __napiType: 'Project' },
   func: (...args: any[]) => any

package/dist/esm/build/swc/index.js CHANGED Viewed

@@ -11,7 +11,7 @@ import { isDeepStrictEqual } from 'util';
 import { getDefineEnv } from '../webpack/plugins/define-env-plugin';
 import { getReactCompilerLoader } from '../get-babel-loader-config';
 import { TurbopackInternalError } from '../../shared/lib/turbopack/utils';
-const nextVersion = "15.2.2-canary.5";
+const nextVersion = "15.2.2-canary.7";
 const ArchName = arch();
 const PlatformName = platform();
 function infoLog(...args) {
@@ -410,77 +410,17 @@ function bindingToApi(binding, _wasm) {
         async update(options) {
             await withErrorCause(async ()=>binding.projectUpdate(this._nativeProject, await rustifyPartialProjectOptions(options)));
         }
+        async writeAllEntrypointsToDisk(appDirOnly) {
+            return await withErrorCause(async ()=>{
+                const napiEndpoints = await binding.projectWriteAllEntrypointsToDisk(this._nativeProject, appDirOnly);
+                return napiEntrypointsToRawEntrypoints(napiEndpoints);
+            });
+        }
         entrypointsSubscribe() {
             const subscription = subscribe(false, async (callback)=>binding.projectEntrypointsSubscribe(this._nativeProject, callback));
             return async function*() {
                 for await (const entrypoints of subscription){
-                    const routes = new Map();
-                    for (const { pathname, ...nativeRoute } of entrypoints.routes){
-                        let route;
-                        const routeType = nativeRoute.type;
-                        switch(routeType){
-                            case 'page':
-                                route = {
-                                    type: 'page',
-                                    htmlEndpoint: new EndpointImpl(nativeRoute.htmlEndpoint),
-                                    dataEndpoint: new EndpointImpl(nativeRoute.dataEndpoint)
-                                };
-                                break;
-                            case 'page-api':
-                                route = {
-                                    type: 'page-api',
-                                    endpoint: new EndpointImpl(nativeRoute.endpoint)
-                                };
-                                break;
-                            case 'app-page':
-                                route = {
-                                    type: 'app-page',
-                                    pages: nativeRoute.pages.map((page)=>({
-                                            originalName: page.originalName,
-                                            htmlEndpoint: new EndpointImpl(page.htmlEndpoint),
-                                            rscEndpoint: new EndpointImpl(page.rscEndpoint)
-                                        }))
-                                };
-                                break;
-                            case 'app-route':
-                                route = {
-                                    type: 'app-route',
-                                    originalName: nativeRoute.originalName,
-                                    endpoint: new EndpointImpl(nativeRoute.endpoint)
-                                };
-                                break;
-                            case 'conflict':
-                                route = {
-                                    type: 'conflict'
-                                };
-                                break;
-                            default:
-                                const _exhaustiveCheck = routeType;
-                                invariant(nativeRoute, ()=>`Unknown route type: ${_exhaustiveCheck}`);
-                        }
-                        routes.set(pathname, route);
-                    }
-                    const napiMiddlewareToMiddleware = (middleware)=>({
-                            endpoint: new EndpointImpl(middleware.endpoint),
-                            runtime: middleware.runtime,
-                            matcher: middleware.matcher
-                        });
-                    const middleware = entrypoints.middleware ? napiMiddlewareToMiddleware(entrypoints.middleware) : undefined;
-                    const napiInstrumentationToInstrumentation = (instrumentation)=>({
-                            nodeJs: new EndpointImpl(instrumentation.nodeJs),
-                            edge: new EndpointImpl(instrumentation.edge)
-                        });
-                    const instrumentation = entrypoints.instrumentation ? napiInstrumentationToInstrumentation(entrypoints.instrumentation) : undefined;
-                    yield {
-                        routes,
-                        middleware,
-                        instrumentation,
-                        pagesDocumentEndpoint: new EndpointImpl(entrypoints.pagesDocumentEndpoint),
-                        pagesAppEndpoint: new EndpointImpl(entrypoints.pagesAppEndpoint),
-                        pagesErrorEndpoint: new EndpointImpl(entrypoints.pagesErrorEndpoint),
-                        issues: entrypoints.issues,
-                        diagnostics: entrypoints.diagnostics
-                    };
+                    yield napiEntrypointsToRawEntrypoints(entrypoints);
                 }
             }();
         }
@@ -643,6 +583,75 @@ function bindingToApi(binding, _wasm) {
             }
         }
     }
+    function napiEntrypointsToRawEntrypoints(entrypoints) {
+        const routes = new Map();
+        for (const { pathname, ...nativeRoute } of entrypoints.routes){
+            let route;
+            const routeType = nativeRoute.type;
+            switch(routeType){
+                case 'page':
+                    route = {
+                        type: 'page',
+                        htmlEndpoint: new EndpointImpl(nativeRoute.htmlEndpoint),
+                        dataEndpoint: new EndpointImpl(nativeRoute.dataEndpoint)
+                    };
+                    break;
+                case 'page-api':
+                    route = {
+                        type: 'page-api',
+                        endpoint: new EndpointImpl(nativeRoute.endpoint)
+                    };
+                    break;
+                case 'app-page':
+                    route = {
+                        type: 'app-page',
+                        pages: nativeRoute.pages.map((page)=>({
+                                originalName: page.originalName,
+                                htmlEndpoint: new EndpointImpl(page.htmlEndpoint),
+                                rscEndpoint: new EndpointImpl(page.rscEndpoint)
+                            }))
+                    };
+                    break;
+                case 'app-route':
+                    route = {
+                        type: 'app-route',
+                        originalName: nativeRoute.originalName,
+                        endpoint: new EndpointImpl(nativeRoute.endpoint)
+                    };
+                    break;
+                case 'conflict':
+                    route = {
+                        type: 'conflict'
+                    };
+                    break;
+                default:
+                    const _exhaustiveCheck = routeType;
+                    invariant(nativeRoute, ()=>`Unknown route type: ${_exhaustiveCheck}`);
+            }
+            routes.set(pathname, route);
+        }
+        const napiMiddlewareToMiddleware = (middleware)=>({
+                endpoint: new EndpointImpl(middleware.endpoint),
+                runtime: middleware.runtime,
+                matcher: middleware.matcher
+            });
+        const middleware = entrypoints.middleware ? napiMiddlewareToMiddleware(entrypoints.middleware) : undefined;
+        const napiInstrumentationToInstrumentation = (instrumentation)=>({
+                nodeJs: new EndpointImpl(instrumentation.nodeJs),
+                edge: new EndpointImpl(instrumentation.edge)
+            });
+        const instrumentation = entrypoints.instrumentation ? napiInstrumentationToInstrumentation(entrypoints.instrumentation) : undefined;
+        return {
+            routes,
+            middleware,
+            instrumentation,
+            pagesDocumentEndpoint: new EndpointImpl(entrypoints.pagesDocumentEndpoint),
+            pagesAppEndpoint: new EndpointImpl(entrypoints.pagesAppEndpoint),
+            pagesErrorEndpoint: new EndpointImpl(entrypoints.pagesErrorEndpoint),
+            issues: entrypoints.issues,
+            diagnostics: entrypoints.diagnostics
+        };
+    }
     return async function createProject(options, turboEngineOptions) {
         return new ProjectImpl(await binding.projectNew(await rustifyProjectOptions(options), turboEngineOptions || {}));
     };