next 15.6.0-canary.37 → 15.6.0-canary.38

package/dist/esm/build/index.js

@@ -20,7 +20,6 @@ import { verifyPartytownSetup } from '../lib/verify-partytown-setup';
 import { BUILD_ID_FILE, BUILD_MANIFEST, CLIENT_STATIC_FILES_PATH, EXPORT_DETAIL, EXPORT_MARKER, IMAGES_MANIFEST, PAGES_MANIFEST, PHASE_PRODUCTION_BUILD, PRERENDER_MANIFEST, REACT_LOADABLE_MANIFEST, ROUTES_MANIFEST, SERVER_DIRECTORY, SERVER_FILES_MANIFEST, STATIC_STATUS_PAGES, MIDDLEWARE_MANIFEST, APP_PATHS_MANIFEST, APP_PATH_ROUTES_MANIFEST, RSC_MODULE_TYPES, NEXT_FONT_MANIFEST, SUBRESOURCE_INTEGRITY_MANIFEST, MIDDLEWARE_BUILD_MANIFEST, MIDDLEWARE_REACT_LOADABLE_MANIFEST, SERVER_REFERENCE_MANIFEST, FUNCTIONS_CONFIG_MANIFEST, DYNAMIC_CSS_MANIFEST, TURBOPACK_CLIENT_MIDDLEWARE_MANIFEST } from '../shared/lib/constants';
 import { UNDERSCORE_NOT_FOUND_ROUTE, UNDERSCORE_NOT_FOUND_ROUTE_ENTRY, UNDERSCORE_GLOBAL_ERROR_ROUTE_ENTRY } from '../shared/lib/entry-constants';
 import { isDynamicRoute } from '../shared/lib/router/utils';
-import { Bundler, finalizeBundlerFromConfig } from '../lib/bundler';
 import loadConfig from '../server/config';
 import { normalizePagePath } from '../shared/lib/page-path/normalize-page-path';
 import { getPagePath } from '../server/require';
@@ -294,7 +293,7 @@ async function getBuildId(isGenerateMode, distDir, nextBuildSpan, config) {
     }
     return await nextBuildSpan.traceChild('generate-buildid').traceAsyncFn(()=>generateBuildId(config.generateBuildId, nanoid));
 }
-export default async function build(dir, reactProductionProfiling = false, debugOutput = false, debugPrerender = false, runLint = true, noMangling = false, appDirOnly = false, bundler = Bundler.Turbopack, experimentalBuildMode, traceUploadUrl) {
+export default async function build(dir, reactProductionProfiling = false, debugOutput = false, debugPrerender = false, runLint = true, noMangling = false, appDirOnly = false, isTurbopack = false, experimentalBuildMode, traceUploadUrl) {
     const isCompileMode = experimentalBuildMode === 'compile';
     const isGenerateMode = experimentalBuildMode === 'generate';
     NextBuildContext.isCompileMode = isCompileMode;
@@ -303,7 +302,8 @@ export default async function build(dir, reactProductionProfiling = false, debug
     try {
         const nextBuildSpan = trace('next-build', undefined, {
             buildMode: experimentalBuildMode,
-            version: "15.6.0-canary.37"
+            isTurboBuild: String(isTurbopack),
+            version: "15.6.0-canary.38"
         });
         NextBuildContext.nextBuildSpan = nextBuildSpan;
         NextBuildContext.dir = dir;
@@ -324,9 +324,6 @@ export default async function build(dir, reactProductionProfiling = false, debug
                         debugPrerender
                     }), turborepoAccessTraceResult));
             loadedConfig = config;
-            // Reading the config can modify environment variables that influence the bundler selection.
-            bundler = finalizeBundlerFromConfig(bundler);
-            nextBuildSpan.setAttribute('bundler', getBundlerForTelemetry(bundler));
             process.env.NEXT_DEPLOYMENT_ID = config.deploymentId || '';
             NextBuildContext.config = config;
             let configOutDir = 'out';
@@ -341,7 +338,7 @@ export default async function build(dir, reactProductionProfiling = false, debug
             const buildId = await getBuildId(isGenerateMode, distDir, nextBuildSpan, config);
             NextBuildContext.buildId = buildId;
             if (experimentalBuildMode === 'generate-env') {
-                if (bundler === Bundler.Turbopack) {
+                if (isTurbopack) {
                     Log.warn('generate-env is not needed with turbopack');
                     process.exit(0);
                 }
@@ -635,7 +632,7 @@ export default async function build(dir, reactProductionProfiling = false, debug
                 await writeValidatorFile(routeTypesManifest, validatorFilePath);
             });
             // Turbopack already handles conflicting app and page routes.
-            if (bundler !== Bundler.Turbopack) {
+            if (!isTurbopack) {
                 const numConflictingAppPaths = conflictingAppPagePaths.length;
                 if (mappedAppPages && numConflictingAppPaths > 0) {
                     Log.error(`Conflicting app and page file${numConflictingAppPaths === 1 ? ' was' : 's were'} found, please remove the conflicting files to continue:`);
@@ -785,7 +782,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.6.0-canary.37");
+            await recordFrameworkVersion("15.6.0-canary.38");
             await updateBuildDiagnostics({
                 buildStage: 'start'
             });
@@ -817,7 +814,7 @@ export default async function build(dir, reactProductionProfiling = false, debug
             });
             let shutdownPromise = Promise.resolve();
             if (!isGenerateMode) {
-                if (bundler === Bundler.Turbopack) {
+                if (isTurbopack) {
                     const { duration: compilerDuration, shutdownPromise: p, ...rest } = await turbopackBuild(process.env.NEXT_TURBOPACK_USE_WORKER === undefined || process.env.NEXT_TURBOPACK_USE_WORKER !== '0');
                     shutdownPromise = p;
                     traceMemoryUsage('Finished build', nextBuildSpan);
@@ -898,7 +895,7 @@ export default async function build(dir, reactProductionProfiling = false, debug
                         const durationString = durationToString(durationInSeconds);
                         Log.event(`Compiled successfully in ${durationString}`);
                         telemetry.record(eventBuildCompleted(pagesPaths, {
-                            bundler: getBundlerForTelemetry(bundler),
+                            bundler: getBundlerForTelemetry(isTurbopack),
                             durationInSeconds,
                             totalAppPagesCount
                         }));
@@ -907,7 +904,7 @@ export default async function build(dir, reactProductionProfiling = false, debug
                         traceMemoryUsage('Finished build', nextBuildSpan);
                         buildTraceContext = rest.buildTraceContext;
                         telemetry.record(eventBuildCompleted(pagesPaths, {
-                            bundler: getBundlerForTelemetry(bundler),
+                            bundler: getBundlerForTelemetry(isTurbopack),
                             durationInSeconds: compilerDuration,
                             totalAppPagesCount
                         }));
@@ -1332,7 +1329,7 @@ export default async function build(dir, reactProductionProfiling = false, debug
                 instrumentationHookEntryFiles.push(path.join(SERVER_DIRECTORY, `${INSTRUMENTATION_HOOK_FILENAME}.js`));
                 // If there's edge routes, append the edge instrumentation hook
                 // Turbopack generates this chunk with a hashed name and references it in middleware-manifest.
-                if (bundler !== Bundler.Turbopack && (edgeRuntimeAppCount || edgeRuntimePagesCount)) {
+                if (!isTurbopack && (edgeRuntimeAppCount || edgeRuntimePagesCount)) {
                     instrumentationHookEntryFiles.push(path.join(SERVER_DIRECTORY, `edge-${INSTRUMENTATION_HOOK_FILENAME}.js`));
                 }
             }
@@ -1369,7 +1366,7 @@ export default async function build(dir, reactProductionProfiling = false, debug
                         path.join(SERVER_DIRECTORY, FUNCTIONS_CONFIG_MANIFEST),
                         path.join(SERVER_DIRECTORY, MIDDLEWARE_MANIFEST),
                         path.join(SERVER_DIRECTORY, MIDDLEWARE_BUILD_MANIFEST + '.js'),
-                        ...bundler !== Bundler.Turbopack ? [
+                        ...!isTurbopack ? [
                             path.join(SERVER_DIRECTORY, MIDDLEWARE_REACT_LOADABLE_MANIFEST + '.js'),
                             REACT_LOADABLE_MANIFEST
                         ] : [],
@@ -1383,7 +1380,7 @@ export default async function build(dir, reactProductionProfiling = false, debug
                             path.join(SERVER_DIRECTORY, SERVER_REFERENCE_MANIFEST + '.js'),
                             path.join(SERVER_DIRECTORY, SERVER_REFERENCE_MANIFEST + '.json')
                         ] : [],
-                        ...pagesDir && bundler !== Bundler.Turbopack ? [
+                        ...pagesDir && !isTurbopack ? [
                             DYNAMIC_CSS_MANIFEST + '.json',
                             path.join(SERVER_DIRECTORY, DYNAMIC_CSS_MANIFEST + '.js')
                         ] : [],
@@ -1424,13 +1421,13 @@ export default async function build(dir, reactProductionProfiling = false, debug
                             }
                         ]
                     };
-                    if (bundler === Bundler.Turbopack) {
+                    if (isTurbopack) {
                         await writeManifest(path.join(distDir, 'static', buildId, TURBOPACK_CLIENT_MIDDLEWARE_MANIFEST), functionsConfigManifest.functions['/_middleware'].matchers || []);
                     }
                 }
             }
             await writeFunctionsConfigManifest(distDir, functionsConfigManifest);
-            if (bundler !== Bundler.Turbopack && !isGenerateMode && !buildTracesPromise) {
+            if (!isTurbopack && !isGenerateMode && !buildTracesPromise) {
                 buildTracesPromise = nextBuildSpan.traceChild('collect-build-traces').traceAsyncFn(()=>{
                     return collectBuildTraces({
                         dir,
@@ -1529,7 +1526,7 @@ export default async function build(dir, reactProductionProfiling = false, debug
             await writeRequiredServerFilesManifest(distDir, requiredServerFilesManifest);
             // we don't need to inline for turbopack build as
             // it will handle it's own caching separate of compile
-            if (isGenerateMode && bundler !== Bundler.Turbopack) {
+            if (isGenerateMode && !isTurbopack) {
                 Log.info('Inlining static env ...');
                 await nextBuildSpan.traceChild('inline-static-env').traceAsyncFn(async ()=>{
                     await inlineStaticEnv({
@@ -2419,7 +2416,7 @@ export default async function build(dir, reactProductionProfiling = false, debug
                         distDir,
                         config,
                         staticPages,
-                        nextVersion: "15.6.0-canary.37",
+                        nextVersion: "15.6.0-canary.38",
                         tracingRoot: outputFileTracingRoot,
                         hasNodeMiddleware,
                         hasInstrumentationHook,
@@ -2463,7 +2460,7 @@ export default async function build(dir, reactProductionProfiling = false, debug
         const telemetry = traceGlobals.get('telemetry');
         if (telemetry) {
             telemetry.record(eventBuildFailed({
-                bundler: getBundlerForTelemetry(bundler),
+                bundler: getBundlerForTelemetry(isTurbopack),
                 errorCode: getErrorCodeForTelemetry(e),
                 durationInSeconds: Math.floor((Date.now() - buildStartTime) / 1000)
             }));
@@ -2481,7 +2478,7 @@ export default async function build(dir, reactProductionProfiling = false, debug
                 mode: 'build',
                 projectDir: dir,
                 distDir: loadedConfig.distDir,
-                isTurboSession: bundler === Bundler.Turbopack,
+                isTurboSession: isTurbopack,
                 sync: true
             });
         }
@@ -2491,21 +2488,14 @@ function errorFromUnsupportedSegmentConfig() {
     Log.error(`Invalid segment configuration export detected. This can cause unexpected behavior from the configs not being applied. You should see the relevant failures in the logs above. Please fix them to continue.`);
     process.exit(1);
 }
-function getBundlerForTelemetry(bundler) {
-    switch(bundler){
-        case Bundler.Turbopack:
-            return 'turbopack';
-        case Bundler.Rspack:
-            return 'rspack';
-        case Bundler.Webpack:
-            return 'webpack';
-        default:
-            throw Object.defineProperty(new Error(`unknown bundler: ${bundler}`), "__NEXT_ERROR_CODE", {
-                value: "E826",
-                enumerable: false,
-                configurable: true
-            });
+function getBundlerForTelemetry(isTurbopack) {
+    if (isTurbopack) {
+        return 'turbopack';
+    }
+    if (process.env.NEXT_RSPACK) {
+        return 'rspack';
     }
+    return 'webpack';
 }
 function getErrorCodeForTelemetry(err) {
     const code = extractNextErrorCode(err);