feat!: use modern type definitions

cyco130 · Jul 17, 2023 · 80279df · 80279df
1 parent 998a855
commit 80279df
Show file tree

Hide file tree

Showing 64 changed files with 830 additions and 712 deletions.
diff --git a/.gitignore b/.gitignore
@@ -118,6 +118,7 @@ dist
 
 # Stores VSCode versions used for testing VSCode extensions
 .vscode-test
+.vscode/
 
 # yarn v2
 .yarn/cache

diff --git a/ci/package.json b/ci/package.json
@@ -6,11 +6,11 @@
     "ci": "vitest run --reporter=verbose --no-threads"
   },
   "dependencies": {
-    "@types/node": "^18.16.19",
+    "@types/node": "^20.4.2",
     "kill-port": "^2.0.1",
     "node-fetch": "^3.3.1",
     "ps-tree": "^1.2.0",
-    "puppeteer": "^20.8.1",
+    "puppeteer": "^20.8.2",
     "typescript": "^5.1.6",
     "vitest": "^0.33.0"
   },

diff --git a/ci/tsconfig.json b/ci/tsconfig.json
@@ -6,6 +6,6 @@
 		"forceConsistentCasingInFileNames": true,
 		"strict": true,
 		"skipLibCheck": true,
-		"moduleResolution": "Node"
+		"moduleResolution": "Bundler"
 	}
 }
diff --git a/examples/express/package.json b/examples/express/package.json
@@ -12,10 +12,10 @@
   ],
   "devDependencies": {
     "@types/express": "^4.17.17",
-    "@types/node": "^18.16.19",
+    "@types/node": "^20.4.2",
     "typescript": "^5.1.6",
     "vavite": "1.8.3",
-    "vite": "^4.4.3"
+    "vite": "^4.4.4"
   },
   "dependencies": {
     "express": "^4.18.2"

diff --git a/examples/express/server.ts b/examples/express/server.ts
@@ -1,7 +1,6 @@
 /// <reference types="vite/client" />
 
 import express, { RequestHandler } from "express";
-import httpDevServer from "vavite/http-dev-server";
 import viteDevServer from "vavite/vite-dev-server";
 
 const app = express();

diff --git a/examples/express/tsconfig.json b/examples/express/tsconfig.json
@@ -6,6 +6,6 @@
 		"forceConsistentCasingInFileNames": true,
 		"strict": true,
 		"skipLibCheck": true,
-		"moduleResolution": "Node"
+		"moduleResolution": "Bundler"
 	}
 }
diff --git a/examples/fastify-vite-plugin-ssr/package.json b/examples/fastify-vite-plugin-ssr/package.json
@@ -9,18 +9,18 @@
   },
   "dependencies": {
     "@fastify/static": "^6.10.2",
-    "@types/node": "^18.16.19",
-    "@types/react": "^18.2.14",
-    "@types/react-dom": "^18.2.6",
+    "@types/node": "^20.4.2",
+    "@types/react": "^18.2.15",
+    "@types/react-dom": "^18.2.7",
     "@vitejs/plugin-react": "^4.0.3",
     "cross-env": "^7.0.3",
-    "fastify": "^4.19.2",
+    "fastify": "^4.20.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.1.6",
     "vavite": "1.8.3",
-    "vite": "^4.4.3",
+    "vite": "^4.4.4",
     "vite-plugin-ssr": "^0.4.133"
   }
 }
diff --git a/examples/fastify-vite-plugin-ssr/tsconfig.json b/examples/fastify-vite-plugin-ssr/tsconfig.json
@@ -2,7 +2,7 @@
 	"compilerOptions": {
 		"strict": true,
 		"module": "ES2020",
-		"moduleResolution": "Node",
+		"moduleResolution": "Bundler",
 		"target": "ES2017",
 		"lib": ["DOM", "DOM.Iterable", "ESNext"],
 		"jsx": "react",

diff --git a/examples/fastify-vite-plugin-ssr/vite.config.ts b/examples/fastify-vite-plugin-ssr/vite.config.ts
@@ -1,5 +1,3 @@
-/// <reference types="vavite/vite-config" />
-
 import { defineConfig } from "vite";
 import react from "@vitejs/plugin-react";
 import ssr from "vite-plugin-ssr/plugin";

diff --git a/examples/fastify/package.json b/examples/fastify/package.json
@@ -11,12 +11,12 @@
     "dist"
   ],
   "devDependencies": {
-    "@types/node": "^18.16.19",
+    "@types/node": "^20.4.2",
     "typescript": "^5.1.6",
     "vavite": "1.8.3",
-    "vite": "^4.4.3"
+    "vite": "^4.4.4"
   },
   "dependencies": {
-    "fastify": "^4.19.2"
+    "fastify": "^4.20.0"
   }
 }
diff --git a/examples/fastify/tsconfig.json b/examples/fastify/tsconfig.json
@@ -6,6 +6,6 @@
 		"forceConsistentCasingInFileNames": true,
 		"strict": true,
 		"skipLibCheck": true,
-		"moduleResolution": "Node"
+		"moduleResolution": "Bundler"
 	}
 }
diff --git a/examples/hapi/package.json b/examples/hapi/package.json
@@ -11,11 +11,10 @@
     "dist"
   ],
   "devDependencies": {
-    "@types/hapi__hapi": "^21.0.0",
-    "@types/node": "^18.16.19",
+    "@types/node": "^20.4.2",
     "typescript": "^5.1.6",
     "vavite": "1.8.3",
-    "vite": "^4.4.3"
+    "vite": "^4.4.4"
   },
   "dependencies": {
     "@hapi/hapi": "^21.3.2"

diff --git a/examples/hapi/tsconfig.json b/examples/hapi/tsconfig.json
@@ -6,6 +6,6 @@
 		"forceConsistentCasingInFileNames": true,
 		"strict": true,
 		"skipLibCheck": true,
-		"moduleResolution": "Node"
+		"moduleResolution": "Bundler"
 	}
 }
diff --git a/examples/koa/package.json b/examples/koa/package.json
@@ -13,10 +13,10 @@
   "devDependencies": {
     "@types/koa": "^2.13.6",
     "@types/koa__router": "^12.0.0",
-    "@types/node": "^18.16.19",
+    "@types/node": "^20.4.2",
     "typescript": "^5.1.6",
     "vavite": "1.8.3",
-    "vite": "^4.4.3"
+    "vite": "^4.4.4"
   },
   "dependencies": {
     "@koa/router": "^12.0.0",

diff --git a/examples/koa/tsconfig.json b/examples/koa/tsconfig.json
@@ -6,6 +6,6 @@
 		"forceConsistentCasingInFileNames": true,
 		"strict": true,
 		"skipLibCheck": true,
-		"moduleResolution": "Node"
+		"moduleResolution": "Bundler"
 	}
 }
diff --git a/examples/nestjs-vite-plugin-ssr/package.json b/examples/nestjs-vite-plugin-ssr/package.json
@@ -11,23 +11,23 @@
     "dist"
   ],
   "devDependencies": {
-    "@swc/core": "^1.3.68",
+    "@swc/core": "^1.3.69",
     "@types/express": "^4.17.17",
-    "@types/node": "^18.16.19",
-    "@types/react": "^18.2.14",
-    "@types/react-dom": "^18.2.6",
+    "@types/node": "^20.4.2",
+    "@types/react": "^18.2.15",
+    "@types/react-dom": "^18.2.7",
     "@vitejs/plugin-react": "^4.0.3",
     "cross-env": "^7.0.3",
-    "rollup-plugin-swc3": "^0.9.0",
+    "rollup-plugin-swc3": "^0.9.1",
     "typescript": "^5.1.6",
     "vavite": "1.8.3",
-    "vite": "^4.4.3",
+    "vite": "^4.4.4",
     "vite-tsconfig-paths": "^4.2.0"
   },
   "dependencies": {
-    "@nestjs/common": "^10.0.5",
-    "@nestjs/core": "^10.0.5",
-    "@nestjs/platform-express": "^10.0.5",
+    "@nestjs/common": "^10.1.0",
+    "@nestjs/core": "^10.1.0",
+    "@nestjs/platform-express": "^10.1.0",
     "@nestjs/serve-static": "^4.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/examples/nestjs-vite-plugin-ssr/renderer/_default.page.server.tsx b/examples/nestjs-vite-plugin-ssr/renderer/_default.page.server.tsx
@@ -1,4 +1,5 @@
 import { renderToPipeableStream } from "react-dom/server";
+// @ts-expect-error - no types
 import reactStreaming from "react-streaming/server";
 import { escapeInject } from "vite-plugin-ssr/server";
 import type { PageContextBuiltIn } from "vite-plugin-ssr";

diff --git a/examples/nestjs-vite-plugin-ssr/tsconfig.json b/examples/nestjs-vite-plugin-ssr/tsconfig.json
@@ -8,7 +8,7 @@
 		"forceConsistentCasingInFileNames": true,
 		"strict": true,
 		"skipLibCheck": true,
-		"moduleResolution": "Node",
+		"moduleResolution": "Bundler",
 		"experimentalDecorators": true,
 		"emitDecoratorMetadata": true,
 		"jsx": "react-jsx",

diff --git a/examples/nestjs-vite-plugin-ssr/vite.config.ts b/examples/nestjs-vite-plugin-ssr/vite.config.ts
@@ -1,5 +1,3 @@
-/// <reference types="vavite/vite-config" />
-
 import { defineConfig } from "vite";
 import vavite from "vavite";
 import { swc } from "rollup-plugin-swc3";

diff --git a/examples/nestjs/package.json b/examples/nestjs/package.json
@@ -11,18 +11,18 @@
     "dist"
   ],
   "devDependencies": {
-    "@swc/core": "^1.3.68",
+    "@swc/core": "^1.3.69",
     "@types/express": "^4.17.17",
-    "@types/node": "^18.16.19",
-    "rollup-plugin-swc3": "^0.9.0",
+    "@types/node": "^20.4.2",
+    "rollup-plugin-swc3": "^0.9.1",
     "typescript": "^5.1.6",
     "vavite": "1.8.3",
-    "vite": "^4.4.3"
+    "vite": "^4.4.4"
   },
   "dependencies": {
-    "@nestjs/common": "^10.0.5",
-    "@nestjs/core": "^10.0.5",
-    "@nestjs/platform-express": "^10.0.5",
+    "@nestjs/common": "^10.1.0",
+    "@nestjs/core": "^10.1.0",
+    "@nestjs/platform-express": "^10.1.0",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.1"
   }

diff --git a/examples/nestjs/tsconfig.json b/examples/nestjs/tsconfig.json
@@ -6,7 +6,7 @@
 		"forceConsistentCasingInFileNames": true,
 		"strict": true,
 		"skipLibCheck": true,
-		"moduleResolution": "Node",
+		"moduleResolution": "Bundler",
 		"experimentalDecorators": true,
 		"types": ["vite/client"]
 	}

diff --git a/examples/simple-standalone/package.json b/examples/simple-standalone/package.json
@@ -8,9 +8,9 @@
     "build": "vite build --ssr --mode=production"
   },
   "devDependencies": {
-    "@types/node": "^18.16.19",
+    "@types/node": "^20.4.2",
     "typescript": "^5.1.6",
     "vavite": "1.8.3",
-    "vite": "^4.4.3"
+    "vite": "^4.4.4"
   }
 }
diff --git a/examples/simple-standalone/tsconfig.json b/examples/simple-standalone/tsconfig.json
@@ -6,6 +6,6 @@
 		"forceConsistentCasingInFileNames": true,
 		"strict": true,
 		"skipLibCheck": true,
-		"moduleResolution": "Node"
+		"moduleResolution": "Bundler"
 	}
 }
diff --git a/examples/socket-io/package.json b/examples/socket-io/package.json
@@ -12,10 +12,10 @@
   ],
   "devDependencies": {
     "@types/express": "^4.17.17",
-    "@types/node": "^18.16.19",
+    "@types/node": "^20.4.2",
     "typescript": "^5.1.6",
     "vavite": "1.8.3",
-    "vite": "^4.4.3"
+    "vite": "^4.4.4"
   },
   "dependencies": {
     "express": "^4.18.2",

diff --git a/examples/socket-io/server.ts b/examples/socket-io/server.ts
@@ -1,28 +1,44 @@
 /// <reference types="vite/client" />
 
-import express, { RequestHandler } from "express";
-import httpDevServer from "vavite/http-dev-server";
-import viteDevServer from "vavite/vite-dev-server";
-import { Server } from "socket.io";
+import express from "express";
+import { Server as SocketIOServer } from "socket.io";
+import type {} from "node:http";
+import type {} from "node:net";
+
+declare module "node:net" {
+	interface Socket {
+		server: import("node:http").Server;
+	}
+}
+
+declare module "node:http" {
+	interface Server {
+		io?: SocketIOServer;
+	}
+}
 
 const app = express();
-const io = new Server();
+
+let io: SocketIOServer;
+
+app.use((req, res, next) => {
+	if (!io || io !== req.socket.server.io) {
+		req.socket.server.io?.close();
+
+		io = req.socket.server.io = new SocketIOServer(req.socket.server);
+
+		io.on("connection", (socket) => {
+			socket.on("chat message", (msg) => {
+				io.emit("chat message", msg);
+			});
+		});
+	}
+
+	next();
+});
 
 app.get("/", async (req, res) => {
 	res.sendFile(process.cwd() + "/view.html");
 });
 
-if (httpDevServer) {
-	httpDevServer.on("request", app);
-	io.attach(viteDevServer.httpServer!);
-} else {
-	console.log("Starting prod server");
-	const server = app.listen(3000);
-	io.attach(server);
-}
-
-io.on("connection", (socket) => {
-	socket.on("chat message", (msg) => {
-		io.emit("chat message", msg);
-	});
-});
+export default app;
diff --git a/examples/socket-io/tsconfig.json b/examples/socket-io/tsconfig.json
@@ -6,6 +6,6 @@
 		"forceConsistentCasingInFileNames": true,
 		"strict": true,
 		"skipLibCheck": true,
-		"moduleResolution": "Node"
+		"moduleResolution": "Bundler"
 	}
 }
diff --git a/examples/socket-io/vite.config.ts b/examples/socket-io/vite.config.ts
@@ -4,7 +4,7 @@ import vavite from "vavite";
 export default defineConfig({
 	plugins: [
 		vavite({
-			serverEntry: "/server.ts",
+			handlerEntry: "/server.ts",
 			reloadOn: "static-deps-change",
 		}),
 	],

diff --git a/examples/ssr-react-express/package.json b/examples/ssr-react-express/package.json
@@ -9,13 +9,13 @@
   },
   "devDependencies": {
     "@types/express": "^4.17.17",
-    "@types/node": "^18.16.19",
-    "@types/react": "^18.2.14",
-    "@types/react-dom": "^18.2.6",
+    "@types/node": "^20.4.2",
+    "@types/react": "^18.2.15",
+    "@types/react-dom": "^18.2.7",
     "@vitejs/plugin-react": "^4.0.3",
     "typescript": "^5.1.6",
     "vavite": "1.8.3",
-    "vite": "^4.4.3"
+    "vite": "^4.4.4"
   },
   "dependencies": {
     "express": "^4.18.2",

diff --git a/examples/ssr-react-express/server-entry.tsx b/examples/ssr-react-express/server-entry.tsx
@@ -30,7 +30,7 @@ async function render(req: Request, res: Response, importer: PageImporter) {
 		clientEntryPath = "/client-entry.tsx";
 	} else {
 		// In production we'll figure out the path to the client entry file using the manifest
-		// @ts-expect-error: This only exists after the client build is complete
+		// @ts-ignore: This only exists after the client build is complete
 		const manifest = (await import("./dist/client/manifest.json")).default;
 		clientEntryPath = manifest["client-entry.tsx"].file;