vite-plugin-fvtt 0.1.3 → 0.1.4

package/dist/index.js

@@ -95,26 +95,36 @@ 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]) ?? "bundle";
-	if (fileName === "bundle") logger_default.warn("No output file specified in manifest, using default \"bundle\"");
+	const fileName = (useEsModules ? context.manifest?.esmodules[0] : context.manifest?.scripts?.[0]) ?? "scripts/bundle.js";
+	if (!(useEsModules || context.manifest?.scripts?.[0])) logger_default.warn("No output file specified in manifest, using default \"bundle\" in the \"scripts/\" folder");
 	if (!context.manifest?.styles?.length) logger_default.warn("No CSS file found in manifest");
-	const cssFileName = posix.parse(context.manifest?.styles[0] ?? "bundle.css").name;
+	const cssFileName = context.manifest?.styles[0] ?? "styles/bundle.css";
+	if (!context.manifest?.styles[0]) logger_default.warn("No output css file specified in manifest, using default \"bundle\" in the \"styles/\" folder");
 	const foundryPort = context.env?.foundryPort ?? 3e4;
 	const foundryUrl = context.env?.foundryUrl ?? "localhost";
 	const entry = (config.build?.lib)?.entry;
 	if (!entry) logger_default.fail("Entry must be specified in lib");
 	if (typeof entry !== "string") logger_default.fail("Only a singular string entry is supported for build.lib.entry");
+	const isWatch = process.argv.includes("--watch") || !!config.build?.watch;
 	return {
 		base,
 		build: {
-			minify: "esbuild",
+			emptyOutDir: config.build?.emptyOutDir ?? !isWatch,
 			lib: {
-				cssFileName,
 				entry,
-				fileName,
 				formats,
-				name: context.manifest?.id
-			}
+				name: context.manifest?.id ?? "bundle",
+				cssFileName: "bundle"
+			},
+			minify: "esbuild",
+			rollupOptions: { output: {
+				entryFileNames: fileName,
+				assetFileNames: (assetInfo) => {
+					const names = assetInfo.names ?? [];
+					if (names.some((n) => n.endsWith(".css"))) return cssFileName;
+					return "[name][extname]";
+				}
+			} }
 		},
 		define: { __FVTT_PLUGIN__: {
 			id: context.manifest?.id,
@@ -133,85 +143,6 @@ function createPartialViteConfig(config) {
 	};
 }
 
-//#endregion
-//#region src/server/hmr-client.ts
-var hmr_client_default = `
-if (import.meta.hot) {
-  const FVTT_PLUGIN = __FVTT_PLUGIN__
-
-  function refreshApplications(path = null) {
-    // AppV1 refresh
-    Object.values(foundry.ui.windows).forEach(app => app.render(true))
-    // AppV2 refresh
-    if (path)
-      foundry.applications.instances.forEach(appV2 => {
-        Object.values(appV2.constructor.PARTS ?? {}).forEach(part => {
-          const templates = Array.isArray(part.templates) ? part.templates : []
-          if (part.template === path || templates.includes(path)) appV2.render(true)
-        })
-      })
-    else foundry.applications.instances.forEach(appV2 => appV2.render(true))
-  }
-
-  import.meta.hot.on('foundryvtt-template-update', ({ path }) => {
-    game.socket.emit('template', path, response => {
-      if (response.error) new Error(response.error)
-      let template = undefined
-      try {
-        template = Handlebars.compile(response.html)
-      } catch (error) {
-        console.error(error)
-        return
-      }
-      Handlebars.registerPartial(path, template)
-      console.log(\`Vite | Retrieved and compiled template \${path}\`)
-      refreshApplications(path)
-    })
-  })
-
-  async function hmrLanguage(lang, targetObject = game.i18n.translations) {
-    try {
-      const languages = FVTT_PLUGIN.isSystem
-        ? game.system.languages
-        : game.modules.get(FVTT_PLUGIN.id)?.languages
-      if (!languages) {
-        console.warn(
-          'Vite | Got a HMR request to reload languages, however no languages were found.',
-        )
-        return
-      }
-      const langEntry = languages.find(l => l.lang === lang)
-      if (!langEntry) {
-        console.warn('Vite | Got an HMR request for an undefined language')
-        return
-      }
-
-      const url = langEntry.path
-      const resp = await fetch(url)
-      if (!resp.ok) throw new Error('Failed to fetch language file!')
-
-      const json = await resp.json()
-
-      foundry.utils.mergeObject(targetObject, json)
-      console.log(\`Vite | HMR: Reloaded language '\${lang}'\`)
-    } catch (error) {
-      console.error(\`Vite | HMR: Error reloading language '\${lang}' for \${FVTT_PLUGIN.id}\`, error);
-    }
-  }
-
-  import.meta.hot.on('foundryvtt-language-update', async () => {
-    const currentLang = game.i18n.lang
-    const promises = []
-    if (currentLang !== 'en') {
-      promises.push(hmrLanguage('en', game.i18n._fallback))
-    }
-    promises.push(hmrLanguage(currentLang))
-    await Promise.all(promises)
-    refreshApplications()
-  })
-} else console.error('Vite | HMR is disabled')
-//`;
-
 //#endregion
 //#region src/server/trackers/abstract-file-tracker.ts
 var AbstractFileTracker = class {
@@ -247,19 +178,6 @@ var AbstractFileTracker = class {
 	}
 };
 
-//#endregion
-//#region src/server/trackers/handlebars-tracker.ts
-var HandlebarsTracker = class extends AbstractFileTracker {
-	updateEvent = "foundryvtt-template-update";
-	constructor() {
-		super(context.config);
-	}
-	getEventData(changedPath, value) {
-		return { path: value };
-	}
-};
-const handlebarsTracker = new HandlebarsTracker();
-
 //#endregion
 //#region src/server/trackers/language-tracker.ts
 var LanguageTracker = class extends AbstractFileTracker {
@@ -445,6 +363,46 @@ function transform(dataMap) {
 	return mergedData;
 }
 
+//#endregion
+//#region src/language/validator.ts
+function validator() {
+	const manifest = context.manifest;
+	const baseLanguageData = loadLanguage("en", true);
+	if (baseLanguageData.size === 0) {
+		logger_default.error("Base language \"en\" not found or could not be loaded.");
+		return;
+	}
+	const base = flattenKeys(baseLanguageData.values().next().value);
+	for (const lang of manifest.languages) {
+		if (lang.lang === "en") continue;
+		const currentLanguageData = loadLanguage(lang.lang, true);
+		if (currentLanguageData.size === 0) {
+			console.warn(`Summary for language [${lang.lang}]: Could not be loaded.`);
+			continue;
+		}
+		const current = flattenKeys(currentLanguageData.values().next().value);
+		const missing = Object.keys(base).filter((key) => !(key in current));
+		const extra = Object.keys(current).filter((key) => !(key in base));
+		console.log(`Summary for language [${lang.lang}]:`);
+		if (missing.length) console.warn(`\tMissing keys: ${missing.length}`, missing.slice(0, 5));
+		if (extra.length) console.warn(`\tExtra keys: ${extra.length}`, extra.slice(0, 5));
+		if (!missing.length && !extra.length) console.log("	✅ All keys match.");
+	}
+}
+
+//#endregion
+//#region src/server/trackers/handlebars-tracker.ts
+var HandlebarsTracker = class extends AbstractFileTracker {
+	updateEvent = "foundryvtt-template-update";
+	constructor() {
+		super(context.config);
+	}
+	getEventData(changedPath, value) {
+		return { path: value };
+	}
+};
+const handlebarsTracker = new HandlebarsTracker();
+
 //#endregion
 //#region src/server/http-middleware.ts
 function httpMiddlewareHook(server) {
@@ -523,31 +481,83 @@ function setupDevServer(server) {
 }
 
 //#endregion
-//#region src/language/validator.ts
-function validator() {
-	const manifest = context.manifest;
-	const baseLanguageData = loadLanguage("en", true);
-	if (baseLanguageData.size === 0) {
-		logger_default.error("Base language \"en\" not found or could not be loaded.");
-		return;
-	}
-	const base = flattenKeys(baseLanguageData.values().next().value);
-	for (const lang of manifest.languages) {
-		if (lang.lang === "en") continue;
-		const currentLanguageData = loadLanguage(lang.lang, true);
-		if (currentLanguageData.size === 0) {
-			console.warn(`Summary for language [${lang.lang}]: Could not be loaded.`);
-			continue;
-		}
-		const current = flattenKeys(currentLanguageData.values().next().value);
-		const missing = Object.keys(base).filter((key) => !(key in current));
-		const extra = Object.keys(current).filter((key) => !(key in base));
-		console.log(`Summary for language [${lang.lang}]:`);
-		if (missing.length) console.warn(`\tMissing keys: ${missing.length}`, missing.slice(0, 5));
-		if (extra.length) console.warn(`\tExtra keys: ${extra.length}`, extra.slice(0, 5));
-		if (!missing.length && !extra.length) console.log("	✅ All keys match.");
-	}
-}
+//#region src/server/hmr-client.ts
+var hmr_client_default = `
+if (import.meta.hot) {
+  const FVTT_PLUGIN = __FVTT_PLUGIN__
+
+  function refreshApplications(path = null) {
+    // AppV1 refresh
+    Object.values(foundry.ui.windows).forEach(app => app.render(true))
+    // AppV2 refresh
+    if (path)
+      foundry.applications.instances.forEach(appV2 => {
+        Object.values(appV2.constructor.PARTS ?? {}).forEach(part => {
+          const templates = Array.isArray(part.templates) ? part.templates : []
+          if (part.template === path || templates.includes(path)) appV2.render(true)
+        })
+      })
+    else foundry.applications.instances.forEach(appV2 => appV2.render(true))
+  }
+
+  import.meta.hot.on('foundryvtt-template-update', ({ path }) => {
+    game.socket.emit('template', path, response => {
+      if (response.error) new Error(response.error)
+      let template = undefined
+      try {
+        template = Handlebars.compile(response.html)
+      } catch (error) {
+        console.error(error)
+        return
+      }
+      Handlebars.registerPartial(path, template)
+      console.log(\`Vite | Retrieved and compiled template \${path}\`)
+      refreshApplications(path)
+    })
+  })
+
+  async function hmrLanguage(lang, targetObject = game.i18n.translations) {
+    try {
+      const languages = FVTT_PLUGIN.isSystem
+        ? game.system.languages
+        : game.modules.get(FVTT_PLUGIN.id)?.languages
+      if (!languages) {
+        console.warn(
+          'Vite | Got a HMR request to reload languages, however no languages were found.',
+        )
+        return
+      }
+      const langEntry = languages.find(l => l.lang === lang)
+      if (!langEntry) {
+        console.warn('Vite | Got an HMR request for an undefined language')
+        return
+      }
+
+      const url = langEntry.path
+      const resp = await fetch(url)
+      if (!resp.ok) throw new Error('Failed to fetch language file!')
+
+      const json = await resp.json()
+
+      foundry.utils.mergeObject(targetObject, json)
+      console.log(\`Vite | HMR: Reloaded language '\${lang}'\`)
+    } catch (error) {
+      console.error(\`Vite | HMR: Error reloading language '\${lang}' for \${FVTT_PLUGIN.id}\`, error);
+    }
+  }
+
+  import.meta.hot.on('foundryvtt-language-update', async () => {
+    const currentLang = game.i18n.lang
+    const promises = []
+    if (currentLang !== 'en') {
+      promises.push(hmrLanguage('en', game.i18n._fallback))
+    }
+    promises.push(hmrLanguage(currentLang))
+    await Promise.all(promises)
+    refreshApplications()
+  })
+} else console.error('Vite | HMR is disabled')
+//`;
 
 //#endregion
 //#region src/index.ts
@@ -590,7 +600,7 @@ function foundryVTTPlugin() {
 		},
 		load(id) {
 			const config = context.config;
-			const jsFileName = config.build.lib.fileName;
+			const jsFileName = (config.build.rollupOptions?.output).entryFileNames;
 			if (id === jsFileName || id === `/${jsFileName}`) {
 				const entryPath = posix.resolve(config.build.lib.entry);
 				const viteId = `/@fs/${entryPath}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-fvtt",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "A Vite plugin for module and system development for Foundry VTT",
   "keywords": [
     "vite",