feat: upgrade to vite 4.5.0 (#141)

* chore: bump vite version

* chore: remove unused package `json`

* chore: remove unused `postinstall` script

* fix: code

---------

Co-authored-by: Daishi Kato <dai-shi@users.noreply.github.com>

package.json

@@ -64,10 +64,5 @@
     "react-server-dom-webpack": "18.3.0-canary-a41957507-20231017",
     "typescript": "^5.2.2",
     "waku": "workspace:*"
-  },
-  "pnpm": {
-    "patchedDependencies": {
-      "vite@4.4.10": "packages/waku/patches/vite@4.4.10.patch"
-    }
   }
 }

packages/create-waku/package.json

@@ -19,7 +19,7 @@
   "scripts": {
     "start": "node dist/cli.js",
     "compile": "rm -rf template dist && pnpm run template && pnpm run build",
-    "template": "cp -r ../../examples template/; for d in template/*; do cp -r ../waku/patches $d; json -I -f $d/package.json -e 'this.pnpm??={};this.pnpm.patchedDependencies??={};this.pnpm.patchedDependencies[\"vite@4.4.10\"]=\"patches/vite@4.4.10.patch\"'; done",
+    "template": "cp -r ../../examples template/",
     "build": "esbuild src/* --bundle --platform=node --outdir=dist"
   },
   "dependencies": {
@@ -30,7 +30,6 @@
   "devDependencies": {
     "@types/fs-extra": "^11.0.2",
     "@types/prompts": "^2.4.5",
-    "json": "^11.0.0",
     "esbuild": "0.19.4"
   }
 }

packages/waku/package.json

@@ -58,8 +58,7 @@
     "dev": "swc src -d dist -w",
     "compile": "rm -rf dist && pnpm run compile:code && pnpm run compile:types",
     "compile:code": "swc src -d dist && swc src -d dist/cjs -C module.type=commonjs && echo '{\"type\":\"commonjs\"}' > dist/cjs/package.json",
-    "compile:types": "tsc --project tsconfig.json",
-    "postinstall": "(cd node_modules/vite && patch -p1 -i ../../patches/vite@4.4.10.patch) || (cd ../vite && patch -p1 -i ../waku/patches/vite@4.4.10.patch) || true"
+    "compile:types": "tsc --project tsconfig.json"
   },
   "license": "MIT",
   "engines": {
@@ -69,7 +68,7 @@
     "@swc/core": "1.3.91",
     "@vitejs/plugin-react": "^4.1.0",
     "busboy": "^1.6.0",
-    "vite": "4.4.10"
+    "vite": "4.5.0"
   },
   "devDependencies": {
     "@swc/cli": "^0.1.62",

packages/waku/src/lib/builder.ts

@@ -61,11 +61,11 @@ const analyzeEntries = async (entriesFile: string) => {
       ),
     ],
     ssr: {
+      resolve: {
+        externalConditions: ["react-server"],
+      },
       noExternal: /^(?!node:)/,
     },
-    resolve: {
-      conditions: ["react-server"],
-    },
     build: {
       write: false,
       ssr: true,
@@ -103,6 +103,9 @@ const buildServerBundle = async (
   const serverBuildOutput = await viteBuild({
     ...configFileConfig(),
     ssr: {
+      resolve: {
+        externalConditions: ["react-server"],
+      },
       noExternal: Object.values(clientEntryFiles).map(
         // FIXME this might not work with pnpm
         (fname) =>
@@ -111,9 +114,6 @@ const buildServerBundle = async (
             .split("/")[0]!,
       ),
     },
-    resolve: {
-      conditions: ["react-server"],
-    },
     publicDir: false,
     build: {
       ssr: true,

packages/waku/src/lib/middleware/rsc/worker-impl.ts

@@ -140,8 +140,10 @@ const getViteServer = async (command: "dev" | "build" | "start") => {
         parentPort!.postMessage(mesg);
       }),
     ],
-    resolve: {
-      conditions: ["react-server"],
+    ssr: {
+      resolve: {
+        externalConditions: ["react-server"],
+      },
     },
     appType: "custom",
     server: { middlewareMode: true, hmr: { server: dummyServer } },