@moostjs/vite 0.6.18 → 0.6.20

package/dist/index.cjs

@@ -374,6 +374,11 @@ function moostVite(options) {
 	];
 	/** A logger instance for plugin debug output. */ const logger = isTest ? console : getLogger();
 	let reloadRequired = false;
+	/** In-flight app reload, shared so concurrent requests await one reload. */ let reloadPromise = null;
+	/**
+	* Drains any pending Moost app reload before a request is served. Assigned once
+	* the SSR module runner exists (see configureServer); a no-op until then.
+	*/ let drainReload = () => Promise.resolve();
 	patchMoostHandlerLogging();
 	const pluginConfig = {
 		name: PLUGIN_NAME,
@@ -507,18 +512,29 @@ function moostVite(options) {
 		async configureServer(server) {
 			const runner = (0, vite.createServerModuleRunner)(server.environments.ssr);
 			const ssrImport = (id) => runner.import(id);
+			const runReload = () => {
+				reloadRequired = false;
+				console.log();
+				logger.debug("🚀 Reloading Moost App...");
+				console.log();
+				return (async () => {
+					await ssrImport(options.entry);
+					await new Promise((resolve) => setTimeout(resolve, 1));
+				})().finally(() => {
+					reloadPromise = null;
+				});
+			};
+			drainReload = async () => {
+				while (reloadRequired || reloadPromise) {
+					if (!reloadPromise) reloadPromise = runReload();
+					await reloadPromise;
+				}
+			};
 			for (const adapter of adapters) adapter.ssrLoadModule = ssrImport;
 			moostRestartCleanup(adapters, options.onEject);
 			await ssrImport(options.entry);
 			server.middlewares.use(async (req, res, next) => {
-				if (reloadRequired) {
-					reloadRequired = false;
-					console.log();
-					logger.debug("🚀 Reloading Moost App...");
-					console.log();
-					await ssrImport(options.entry);
-					await new Promise((resolve) => setTimeout(resolve, 1));
-				}
+				await drainReload();
 				if (options.middleware && prefix) {
 					const url = req.url || "";
 					if (url !== prefix && !url.startsWith(prefixSlash) && !url.startsWith(prefixQuery)) return next();
@@ -575,6 +591,7 @@ function moostVite(options) {
 					if (req.method !== "GET") return next();
 					const url = req.originalUrl || req.url || "/";
 					try {
+						await drainReload();
 						let template = await fs.readFile((0, node_path.resolve)(process.cwd(), "index.html"), "utf8");
 						template = await server.transformIndexHtml(url, template);
 						const { render } = await server.ssrLoadModule(options.ssrEntry);

package/dist/index.mjs

@@ -343,6 +343,11 @@ function moostVite(options) {
 	];
 	/** A logger instance for plugin debug output. */ const logger = getLogger();
 	let reloadRequired = false;
+	/** In-flight app reload, shared so concurrent requests await one reload. */ let reloadPromise = null;
+	/**
+	* Drains any pending Moost app reload before a request is served. Assigned once
+	* the SSR module runner exists (see configureServer); a no-op until then.
+	*/ let drainReload = () => Promise.resolve();
 	patchMoostHandlerLogging();
 	return [{
 		name: PLUGIN_NAME,
@@ -476,18 +481,29 @@ function moostVite(options) {
 		async configureServer(server) {
 			const runner = createServerModuleRunner(server.environments.ssr);
 			const ssrImport = (id) => runner.import(id);
+			const runReload = () => {
+				reloadRequired = false;
+				console.log();
+				logger.debug("🚀 Reloading Moost App...");
+				console.log();
+				return (async () => {
+					await ssrImport(options.entry);
+					await new Promise((resolve) => setTimeout(resolve, 1));
+				})().finally(() => {
+					reloadPromise = null;
+				});
+			};
+			drainReload = async () => {
+				while (reloadRequired || reloadPromise) {
+					if (!reloadPromise) reloadPromise = runReload();
+					await reloadPromise;
+				}
+			};
 			for (const adapter of adapters) adapter.ssrLoadModule = ssrImport;
 			moostRestartCleanup(adapters, options.onEject);
 			await ssrImport(options.entry);
 			server.middlewares.use(async (req, res, next) => {
-				if (reloadRequired) {
-					reloadRequired = false;
-					console.log();
-					logger.debug("🚀 Reloading Moost App...");
-					console.log();
-					await ssrImport(options.entry);
-					await new Promise((resolve) => setTimeout(resolve, 1));
-				}
+				await drainReload();
 				if (options.middleware && prefix) {
 					const url = req.url || "";
 					if (url !== prefix && !url.startsWith(prefixSlash) && !url.startsWith(prefixQuery)) return next();
@@ -536,6 +552,7 @@ function moostVite(options) {
 					if (req.method !== "GET") return next();
 					const url = req.originalUrl || req.url || "/";
 					try {
+						await drainReload();
 						let template = await fs.readFile(resolve(process.cwd(), "index.html"), "utf8");
 						template = await server.transformIndexHtml(url, template);
 						const { render } = await server.ssrLoadModule(options.ssrEntry);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moostjs/vite",
-  "version": "0.6.18",
+  "version": "0.6.20",
   "description": "Vite Dev plugin for moostjs",
   "keywords": [
     "composables",
@@ -58,8 +58,8 @@
   "peerDependencies": {
     "sirv": "^3.0.0",
     "vite": "^8.0.0",
-    "@moostjs/event-http": "^0.6.18",
-    "moost": "^0.6.18"
+    "@moostjs/event-http": "^0.6.20",
+    "moost": "^0.6.20"
   },
   "peerDependenciesMeta": {
     "sirv": {