next 16.0.0-canary.5 → 16.0.0-canary.6

package/dist/esm/build/webpack-config.js

@@ -35,7 +35,7 @@ import { MemoryWithGcCachePlugin } from './webpack/plugins/memory-with-gc-cache-
 import { getBabelConfigFile } from './get-babel-config-file';
 import { needsExperimentalReact } from '../lib/needs-experimental-react';
 import { isResourceInPackages, makeExternalHandler } from './handle-externals';
-import { getMainField, edgeConditionNames } from './webpack-config-rules/resolve';
+import { getMainField, edgeConditionName } from './webpack-config-rules/resolve';
 import { OptionalPeerDependencyResolverPlugin } from './webpack/plugins/optional-peer-dependency-resolve-plugin';
 import { createWebpackAliases, createServerOnlyClientOnlyAliases, createVendoredReactAliases, createNextApiEsmAliases, createAppRouterApiAliases } from './create-compiler-aliases';
 import { hasCustomExportOutput } from '../export/utils';
@@ -204,9 +204,9 @@ export function getCacheDirectories(configs) {
     }).filter((dir)=>dir != null));
 }
 export default async function getBaseWebpackConfig(dir, { buildId, encryptionKey, config, compilerType, dev = false, entrypoints, isDevFallback = false, pagesDir, reactProductionProfiling = false, rewrites, originalRewrites, originalRedirects, runWebpackSpan, appDir, middlewareMatchers, noMangling, jsConfig, jsConfigPath, resolvedBaseUrl, supportedBrowsers, clientRouterFilters, fetchCacheKeyPrefix, isCompileMode, previewProps }) {
-    var _config_compiler, _config_compiler1, _config_compiler2, _jsConfig_compilerOptions, _config_compiler3, _jsConfig_compilerOptions1, _config_compiler4, _config_experimental, _config_watchOptions, _config_experimental_sri, _config_experimental_sri1, _jsConfig_compilerOptions2, // always add JsConfigPathsPlugin to allow hot-reloading
+    var _config_experimental, _config_compiler, _config_compiler1, _config_compiler2, _jsConfig_compilerOptions, _config_compiler3, _jsConfig_compilerOptions1, _config_compiler4, _config_experimental1, _config_watchOptions, _config_experimental_sri, _config_experimental_sri1, _jsConfig_compilerOptions2, // always add JsConfigPathsPlugin to allow hot-reloading
     // if the config is added/removed
-    _webpackConfig_resolve_plugins, _webpackConfig_resolve, _config_experimental1, _config_compiler5, _config_compiler6, _config_compiler7, _config_compiler8, _config_compiler9, _webpack5Config_plugins, _webpackConfig_module, _webpackConfig_module1, _webpackConfig_module_rules, _webpackConfig_module2;
+    _webpackConfig_resolve_plugins, _webpackConfig_resolve, _config_experimental2, _config_compiler5, _config_compiler6, _config_compiler7, _config_compiler8, _config_compiler9, _webpack5Config_plugins, _webpackConfig_module, _webpackConfig_module1, _webpackConfig_module_rules, _webpackConfig_module2;
     const bundler = getWebpackBundler();
     const isClient = compilerType === COMPILER_NAMES.client;
     const isEdgeServer = compilerType === COMPILER_NAMES.edgeServer;
@@ -433,12 +433,21 @@ export default async function getBaseWebpackConfig(dir, { buildId, encryptionKey
     }) : defaultLoaders.babel;
     const pageExtensions = config.pageExtensions;
     const outputPath = isNodeOrEdgeCompilation ? path.join(distDir, SERVER_DIRECTORY) : distDir;
-    const reactServerCondition = [
-        'react-server',
-        ...isEdgeServer ? edgeConditionNames : [],
-        // inherits the default conditions
+    const conditionNames = [
+        ...((_config_experimental = config.experimental) == null ? void 0 : _config_experimental.cacheComponents) === true ? [
+            'next-js'
+        ] : [],
+        ...isEdgeServer ? [
+            edgeConditionName
+        ] : [],
+        // inherits Webpack's default conditions
         '...'
     ];
+    const reactServerConditionNames = [
+        'react-server',
+        // We could just use `'...'`. Explicit spread makes it more obvious.
+        ...conditionNames
+    ];
     const reactRefreshEntry = isRspack ? require.resolve(`next/dist/compiled/@next/react-refresh-utils/dist/rspack-runtime`) : require.resolve(`next/dist/compiled/@next/react-refresh-utils/dist/runtime`);
     const clientEntries = isClient ? {
         // Backwards compatibility
@@ -457,6 +466,7 @@ export default async function getBaseWebpackConfig(dir, { buildId, encryptionKey
         } : {}
     } : undefined;
     const resolveConfig = {
+        conditionNames,
         // Disable .mjs for node_modules bundling
         extensions: [
             '.js',
@@ -490,9 +500,6 @@ export default async function getBaseWebpackConfig(dir, { buildId, encryptionKey
         } : undefined,
         // default main fields use pages dir ones, and customize app router ones in loaders.
         mainFields: getMainField(compilerType, false),
-        ...isEdgeServer && {
-            conditionNames: edgeConditionNames
-        },
         plugins: [
             isNodeServer ? new OptionalPeerDependencyResolverPlugin() : undefined
         ].filter(Boolean),
@@ -875,7 +882,7 @@ export default async function getBaseWebpackConfig(dir, { buildId, encryptionKey
                 // Minify CSS
                 // By default, Rspack uses LightningCSS for CSS minification.
                 // Rspack uses css-minimizer-plugin by default for compatibility.
-                isRspack && (process.env.__NEXT_TEST_MODE ? config.experimental.useLightningcss : ((_config_experimental = config.experimental) == null ? void 0 : _config_experimental.useLightningcss) === undefined || config.experimental.useLightningcss) ? new (getRspackCore()).LightningCssMinimizerRspackPlugin({
+                isRspack && (process.env.__NEXT_TEST_MODE ? config.experimental.useLightningcss : ((_config_experimental1 = config.experimental) == null ? void 0 : _config_experimental1.useLightningcss) === undefined || config.experimental.useLightningcss) ? new (getRspackCore()).LightningCssMinimizerRspackPlugin({
                     // CSS minimizer configuration
                     minimizerOptions: {
                         targets: supportedBrowsers
@@ -1119,7 +1126,7 @@ export default async function getBaseWebpackConfig(dir, { buildId, encryptionKey
                         },
                         resolve: {
                             mainFields: getMainField(compilerType, true),
-                            conditionNames: reactServerCondition,
+                            conditionNames: reactServerConditionNames,
                             // If missing the alias override here, the default alias will be used which aliases
                             // react to the direct file path, not the package name. In that case the condition
                             // will be ignored completely.
@@ -1258,7 +1265,7 @@ export default async function getBaseWebpackConfig(dir, { buildId, encryptionKey
                             use: middlewareLayerLoaders,
                             resolve: {
                                 mainFields: getMainField(compilerType, true),
-                                conditionNames: reactServerCondition,
+                                conditionNames: reactServerConditionNames,
                                 alias: createVendoredReactAliases(bundledReactChannel, {
                                     reactProductionProfiling,
                                     layer: WEBPACK_LAYERS.middleware,
@@ -1273,7 +1280,7 @@ export default async function getBaseWebpackConfig(dir, { buildId, encryptionKey
                             use: instrumentLayerLoaders,
                             resolve: {
                                 mainFields: getMainField(compilerType, true),
-                                conditionNames: reactServerCondition,
+                                conditionNames: reactServerConditionNames,
                                 alias: createVendoredReactAliases(bundledReactChannel, {
                                     reactProductionProfiling,
                                     layer: WEBPACK_LAYERS.instrument,
@@ -1600,7 +1607,7 @@ export default async function getBaseWebpackConfig(dir, { buildId, encryptionKey
             isClient && new CopyFilePlugin({
                 // file path to build output of `@next/polyfill-nomodule`
                 filePath: require.resolve('./polyfills/polyfill-nomodule'),
-                cacheKey: "16.0.0-canary.5",
+                cacheKey: "16.0.0-canary.6",
                 name: `static/chunks/polyfills${dev ? '' : '-[hash]'}.js`,
                 minimize: false,
                 info: {
@@ -1753,7 +1760,7 @@ export default async function getBaseWebpackConfig(dir, { buildId, encryptionKey
         webpack5Config.optimization.usedExports = false;
     }
     const configVars = JSON.stringify({
-        optimizePackageImports: config == null ? void 0 : (_config_experimental1 = config.experimental) == null ? void 0 : _config_experimental1.optimizePackageImports,
+        optimizePackageImports: config == null ? void 0 : (_config_experimental2 = config.experimental) == null ? void 0 : _config_experimental2.optimizePackageImports,
         crossOrigin: config.crossOrigin,
         pageExtensions: pageExtensions,
         trailingSlash: config.trailingSlash,
@@ -1791,7 +1798,7 @@ export default async function getBaseWebpackConfig(dir, { buildId, encryptionKey
         //  - Next.js location on disk (some loaders use absolute paths and some resolve options depend on absolute paths)
         //  - Next.js version
         //  - next.config.js keys that affect compilation
-        version: `${__dirname}|${"16.0.0-canary.5"}|${configVars}`,
+        version: `${__dirname}|${"16.0.0-canary.6"}|${configVars}`,
         cacheDirectory: path.join(distDir, 'cache', 'webpack'),
         // For production builds, it's more efficient to compress all cache files together instead of compression each one individually.
         // So we disable compression here and allow the build runner to take care of compressing the cache as a whole.