feat: streaming ssr + rsc

web-infra-dev · Sep 6, 2024 · 7a3c0a6 · 7a3c0a6
1 parent 6631d6b
commit 7a3c0a6
Show file tree

Hide file tree

Showing 23 changed files with 648 additions and 41 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -59,4 +59,5 @@
   "[javascript]": {
     "editor.defaultFormatter": "biomejs.biome"
   },
+  "todo-tree.tree.disableCompactFolders": true,
 }
diff --git a/packages/runtime/plugin-runtime/package.json b/packages/runtime/plugin-runtime/package.json
@@ -232,8 +232,8 @@
     "@types/node": "^14",
     "@types/react-side-effect": "^1.1.1",
     "jest": "^29",
-    "react": "^18",
-    "react-dom": "^18",
+    "react": "18.3.0-canary-8039e6d0b-20231026",
+    "react-dom": "18.3.0-canary-8039e6d0b-20231026",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.93.0"

diff --git a/packages/runtime/plugin-runtime/src/cli/template.ts b/packages/runtime/plugin-runtime/src/cli/template.ts
@@ -68,7 +68,8 @@ export const index = ({
   customBootstrap?: string | false;
   mountId?: string;
 }) =>
-  `import '@${metaName}/runtime/registry/${entryName}';
+  // TODO: remove this
+  `
 ${genRenderCode({
   srcDirectory,
   internalSrcAlias,
@@ -166,6 +167,7 @@ import App from '${
       customEntry
         ? entry
             .replace('entry.tsx', 'App')
+            .replace('entry.jsx', 'App')
             .replace(srcDirectory, internalSrcAlias)
         : entry.replace(srcDirectory, internalSrcAlias).replace('.tsx', ''),
     )

diff --git a/packages/runtime/plugin-runtime/src/core/server/stream/afterTemplate.ts b/packages/runtime/plugin-runtime/src/core/server/stream/afterTemplate.ts
@@ -38,7 +38,7 @@ export function buildShellAfterTemplate(
   async function injectJs(template: string, entryName: string, nonce?: string) {
     const { routeManifest } = runtimeContext;
     const { routeAssets } = routeManifest;
-    const asyncEntry = routeAssets[`async-${entryName}`];
+    const asyncEntry = routeAssets?.[`async-${entryName}`];
     if (asyncEntry) {
       const { assets } = asyncEntry;
       const jsChunkStr = assets

diff --git a/packages/runtime/plugin-runtime/src/core/server/stream/createReadableStream.ts b/packages/runtime/plugin-runtime/src/core/server/stream/createReadableStream.ts
@@ -64,15 +64,15 @@ export const createReadableStreamFromElement: CreateReadableStreamFromElement =
                      * So we use the `SHELL_STREAM_END_MARK` to mark the shell content' tail.
                      */
                     let concatedChunk = chunkVec.join('');
-                    if (concatedChunk.includes(ESCAPED_SHELL_STREAM_END_MARK)) {
-                      concatedChunk = concatedChunk.replace(
-                        ESCAPED_SHELL_STREAM_END_MARK,
-                        '',
-                      );
-
-                      shellChunkStatus = ShellChunkStatus.FINISH;
-                      this.push(`${shellBefore}${concatedChunk}${shellAfter}`);
-                    }
+                    // if (concatedChunk.includes(ESCAPED_SHELL_STREAM_END_MARK)) {
+                    concatedChunk = concatedChunk.replace(
+                      ESCAPED_SHELL_STREAM_END_MARK,
+                      '',
+                    );
+
+                    shellChunkStatus = ShellChunkStatus.FINISH;
+                    this.push(`${shellBefore}${concatedChunk}${shellAfter}`);
+                    // }
                   } else {
                     this.push(chunk);
                   }

diff --git a/packages/solutions/app-tools/src/plugins/analyze/index.ts b/packages/solutions/app-tools/src/plugins/analyze/index.ts
@@ -168,7 +168,7 @@ export default ({
 
           builder.onAfterBuild(async ({ stats }) => {
             const hookRunners = api.useHookRunners();
-            await hookRunners.afterBuild({ stats });
+            await hookRunners.afterBuild({ stats: stats as any });
             await emitResolvedConfig(appContext.appDirectory, normalizedConfig);
           });
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/integration/basic-rsc-ssr/.browserslistrc b/tests/integration/basic-rsc-ssr/.browserslistrc
@@ -0,0 +1,5 @@
+chrome >= 51
+edge >= 15
+firefox >= 54
+safari >= 10
+ios_saf >= 10