From 56ce2424b65b0d12a41ae5aafb53be49a563f627 Mon Sep 17 00:00:00 2001 From: Jiachi Liu Date: Thu, 25 Apr 2024 14:11:40 +0200 Subject: [PATCH 01/23] Fix esm externals in app router --- packages/next/src/build/handle-externals.ts | 37 +++++++++---------- ...om-turbopack-client.browser.development.js | 4 +- ...dom-turbopack-client.browser.production.js | 4 +- ...r-dom-turbopack-client.edge.development.js | 2 +- ...er-dom-turbopack-client.edge.production.js | 4 +- ...r-dom-turbopack-client.node.development.js | 2 +- ...er-dom-turbopack-client.node.production.js | 4 +- ...om-turbopack-server.browser.development.js | 2 +- ...dom-turbopack-server.browser.production.js | 2 +- ...er-dom-turbopack-server.edge.production.js | 2 +- ...er-dom-turbopack-server.node.production.js | 2 +- ...om-turbopack-client.browser.development.js | 4 +- ...dom-turbopack-client.browser.production.js | 4 +- ...r-dom-turbopack-client.edge.development.js | 2 +- ...er-dom-turbopack-client.edge.production.js | 4 +- ...r-dom-turbopack-client.node.development.js | 2 +- ...er-dom-turbopack-client.node.production.js | 4 +- ...om-turbopack-server.browser.development.js | 2 +- ...dom-turbopack-server.browser.production.js | 2 +- ...er-dom-turbopack-server.edge.production.js | 2 +- ...er-dom-turbopack-server.node.production.js | 2 +- ...-dom-webpack-client.browser.development.js | 4 +- ...r-dom-webpack-client.browser.production.js | 4 +- ...ver-dom-webpack-client.edge.development.js | 2 +- ...rver-dom-webpack-client.edge.production.js | 4 +- ...ver-dom-webpack-client.node.development.js | 2 +- ...rver-dom-webpack-client.node.production.js | 4 +- ...-dom-webpack-server.browser.development.js | 2 +- ...r-dom-webpack-server.browser.production.js | 2 +- ...rver-dom-webpack-server.edge.production.js | 2 +- ...rver-dom-webpack-server.node.production.js | 2 +- ...-dom-webpack-client.browser.development.js | 4 +- ...r-dom-webpack-client.browser.production.js | 4 +- ...ver-dom-webpack-client.edge.development.js | 2 +- ...rver-dom-webpack-client.edge.production.js | 4 +- ...ver-dom-webpack-client.node.development.js | 2 +- ...rver-dom-webpack-client.node.production.js | 4 +- ...-dom-webpack-server.browser.development.js | 2 +- ...r-dom-webpack-server.browser.production.js | 2 +- ...rver-dom-webpack-server.edge.production.js | 2 +- ...rver-dom-webpack-server.node.production.js | 2 +- 41 files changed, 74 insertions(+), 75 deletions(-) diff --git a/packages/next/src/build/handle-externals.ts b/packages/next/src/build/handle-externals.ts index b77d1f848f5dc..f42d16cd805a2 100644 --- a/packages/next/src/build/handle-externals.ts +++ b/packages/next/src/build/handle-externals.ts @@ -78,13 +78,12 @@ export async function resolveExternal( let isEsm: boolean = false const preferEsmOptions = - esmExternals && - isEsmRequested && - // For package that marked as externals that should be not bundled, - // we don't resolve them as ESM since it could be resolved as async module, - // such as `import(external package)` in the bundle, valued as a `Promise`. - !containsImportInPackages(request, optOutBundlingPackages) - ? [true, false] + esmExternals && isEsmRequested + ? // For package that marked as externals that should be not bundled, + // we don't resolve them as ESM since it could be resolved as async module, + // such as `import(external package)` in the bundle, valued as a `Promise`. + // && !containsImportInPackages(request, optOutBundlingPackages) + [true, false] : [false] for (const preferEsm of preferEsmOptions) { @@ -277,18 +276,18 @@ export function makeExternalHandler({ // Treat react packages and next internals as external for SSR layer, // also map react to builtin ones with require-hook. // Otherwise keep continue the process to resolve the externals. - if (layer === WEBPACK_LAYERS.serverSideRendering) { - const isRelative = request.startsWith('.') - const fullRequest = isRelative - ? normalizePathSep(path.join(context, request)) - : request - - // Check if it's opt out bundling package first - if (containsImportInPackages(fullRequest, optOutBundlingPackages)) { - return fullRequest - } - return resolveNextExternal(fullRequest) - } + // if (layer === WEBPACK_LAYERS.serverSideRendering) { + // const isRelative = request.startsWith('.') + // const fullRequest = isRelative + // ? normalizePathSep(path.join(context, request)) + // : request + + // // Check if it's opt out bundling package first + // if (containsImportInPackages(fullRequest, optOutBundlingPackages)) { + // return fullRequest + // } + // return resolveNextExternal(fullRequest) + // } // TODO-APP: Let's avoid this resolve call as much as possible, and eventually get rid of it. const resolveResult = await resolveExternal( diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.development.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.development.js index ff6201a2d400d..d6a53c773d5c0 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.development.js @@ -106,7 +106,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; @@ -192,7 +192,7 @@ function preloadModule(metadata) { function requireModule(metadata) { var moduleExports = __turbopack_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.production.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.production.js index 115bd293313e1..df6e7df78b86a 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.production.js @@ -59,7 +59,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; @@ -145,7 +145,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = __turbopack_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.edge.development.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.edge.development.js index c8fa0d9c12850..6eec777e8f519 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.edge.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.edge.development.js @@ -117,7 +117,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.edge.production.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.edge.production.js index e744efd3d9222..566583cc61c89 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.edge.production.js @@ -69,7 +69,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; @@ -155,7 +155,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.node.development.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.node.development.js index 982f19c275570..3319a789c8b06 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.node.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.node.development.js @@ -118,7 +118,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.node.production.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.node.production.js index 35ac2bbe5f4a0..a88687d9ccc86 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.node.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.node.production.js @@ -70,7 +70,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; @@ -156,7 +156,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.development.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.development.js index 20572b09903ce..2dc93edf5b132 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.development.js @@ -3647,7 +3647,7 @@ function preloadModule(metadata) { function requireModule(metadata) { var moduleExports = __turbopack_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.production.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.production.js index 837315279c86f..3f632b722746a 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.production.js @@ -2885,7 +2885,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = __turbopack_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.production.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.production.js index ede7e2db8452d..7205c68e59da5 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.production.js @@ -2908,7 +2908,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.production.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.production.js index 3f33cae414bdf..96f006a5426f4 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.production.js @@ -2971,7 +2971,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.development.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.development.js index b00f111e16a33..e44a6ebf159c8 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.development.js @@ -109,7 +109,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; @@ -195,7 +195,7 @@ function preloadModule(metadata) { function requireModule(metadata) { var moduleExports = __turbopack_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.production.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.production.js index a22e373a47cd8..189417c50dd64 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.production.js @@ -62,7 +62,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; @@ -148,7 +148,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = __turbopack_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.edge.development.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.edge.development.js index ce65d5e5862fd..72fea92778422 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.edge.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.edge.development.js @@ -120,7 +120,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.edge.production.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.edge.production.js index 5af0c59fb9e8a..8b5b9faa6c4a9 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.edge.production.js @@ -72,7 +72,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; @@ -158,7 +158,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.node.development.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.node.development.js index 1f64488318e29..ec6052edfbb00 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.node.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.node.development.js @@ -121,7 +121,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.node.production.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.node.production.js index 7c43361c4a881..e63c1b71fc0dd 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.node.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.node.production.js @@ -73,7 +73,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; @@ -159,7 +159,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.development.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.development.js index 69fe5becceeec..c02d3fd58caec 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.development.js @@ -3011,7 +3011,7 @@ function preloadModule(metadata) { function requireModule(metadata) { var moduleExports = __turbopack_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.production.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.production.js index c371e076d1167..e2657cf37eb73 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.production.js @@ -2606,7 +2606,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = __turbopack_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.production.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.production.js index caf03d0db4c23..b8c185a7d24fb 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.production.js @@ -2629,7 +2629,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.production.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.production.js index 9d2ce2ce767a8..2c813fdcb89ed 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.production.js @@ -2698,7 +2698,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.development.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.development.js index 205b28c679109..554de04bd95d2 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.development.js @@ -106,7 +106,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; @@ -194,7 +194,7 @@ function preloadModule(metadata) { function requireModule(metadata) { var moduleExports = __webpack_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.production.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.production.js index 87088623d18ca..c158763692190 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.production.js @@ -59,7 +59,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; @@ -147,7 +147,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = __webpack_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.edge.development.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.edge.development.js index 597e05ccba680..b4fec97d05df0 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.edge.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.edge.development.js @@ -117,7 +117,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.edge.production.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.edge.production.js index 362161a8b80e2..de9fc5043f02d 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.edge.production.js @@ -69,7 +69,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; @@ -157,7 +157,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.node.development.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.node.development.js index b72ffb3d6acc1..c4639800afcf4 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.node.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.node.development.js @@ -118,7 +118,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.node.production.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.node.production.js index 3700409ede7d0..825a48106139b 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.node.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.node.production.js @@ -70,7 +70,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; @@ -158,7 +158,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.development.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.development.js index c43ce75142ac2..517544092714f 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.development.js @@ -3660,7 +3660,7 @@ function preloadModule(metadata) { function requireModule(metadata) { var moduleExports = __webpack_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.production.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.production.js index b7db484724ae6..6b6c283581d00 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.production.js @@ -2891,7 +2891,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = __webpack_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.production.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.production.js index d5bc5a02d0e31..2d7d93adf8f17 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.production.js @@ -2914,7 +2914,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.production.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.production.js index 03674bd58a7c3..33b72d84c8324 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.production.js @@ -2977,7 +2977,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.development.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.development.js index 69a59c776ae68..b1ffff5c6e32b 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.development.js @@ -109,7 +109,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; @@ -197,7 +197,7 @@ function preloadModule(metadata) { function requireModule(metadata) { var moduleExports = __webpack_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.production.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.production.js index 8537d123acece..65fafc40c8883 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.production.js @@ -62,7 +62,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; @@ -150,7 +150,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = __webpack_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.edge.development.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.edge.development.js index d65263eb4a510..dee7bbe3eed06 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.edge.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.edge.development.js @@ -120,7 +120,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.edge.production.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.edge.production.js index dc7e3466a1012..00162f130739f 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.edge.production.js @@ -72,7 +72,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; @@ -160,7 +160,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.node.development.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.node.development.js index fee3781514258..d073ef2a8a704 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.node.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.node.development.js @@ -121,7 +121,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.node.production.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.node.production.js index 87be2b0130fe8..806b2d6d4e1fc 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.node.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.node.production.js @@ -73,7 +73,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; @@ -161,7 +161,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.development.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.development.js index 8a0bf8c45c434..71ae5ddd80f1b 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.development.js @@ -3024,7 +3024,7 @@ function preloadModule(metadata) { function requireModule(metadata) { var moduleExports = __webpack_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.production.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.production.js index 3428c227d1fc1..589a07f115ada 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.production.js @@ -2612,7 +2612,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = __webpack_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.production.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.production.js index 55bef5e018c1e..9b17c133ea679 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.production.js @@ -2635,7 +2635,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.production.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.production.js index 5f4f291deb404..76eb4fe6da6c7 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.production.js @@ -2704,7 +2704,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (isAsyncImport(metadata)) { + if (resolvedModuleData.async || isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; From 5c65f5baa892dbbc24e9716121abec8f7e9a1c46 Mon Sep 17 00:00:00 2001 From: Jiachi Liu Date: Thu, 25 Apr 2024 15:13:35 +0200 Subject: [PATCH 02/23] revert few --- .../react-server-dom-turbopack-client.browser.development.js | 2 +- .../cjs/react-server-dom-turbopack-client.browser.production.js | 2 +- .../cjs/react-server-dom-turbopack-client.edge.production.js | 2 +- .../cjs/react-server-dom-turbopack-client.node.production.js | 2 +- .../react-server-dom-turbopack-server.browser.development.js | 2 +- .../cjs/react-server-dom-turbopack-server.browser.production.js | 2 +- .../cjs/react-server-dom-turbopack-server.edge.production.js | 2 +- .../cjs/react-server-dom-turbopack-server.node.production.js | 2 +- .../react-server-dom-turbopack-client.browser.development.js | 2 +- .../cjs/react-server-dom-turbopack-client.browser.production.js | 2 +- .../cjs/react-server-dom-turbopack-client.edge.production.js | 2 +- .../cjs/react-server-dom-turbopack-client.node.production.js | 2 +- .../react-server-dom-turbopack-server.browser.development.js | 2 +- .../cjs/react-server-dom-turbopack-server.browser.production.js | 2 +- .../cjs/react-server-dom-turbopack-server.edge.production.js | 2 +- .../cjs/react-server-dom-turbopack-server.node.production.js | 2 +- .../cjs/react-server-dom-webpack-client.browser.development.js | 2 +- .../cjs/react-server-dom-webpack-client.browser.production.js | 2 +- .../cjs/react-server-dom-webpack-client.edge.production.js | 2 +- .../cjs/react-server-dom-webpack-client.node.production.js | 2 +- .../cjs/react-server-dom-webpack-server.browser.development.js | 2 +- .../cjs/react-server-dom-webpack-server.browser.production.js | 2 +- .../cjs/react-server-dom-webpack-server.edge.production.js | 2 +- .../cjs/react-server-dom-webpack-server.node.production.js | 2 +- .../cjs/react-server-dom-webpack-client.browser.development.js | 2 +- .../cjs/react-server-dom-webpack-client.browser.production.js | 2 +- .../cjs/react-server-dom-webpack-client.edge.production.js | 2 +- .../cjs/react-server-dom-webpack-client.node.production.js | 2 +- .../cjs/react-server-dom-webpack-server.browser.development.js | 2 +- .../cjs/react-server-dom-webpack-server.browser.production.js | 2 +- .../cjs/react-server-dom-webpack-server.edge.production.js | 2 +- .../cjs/react-server-dom-webpack-server.node.production.js | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.development.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.development.js index d6a53c773d5c0..d4d9ef61253c1 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.development.js @@ -192,7 +192,7 @@ function preloadModule(metadata) { function requireModule(metadata) { var moduleExports = __turbopack_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.production.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.production.js index df6e7df78b86a..6b03ef8a22261 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.production.js @@ -145,7 +145,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = __turbopack_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.edge.production.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.edge.production.js index 566583cc61c89..66c6af23681d6 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.edge.production.js @@ -155,7 +155,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.node.production.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.node.production.js index a88687d9ccc86..294306549b8d7 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.node.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.node.production.js @@ -156,7 +156,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.development.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.development.js index 2dc93edf5b132..20572b09903ce 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.development.js @@ -3647,7 +3647,7 @@ function preloadModule(metadata) { function requireModule(metadata) { var moduleExports = __turbopack_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.production.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.production.js index 3f632b722746a..837315279c86f 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.production.js @@ -2885,7 +2885,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = __turbopack_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.production.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.production.js index 7205c68e59da5..ede7e2db8452d 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.production.js @@ -2908,7 +2908,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.production.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.production.js index 96f006a5426f4..3f33cae414bdf 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.production.js @@ -2971,7 +2971,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.development.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.development.js index e44a6ebf159c8..d93f7741f3b4b 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.development.js @@ -195,7 +195,7 @@ function preloadModule(metadata) { function requireModule(metadata) { var moduleExports = __turbopack_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.production.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.production.js index 189417c50dd64..ae4f8fa3cb600 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.production.js @@ -148,7 +148,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = __turbopack_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.edge.production.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.edge.production.js index 8b5b9faa6c4a9..8293759cd2418 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.edge.production.js @@ -158,7 +158,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.node.production.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.node.production.js index e63c1b71fc0dd..e9d8f260e3a8e 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.node.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.node.production.js @@ -159,7 +159,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.development.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.development.js index c02d3fd58caec..69fe5becceeec 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.development.js @@ -3011,7 +3011,7 @@ function preloadModule(metadata) { function requireModule(metadata) { var moduleExports = __turbopack_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.production.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.production.js index e2657cf37eb73..c371e076d1167 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.production.js @@ -2606,7 +2606,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = __turbopack_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.production.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.production.js index b8c185a7d24fb..caf03d0db4c23 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.production.js @@ -2629,7 +2629,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.production.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.production.js index 2c813fdcb89ed..9d2ce2ce767a8 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.production.js @@ -2698,7 +2698,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.development.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.development.js index 554de04bd95d2..b7b576c61aaf1 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.development.js @@ -194,7 +194,7 @@ function preloadModule(metadata) { function requireModule(metadata) { var moduleExports = __webpack_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.production.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.production.js index c158763692190..5147882bb6066 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.production.js @@ -147,7 +147,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = __webpack_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.edge.production.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.edge.production.js index de9fc5043f02d..508bd17631bfd 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.edge.production.js @@ -157,7 +157,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.node.production.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.node.production.js index 825a48106139b..6cb6229498366 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.node.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.node.production.js @@ -158,7 +158,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.development.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.development.js index 517544092714f..c43ce75142ac2 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.development.js @@ -3660,7 +3660,7 @@ function preloadModule(metadata) { function requireModule(metadata) { var moduleExports = __webpack_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.production.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.production.js index 6b6c283581d00..b7db484724ae6 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.production.js @@ -2891,7 +2891,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = __webpack_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.production.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.production.js index 2d7d93adf8f17..d5bc5a02d0e31 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.production.js @@ -2914,7 +2914,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.production.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.production.js index 33b72d84c8324..03674bd58a7c3 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.production.js @@ -2977,7 +2977,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.development.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.development.js index b1ffff5c6e32b..8b396cc94f074 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.development.js @@ -197,7 +197,7 @@ function preloadModule(metadata) { function requireModule(metadata) { var moduleExports = __webpack_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.production.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.production.js index 65fafc40c8883..df226e62014c9 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.production.js @@ -150,7 +150,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = __webpack_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.edge.production.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.edge.production.js index 00162f130739f..b0b31bb8f8f03 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.edge.production.js @@ -160,7 +160,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.node.production.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.node.production.js index 806b2d6d4e1fc..8569bd705f73a 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.node.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.node.production.js @@ -161,7 +161,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.development.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.development.js index 71ae5ddd80f1b..8a0bf8c45c434 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.development.js @@ -3024,7 +3024,7 @@ function preloadModule(metadata) { function requireModule(metadata) { var moduleExports = __webpack_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.production.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.production.js index 589a07f115ada..3428c227d1fc1 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.production.js @@ -2612,7 +2612,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = __webpack_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.production.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.production.js index 9b17c133ea679..55bef5e018c1e 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.production.js @@ -2635,7 +2635,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.production.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.production.js index 76eb4fe6da6c7..5f4f291deb404 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.production.js @@ -2704,7 +2704,7 @@ function preloadModule(metadata) { function requireModule(metadata) { let moduleExports = globalThis.__next_require__(metadata[ID]); - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { if (typeof moduleExports.then !== 'function') ; else if (moduleExports.status === 'fulfilled') { // This Promise should've been instrumented by preloadModule. moduleExports = moduleExports.value; From 8883aa7522f5a3fc64cd97edc020101da9781721 Mon Sep 17 00:00:00 2001 From: Jiachi Liu Date: Thu, 25 Apr 2024 15:33:35 +0200 Subject: [PATCH 03/23] uncomment legacy logic --- packages/next/src/build/handle-externals.ts | 26 ++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/next/src/build/handle-externals.ts b/packages/next/src/build/handle-externals.ts index f42d16cd805a2..900c11013ac80 100644 --- a/packages/next/src/build/handle-externals.ts +++ b/packages/next/src/build/handle-externals.ts @@ -57,7 +57,7 @@ export async function resolveExternal( context: string, request: string, isEsmRequested: boolean, - optOutBundlingPackages: string[], + _optOutBundlingPackages: string[], getResolve: ( options: any ) => ( @@ -276,18 +276,18 @@ export function makeExternalHandler({ // Treat react packages and next internals as external for SSR layer, // also map react to builtin ones with require-hook. // Otherwise keep continue the process to resolve the externals. - // if (layer === WEBPACK_LAYERS.serverSideRendering) { - // const isRelative = request.startsWith('.') - // const fullRequest = isRelative - // ? normalizePathSep(path.join(context, request)) - // : request - - // // Check if it's opt out bundling package first - // if (containsImportInPackages(fullRequest, optOutBundlingPackages)) { - // return fullRequest - // } - // return resolveNextExternal(fullRequest) - // } + if (layer === WEBPACK_LAYERS.serverSideRendering) { + const isRelative = request.startsWith('.') + const fullRequest = isRelative + ? normalizePathSep(path.join(context, request)) + : request + + // Check if it's opt out bundling package first + if (containsImportInPackages(fullRequest, optOutBundlingPackages)) { + return fullRequest + } + return resolveNextExternal(fullRequest) + } // TODO-APP: Let's avoid this resolve call as much as possible, and eventually get rid of it. const resolveResult = await resolveExternal( From 6ac34341193e57504312c53c86317b69f264de37 Mon Sep 17 00:00:00 2001 From: Jiachi Liu Date: Mon, 6 May 2024 11:28:22 +0200 Subject: [PATCH 04/23] revert react changes and make await client entry --- .../loaders/next-flight-client-entry-loader.ts | 14 +++++++++++--- ...ver-dom-turbopack-client.browser.development.js | 2 +- ...rver-dom-turbopack-client.browser.production.js | 2 +- ...server-dom-turbopack-client.edge.development.js | 2 +- ...-server-dom-turbopack-client.edge.production.js | 2 +- ...server-dom-turbopack-client.node.development.js | 2 +- ...-server-dom-turbopack-client.node.production.js | 2 +- ...ver-dom-turbopack-client.browser.development.js | 2 +- ...rver-dom-turbopack-client.browser.production.js | 2 +- ...server-dom-turbopack-client.edge.development.js | 2 +- ...-server-dom-turbopack-client.edge.production.js | 2 +- ...server-dom-turbopack-client.node.development.js | 2 +- ...-server-dom-turbopack-client.node.production.js | 2 +- ...erver-dom-webpack-client.browser.development.js | 2 +- ...server-dom-webpack-client.browser.production.js | 2 +- ...t-server-dom-webpack-client.edge.development.js | 2 +- ...ct-server-dom-webpack-client.edge.production.js | 2 +- ...t-server-dom-webpack-client.node.development.js | 2 +- ...ct-server-dom-webpack-client.node.production.js | 2 +- ...erver-dom-webpack-client.browser.development.js | 2 +- ...server-dom-webpack-client.browser.production.js | 2 +- ...t-server-dom-webpack-client.edge.development.js | 2 +- ...ct-server-dom-webpack-client.edge.production.js | 2 +- ...t-server-dom-webpack-client.node.development.js | 2 +- ...ct-server-dom-webpack-client.node.production.js | 2 +- 25 files changed, 35 insertions(+), 27 deletions(-) diff --git a/packages/next/src/build/webpack/loaders/next-flight-client-entry-loader.ts b/packages/next/src/build/webpack/loaders/next-flight-client-entry-loader.ts index 819154545a01a..72b2f0d0c94e0 100644 --- a/packages/next/src/build/webpack/loaders/next-flight-client-entry-loader.ts +++ b/packages/next/src/build/webpack/loaders/next-flight-client-entry-loader.ts @@ -50,9 +50,9 @@ export default function transformSource( // Otherwise, we use eager mode with webpackExports to only include the necessary exports. // If we have '*' in the ids, we include all the imports if (ids.length === 0 || ids.includes('*')) { - return `import(/* webpackMode: "eager" */ ${importPath});\n` + return `await import(/* webpackMode: "eager" */ ${importPath});\n` } else { - return `import(/* webpackMode: "eager", webpackExports: ${JSON.stringify( + return `await import(/* webpackMode: "eager", webpackExports: ${JSON.stringify( ids )} */ ${importPath});\n` } @@ -65,5 +65,13 @@ export default function transformSource( type: RSC_MODULE_TYPES.client, } - return code + const asyncModuleCode = ` + async function deps() { + ${code} + } + + export const __client = await deps() + ` + return asyncModuleCode + // return code } diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.development.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.development.js index d4d9ef61253c1..ff6201a2d400d 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.development.js @@ -106,7 +106,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.production.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.production.js index 6b03ef8a22261..115bd293313e1 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.production.js @@ -59,7 +59,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.edge.development.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.edge.development.js index 6eec777e8f519..c8fa0d9c12850 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.edge.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.edge.development.js @@ -117,7 +117,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.edge.production.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.edge.production.js index 66c6af23681d6..e744efd3d9222 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.edge.production.js @@ -69,7 +69,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.node.development.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.node.development.js index 3319a789c8b06..982f19c275570 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.node.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.node.development.js @@ -118,7 +118,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.node.production.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.node.production.js index 294306549b8d7..35ac2bbe5f4a0 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.node.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.node.production.js @@ -70,7 +70,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.development.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.development.js index d93f7741f3b4b..b00f111e16a33 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.development.js @@ -109,7 +109,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.production.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.production.js index ae4f8fa3cb600..a22e373a47cd8 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.production.js @@ -62,7 +62,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.edge.development.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.edge.development.js index 72fea92778422..ce65d5e5862fd 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.edge.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.edge.development.js @@ -120,7 +120,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.edge.production.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.edge.production.js index 8293759cd2418..5af0c59fb9e8a 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.edge.production.js @@ -72,7 +72,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.node.development.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.node.development.js index ec6052edfbb00..1f64488318e29 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.node.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.node.development.js @@ -121,7 +121,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.node.production.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.node.production.js index e9d8f260e3a8e..7c43361c4a881 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.node.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.node.production.js @@ -73,7 +73,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.development.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.development.js index b7b576c61aaf1..205b28c679109 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.development.js @@ -106,7 +106,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.production.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.production.js index 5147882bb6066..87088623d18ca 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.production.js @@ -59,7 +59,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.edge.development.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.edge.development.js index b4fec97d05df0..597e05ccba680 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.edge.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.edge.development.js @@ -117,7 +117,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.edge.production.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.edge.production.js index 508bd17631bfd..362161a8b80e2 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.edge.production.js @@ -69,7 +69,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.node.development.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.node.development.js index c4639800afcf4..b72ffb3d6acc1 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.node.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.node.development.js @@ -118,7 +118,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.node.production.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.node.production.js index 6cb6229498366..3700409ede7d0 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.node.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.node.production.js @@ -70,7 +70,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.development.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.development.js index 8b396cc94f074..69a59c776ae68 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.development.js @@ -109,7 +109,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.production.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.production.js index df226e62014c9..8537d123acece 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.production.js @@ -62,7 +62,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.edge.development.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.edge.development.js index dee7bbe3eed06..d65263eb4a510 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.edge.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.edge.development.js @@ -120,7 +120,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.edge.production.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.edge.production.js index b0b31bb8f8f03..dc7e3466a1012 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.edge.production.js @@ -72,7 +72,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.node.development.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.node.development.js index d073ef2a8a704..fee3781514258 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.node.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.node.development.js @@ -121,7 +121,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.node.production.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.node.production.js index 8569bd705f73a..87be2b0130fe8 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.node.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.node.production.js @@ -73,7 +73,7 @@ function resolveClientReference(bundlerConfig, metadata) { name = metadata[NAME]; } - if (resolvedModuleData.async || isAsyncImport(metadata)) { + if (isAsyncImport(metadata)) { return [resolvedModuleData.id, resolvedModuleData.chunks, name, 1 /* async */ ]; From f6e62c17ab53d69cae1d6fc1080ba05fe891feb3 Mon Sep 17 00:00:00 2001 From: Jiachi Liu Date: Mon, 6 May 2024 13:58:27 +0200 Subject: [PATCH 05/23] await client --- packages/next/src/build/handle-externals.ts | 40 ++++++++++--------- .../next-flight-client-entry-loader.ts | 8 ++-- .../app-render/create-component-tree.tsx | 2 +- .../app-external/app/optout/action/actions.js | 2 + .../app-external/app/optout/action/page.js | 4 +- 5 files changed, 32 insertions(+), 24 deletions(-) diff --git a/packages/next/src/build/handle-externals.ts b/packages/next/src/build/handle-externals.ts index 900c11013ac80..c86356b7a30bb 100644 --- a/packages/next/src/build/handle-externals.ts +++ b/packages/next/src/build/handle-externals.ts @@ -272,23 +272,6 @@ export function makeExternalHandler({ return resolveNextExternal(request) } - // Early return if the request needs to be bundled, such as in the client layer. - // Treat react packages and next internals as external for SSR layer, - // also map react to builtin ones with require-hook. - // Otherwise keep continue the process to resolve the externals. - if (layer === WEBPACK_LAYERS.serverSideRendering) { - const isRelative = request.startsWith('.') - const fullRequest = isRelative - ? normalizePathSep(path.join(context, request)) - : request - - // Check if it's opt out bundling package first - if (containsImportInPackages(fullRequest, optOutBundlingPackages)) { - return fullRequest - } - return resolveNextExternal(fullRequest) - } - // TODO-APP: Let's avoid this resolve call as much as possible, and eventually get rid of it. const resolveResult = await resolveExternal( dir, @@ -327,6 +310,25 @@ export function makeExternalHandler({ ) } + // Early return if the request needs to be bundled, such as in the client layer. + // Treat react packages and next internals as external for SSR layer, + // also map react to builtin ones with require-hook. + // Otherwise keep continue the process to resolve the externals. + // if (layer === WEBPACK_LAYERS.serverSideRendering) { + // const isRelative = request.startsWith('.') + // const fullRequest = isRelative + // ? normalizePathSep(path.join(context, request)) + // : request + + // // // Check if it's opt out bundling package first + // // if (containsImportInPackages(fullRequest, optOutBundlingPackages)) { + // // return fullRequest + // // } + // const nextExternalRes = resolveNextExternal(res) + // if (nextExternalRes) return nextExternalRes + // return undefined + // } + const externalType = isEsm ? 'module' : 'commonjs' // Default pages have to be transpiled @@ -419,7 +421,9 @@ function resolveBundlingOptOutPackages({ if (nodeModulesRegex.test(resolvedRes)) { const isOptOutBundling = optOutBundlingPackageRegex.test(resolvedRes) - if (isWebpackServerOnlyLayer(layer)) { + // Apply bundling rules to all app layers. + // Since handleExternals only handle the server layers, we don't need to exclude client here + if (isWebpackAppLayer(layer)) { if (isOptOutBundling) { return `${externalType} ${request}` // Externalize if opted out } diff --git a/packages/next/src/build/webpack/loaders/next-flight-client-entry-loader.ts b/packages/next/src/build/webpack/loaders/next-flight-client-entry-loader.ts index 72b2f0d0c94e0..acca5048e9e5b 100644 --- a/packages/next/src/build/webpack/loaders/next-flight-client-entry-loader.ts +++ b/packages/next/src/build/webpack/loaders/next-flight-client-entry-loader.ts @@ -50,9 +50,9 @@ export default function transformSource( // Otherwise, we use eager mode with webpackExports to only include the necessary exports. // If we have '*' in the ids, we include all the imports if (ids.length === 0 || ids.includes('*')) { - return `await import(/* webpackMode: "eager" */ ${importPath});\n` + return `import(/* webpackMode: "eager" */ ${importPath});\n` } else { - return `await import(/* webpackMode: "eager", webpackExports: ${JSON.stringify( + return `import(/* webpackMode: "eager", webpackExports: ${JSON.stringify( ids )} */ ${importPath});\n` } @@ -66,11 +66,11 @@ export default function transformSource( } const asyncModuleCode = ` - async function deps() { + function deps() { ${code} } - export const __client = await deps() + export const __client = deps() ` return asyncModuleCode // return code diff --git a/packages/next/src/server/app-render/create-component-tree.tsx b/packages/next/src/server/app-render/create-component-tree.tsx index 37dcc63261152..184c98d978f31 100644 --- a/packages/next/src/server/app-render/create-component-tree.tsx +++ b/packages/next/src/server/app-render/create-component-tree.tsx @@ -265,7 +265,7 @@ async function createComponentTreeInternal({ } const LayoutOrPage: React.ComponentType | undefined = layoutOrPageMod - ? interopDefault(layoutOrPageMod) + ? await interopDefault(layoutOrPageMod) : undefined /** diff --git a/test/e2e/app-dir/app-external/app/optout/action/actions.js b/test/e2e/app-dir/app-external/app/optout/action/actions.js index b6c9a47131f15..323b4b1894166 100644 --- a/test/e2e/app-dir/app-external/app/optout/action/actions.js +++ b/test/e2e/app-dir/app-external/app/optout/action/actions.js @@ -1,7 +1,9 @@ 'use server' import { value as dualPkgOptoutValue } from 'dual-pkg-optout' +import * as mod from 'dual-pkg-optout' export async function getDualOptoutValue() { + console.log('getDualOptoutValue', dualPkgOptoutValue, 'mod', mod) return dualPkgOptoutValue } diff --git a/test/e2e/app-dir/app-external/app/optout/action/page.js b/test/e2e/app-dir/app-external/app/optout/action/page.js index 0d339c7c39262..7cfc2250538f8 100644 --- a/test/e2e/app-dir/app-external/app/optout/action/page.js +++ b/test/e2e/app-dir/app-external/app/optout/action/page.js @@ -10,7 +10,9 @@ export default function Page() {

{optoutDisplayValue}