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

package/dist/build/webpack-config.js

@@ -307,9 +307,9 @@ function getCacheDirectories(configs) {
     }).filter((dir)=>dir != null));
 }
 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 = (0, _getwebpackbundler.default)();
     const isClient = compilerType === _constants1.COMPILER_NAMES.client;
     const isEdgeServer = compilerType === _constants1.COMPILER_NAMES.edgeServer;
@@ -536,12 +536,21 @@ async function getBaseWebpackConfig(dir, { buildId, encryptionKey, config, compi
     }) : defaultLoaders.babel;
     const pageExtensions = config.pageExtensions;
     const outputPath = isNodeOrEdgeCompilation ? _path.default.join(distDir, _constants1.SERVER_DIRECTORY) : distDir;
-    const reactServerCondition = [
-        'react-server',
-        ...isEdgeServer ? _resolve.edgeConditionNames : [],
-        // inherits the default conditions
+    const conditionNames = [
+        ...((_config_experimental = config.experimental) == null ? void 0 : _config_experimental.cacheComponents) === true ? [
+            'next-js'
+        ] : [],
+        ...isEdgeServer ? [
+            _resolve.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
@@ -560,6 +569,7 @@ async function getBaseWebpackConfig(dir, { buildId, encryptionKey, config, compi
         } : {}
     } : undefined;
     const resolveConfig = {
+        conditionNames,
         // Disable .mjs for node_modules bundling
         extensions: [
             '.js',
@@ -593,9 +603,6 @@ async function getBaseWebpackConfig(dir, { buildId, encryptionKey, config, compi
         } : undefined,
         // default main fields use pages dir ones, and customize app router ones in loaders.
         mainFields: (0, _resolve.getMainField)(compilerType, false),
-        ...isEdgeServer && {
-            conditionNames: _resolve.edgeConditionNames
-        },
         plugins: [
             isNodeServer ? new _optionalpeerdependencyresolveplugin.OptionalPeerDependencyResolverPlugin() : undefined
         ].filter(Boolean),
@@ -978,7 +985,7 @@ async function getBaseWebpackConfig(dir, { buildId, encryptionKey, config, compi
                 // 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 ((0, _getrspack.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 ((0, _getrspack.getRspackCore)()).LightningCssMinimizerRspackPlugin({
                     // CSS minimizer configuration
                     minimizerOptions: {
                         targets: supportedBrowsers
@@ -1222,7 +1229,7 @@ async function getBaseWebpackConfig(dir, { buildId, encryptionKey, config, compi
                         },
                         resolve: {
                             mainFields: (0, _resolve.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.
@@ -1361,7 +1368,7 @@ async function getBaseWebpackConfig(dir, { buildId, encryptionKey, config, compi
                             use: middlewareLayerLoaders,
                             resolve: {
                                 mainFields: (0, _resolve.getMainField)(compilerType, true),
-                                conditionNames: reactServerCondition,
+                                conditionNames: reactServerConditionNames,
                                 alias: (0, _createcompileraliases.createVendoredReactAliases)(bundledReactChannel, {
                                     reactProductionProfiling,
                                     layer: _constants.WEBPACK_LAYERS.middleware,
@@ -1376,7 +1383,7 @@ async function getBaseWebpackConfig(dir, { buildId, encryptionKey, config, compi
                             use: instrumentLayerLoaders,
                             resolve: {
                                 mainFields: (0, _resolve.getMainField)(compilerType, true),
-                                conditionNames: reactServerCondition,
+                                conditionNames: reactServerConditionNames,
                                 alias: (0, _createcompileraliases.createVendoredReactAliases)(bundledReactChannel, {
                                     reactProductionProfiling,
                                     layer: _constants.WEBPACK_LAYERS.instrument,
@@ -1703,7 +1710,7 @@ async function getBaseWebpackConfig(dir, { buildId, encryptionKey, config, compi
             isClient && new _copyfileplugin.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: {
@@ -1856,7 +1863,7 @@ async function getBaseWebpackConfig(dir, { buildId, encryptionKey, config, compi
         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,
@@ -1894,7 +1901,7 @@ async function getBaseWebpackConfig(dir, { buildId, encryptionKey, config, compi
         //  - 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.default.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.