fix: misc fix from #673

hi-ogawa · Feb 4, 2025 · 4563301 · 4563301
1 parent 01aabbd
commit 4563301
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 13 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -15,7 +15,7 @@ runs:
       with:
         node-version: 20
 
-    - run: corepack enable
+    - run: npm install -g corepack@latest && corepack enable
       shell: bash
 
     - run: pnpm i

diff --git a/packages/pre-bundle-new-url/examples/basic/tsconfig.json b/packages/pre-bundle-new-url/examples/basic/tsconfig.json
@@ -1,6 +1,7 @@
 {
   "exclude": ["node_modules"],
   "compilerOptions": {
+    "skipLibCheck": true,
     "strict": true,
     "verbatimModuleSyntax": true,
     "noEmit": true,

diff --git a/packages/react-server-next/src/compat/og.tsx b/packages/react-server-next/src/compat/og.tsx
@@ -8,13 +8,17 @@ export class ImageResponse extends Response {
   constructor(...args: ConstructorParameters<typeof OgType.ImageResponse>) {
     const body = new ReadableStream({
       async start(controller) {
-        const ogModule = await import("@vercel/og");
-        const response = new ogModule.ImageResponse(...args);
-        tinyassert(response.body);
-        for await (const chunk of response.body) {
-          controller.enqueue(chunk);
+        try {
+          const ogModule = await import("@vercel/og");
+          const response = new ogModule.ImageResponse(...args);
+          tinyassert(response.body);
+          for await (const chunk of response.body) {
+            controller.enqueue(chunk);
+          }
+          controller.close();
+        } catch (e) {
+          console.error("[ERROR:ImageResponse]", e);
         }
-        controller.close();
       },
     });
     const headers = new Headers(args[1]?.headers);

diff --git a/packages/react-server/src/features/prerender/plugin.ts b/packages/react-server/src/features/prerender/plugin.ts
@@ -33,7 +33,7 @@ export function prerenderPlugin({
 }): Plugin[] {
   return [
     {
-      name: prerenderPlugin + ":build",
+      name: prerenderPlugin.name + ":build",
       enforce: "post",
       apply: () => manager.buildType === "ssr",
       writeBundle: {
@@ -44,7 +44,7 @@ export function prerenderPlugin({
       },
     },
     {
-      name: prerenderPlugin + ":preview",
+      name: prerenderPlugin.name + ":preview",
       apply: (_config, env) => !!env.isPreview,
       configurePreviewServer(server) {
         const outDir = server.config.build.outDir;

diff --git a/packages/react-server/src/plugin/index.ts b/packages/react-server/src/plugin/index.ts
@@ -439,13 +439,22 @@ export function vitePluginReactServer(
       }),
     ),
     {
+      // externalize `dist/rsc/index.js` import as relative path in ssr build
       name: "virtual:react-server-build",
       resolveId(source) {
         if (source === "virtual:react-server-build") {
-          // externalize as relative path
-          // from: dist/server/index.js  (ssr build)
-          // to:   dist/rsc/index.js     (rsc build)
-          return { id: "../rsc/index.js", external: true };
+          return { id: "__VIRTUAL_REACT_SERVER_BUILD__", external: true };
+        }
+        return;
+      },
+      renderChunk(code, chunk) {
+        if (code.includes("__VIRTUAL_REACT_SERVER_BUILD__")) {
+          const replacement = path.relative(
+            path.join(outDir, "server", chunk.fileName, ".."),
+            path.join(outDir, "rsc", "index.js"),
+          );
+          code = code.replace("__VIRTUAL_REACT_SERVER_BUILD__", replacement);
+          return { code };
         }
         return;
       },