style(src): 🎨 simpler & improve conditions & functions

package.json

@@ -40,26 +40,27 @@
   ],
   "scripts": {
     "prebuild": "rm -rf dist",
-    "build": "tsc --emitDeclarationOnly --project tsconfig.json",
+    "build": "tsc --emitDeclarationOnly --project tsconfig.build.json",
     "postbuild": "bun run build.config.ts"
   },
   "peerDependencies": {
     "vite": "^5.0.0"
   },
   "devDependencies": {
-    "@types/bun": "latest",
+    "@types/bun": "^1.0.5",
     "@types/minify": "^9.1.4",
-    "@types/node": "^20.11.8",
+    "@types/node": "^20.11.17",
     "@typescript-eslint/eslint-plugin": "latest",
     "@typescript-eslint/parser": "latest",
     "eslint": "latest",
     "minify": "^11.0.1",
-    "prettier": "^3.2.4",
+    "prettier": "^3.2.5",
     "typescript": "^5.3.3",
-    "vite": "^5.0.12"
+    "vite": "^5.1.1"
   },
   "dependencies": {
     "picocolors": "^1.0.0",
+    "semver": "^7.6.0",
     "vite-plugin-full-reload": "^1.1.0"
   }
 }

src/handlers/_getServerUrl.ts → src/handlers/_getDevServerUrl.ts

@@ -4,7 +4,7 @@ import type { ResolvedConfig } from "vite";
 import { isIpv6 } from "@utils/uri";
 import { HTTP_PROTOCOLS } from "@config/http";
 
-export const _getServerUrl = (address: AddressInfo, config: ResolvedConfig): string => {
+export const _getDevServerUrl = (address: AddressInfo, config: ResolvedConfig): string => {
 	const configHmrProtocol =
 		typeof config.server.hmr === "object" ? config.server.hmr.protocol : null;
 	const clientProtocol = configHmrProtocol
@@ -24,5 +24,5 @@ export const _getServerUrl = (address: AddressInfo, config: ResolvedConfig): str
 		typeof config.server.hmr === "object" ? config.server.hmr.clientPort : null;
 	const port = configHmrClientPort ?? address.port;
 
-	return `${protocol}://${host}:${port}`;
+	return config.server?.origin ?? `${protocol}://${host}:${port}`;
 };

src/handlers/_handleDevServer.ts

@@ -1,17 +1,17 @@
 import { loadEnv } from "vite";
-import type { ResolvedConfig, ViteDevServer } from "vite";
+import type { ViteDevServer } from "vite";
 
 import { joinPaths } from "@utils/string";
 import { getCurrentPath } from "@utils/uri";
 import { appConfig } from "@config/constant";
 import { readFileAsString } from "@utils/io";
 
-export const _handleDevServer = (config: ResolvedConfig, server: ViteDevServer) => {
-	const envDir = config.envDir || process.cwd();
+export const _handleDevServer = ({ config, middlewares }: ViteDevServer) => {
 	const { serverListener, placeholder, placeholderRegExp } = appConfig;
-	const appUrl = loadEnv(config.mode, envDir, "")[placeholder] ?? "undefined";
+	const appUrl =
+		loadEnv(config.mode, config.envDir || process.cwd(), "")[placeholder] ?? "undefined";
 
-	return server.middlewares.use(async (req, res, next) => {
+	return middlewares.use(async (req, res, next) => {
 		if (req.url === `/${serverListener}`) {
 			res.writeHead(200, { "Content-Type": "text/html" });
 			res.end(

src/handlers/_logger.ts

@@ -1,23 +1,38 @@
+import { loadEnv } from "vite";
 import type { ViteDevServer } from "vite";
 
+import { appConfig } from "@config/constant";
 import { highlighter } from "@utils/decorate";
 import { getFrameworkVersion, getPluginVersion } from "@utils/version";
 
 export const _handleLogger = (server: ViteDevServer): void => {
+	const { placeholder } = appConfig;
+	const { mode, envDir, logger } = server.config;
+	const appUrl = {
+		name: "App Url",
+		version: loadEnv(mode, envDir || process.cwd(), "")[placeholder] ?? "undefined"
+	};
+
 	setTimeout(() => {
-		server.config.logger.info("");
+		logger.info("");
 
 		Promise.all([getFrameworkVersion(), getPluginVersion()])
 			.then((values) => {
 				if (server.resolvedUrls) {
 					for (const value of values) {
-						server.config.logger.info(highlighter(value));
+						logger.info(
+							highlighter({
+								name: value.name,
+								version: `v${value.version.replace("v", "")}`
+							})
+						);
 					}
 				}
 			})
 			.catch((error) => {
-				server.config.logger.error(error);
+				logger.error(error);
 				server.close();
-			});
+			})
+			.finally(() => logger.info("\n" + highlighter(appUrl)));
 	}, 100);
 };

src/handlers/server.ts

@@ -1,4 +1,4 @@
-import { type ResolvedConfig, type ViteDevServer } from "vite";
+import type { ViteDevServer } from "vite";
 
 import { writingFile } from "@utils/io";
 import { joinPaths } from "@utils/string";
@@ -7,13 +7,12 @@ import { appConfig } from "@config/constant";
 import { Errors, errorMessages } from "@utils/errors";
 
 import { _handleLogger } from "./_logger";
-import { _devServerUrl } from "./_devServerUrl";
 import { _handleExitProcess } from "./_processes";
+import { _getDevServerUrl } from "./_getDevServerUrl";
 import { _handleDevServer } from "./_handleDevServer";
 
 export const handleConfigureServer = (
-	server: ViteDevServer,
-	config: ResolvedConfig
+	server: ViteDevServer
 ): (() => void) | void | Promise<(() => void) | void> => {
 	const { publicDirectory, hotFile } = appConfig;
 	const hotFilePath = joinPaths(publicDirectory, hotFile);
@@ -22,7 +21,7 @@ export const handleConfigureServer = (
 		const address = server.httpServer?.address();
 
 		if (isAddressInfo(address)) {
-			writingFile(hotFilePath, _devServerUrl(config, server, address))
+			writingFile(hotFilePath, _getDevServerUrl(address, server.config))
 				.then(() => _handleLogger(server))
 				.catch(() => {
 					server.config.logger.error(errorMessages(Errors.UnableToWriteHotFile));
@@ -33,5 +32,5 @@ export const handleConfigureServer = (
 
 	_handleExitProcess();
 
-	return () => _handleDevServer(config, server);
+	return () => _handleDevServer(server);
 };

src/plugins/ci4.ts

@@ -23,6 +23,6 @@ export const ci4 = (_config: Required<PluginConfig>): Ci4Plugin => {
 				return _config.transformOnServe(code, devServerUrl);
 			}
 		},
-		configureServer: (server) => handleConfigureServer(server, config)
+		configureServer: handleConfigureServer
 	};
 };

src/resolvers/_aliases.ts

@@ -1,18 +1,14 @@
+/* eslint-disable indent */
 import type { AliasOptions, UserConfig } from "vite";
 import { appConfig } from "@config/constant";
 
-export const _resolveAliases = (config: UserConfig): AliasOptions => {
-	if (Array.isArray(config.resolve?.alias)) {
-		return [
-			...(config.resolve?.alias ?? []),
-			...Object.keys(appConfig.alias).map((alias) => ({
-				find: alias,
-				replacement: appConfig.alias[alias]
-			}))
-		];
-	}
-	return {
-		...appConfig.alias,
-		...config.resolve?.alias
-	};
-};
+export const _resolveAliases = (config: UserConfig): AliasOptions =>
+	Array.isArray(config.resolve?.alias)
+		? [
+				...(config.resolve?.alias ?? []),
+				...Object.keys(appConfig.alias).map((alias) => ({
+					find: alias,
+					replacement: appConfig.alias[alias]
+				}))
+			]
+		: { ...appConfig.alias, ...config.resolve?.alias };

src/utils/decorate.ts

@@ -2,4 +2,4 @@ import colors from "picocolors";
 import type { JsonVersion } from "src/types";
 
 export const highlighter = (plugin: JsonVersion): string =>
-	`  ${colors.green("➜")}  ${colors.white(plugin.name)}: ${colors.cyan(`v${plugin.version.replace("v", "")}`)}`;
+	`  ${colors.green("➜")}  ${colors.white(plugin.name)}: ${colors.cyan(plugin.version)}`;

tsconfig.build.json

@@ -0,0 +1,5 @@
+{
+  "extends": ["./tsconfig.json"],
+  "compilerOptions": { "rootDir": "./src/" },
+  "exclude": ["tests"]
+}

tsconfig.json

@@ -25,20 +25,17 @@
     "useUnknownInCatchVariables": true,
     "noPropertyAccessFromIndexSignature": true,
     "outDir": "dist",
-    "types": ["vite", "bun"],
 
     // Paths
     "baseUrl": ".",
-    "rootDir": "./src",
     "paths": {
       "@config/*": ["./src/config/*"],
       "@handlers/*": ["./src/handlers/*"],
       "@plugins/*": ["./src/plugins/*"],
       "@resolvers/*": ["./src/resolvers/*"],
-      // "@type": ["./src/types/index.ts"],
       "@utils/*": ["./src/utils/*"]
     }
   },
-  "include": ["src"],
+  "include": ["src", "tests"],
   "exclude": ["node_modules"]
 }