revert react changes and make await client entry

vercel · May 6, 2024 · 6ac3434 · 6ac3434
1 parent 8883aa7
commit 6ac3434
Show file tree

Hide file tree

Showing 25 changed files with 35 additions and 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
@@ -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/...r-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.development.js b/...r-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/...er-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.production.js b/...er-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/...rver-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.edge.development.js b/...rver-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/...erver-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.edge.production.js b/...erver-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/...rver-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.node.development.js b/...rver-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/...erver-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.node.production.js b/...erver-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/...d/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.development.js b/...d/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/...ed/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.production.js b/...ed/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/...iled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.edge.development.js b/...iled/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/...piled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.edge.production.js b/...piled/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/...iled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.node.development.js b/...iled/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/...piled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.node.production.js b/...piled/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/...erver-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.development.js b/...erver-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/...server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.production.js b/...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/...t-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.edge.development.js b/...t-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/...ct-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.edge.production.js b/...ct-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/...t-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.node.development.js b/...t-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/...ct-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.node.production.js b/...ct-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/...piled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.development.js b/...piled/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/...mpiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.production.js b/...mpiled/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/...compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.edge.development.js b/...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/.../compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.edge.production.js b/.../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/...compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.node.development.js b/...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/.../compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.node.production.js b/.../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 */
       ];