@moostjs/vite 0.6.39 → 0.6.41

package/dist/index.cjs

@@ -337,30 +337,41 @@ function _define_property(obj, key, value) {
 
 //#endregion
 //#region packages/vite/src/restart-cleanup.ts
+/** Metadata key the transform's `@__VITE_ID(<module id>)` stamps on DI classes. */ const VITE_ID_KEY = "__vite_id";
+/** The module id stamped on the class of `target` (a class or an instance), if any. */ function readViteId(target) {
+	return (0, moost.getMoostMate)().read(target)?.[VITE_ID_KEY];
+}
+/** Cleanup scope of a full reboot (server start/restart, full invalidation). */ const EJECT_ALL = "all";
+/** Coalesces a queued cleanup with the next one: module ids add up, `EJECT_ALL` wins. */ function mergeCleanup(pending, next) {
+	if (pending === EJECT_ALL || next === EJECT_ALL) return EJECT_ALL;
+	return pending ? new Set([...pending, ...next]) : next;
+}
 /**
-* Clean up Moost’s global containers and optionally remove specific instances from the registry.
+* Clean up Moost’s global containers and eject instances from the registry:
+* those of the given module ids (plus, transitively, their dependants), or —
+* with `EJECT_ALL`, the default — every instance.
 *
 * Every instance actually removed from the registry is **disposed** before the
 * caches are dropped: its `@MoostDispose` hooks (or `Symbol.asyncDispose` /
 * `Symbol.dispose`) are awaited, so a singleton owning a connection, consumer,
 * timer or file handle releases it instead of leaking one copy per reload. An
-* instance kept by an `onEject` veto is never disposed. A failing hook is
-* warned about and the reload continues.
+* instance kept by an `onEject` veto is never disposed (there is no veto on a
+* full reboot: the registry is dropped either way). A failing hook is warned
+* about and the reload continues.
 *
-* @param {Set<string>} [cleanupInstances] A set of module IDs to remove from the registry.
 * @returns the instances that were ejected (and therefore disposed)
-*/ async function moostRestartCleanup(onEject, cleanupInstances) {
+*/ async function moostRestartCleanup(onEject, cleanup = EJECT_ALL) {
 	const logger = getLogger();
 	const infact = (0, moost.getMoostInfact)();
 	const { registry } = infact;
 	infact._cleanup();
-	const mate = (0, moost.getMoostMate)();
 	/** Instances removed from the registry by this run — disposed below, before the caches drop. */ const ejected = [];
-	if (cleanupInstances) {
+	if (cleanup === EJECT_ALL) for (const key of Object.getOwnPropertySymbols(registry)) ejected.push(registry[key]);
+	else {
 		for (const key of Object.getOwnPropertySymbols(registry)) {
 			const instance = registry[key];
-			const viteId = mate.read(instance)?.__vite_id;
-			if (viteId && cleanupInstances.has(viteId)) {
+			const viteId = readViteId(instance);
+			if (viteId && cleanup.has(viteId)) {
 				logger.debug(`🔃 Replacing "${constructorName(instance)}"`);
 				delete registry[key];
 				ejected.push(instance);
@@ -603,8 +614,11 @@ function readPkgJson(dir) {
 
 //#endregion
 //#region packages/vite/src/moost-vite.ts
-/** Regex checks */ const REG_HAS_EXPORT_CLASS = /(^\s*@(Injectable|Controller)\()/m;
-const REG_REPLACE_EXPORT_CLASS = /(^\s*@(Injectable|Controller)\()/gm;
+/**
+* Classes that land in the DI registry: every `@Injectable()`, `@Controller()`
+* and `@Interceptor()` class (exported or not) gets `@__VITE_ID(<module id>)`,
+* which drives the per-module eject on reload.
+*/ const REG_DI_CLASS = /(^\s*@(Injectable|Controller|Interceptor)\()/gm;
 /**
 * The main Vite plugin for integrating Moost applications.
 *
@@ -613,7 +627,7 @@ const REG_REPLACE_EXPORT_CLASS = /(^\s*@(Injectable|Controller)\()/gm;
 * - **Dev Mode Middleware**:
 *   - Patches `MoostHttp.prototype.listen` to register a custom middleware for serving the app via Vite's dev server instead of binding to a port.
 *   - Handles Moost state cleanup and hot module replacement (HMR) during development.
-* - **Class Tracking**: Injects a `__VITE_ID()` decorator into exported classes to enable tracking and cleanup during hot reloads.
+* - **Class Tracking**: Injects a `__VITE_ID()` decorator into DI classes to enable tracking and cleanup during hot reloads.
 * - **Externals Support**:
 *   - Allows marking Node.js built-in modules and dependencies from `package.json` (optionally excluding workspace dependencies) as external during builds.
 *   - Configured via the `externals` option, which helps reduce bundle size and ensures compatibility with runtime environments.
@@ -665,6 +679,9 @@ function moostVite(options) {
 	* boot, cleared on eject.
 	*/ const moostHttpRef = { current: null };
 	const ssrForwarding = options.ssrFetchForwarding !== false;
+	const ssrOutlet = options.ssrOutlet || DEFAULT_SSR_OUTLET;
+	const ssrState = options.ssrState || DEFAULT_SSR_STATE;
+	const ssrHead = options.ssrHead || DEFAULT_SSR_HEAD;
 	/**
 	* Boot-identity stamps (dev-only "mongrel state" diagnostic — a stale pipeline
 	* presents as security middleware silently switched off). `bootGeneration` is
@@ -680,7 +697,7 @@ function moostVite(options) {
 	* several when one entry boots several apps, none for a boot that never calls
 	* `init()`. Reset by `beginBoot()`, consumed by `settleBootInit()`.
 	*/ let bootInitPromises = [];
-	/** Module IDs awaiting DI cleanup — consumed in runReload; see ejectApp. */ let pendingCleanup = null;
+	/** DI cleanup awaiting the next reload (module IDs, or EJECT_ALL) — consumed in runReload; see ejectApp. */ let pendingCleanup = null;
 	/** In middleware mode: maps req → next() for the onNoMatch callback */ const pendingNextMap = /* @__PURE__ */ new WeakMap();
 	const adapters = isTest ? [] : [
 		createAdapterDetector("http", (MoostHttp, moduleExports) => {
@@ -736,7 +753,7 @@ function moostVite(options) {
 	* into the OLD pipeline, producing a mongrel half-old/half-new app. Waves
 	* arriving before the lazy reload (editor bulk-save storms) coalesce into one
 	* pending set and one cleanup.
-	*/ const ejectApp = (cleanupInstances) => {
+	*/ const ejectApp = (cleanup) => {
 		bootGeneration++;
 		moostMiddleware = null;
 		moostHttpRef.current = null;
@@ -744,8 +761,7 @@ function moostVite(options) {
 			localFetchTeardown();
 			localFetchTeardown = null;
 		}
-		if (pendingCleanup) for (const id of cleanupInstances) pendingCleanup.add(id);
-		else pendingCleanup = cleanupInstances;
+		pendingCleanup = mergeCleanup(pendingCleanup, cleanup);
 		reloadRequired = true;
 	};
 	patchMoostHandlerLogging();
@@ -756,6 +772,22 @@ function moostVite(options) {
 		}
 		bootInitPromises.push(promise);
 	});
+	/**
+	* Readies the process for the next evaluation of the entry — the first boot,
+	* a `server.restart()` and every reload alike (they drifted apart once: a
+	* restart skipped the adapter step and its app bound the port for real):
+	* 1. DI cleanup, awaited: the ejected instances' `@MoostDispose` hooks must
+	*    release what they own (connections, consumers, handles) BEFORE the entry
+	*    re-imports, or the replacement opens a second copy of the resource.
+	* 2. Re-establish the adapter capture. The listen() patch lives on whatever
+	*    `MoostHttp.prototype` was evaluated first; a new runner or a re-evaluated
+	*    `@moostjs/event-http` hands the entry an unpatched prototype, and
+	*    `app.listen()` would bind the port for real → EADDRINUSE. `init()`
+	*    re-resolves the adapter through the runner the entry imports from.
+	*/ const prepareBoot = async (cleanup) => {
+		await moostRestartCleanup(options.onEject, cleanup);
+		for (const adapter of adapters) if (adapter.detected) await adapter.init();
+	};
 	/** Marks the boot about to run as authoritative for the current generation. */ const beginBoot = () => {
 		bootingGeneration = bootGeneration;
 		bootInitPromises = [];
@@ -797,7 +829,11 @@ function moostVite(options) {
 					"process.env.MOOST_DEFERRED_ENV": "\"production\"",
 					__MOOST_ENTRY__: JSON.stringify(`./${entryKey}.js`),
 					__MOOST_PREFIX__: JSON.stringify(prefixes ?? null),
-					__MOOST_SSR_FORWARDING__: JSON.stringify(ssrForwarding)
+					__MOOST_SSR_FORWARDING__: JSON.stringify(ssrForwarding),
+					__MOOST_SSR_ENTRY__: "undefined",
+					__MOOST_SSR_OUTLET__: JSON.stringify(ssrOutlet),
+					__MOOST_SSR_STATE__: JSON.stringify(ssrState),
+					__MOOST_SSR_HEAD__: JSON.stringify(ssrHead)
 				};
 				const ssrInput = {
 					server: options.serverEntry || generatedServerEntry(cfg.root),
@@ -807,9 +843,6 @@ function moostVite(options) {
 					const ssrBasename = entryBasename(options.ssrEntry);
 					ssrInput[`ssr/${ssrBasename.replace(/\.js$/, "")}`] = options.ssrEntry;
 					serverDefines.__MOOST_SSR_ENTRY__ = JSON.stringify(`./ssr/${ssrBasename}`);
-					serverDefines.__MOOST_SSR_OUTLET__ = JSON.stringify(options.ssrOutlet || DEFAULT_SSR_OUTLET);
-					serverDefines.__MOOST_SSR_STATE__ = JSON.stringify(options.ssrState || DEFAULT_SSR_STATE);
-					serverDefines.__MOOST_SSR_HEAD__ = JSON.stringify(options.ssrHead || DEFAULT_SSR_HEAD);
 				}
 				const outDir = cfg.build?.outDir || "dist";
 				const isBuild = env.command === "build";
@@ -913,9 +946,9 @@ function moostVite(options) {
 		async transform(code, id) {
 			if (!id.endsWith(".ts")) return null;
 			for (const adapter of adapters) if (!adapter.detected && adapter.regex.test(code)) await adapter.init();
-			if (REG_HAS_EXPORT_CLASS.test(code)) {
+			if (code.search(REG_DI_CLASS) !== -1) {
 				const s = new magic_string.default(code);
-				s.replace(REG_REPLACE_EXPORT_CLASS, "\n@__VITE_ID(import.meta.filename)\n$1");
+				s.replace(REG_DI_CLASS, "\n@__VITE_ID(import.meta.filename)\n$1");
 				s.prepend(`import { __VITE_ID } from 'virtual:vite-id'\n\n`);
 				return {
 					code: s.toString(),
@@ -933,7 +966,7 @@ function moostVite(options) {
           import { getMoostMate } from "moost";
           const mate = getMoostMate();
           export function __VITE_ID(id) {
-            return mate.decorate("__vite_id", id)
+            return mate.decorate(${JSON.stringify(VITE_ID_KEY)}, id)
           }
         `,
 				map: null
@@ -955,10 +988,9 @@ function moostVite(options) {
 				return (async () => {
 					try {
 						beginBoot();
-						const cleanupInstances = pendingCleanup ?? void 0;
+						const cleanup = pendingCleanup ?? EJECT_ALL;
 						pendingCleanup = null;
-						await moostRestartCleanup(options.onEject, cleanupInstances);
-						for (const adapter of adapters) if (adapter.detected) await adapter.init();
+						await prepareBoot(cleanup);
 						const entryModule = await getEntryModule(server.environments.ssr.moduleGraph);
 						if (entryModule?.transformResult) server.environments.ssr.moduleGraph.invalidateModule(entryModule);
 						await ssrImport(options.entry);
@@ -979,7 +1011,7 @@ function moostVite(options) {
 				}
 			};
 			for (const adapter of adapters) adapter.ssrLoadModule = ssrImport;
-			await moostRestartCleanup(options.onEject);
+			await prepareBoot(EJECT_ALL);
 			await ssrImport(options.entry);
 			await settleBootInit();
 			server.middlewares.use(async (req, res, next) => {
@@ -1010,9 +1042,13 @@ function moostVite(options) {
 			const cleanupInstances = /* @__PURE__ */ new Set();
 			for (const importers of importerSets) for (const impModule of importers) if (impModule.id) cleanupInstances.add(impModule.id);
 			for (const mod of modules) moduleGraph.invalidateModule(mod);
-			if (entryModule) moduleGraph.invalidateModule(entryModule);
-			else moduleGraph.invalidateAll();
-			ejectApp(cleanupInstances);
+			if (entryModule) {
+				moduleGraph.invalidateModule(entryModule);
+				ejectApp(cleanupInstances);
+			} else {
+				moduleGraph.invalidateAll();
+				ejectApp(EJECT_ALL);
+			}
 			return [];
 		}
 	};
@@ -1026,9 +1062,6 @@ function moostVite(options) {
 	return [pluginConfig, !isProd && !isTest && options.middleware && options.ssrEntry ? {
 		name: `${PLUGIN_NAME}:ssr-fallback`,
 		async configureServer(server) {
-			const ssrOutlet = options.ssrOutlet || DEFAULT_SSR_OUTLET;
-			const ssrState = options.ssrState || DEFAULT_SSR_STATE;
-			const ssrHead = options.ssrHead || DEFAULT_SSR_HEAD;
 			const fs = await import("node:fs/promises");
 			return () => {
 				server.middlewares.use(async (req, res, next) => {

package/dist/index.mjs

@@ -308,30 +308,41 @@ function _define_property(obj, key, value) {
 
 //#endregion
 //#region packages/vite/src/restart-cleanup.ts
+/** Metadata key the transform's `@__VITE_ID(<module id>)` stamps on DI classes. */ const VITE_ID_KEY = "__vite_id";
+/** The module id stamped on the class of `target` (a class or an instance), if any. */ function readViteId(target) {
+	return getMoostMate().read(target)?.[VITE_ID_KEY];
+}
+/** Cleanup scope of a full reboot (server start/restart, full invalidation). */ const EJECT_ALL = "all";
+/** Coalesces a queued cleanup with the next one: module ids add up, `EJECT_ALL` wins. */ function mergeCleanup(pending, next) {
+	if (pending === EJECT_ALL || next === EJECT_ALL) return EJECT_ALL;
+	return pending ? new Set([...pending, ...next]) : next;
+}
 /**
-* Clean up Moost’s global containers and optionally remove specific instances from the registry.
+* Clean up Moost’s global containers and eject instances from the registry:
+* those of the given module ids (plus, transitively, their dependants), or —
+* with `EJECT_ALL`, the default — every instance.
 *
 * Every instance actually removed from the registry is **disposed** before the
 * caches are dropped: its `@MoostDispose` hooks (or `Symbol.asyncDispose` /
 * `Symbol.dispose`) are awaited, so a singleton owning a connection, consumer,
 * timer or file handle releases it instead of leaking one copy per reload. An
-* instance kept by an `onEject` veto is never disposed. A failing hook is
-* warned about and the reload continues.
+* instance kept by an `onEject` veto is never disposed (there is no veto on a
+* full reboot: the registry is dropped either way). A failing hook is warned
+* about and the reload continues.
 *
-* @param {Set<string>} [cleanupInstances] A set of module IDs to remove from the registry.
 * @returns the instances that were ejected (and therefore disposed)
-*/ async function moostRestartCleanup(onEject, cleanupInstances) {
+*/ async function moostRestartCleanup(onEject, cleanup = EJECT_ALL) {
 	const logger = getLogger();
 	const infact = getMoostInfact();
 	const { registry } = infact;
 	infact._cleanup();
-	const mate = getMoostMate();
 	/** Instances removed from the registry by this run — disposed below, before the caches drop. */ const ejected = [];
-	if (cleanupInstances) {
+	if (cleanup === EJECT_ALL) for (const key of Object.getOwnPropertySymbols(registry)) ejected.push(registry[key]);
+	else {
 		for (const key of Object.getOwnPropertySymbols(registry)) {
 			const instance = registry[key];
-			const viteId = mate.read(instance)?.__vite_id;
-			if (viteId && cleanupInstances.has(viteId)) {
+			const viteId = readViteId(instance);
+			if (viteId && cleanup.has(viteId)) {
 				logger.debug(`🔃 Replacing "${constructorName(instance)}"`);
 				delete registry[key];
 				ejected.push(instance);
@@ -574,8 +585,11 @@ function readPkgJson(dir) {
 
 //#endregion
 //#region packages/vite/src/moost-vite.ts
-/** Regex checks */ const REG_HAS_EXPORT_CLASS = /(^\s*@(Injectable|Controller)\()/m;
-const REG_REPLACE_EXPORT_CLASS = /(^\s*@(Injectable|Controller)\()/gm;
+/**
+* Classes that land in the DI registry: every `@Injectable()`, `@Controller()`
+* and `@Interceptor()` class (exported or not) gets `@__VITE_ID(<module id>)`,
+* which drives the per-module eject on reload.
+*/ const REG_DI_CLASS = /(^\s*@(Injectable|Controller|Interceptor)\()/gm;
 /**
 * The main Vite plugin for integrating Moost applications.
 *
@@ -584,7 +598,7 @@ const REG_REPLACE_EXPORT_CLASS = /(^\s*@(Injectable|Controller)\()/gm;
 * - **Dev Mode Middleware**:
 *   - Patches `MoostHttp.prototype.listen` to register a custom middleware for serving the app via Vite's dev server instead of binding to a port.
 *   - Handles Moost state cleanup and hot module replacement (HMR) during development.
-* - **Class Tracking**: Injects a `__VITE_ID()` decorator into exported classes to enable tracking and cleanup during hot reloads.
+* - **Class Tracking**: Injects a `__VITE_ID()` decorator into DI classes to enable tracking and cleanup during hot reloads.
 * - **Externals Support**:
 *   - Allows marking Node.js built-in modules and dependencies from `package.json` (optionally excluding workspace dependencies) as external during builds.
 *   - Configured via the `externals` option, which helps reduce bundle size and ensures compatibility with runtime environments.
@@ -634,6 +648,9 @@ function moostVite(options) {
 	* boot, cleared on eject.
 	*/ const moostHttpRef = { current: null };
 	const ssrForwarding = options.ssrFetchForwarding !== false;
+	const ssrOutlet = options.ssrOutlet || DEFAULT_SSR_OUTLET;
+	const ssrState = options.ssrState || DEFAULT_SSR_STATE;
+	const ssrHead = options.ssrHead || DEFAULT_SSR_HEAD;
 	/**
 	* Boot-identity stamps (dev-only "mongrel state" diagnostic — a stale pipeline
 	* presents as security middleware silently switched off). `bootGeneration` is
@@ -649,7 +666,7 @@ function moostVite(options) {
 	* several when one entry boots several apps, none for a boot that never calls
 	* `init()`. Reset by `beginBoot()`, consumed by `settleBootInit()`.
 	*/ let bootInitPromises = [];
-	/** Module IDs awaiting DI cleanup — consumed in runReload; see ejectApp. */ let pendingCleanup = null;
+	/** DI cleanup awaiting the next reload (module IDs, or EJECT_ALL) — consumed in runReload; see ejectApp. */ let pendingCleanup = null;
 	/** In middleware mode: maps req → next() for the onNoMatch callback */ const pendingNextMap = /* @__PURE__ */ new WeakMap();
 	const adapters = [
 		createAdapterDetector("http", (MoostHttp, moduleExports) => {
@@ -705,7 +722,7 @@ function moostVite(options) {
 	* into the OLD pipeline, producing a mongrel half-old/half-new app. Waves
 	* arriving before the lazy reload (editor bulk-save storms) coalesce into one
 	* pending set and one cleanup.
-	*/ const ejectApp = (cleanupInstances) => {
+	*/ const ejectApp = (cleanup) => {
 		bootGeneration++;
 		moostMiddleware = null;
 		moostHttpRef.current = null;
@@ -713,8 +730,7 @@ function moostVite(options) {
 			localFetchTeardown();
 			localFetchTeardown = null;
 		}
-		if (pendingCleanup) for (const id of cleanupInstances) pendingCleanup.add(id);
-		else pendingCleanup = cleanupInstances;
+		pendingCleanup = mergeCleanup(pendingCleanup, cleanup);
 		reloadRequired = true;
 	};
 	patchMoostHandlerLogging();
@@ -725,6 +741,22 @@ function moostVite(options) {
 		}
 		bootInitPromises.push(promise);
 	});
+	/**
+	* Readies the process for the next evaluation of the entry — the first boot,
+	* a `server.restart()` and every reload alike (they drifted apart once: a
+	* restart skipped the adapter step and its app bound the port for real):
+	* 1. DI cleanup, awaited: the ejected instances' `@MoostDispose` hooks must
+	*    release what they own (connections, consumers, handles) BEFORE the entry
+	*    re-imports, or the replacement opens a second copy of the resource.
+	* 2. Re-establish the adapter capture. The listen() patch lives on whatever
+	*    `MoostHttp.prototype` was evaluated first; a new runner or a re-evaluated
+	*    `@moostjs/event-http` hands the entry an unpatched prototype, and
+	*    `app.listen()` would bind the port for real → EADDRINUSE. `init()`
+	*    re-resolves the adapter through the runner the entry imports from.
+	*/ const prepareBoot = async (cleanup) => {
+		await moostRestartCleanup(options.onEject, cleanup);
+		for (const adapter of adapters) if (adapter.detected) await adapter.init();
+	};
 	/** Marks the boot about to run as authoritative for the current generation. */ const beginBoot = () => {
 		bootingGeneration = bootGeneration;
 		bootInitPromises = [];
@@ -766,7 +798,11 @@ function moostVite(options) {
 					"process.env.MOOST_DEFERRED_ENV": "\"production\"",
 					__MOOST_ENTRY__: JSON.stringify(`./${entryKey}.js`),
 					__MOOST_PREFIX__: JSON.stringify(prefixes ?? null),
-					__MOOST_SSR_FORWARDING__: JSON.stringify(ssrForwarding)
+					__MOOST_SSR_FORWARDING__: JSON.stringify(ssrForwarding),
+					__MOOST_SSR_ENTRY__: "undefined",
+					__MOOST_SSR_OUTLET__: JSON.stringify(ssrOutlet),
+					__MOOST_SSR_STATE__: JSON.stringify(ssrState),
+					__MOOST_SSR_HEAD__: JSON.stringify(ssrHead)
 				};
 				const ssrInput = {
 					server: options.serverEntry || generatedServerEntry(cfg.root),
@@ -776,9 +812,6 @@ function moostVite(options) {
 					const ssrBasename = entryBasename(options.ssrEntry);
 					ssrInput[`ssr/${ssrBasename.replace(/\.js$/, "")}`] = options.ssrEntry;
 					serverDefines.__MOOST_SSR_ENTRY__ = JSON.stringify(`./ssr/${ssrBasename}`);
-					serverDefines.__MOOST_SSR_OUTLET__ = JSON.stringify(options.ssrOutlet || DEFAULT_SSR_OUTLET);
-					serverDefines.__MOOST_SSR_STATE__ = JSON.stringify(options.ssrState || DEFAULT_SSR_STATE);
-					serverDefines.__MOOST_SSR_HEAD__ = JSON.stringify(options.ssrHead || DEFAULT_SSR_HEAD);
 				}
 				const outDir = cfg.build?.outDir || "dist";
 				const isBuild = env.command === "build";
@@ -882,9 +915,9 @@ function moostVite(options) {
 		async transform(code, id) {
 			if (!id.endsWith(".ts")) return null;
 			for (const adapter of adapters) if (!adapter.detected && adapter.regex.test(code)) await adapter.init();
-			if (REG_HAS_EXPORT_CLASS.test(code)) {
+			if (code.search(REG_DI_CLASS) !== -1) {
 				const s = new MagicString(code);
-				s.replace(REG_REPLACE_EXPORT_CLASS, "\n@__VITE_ID(import.meta.filename)\n$1");
+				s.replace(REG_DI_CLASS, "\n@__VITE_ID(import.meta.filename)\n$1");
 				s.prepend(`import { __VITE_ID } from 'virtual:vite-id'\n\n`);
 				return {
 					code: s.toString(),
@@ -902,7 +935,7 @@ function moostVite(options) {
           import { getMoostMate } from "moost";
           const mate = getMoostMate();
           export function __VITE_ID(id) {
-            return mate.decorate("__vite_id", id)
+            return mate.decorate(${JSON.stringify(VITE_ID_KEY)}, id)
           }
         `,
 				map: null
@@ -924,10 +957,9 @@ function moostVite(options) {
 				return (async () => {
 					try {
 						beginBoot();
-						const cleanupInstances = pendingCleanup ?? void 0;
+						const cleanup = pendingCleanup ?? EJECT_ALL;
 						pendingCleanup = null;
-						await moostRestartCleanup(options.onEject, cleanupInstances);
-						for (const adapter of adapters) if (adapter.detected) await adapter.init();
+						await prepareBoot(cleanup);
 						const entryModule = await getEntryModule(server.environments.ssr.moduleGraph);
 						if (entryModule?.transformResult) server.environments.ssr.moduleGraph.invalidateModule(entryModule);
 						await ssrImport(options.entry);
@@ -948,7 +980,7 @@ function moostVite(options) {
 				}
 			};
 			for (const adapter of adapters) adapter.ssrLoadModule = ssrImport;
-			await moostRestartCleanup(options.onEject);
+			await prepareBoot(EJECT_ALL);
 			await ssrImport(options.entry);
 			await settleBootInit();
 			server.middlewares.use(async (req, res, next) => {
@@ -979,17 +1011,18 @@ function moostVite(options) {
 			const cleanupInstances = /* @__PURE__ */ new Set();
 			for (const importers of importerSets) for (const impModule of importers) if (impModule.id) cleanupInstances.add(impModule.id);
 			for (const mod of modules) moduleGraph.invalidateModule(mod);
-			if (entryModule) moduleGraph.invalidateModule(entryModule);
-			else moduleGraph.invalidateAll();
-			ejectApp(cleanupInstances);
+			if (entryModule) {
+				moduleGraph.invalidateModule(entryModule);
+				ejectApp(cleanupInstances);
+			} else {
+				moduleGraph.invalidateAll();
+				ejectApp(EJECT_ALL);
+			}
 			return [];
 		}
 	}, options.middleware && options.ssrEntry ? {
 		name: `${PLUGIN_NAME}:ssr-fallback`,
 		async configureServer(server) {
-			const ssrOutlet = options.ssrOutlet || DEFAULT_SSR_OUTLET;
-			const ssrState = options.ssrState || DEFAULT_SSR_STATE;
-			const ssrHead = options.ssrHead || DEFAULT_SSR_HEAD;
 			const fs = await import("node:fs/promises");
 			return () => {
 				server.middlewares.use(async (req, res, next) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moostjs/vite",
-  "version": "0.6.39",
+  "version": "0.6.41",
   "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.39",
-    "moost": "^0.6.39"
+    "@moostjs/event-http": "^0.6.41",
+    "moost": "^0.6.41"
   },
   "peerDependenciesMeta": {
     "sirv": {