next 15.6.0-canary.12 → 15.6.0-canary.13

package/dist/esm/server/dev/hot-reloader-turbopack.js

@@ -90,7 +90,7 @@ export async function createHotReloaderTurbopack(opts, serverFields, distDir, re
     }
     const hasRewrites = opts.fsChecker.rewrites.afterFiles.length > 0 || opts.fsChecker.rewrites.beforeFiles.length > 0 || opts.fsChecker.rewrites.fallback.length > 0;
     const hotReloaderSpan = trace('hot-reloader', undefined, {
-        version: "15.6.0-canary.12"
+        version: "15.6.0-canary.13"
     });
     // Ensure the hotReloaderSpan is flushed immediately as it's the parentSpan for all processing
     // of the current `next dev` invocation.

package/dist/esm/server/dev/hot-reloader-webpack.js

@@ -158,7 +158,7 @@ export default class HotReloaderWebpack {
         this.previewProps = previewProps;
         this.rewrites = rewrites;
         this.hotReloaderSpan = trace('hot-reloader', undefined, {
-            version: "15.6.0-canary.12"
+            version: "15.6.0-canary.13"
         });
         // Ensure the hotReloaderSpan is flushed immediately as it's the parentSpan for all processing
         // of the current `next dev` invocation.

package/dist/esm/server/lib/app-info-log.js

@@ -14,7 +14,7 @@ export function logStartInfo({ networkUrl, appUrl, envInfo, experimentalFeatures
             bundlerSuffix = ' (webpack)';
         }
     }
-    Log.bootstrap(`${bold(purple(`${Log.prefixes.ready} Next.js ${"15.6.0-canary.12"}`))}${bundlerSuffix}`);
+    Log.bootstrap(`${bold(purple(`${Log.prefixes.ready} Next.js ${"15.6.0-canary.13"}`))}${bundlerSuffix}`);
     if (appUrl) {
         Log.bootstrap(`- Local:        ${appUrl}`);
     }

package/dist/esm/server/lib/experimental/create-env-definitions.js

@@ -29,8 +29,7 @@ export {}`;
     try {
         // we expect the types directory to already exist
         const envDtsPath = join(distDir, 'types', 'env.d.ts');
-        // do not await, this is not essential for further process
-        writeFile(envDtsPath, definitionStr, 'utf-8');
+        await writeFile(envDtsPath, definitionStr, 'utf-8');
     } catch (e) {
         console.error('Failed to write env.d.ts:', e);
     }

package/dist/esm/server/lib/experimental/create-env-definitions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/server/lib/experimental/create-env-definitions.ts"],"sourcesContent":["import type { LoadedEnvFiles } from '@next/env'\nimport { join } from 'node:path'\nimport { writeFile } from 'node:fs/promises'\n\nexport async function createEnvDefinitions({\n  distDir,\n  loadedEnvFiles,\n}: {\n  distDir: string\n  loadedEnvFiles: LoadedEnvFiles\n}) {\n  const envLines = []\n  const seenKeys = new Set()\n  // env files are in order of priority\n  for (const { path, env } of loadedEnvFiles) {\n    for (const key in env) {\n      if (!seenKeys.has(key)) {\n        envLines.push(`      /** Loaded from \\`${path}\\` */`)\n        envLines.push(`      ${key}?: string`)\n        seenKeys.add(key)\n      }\n    }\n  }\n  const envStr = envLines.join('\\n')\n\n  const definitionStr = `// Type definitions for Next.js environment variables\ndeclare global {\n  namespace NodeJS {\n    interface ProcessEnv {\n${envStr}\n    }\n  }\n}\nexport {}`\n\n  if (process.env.NODE_ENV === 'test') {\n    return definitionStr\n  }\n\n  try {\n    // we expect the types directory to already exist\n    const envDtsPath = join(distDir, 'types', 'env.d.ts')\n    // do not await, this is not essential for further process\n    writeFile(envDtsPath, definitionStr, 'utf-8')\n  } catch (e) {\n    console.error('Failed to write env.d.ts:', e)\n  }\n}\n"],"names":["join","writeFile","createEnvDefinitions","distDir","loadedEnvFiles","envLines","seenKeys","Set","path","env","key","has","push","add","envStr","definitionStr","process","NODE_ENV","envDtsPath","e","console","error"],"mappings":"AACA,SAASA,IAAI,QAAQ,YAAW;AAChC,SAASC,SAAS,QAAQ,mBAAkB;AAE5C,OAAO,eAAeC,qBAAqB,EACzCC,OAAO,EACPC,cAAc,EAIf;IACC,MAAMC,WAAW,EAAE;IACnB,MAAMC,WAAW,IAAIC;IACrB,qCAAqC;IACrC,KAAK,MAAM,EAAEC,IAAI,EAAEC,GAAG,EAAE,IAAIL,eAAgB;QAC1C,IAAK,MAAMM,OAAOD,IAAK;YACrB,IAAI,CAACH,SAASK,GAAG,CAACD,MAAM;gBACtBL,SAASO,IAAI,CAAC,CAAC,wBAAwB,EAAEJ,KAAK,KAAK,CAAC;gBACpDH,SAASO,IAAI,CAAC,CAAC,MAAM,EAAEF,IAAI,SAAS,CAAC;gBACrCJ,SAASO,GAAG,CAACH;YACf;QACF;IACF;IACA,MAAMI,SAAST,SAASL,IAAI,CAAC;IAE7B,MAAMe,gBAAgB,CAAC;;;;AAIzB,EAAED,OAAO;;;;SAIA,CAAC;IAER,IAAIE,QAAQP,GAAG,CAACQ,QAAQ,KAAK,QAAQ;QACnC,OAAOF;IACT;IAEA,IAAI;QACF,iDAAiD;QACjD,MAAMG,aAAalB,KAAKG,SAAS,SAAS;QAC1C,0DAA0D;QAC1DF,UAAUiB,YAAYH,eAAe;IACvC,EAAE,OAAOI,GAAG;QACVC,QAAQC,KAAK,CAAC,6BAA6BF;IAC7C;AACF","ignoreList":[0]}
+{"version":3,"sources":["../../../../src/server/lib/experimental/create-env-definitions.ts"],"sourcesContent":["import type { LoadedEnvFiles } from '@next/env'\nimport { join } from 'node:path'\nimport { writeFile } from 'node:fs/promises'\n\nexport async function createEnvDefinitions({\n  distDir,\n  loadedEnvFiles,\n}: {\n  distDir: string\n  loadedEnvFiles: LoadedEnvFiles\n}) {\n  const envLines = []\n  const seenKeys = new Set()\n  // env files are in order of priority\n  for (const { path, env } of loadedEnvFiles) {\n    for (const key in env) {\n      if (!seenKeys.has(key)) {\n        envLines.push(`      /** Loaded from \\`${path}\\` */`)\n        envLines.push(`      ${key}?: string`)\n        seenKeys.add(key)\n      }\n    }\n  }\n  const envStr = envLines.join('\\n')\n\n  const definitionStr = `// Type definitions for Next.js environment variables\ndeclare global {\n  namespace NodeJS {\n    interface ProcessEnv {\n${envStr}\n    }\n  }\n}\nexport {}`\n\n  if (process.env.NODE_ENV === 'test') {\n    return definitionStr\n  }\n\n  try {\n    // we expect the types directory to already exist\n    const envDtsPath = join(distDir, 'types', 'env.d.ts')\n    await writeFile(envDtsPath, definitionStr, 'utf-8')\n  } catch (e) {\n    console.error('Failed to write env.d.ts:', e)\n  }\n}\n"],"names":["join","writeFile","createEnvDefinitions","distDir","loadedEnvFiles","envLines","seenKeys","Set","path","env","key","has","push","add","envStr","definitionStr","process","NODE_ENV","envDtsPath","e","console","error"],"mappings":"AACA,SAASA,IAAI,QAAQ,YAAW;AAChC,SAASC,SAAS,QAAQ,mBAAkB;AAE5C,OAAO,eAAeC,qBAAqB,EACzCC,OAAO,EACPC,cAAc,EAIf;IACC,MAAMC,WAAW,EAAE;IACnB,MAAMC,WAAW,IAAIC;IACrB,qCAAqC;IACrC,KAAK,MAAM,EAAEC,IAAI,EAAEC,GAAG,EAAE,IAAIL,eAAgB;QAC1C,IAAK,MAAMM,OAAOD,IAAK;YACrB,IAAI,CAACH,SAASK,GAAG,CAACD,MAAM;gBACtBL,SAASO,IAAI,CAAC,CAAC,wBAAwB,EAAEJ,KAAK,KAAK,CAAC;gBACpDH,SAASO,IAAI,CAAC,CAAC,MAAM,EAAEF,IAAI,SAAS,CAAC;gBACrCJ,SAASO,GAAG,CAACH;YACf;QACF;IACF;IACA,MAAMI,SAAST,SAASL,IAAI,CAAC;IAE7B,MAAMe,gBAAgB,CAAC;;;;AAIzB,EAAED,OAAO;;;;SAIA,CAAC;IAER,IAAIE,QAAQP,GAAG,CAACQ,QAAQ,KAAK,QAAQ;QACnC,OAAOF;IACT;IAEA,IAAI;QACF,iDAAiD;QACjD,MAAMG,aAAalB,KAAKG,SAAS,SAAS;QAC1C,MAAMF,UAAUiB,YAAYH,eAAe;IAC7C,EAAE,OAAOI,GAAG;QACVC,QAAQC,KAAK,CAAC,6BAA6BF;IAC7C;AACF","ignoreList":[0]}

package/dist/esm/server/lib/router-utils/setup-dev-bundler.js

@@ -203,6 +203,7 @@ async function startWatcher(opts) {
         const validatorFilePath = path.join(distDir, 'types', 'validator.ts');
         wp.on('aggregated', async ()=>{
             var _serverFields_middleware, _serverFields_middleware1;
+            let writeEnvDefinitions = false;
             let typescriptStatusFromLastAggregation = enabledTypeScript;
             let middlewareMatchers;
             const routedPages = [];
@@ -459,55 +460,16 @@ async function startWatcher(opts) {
                     previousClientRouterFilters = clientRouterFilters;
                 }
             }
-            // Using === false to make the check clearer.
-            if (typescriptStatusFromLastAggregation === false && enabledTypeScript) {
-                // we tolerate the error here as this is best effort
-                // and the manual install command will be shown
-                await verifyTypeScript(opts).then(()=>{
-                    tsconfigChange = true;
-                }).catch(()=>{});
-            }
             if (envChange || tsconfigChange) {
-                var _hotReloader_activeWebpackConfigs;
                 if (envChange) {
-                    var _nextConfig_experimental;
-                    const loadEnvConfig = require('@next/env').loadEnvConfig;
-                    const { loadedEnvFiles } = loadEnvConfig(dir, process.env.NODE_ENV === 'development', Log, true, (envFilePath)=>{
-                        Log.info(`Reload env: ${envFilePath}`);
-                    });
-                    if (enabledTypeScript && ((_nextConfig_experimental = nextConfig.experimental) == null ? void 0 : _nextConfig_experimental.typedEnv)) {
-                        // do not await, this is not essential for further process
-                        createEnvDefinitions({
-                            distDir,
-                            loadedEnvFiles: [
-                                ...loadedEnvFiles,
-                                {
-                                    path: nextConfig.configFileName,
-                                    env: nextConfig.env,
-                                    contents: ''
-                                }
-                            ]
-                        });
-                    }
+                    writeEnvDefinitions = true;
                     await propagateServerField(opts, 'loadEnvConfig', [
                         {
                             dev: true,
-                            forceReload: true,
-                            silent: true
+                            forceReload: true
                         }
                     ]);
                 }
-                let tsconfigResult;
-                // This is not relevant for Turbopack because tsconfig/jsconfig is handled internally.
-                if (!hotReloader.turbopackProject) {
-                    if (tsconfigChange) {
-                        try {
-                            const loadJsConfig = require('../../../build/load-jsconfig').default;
-                            tsconfigResult = await loadJsConfig(dir, nextConfig);
-                        } catch (_) {
-                        /* do we want to log if there are syntax errors in tsconfig while editing? */ }
-                    }
-                }
                 if (hotReloader.turbopackProject) {
                     var _opts_nextConfig_turbopack;
                     const hasRewrites = opts.fsChecker.rewrites.afterFiles.length > 0 || opts.fsChecker.rewrites.beforeFiles.length > 0 || opts.fsChecker.rewrites.fallback.length > 0;
@@ -529,78 +491,89 @@ async function startWatcher(opts) {
                         rootPath,
                         projectPath: normalizePath(path.relative(rootPath, dir))
                     });
-                }
-                (_hotReloader_activeWebpackConfigs = hotReloader.activeWebpackConfigs) == null ? void 0 : _hotReloader_activeWebpackConfigs.forEach((config, idx)=>{
-                    const isClient = idx === 0;
-                    const isNodeServer = idx === 1;
-                    const isEdgeServer = idx === 2;
-                    const hasRewrites = opts.fsChecker.rewrites.afterFiles.length > 0 || opts.fsChecker.rewrites.beforeFiles.length > 0 || opts.fsChecker.rewrites.fallback.length > 0;
+                } else {
+                    var _hotReloader_activeWebpackConfigs;
+                    let tsconfigResult;
+                    // This is not relevant for Turbopack because tsconfig/jsconfig is handled internally.
                     if (tsconfigChange) {
-                        var _config_resolve_plugins, _config_resolve;
-                        (_config_resolve = config.resolve) == null ? void 0 : (_config_resolve_plugins = _config_resolve.plugins) == null ? void 0 : _config_resolve_plugins.forEach((plugin)=>{
-                            // look for the JsConfigPathsPlugin and update with
-                            // the latest paths/baseUrl config
-                            if (plugin instanceof JsConfigPathsPlugin && tsconfigResult) {
-                                var _config_resolve_modules, _config_resolve, _jsConfig_compilerOptions;
-                                const { resolvedBaseUrl, jsConfig } = tsconfigResult;
-                                const currentResolvedBaseUrl = plugin.resolvedBaseUrl;
-                                const resolvedUrlIndex = (_config_resolve = config.resolve) == null ? void 0 : (_config_resolve_modules = _config_resolve.modules) == null ? void 0 : _config_resolve_modules.findIndex((item)=>item === (currentResolvedBaseUrl == null ? void 0 : currentResolvedBaseUrl.baseUrl));
-                                if (resolvedBaseUrl) {
-                                    if (resolvedBaseUrl.baseUrl !== (currentResolvedBaseUrl == null ? void 0 : currentResolvedBaseUrl.baseUrl)) {
-                                        // remove old baseUrl and add new one
-                                        if (resolvedUrlIndex && resolvedUrlIndex > -1) {
-                                            var _config_resolve_modules1, _config_resolve1;
-                                            (_config_resolve1 = config.resolve) == null ? void 0 : (_config_resolve_modules1 = _config_resolve1.modules) == null ? void 0 : _config_resolve_modules1.splice(resolvedUrlIndex, 1);
-                                        }
-                                        // If the resolvedBaseUrl is implicit we only remove the previous value.
-                                        // Only add the baseUrl if it's explicitly set in tsconfig/jsconfig
-                                        if (!resolvedBaseUrl.isImplicit) {
-                                            var _config_resolve_modules2, _config_resolve2;
-                                            (_config_resolve2 = config.resolve) == null ? void 0 : (_config_resolve_modules2 = _config_resolve2.modules) == null ? void 0 : _config_resolve_modules2.push(resolvedBaseUrl.baseUrl);
+                        try {
+                            const loadJsConfig = require('../../../build/load-jsconfig').default;
+                            tsconfigResult = await loadJsConfig(dir, nextConfig);
+                        } catch (_) {
+                        /* do we want to log if there are syntax errors in tsconfig while editing? */ }
+                    }
+                    (_hotReloader_activeWebpackConfigs = hotReloader.activeWebpackConfigs) == null ? void 0 : _hotReloader_activeWebpackConfigs.forEach((config, idx)=>{
+                        const isClient = idx === 0;
+                        const isNodeServer = idx === 1;
+                        const isEdgeServer = idx === 2;
+                        const hasRewrites = opts.fsChecker.rewrites.afterFiles.length > 0 || opts.fsChecker.rewrites.beforeFiles.length > 0 || opts.fsChecker.rewrites.fallback.length > 0;
+                        if (tsconfigChange) {
+                            var _config_resolve_plugins, _config_resolve;
+                            (_config_resolve = config.resolve) == null ? void 0 : (_config_resolve_plugins = _config_resolve.plugins) == null ? void 0 : _config_resolve_plugins.forEach((plugin)=>{
+                                // look for the JsConfigPathsPlugin and update with
+                                // the latest paths/baseUrl config
+                                if (plugin instanceof JsConfigPathsPlugin && tsconfigResult) {
+                                    var _config_resolve_modules, _config_resolve, _jsConfig_compilerOptions;
+                                    const { resolvedBaseUrl, jsConfig } = tsconfigResult;
+                                    const currentResolvedBaseUrl = plugin.resolvedBaseUrl;
+                                    const resolvedUrlIndex = (_config_resolve = config.resolve) == null ? void 0 : (_config_resolve_modules = _config_resolve.modules) == null ? void 0 : _config_resolve_modules.findIndex((item)=>item === (currentResolvedBaseUrl == null ? void 0 : currentResolvedBaseUrl.baseUrl));
+                                    if (resolvedBaseUrl) {
+                                        if (resolvedBaseUrl.baseUrl !== (currentResolvedBaseUrl == null ? void 0 : currentResolvedBaseUrl.baseUrl)) {
+                                            // remove old baseUrl and add new one
+                                            if (resolvedUrlIndex && resolvedUrlIndex > -1) {
+                                                var _config_resolve_modules1, _config_resolve1;
+                                                (_config_resolve1 = config.resolve) == null ? void 0 : (_config_resolve_modules1 = _config_resolve1.modules) == null ? void 0 : _config_resolve_modules1.splice(resolvedUrlIndex, 1);
+                                            }
+                                            // If the resolvedBaseUrl is implicit we only remove the previous value.
+                                            // Only add the baseUrl if it's explicitly set in tsconfig/jsconfig
+                                            if (!resolvedBaseUrl.isImplicit) {
+                                                var _config_resolve_modules2, _config_resolve2;
+                                                (_config_resolve2 = config.resolve) == null ? void 0 : (_config_resolve_modules2 = _config_resolve2.modules) == null ? void 0 : _config_resolve_modules2.push(resolvedBaseUrl.baseUrl);
+                                            }
                                         }
                                     }
+                                    if ((jsConfig == null ? void 0 : (_jsConfig_compilerOptions = jsConfig.compilerOptions) == null ? void 0 : _jsConfig_compilerOptions.paths) && resolvedBaseUrl) {
+                                        Object.keys(plugin.paths).forEach((key)=>{
+                                            delete plugin.paths[key];
+                                        });
+                                        Object.assign(plugin.paths, jsConfig.compilerOptions.paths);
+                                        plugin.resolvedBaseUrl = resolvedBaseUrl;
+                                    }
                                 }
-                                if ((jsConfig == null ? void 0 : (_jsConfig_compilerOptions = jsConfig.compilerOptions) == null ? void 0 : _jsConfig_compilerOptions.paths) && resolvedBaseUrl) {
-                                    Object.keys(plugin.paths).forEach((key)=>{
-                                        delete plugin.paths[key];
+                            });
+                        }
+                        if (envChange) {
+                            var _config_plugins;
+                            (_config_plugins = config.plugins) == null ? void 0 : _config_plugins.forEach((plugin)=>{
+                                // we look for the DefinePlugin definitions so we can
+                                // update them on the active compilers
+                                if (plugin && typeof plugin.definitions === 'object' && plugin.definitions.__NEXT_DEFINE_ENV) {
+                                    const newDefine = getDefineEnv({
+                                        isTurbopack: false,
+                                        clientRouterFilters,
+                                        config: nextConfig,
+                                        dev: true,
+                                        distDir,
+                                        fetchCacheKeyPrefix: opts.nextConfig.experimental.fetchCacheKeyPrefix,
+                                        hasRewrites,
+                                        isClient,
+                                        isEdgeServer,
+                                        isNodeServer,
+                                        middlewareMatchers: undefined,
+                                        projectPath: opts.dir,
+                                        rewrites: opts.fsChecker.rewrites
+                                    });
+                                    Object.keys(plugin.definitions).forEach((key)=>{
+                                        if (!(key in newDefine)) {
+                                            delete plugin.definitions[key];
+                                        }
                                     });
-                                    Object.assign(plugin.paths, jsConfig.compilerOptions.paths);
-                                    plugin.resolvedBaseUrl = resolvedBaseUrl;
+                                    Object.assign(plugin.definitions, newDefine);
                                 }
-                            }
-                        });
-                    }
-                    if (envChange) {
-                        var _config_plugins;
-                        (_config_plugins = config.plugins) == null ? void 0 : _config_plugins.forEach((plugin)=>{
-                            // we look for the DefinePlugin definitions so we can
-                            // update them on the active compilers
-                            if (plugin && typeof plugin.definitions === 'object' && plugin.definitions.__NEXT_DEFINE_ENV) {
-                                const newDefine = getDefineEnv({
-                                    isTurbopack: false,
-                                    clientRouterFilters,
-                                    config: nextConfig,
-                                    dev: true,
-                                    distDir,
-                                    fetchCacheKeyPrefix: opts.nextConfig.experimental.fetchCacheKeyPrefix,
-                                    hasRewrites,
-                                    isClient,
-                                    isEdgeServer,
-                                    isNodeServer,
-                                    middlewareMatchers: undefined,
-                                    projectPath: opts.dir,
-                                    rewrites: opts.fsChecker.rewrites
-                                });
-                                Object.keys(plugin.definitions).forEach((key)=>{
-                                    if (!(key in newDefine)) {
-                                        delete plugin.definitions[key];
-                                    }
-                                });
-                                Object.assign(plugin.definitions, newDefine);
-                            }
-                        });
-                    }
-                });
+                            });
+                        }
+                    });
+                }
                 await hotReloader.invalidate({
                     reloadAfterInvalidation: envChange
                 });
@@ -721,6 +694,32 @@ async function startWatcher(opts) {
                 }
                 prevSortedRoutes = sortedRoutes;
                 if (enabledTypeScript) {
+                    var _nextConfig_experimental;
+                    // Using === false to make the check clearer.
+                    if (typescriptStatusFromLastAggregation === false) {
+                        // we tolerate the error here as this is best effort
+                        // and the manual install command will be shown
+                        await verifyTypeScript(opts).then(()=>{
+                            tsconfigChange = true;
+                        }).catch(()=>{});
+                    }
+                    if (writeEnvDefinitions && ((_nextConfig_experimental = nextConfig.experimental) == null ? void 0 : _nextConfig_experimental.typedEnv)) {
+                        // TODO: The call to propagateServerField 'loadEnvConfig' causes the env to be loaded twice on env file changes.
+                        const loadEnvConfig = require('@next/env').loadEnvConfig;
+                        const { loadedEnvFiles } = loadEnvConfig(dir, process.env.NODE_ENV === 'development', // Silent as it's the second time `loadEnvConfig` is called in this pass.
+                        undefined, true);
+                        await createEnvDefinitions({
+                            distDir,
+                            loadedEnvFiles: [
+                                ...loadedEnvFiles,
+                                {
+                                    path: nextConfig.configFileName,
+                                    env: nextConfig.env,
+                                    contents: ''
+                                }
+                            ]
+                        });
+                    }
                     const routeTypesManifest = await createRouteTypesManifest({
                         dir,
                         pageRoutes,