vite-plugin-fvtt 0.2.10 → 0.2.12

package/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 ## [Unreleased]
 
+## [0.2.12]
+
+### Changed
+
+- Switch to oxc for minification when using Vite 8+, falling back to esbuild for older versions.
+- Bump @foundryvtt/foundryvtt-cli to version 3.0.4
+
+## [0.2.11]
+
+### Changed
+
+- Bump @foundryvtt/foundryvtt-cli to version 3.0.3
+- Updated `package.json` for dependencies, for the correct semver ranges.
+
+## [0.2.10] - 2026-01-01
+
+### Changed
+
+- Bump socket.io to 4.8.3
+
 ### Fixed
 
 - Middleware now returns an empty CSS asset instead of a 404, when Vite handles style injection.
@@ -151,7 +171,10 @@
 
 - Initial Release
 
-[unreleased]: https://github.com/MatyeusM/vite-plugin-fvtt/compare/v0.2.9...HEAD
+[unreleased]: https://github.com/MatyeusM/vite-plugin-fvtt/compare/v0.2.11...HEAD
+[0.2.12]: https://github.com/MatyeusM/vite-plugin-fvtt/compare/v0.2.11...v0.2.12
+[0.2.11]: https://github.com/MatyeusM/vite-plugin-fvtt/compare/v0.2.10...v0.2.11
+[0.2.10]: https://github.com/MatyeusM/vite-plugin-fvtt/compare/v0.2.9...v0.2.10
 [0.2.9]: https://github.com/MatyeusM/vite-plugin-fvtt/compare/v0.2.8...v0.2.9
 [0.2.8]: https://github.com/MatyeusM/vite-plugin-fvtt/compare/v0.2.7...v0.2.8
 [0.2.7]: https://github.com/MatyeusM/vite-plugin-fvtt/compare/v0.2.6...v0.2.7

package/dist/index.mjs

@@ -1,18 +1,17 @@
 import path from "node:path";
 import { glob } from "tinyglobby";
 import fs from "node:fs/promises";
+import { mergeConfig, version } from "vite";
 import { compilePack } from "@foundryvtt/foundryvtt-cli";
 import { Server } from "socket.io";
 import { io } from "socket.io-client";
-
 //#region src/context.ts
 const context = {};
-
 //#endregion
 //#region src/utils/fs-utilities.ts
-async function checkType(p, check) {
+async function checkType(p, isMatching) {
 	try {
-		return check(await fs.stat(p));
+		return isMatching(await fs.stat(p));
 	} catch {
 		return false;
 	}
@@ -34,7 +33,6 @@ async function readJson(filePath) {
 		return;
 	}
 }
-
 //#endregion
 //#region src/config/environment.ts
 function parseEnvironment(content) {
@@ -62,13 +60,12 @@ async function loadEnvironment() {
 	}
 	return {
 		foundryUrl: merged.FOUNDRY_URL,
-		foundryPort: Number.parseInt(merged.FOUNDRY_PORT, 10)
+		foundryPort: Number(merged.FOUNDRY_PORT)
 	};
 }
-
 //#endregion
 //#region src/utils/logger.ts
-let loggerNamespace = "vite-plugin-fvtt";
+const config = { loggerNamespace: "vite-plugin-fvtt" };
 const colors = {
 	info: "\x1B[36m",
 	warn: "\x1B[33m",
@@ -76,7 +73,7 @@ const colors = {
 };
 const reset = "\x1B[0m";
 function format(level, message) {
-	return `${colors[level] ?? ""}[${loggerNamespace}] [${level.toUpperCase()}]${reset} ${message}`;
+	return `${colors[level] ?? ""}[${config.loggerNamespace}] [${level.toUpperCase()}]${reset} ${message}`;
 }
 function info(message) {
 	console.log(format("info", message));
@@ -96,7 +93,6 @@ function stringify(message) {
 	if (message instanceof Error) return message.stack ?? message.message;
 	return typeof message === "string" ? message : JSON.stringify(message, void 0, 2);
 }
-
 //#endregion
 //#region src/config/foundryvtt-manifest.ts
 async function resolveManifestPath(publicDirectory) {
@@ -142,20 +138,43 @@ async function loadManifest(config) {
 	if (!foundPath) fail(`Could not find a manifest file (system.json or module.json) in project root or ${publicDirectory}/.`);
 	try {
 		return validateManifest(await readJson(foundPath), foundPath);
-	} catch (error$1) {
-		if (error$1 instanceof Error) fail(`Failed to read manifest at ${foundPath}: ${error$1.message}`);
-		fail(`Failed to read manifest at ${foundPath}: ${String(error$1)}`);
+	} catch (error) {
+		if (error instanceof Error) fail(`Failed to read manifest at ${foundPath}: ${error.message}`);
+		fail(`Failed to read manifest at ${foundPath}: ${String(error)}`);
 	}
 }
-
 //#endregion
 //#region src/config/vite-options.ts
+function getViteMajorVersion() {
+	try {
+		return Number(version.split(".", 1)[0]);
+	} catch {
+		return 8;
+	}
+}
+const oxcMinifyOptions = { build: {
+	minify: "oxc",
+	rollupOptions: { output: { minify: {
+		compress: true,
+		mangle: false
+	} } }
+} };
+const esbuildMinifyOptions = (config) => ({
+	build: { minify: "esbuild" },
+	esbuild: config.esbuild ?? {
+		minifyIdentifiers: false,
+		minifySyntax: true,
+		minifyWhitespace: true,
+		keepNames: true
+	}
+});
 function createPartialViteConfig(config) {
 	const base = config.base ?? `/${context.manifest?.manifestType}s/${context.manifest?.id}/`;
-	const useEsModules = context.manifest?.esmodules.length === 1;
-	const formats = useEsModules ? ["es"] : ["umd"];
-	const fileName = (useEsModules ? context.manifest?.esmodules[0] : context.manifest?.scripts?.[0]) ?? "scripts/bundle.js";
-	if (!(useEsModules || context.manifest?.scripts?.[0])) warn("No output file specified in manifest, using default \"bundle\" in the \"scripts/\" folder");
+	const isUseEsModules = context.manifest?.esmodules.length === 1;
+	const formats = isUseEsModules ? ["es"] : ["umd"];
+	const isVite8OrAbove = getViteMajorVersion() >= 8;
+	const fileName = (isUseEsModules ? context.manifest?.esmodules[0] : context.manifest?.scripts?.[0]) ?? "scripts/bundle.js";
+	if (!(isUseEsModules || context.manifest?.scripts?.[0])) warn("No output file specified in manifest, using default \"bundle\" in the \"scripts/\" folder");
 	if (!context.manifest?.styles?.length) warn("No CSS file found in manifest");
 	const cssFileName = context.manifest?.styles[0] ?? "styles/bundle.css";
 	if (!context.manifest?.styles[0]) warn("No output css file specified in manifest, using default \"bundle\" in the \"styles/\" folder");
@@ -167,7 +186,7 @@ function createPartialViteConfig(config) {
 	if (!entry) fail("Entry must be specified in lib");
 	if (typeof entry !== "string") fail("Only a singular string entry is supported for build.lib.entry");
 	const isWatch = process.argv.includes("--watch") || !!config.build?.watch;
-	return {
+	return mergeConfig({
 		base,
 		build: {
 			emptyOutDir: config.build?.emptyOutDir ?? !isWatch,
@@ -177,7 +196,6 @@ function createPartialViteConfig(config) {
 				name: context.manifest?.id ?? "bundle",
 				cssFileName: "bundle"
 			},
-			minify: "esbuild",
 			rollupOptions: { output: {
 				entryFileNames: fileName,
 				assetFileNames: (assetInfo) => {
@@ -190,19 +208,12 @@ function createPartialViteConfig(config) {
 			id: context.manifest?.id,
 			isSystem: context.manifest?.manifestType === "system"
 		} },
-		esbuild: config.esbuild ?? {
-			minifyIdentifiers: false,
-			minifySyntax: true,
-			minifyWhitespace: true,
-			keepNames: true
-		},
 		server: {
 			port: foundryPort + 1,
 			proxy: { [`^(?!${base})`]: `http://${foundryUrl}:${foundryPort}` }
 		}
-	};
+	}, isVite8OrAbove ? oxcMinifyOptions : esbuildMinifyOptions(config));
 }
-
 //#endregion
 //#region src/server/trackers/abstract-file-tracker.ts
 var AbstractFileTracker = class {
@@ -237,7 +248,6 @@ var AbstractFileTracker = class {
 		}
 	}
 };
-
 //#endregion
 //#region src/server/trackers/language-tracker.ts
 var LanguageTracker = class extends AbstractFileTracker {
@@ -250,59 +260,53 @@ var LanguageTracker = class extends AbstractFileTracker {
 	}
 };
 const languageTracker = new LanguageTracker();
-
 //#endregion
 //#region src/utils/path-utilities.ts
-let _config;
-let _sourceDirectory;
-let _decodedBase;
-let _publicDirectory;
-let _outDirectory;
-let _root;
+const cache = {};
 function getConfig() {
-	if (!_config) {
+	if (!cache.config) {
 		const config = context.config;
 		if (!config) fail("Path utils can only be called after vite has resolved the config");
-		_config = config;
+		cache.config = config;
 	}
-	return _config;
+	return cache.config;
 }
 function getDecodedBase() {
-	if (!_decodedBase) {
+	if (!cache.decodedBase) {
 		const config = getConfig();
-		_decodedBase = path.posix.normalize(decodeURI(config.base));
+		cache.decodedBase = path.posix.normalize(decodeURI(config.base));
 	}
-	return _decodedBase;
+	return cache.decodedBase;
 }
 function getSourceDirectory() {
-	if (!_sourceDirectory) {
+	if (!cache.sourceDirectory) {
 		const config = getConfig();
 		const segments = path.normalize(config.build.lib.entry.toString()).split(path.sep).filter(Boolean).filter((s) => s !== ".");
 		const firstFolder = segments.length > 0 ? segments[0] : ".";
-		_sourceDirectory = path.join(config.root, firstFolder);
+		cache.sourceDirectory = path.join(config.root, firstFolder);
 	}
-	return _sourceDirectory;
+	return cache.sourceDirectory;
 }
 function getPublicDirectory() {
-	if (!_publicDirectory) {
+	if (!cache.publicDirectory) {
 		const config = getConfig();
-		_publicDirectory = path.resolve(config.publicDir);
+		cache.publicDirectory = path.resolve(config.publicDir);
 	}
-	return _publicDirectory;
+	return cache.publicDirectory;
 }
 function getOutDirectory() {
-	if (!_outDirectory) {
+	if (!cache.outDirectory) {
 		const config = getConfig();
-		_outDirectory = path.resolve(config.build.outDir);
+		cache.outDirectory = path.resolve(config.build.outDir);
 	}
-	return _outDirectory;
+	return cache.outDirectory;
 }
 function getRoot() {
-	if (!_root) {
+	if (!cache.root) {
 		const config = getConfig();
-		_root = path.resolve(config.root);
+		cache.root = path.resolve(config.root);
 	}
-	return _root;
+	return cache.root;
 }
 async function getOutDirectoryFile(p) {
 	const file = path.join(getOutDirectory(), p);
@@ -347,14 +351,16 @@ function getLanguageSourcePath(p, lang) {
 	const finalSegments = path.basename(directory) === lang ? directory : path.join(directory, lang);
 	return path.join(getSourceDirectory(), finalSegments);
 }
-
+async function findFirstExistingDirectory(directories) {
+	for (const directory of directories) if (await directoryExists(directory)) return directory;
+}
 //#endregion
 //#region src/language/loader.ts
-async function getLocalLanguageFiles(lang, inOutDirectory = false) {
+async function getLocalLanguageFiles(lang, isInOutDirectory = false) {
 	const language = context.manifest.languages.find((l) => l.lang === lang);
 	if (!language) fail(`Cannot find language "${lang}"`);
 	const langPath = language?.path ?? "";
-	if (inOutDirectory) return [await getOutDirectoryFile(langPath)];
+	if (isInOutDirectory) return [await getOutDirectoryFile(langPath)];
 	const publicDirectoryFile = await getPublicDirectoryFile(langPath);
 	if (publicDirectoryFile !== "") return [publicDirectoryFile];
 	const sourcePath = getLanguageSourcePath(langPath, lang);
@@ -362,8 +368,8 @@ async function getLocalLanguageFiles(lang, inOutDirectory = false) {
 	warn(`No language folder found at: ${sourcePath}`);
 	return [];
 }
-async function loadLanguage(lang, inOutDirectory = false) {
-	const files = await getLocalLanguageFiles(lang, inOutDirectory);
+async function loadLanguage(lang, isInOutDirectory = false) {
+	const files = await getLocalLanguageFiles(lang, isInOutDirectory);
 	const result = /* @__PURE__ */ new Map();
 	const reads = files.map(async (file) => {
 		try {
@@ -371,8 +377,8 @@ async function loadLanguage(lang, inOutDirectory = false) {
 			if (typeof json !== "object" || json === null) throw new Error(`Language file ${file} is not a valid JSON object`);
 			languageTracker.addFile(lang, file);
 			return [file, json];
-		} catch (error$1) {
-			warn(error$1);
+		} catch (error) {
+			warn(error);
 			return;
 		}
 	});
@@ -380,7 +386,6 @@ async function loadLanguage(lang, inOutDirectory = false) {
 	for (const entry of results) if (entry) result.set(entry[0], entry[1]);
 	return result;
 }
-
 //#endregion
 //#region src/language/transformer.ts
 function flattenKeys(object, prefix = "") {
@@ -400,10 +405,10 @@ function expandDotNotationKeys(target, source, depth = 0) {
 		const parts = key.split(".");
 		const lastKey = parts.pop();
 		for (const part of parts) {
-			if (!(part in current)) current[part] = {};
+			if (!Object.hasOwn(current, part)) current[part] = {};
 			current = current[part];
 		}
-		if (lastKey in current) console.warn(`Warning: Overwriting key "${lastKey}" during transformation.`);
+		if (Object.hasOwn(current, lastKey)) console.warn(`Warning: Overwriting key "${lastKey}" during transformation.`);
 		current[lastKey] = expandDotNotationKeys({}, value, depth + 1);
 	}
 	return target;
@@ -413,7 +418,6 @@ function transform(dataMap) {
 	for (const data of dataMap.values()) expandDotNotationKeys(mergedData, data);
 	return mergedData;
 }
-
 //#endregion
 //#region src/language/validator.ts
 function getFirstMapValueOrWarn(map, contextDescription) {
@@ -441,15 +445,14 @@ async function validator() {
 		const current = getFirstMapValueOrWarn(await loadLanguage(lang.lang, true), `Language "${lang.lang}"`);
 		if (!current) continue;
 		const currentFlattened = flattenKeys(current);
-		const missing = Object.keys(baseFlattened).filter((key) => !(key in currentFlattened));
-		const extra = Object.keys(currentFlattened).filter((key) => !(key in baseFlattened));
+		const missing = Object.keys(baseFlattened).filter((key) => !Object.hasOwn(currentFlattened, key));
+		const extra = Object.keys(currentFlattened).filter((key) => !Object.hasOwn(baseFlattened, key));
 		info(`Summary for language [${lang.lang}]:`);
 		if (missing.length > 0) console.warn(`Missing keys: ${missing.length}`, missing.slice(0, 5));
 		if (extra.length > 0) console.warn(`Extra keys: ${extra.length}`, extra.slice(0, 5));
 		if (missing.length === 0 && extra.length === 0) console.log("	✅ All keys match.");
 	}
 }
-
 //#endregion
 //#region src/packs/compile-packs.ts
 async function compileManifestPacks() {
@@ -457,11 +460,7 @@ async function compileManifestPacks() {
 	for (const pack of context.manifest.packs) {
 		const sourceCandidates = [path.resolve(getSourceDirectory(), pack.path), path.resolve(getRoot(), pack.path)];
 		const destination = path.resolve(getOutDirectory(), pack.path);
-		let chosenSource;
-		for (const candidate of sourceCandidates) if (await directoryExists(candidate)) {
-			chosenSource = candidate;
-			break;
-		}
+		const chosenSource = await findFirstExistingDirectory(sourceCandidates);
 		if (!chosenSource) {
 			warn(`Pack path not found for ${pack.path}, skipped.`);
 			continue;
@@ -477,7 +476,6 @@ async function compileManifestPacks() {
 		info(`Compiled pack ${pack.path} (${hasYaml ? "YAML" : "JSON"}) from ${chosenSource}`);
 	}
 }
-
 //#endregion
 //#region src/server/trackers/handlebars-tracker.ts
 var HandlebarsTracker = class extends AbstractFileTracker {
@@ -490,20 +488,18 @@ var HandlebarsTracker = class extends AbstractFileTracker {
 	}
 };
 const handlebarsTracker = new HandlebarsTracker();
-
 //#endregion
 //#region src/server/http-middleware.ts
 function httpMiddlewareHook(server) {
 	server.middlewares.use(async (request, response, next) => {
-		const config = context.config;
 		if (!isFoundryVTTUrl(request.url ?? "")) {
 			next();
 			return;
 		}
-		const cssEntryName = config.build.lib.cssFileName;
+		const cssEntryName = context.config.build.lib.cssFileName;
 		const cssEntry = cssEntryName ? localToFoundryVTTUrl(`${cssEntryName}.css`) : void 0;
 		const cssFileName = context.manifest?.styles[0] ?? "styles/bundle.css";
-		const cssFile = cssFileName ? localToFoundryVTTUrl(`${cssFileName}`) : void 0;
+		const cssFile = cssFileName ? localToFoundryVTTUrl(cssFileName) : void 0;
 		const normalizedPath = path.posix.normalize(request.url ?? "");
 		if (normalizedPath === cssEntry || normalizedPath == cssFile) {
 			info(`Blocking CSS entry to ${request.url}`);
@@ -522,7 +518,6 @@ function httpMiddlewareHook(server) {
 		next();
 	});
 }
-
 //#endregion
 //#region src/server/socket-proxy.ts
 function socketProxy(server) {
@@ -559,7 +554,6 @@ function socketProxy(server) {
 		});
 	});
 }
-
 //#endregion
 //#region src/server/index.ts
 function setupDevelopmentServer(server) {
@@ -568,7 +562,6 @@ function setupDevelopmentServer(server) {
 	httpMiddlewareHook(server);
 	socketProxy(server);
 }
-
 //#endregion
 //#region src/server/hmr-client.ts
 var hmr_client_default = `
@@ -657,53 +650,55 @@ if (import.meta.hot) {
   })
 } else console.error('Vite | HMR is disabled')
 //`;
-
 //#endregion
 //#region src/index.ts
+async function generateBundleImpl(pluginContext) {
+	for (const file of ["system.json", "module.json"]) {
+		const source = path.resolve(file);
+		if (!await getPublicDirectoryFile(file) && await fileExists(source)) {
+			pluginContext.addWatchFile(source);
+			const manifest = await readJson(source);
+			pluginContext.emitFile({
+				type: "asset",
+				fileName: file,
+				source: JSON.stringify(manifest, void 0, 2)
+			});
+		}
+	}
+	const languages = context.manifest?.languages ?? [];
+	if (languages.length > 0) for (const language of languages) {
+		if (await getPublicDirectoryFile(language.path)) continue;
+		const langFiles = await getLocalLanguageFiles(language.lang);
+		for (const file of langFiles) pluginContext.addWatchFile(file);
+		const languageData = transform(await loadLanguage(language.lang));
+		pluginContext.emitFile({
+			type: "asset",
+			fileName: path.join(language.path),
+			source: JSON.stringify(languageData, void 0, 2)
+		});
+	}
+}
 async function foundryVTTPlugin({ buildPacks = true } = {}) {
 	context.env = await loadEnvironment();
-	return {
-		name: "vite-plugin-fvtt",
+	class FoundryVTTPluginInstance {
+		name = "vite-plugin-fvtt";
+		configureServer = setupDevelopmentServer;
 		async config(config) {
 			context.manifest = await loadManifest(config) ?? void 0;
 			return createPartialViteConfig(config);
-		},
+		}
 		configResolved(config) {
 			context.config = config;
-		},
+		}
 		async generateBundle() {
-			for (const file of ["system.json", "module.json"]) {
-				const source = path.resolve(file);
-				if (!await getPublicDirectoryFile(file) && await fileExists(source)) {
-					this.addWatchFile(source);
-					const manifest = await readJson(source);
-					this.emitFile({
-						type: "asset",
-						fileName: file,
-						source: JSON.stringify(manifest, void 0, 2)
-					});
-				}
-			}
-			const languages = context.manifest?.languages ?? [];
-			if (languages.length > 0) for (const language of languages) {
-				if (await getPublicDirectoryFile(language.path)) continue;
-				getLocalLanguageFiles(language.lang).then((langFiles) => {
-					for (const file of langFiles) this.addWatchFile(file);
-				});
-				const languageData = transform(await loadLanguage(language.lang));
-				this.emitFile({
-					type: "asset",
-					fileName: path.join(language.path),
-					source: JSON.stringify(languageData, void 0, 2)
-				});
-			}
-		},
+			await generateBundleImpl(this);
+		}
 		async writeBundle() {
 			if (buildPacks) await compileManifestPacks();
-		},
+		}
 		closeBundle() {
 			if ((context.manifest?.languages ?? []).length > 0 && context.config?.command === "build") validator();
-		},
+		}
 		load(id) {
 			const config = context.config;
 			const output = config.build.rollupOptions?.output;
@@ -711,10 +706,9 @@ async function foundryVTTPlugin({ buildPacks = true } = {}) {
 			if (Array.isArray(output)) jsFileName = String(output[0].entryFileNames);
 			else if (output) jsFileName = String(output.entryFileNames);
 			if (id === jsFileName || id === `/${jsFileName}`) return `import '${`/@fs/${path.resolve(config.build.lib.entry)}`}';\n${hmr_client_default}`;
-		},
-		configureServer: setupDevelopmentServer
-	};
+		}
+	}
+	return new FoundryVTTPluginInstance();
 }
-
 //#endregion
-export { foundryVTTPlugin as default };
+export { foundryVTTPlugin as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-fvtt",
-  "version": "0.2.10",
+  "version": "0.2.12",
   "description": "A Vite plugin for module and system development for Foundry VTT",
   "keywords": [
     "vite",
@@ -35,23 +35,24 @@
     "test": "vitest"
   },
   "devDependencies": {
-    "@eslint/js": "^9.39.1",
-    "@types/node": "^25.0.1",
-    "eslint": "^9.39.1",
-    "eslint-plugin-sonarjs": "^3.0.5",
-    "eslint-plugin-unicorn": "^62.0.0",
-    "prettier": "^3.6.2",
-    "tsdown": "^0.18.3",
-    "typescript": "^5.9.3",
-    "typescript-eslint": "^8.46.4",
-    "vite": "^7.2.2",
-    "vitest": "^4.0.9"
+    "@eslint/js": "^10.0.1",
+    "@types/node": "^26.1.0",
+    "eslint": "^10.6.0",
+    "eslint-plugin-sonarjs": "^4.1.0",
+    "eslint-plugin-unicorn": "^70.0.0",
+    "prettier": "^3.9.4",
+    "rolldown": "^1.1.4",
+    "tsdown": "^0.22.3",
+    "typescript": "^6.0.3",
+    "typescript-eslint": "^8.62.1",
+    "vite": "^8.1.3",
+    "vitest": "^4.1.10"
   },
   "dependencies": {
-    "@foundryvtt/foundryvtt-cli": "^3.0.2",
-    "socket.io": "^4.8.1",
-    "socket.io-client": "^4.8.1",
-    "tinyglobby": "^0.2.15"
+    "@foundryvtt/foundryvtt-cli": "^3.0.4",
+    "socket.io": "^4.8.3",
+    "socket.io-client": "^4.8.3",
+    "tinyglobby": "^0.2.17"
   },
   "peerDependencies": {
     "vite": "^7.0.0"