@astroscope/boot 0.3.3 → 0.4.0

package/dist/index.cjs

@@ -39,6 +39,7 @@ module.exports = __toCommonJS(index_exports);
 // src/integration.ts
 var import_node_fs2 = __toESM(require("fs"), 1);
 var import_magic_string = __toESM(require("magic-string"), 1);
+var import_vite2 = require("vite");
 
 // src/hmr.ts
 var import_node_path = __toESM(require("path"), 1);
@@ -127,6 +128,16 @@ function serializeError(error) {
   return JSON.stringify(error);
 }
 
+// src/vite-env.ts
+var import_vite = require("vite");
+async function ssrImport(server, moduleId) {
+  const ssr = server.environments["ssr"];
+  if (!(0, import_vite.isRunnableDevEnvironment)(ssr)) {
+    throw new Error("SSR environment is not runnable");
+  }
+  return ssr.runner.import(moduleId);
+}
+
 // src/hmr.ts
 function setupBootHmr(server, entry, logger, getBootContext2) {
   const bootModuleId = `/${entry}`;
@@ -158,14 +169,14 @@ function setupBootHmr(server, entry, logger, getBootContext2) {
       logger.info(`boot dependency changed: ${changedPath}, rerunning hooks...`);
       const bootContext = getBootContext2();
       try {
-        const oldModule = await server.ssrLoadModule(bootModuleId);
+        const oldModule = await ssrImport(server, bootModuleId);
         await runShutdown(oldModule, bootContext);
       } catch (error) {
         logger.error(`Error during boot HMR shutdown: ${serializeError(error)}`);
       }
       server.moduleGraph.invalidateAll();
       try {
-        const newModule = await server.ssrLoadModule(bootModuleId);
+        const newModule = await ssrImport(server, bootModuleId);
         await runStartup(newModule, bootContext);
       } catch (error) {
         logger.error(`Error during boot HMR startup: ${serializeError(error)}`);
@@ -235,19 +246,15 @@ function getBootContext(server, config) {
   const { host, port } = getServerDefaults(config);
   return { dev: true, host, port };
 }
+var getState = (0, import_vite2.perEnvironmentState)(() => ({ bootChunkRef: null, warmupModules: null }));
 function boot(options = {}) {
   const entry = resolveEntry(options.entry);
   const hmr = options.hmr ?? false;
-  let isBuild = false;
-  let isSSR = false;
-  let bootChunkRef = null;
   let astroConfig = null;
-  let warmupModules = null;
   return {
     name: "@astroscope/boot",
     hooks: {
       "astro:config:setup": ({ command, updateConfig, logger, config }) => {
-        isBuild = command === "build";
         astroConfig = config;
         updateConfig({
           vite: {
@@ -255,19 +262,18 @@ function boot(options = {}) {
               // build plugin: handles entry.mjs injection, warmup manifest
               {
                 name: "@astroscope/boot",
-                configResolved(config2) {
-                  isSSR = !!config2.build?.ssr;
-                },
                 buildStart() {
-                  if (!isSSR) return;
+                  if (this.environment.name !== "ssr") return;
+                  const state = getState(this);
                   try {
-                    bootChunkRef = this.emitFile({ type: "chunk", id: entry, name: "boot" });
+                    state.bootChunkRef = this.emitFile({ type: "chunk", id: entry, name: "boot" });
                   } catch {
                   }
                 },
                 generateBundle(_, bundle) {
-                  if (!isSSR || !bootChunkRef) return;
-                  const bootChunkName = this.getFileName(bootChunkRef);
+                  const state = getState(this);
+                  if (!state.bootChunkRef) return;
+                  const bootChunkName = this.getFileName(state.bootChunkRef);
                   if (!bootChunkName) {
                     logger.warn("boot chunk not found");
                     return;
@@ -277,7 +283,7 @@ function boot(options = {}) {
                     logger.warn("entry.mjs not found - boot injection skipped");
                     return;
                   }
-                  warmupModules = collectWarmupModules(bundle);
+                  state.warmupModules = collectWarmupModules(bundle);
                   const { host, port } = getServerDefaults(astroConfig);
                   const prependCode = getPrependCode();
                   const prefix = prependCode.length ? `${prependCode.join("\n")}
@@ -296,10 +302,11 @@ await __astroscope_bootSetup(__astroscope_boot, ${JSON.stringify({ host, port })
                   logger.info(`injected ${bootChunkName} into entry.mjs`);
                 },
                 writeBundle(outputOptions) {
-                  if (!isSSR || !warmupModules) return;
+                  const state = getState(this);
+                  if (!state.warmupModules) return;
                   const outDir = outputOptions.dir;
                   if (!outDir) return;
-                  writeWarmupManifest(outDir, warmupModules, logger);
+                  writeWarmupManifest(outDir, state.warmupModules, logger);
                 }
               },
               // startup plugin: runs after all other configureServer hooks
@@ -307,10 +314,10 @@ await __astroscope_bootSetup(__astroscope_boot, ${JSON.stringify({ host, port })
                 name: "@astroscope/boot/startup",
                 enforce: "post",
                 async configureServer(server) {
-                  if (isBuild) return;
+                  if (command !== "dev") return;
                   try {
                     const bootContext = getBootContext(server, astroConfig);
-                    const module2 = await server.ssrLoadModule(`/${entry}`);
+                    const module2 = await ssrImport(server, `/${entry}`);
                     await runStartup(module2, bootContext);
                   } catch (error) {
                     logger.error(`Error running startup script: ${serializeError(error)}`);
@@ -318,7 +325,7 @@ await __astroscope_bootSetup(__astroscope_boot, ${JSON.stringify({ host, port })
                   server.httpServer?.once("close", async () => {
                     try {
                       const bootContext = getBootContext(server, astroConfig);
-                      const module2 = await server.ssrLoadModule(`/${entry}`);
+                      const module2 = await ssrImport(server, `/${entry}`);
                       await runShutdown(module2, bootContext);
                     } catch (error) {
                       logger.error(`Error running shutdown script: ${serializeError(error)}`);

package/dist/index.js

@@ -11,6 +11,7 @@ import "./chunk-I62ZQYTP.js";
 // src/integration.ts
 import fs2 from "fs";
 import MagicString from "magic-string";
+import { perEnvironmentState } from "vite";
 
 // src/hmr.ts
 import path from "path";
@@ -66,6 +67,16 @@ function serializeError(error) {
   return JSON.stringify(error);
 }
 
+// src/vite-env.ts
+import { isRunnableDevEnvironment } from "vite";
+async function ssrImport(server, moduleId) {
+  const ssr = server.environments["ssr"];
+  if (!isRunnableDevEnvironment(ssr)) {
+    throw new Error("SSR environment is not runnable");
+  }
+  return ssr.runner.import(moduleId);
+}
+
 // src/hmr.ts
 function setupBootHmr(server, entry, logger, getBootContext2) {
   const bootModuleId = `/${entry}`;
@@ -97,14 +108,14 @@ function setupBootHmr(server, entry, logger, getBootContext2) {
       logger.info(`boot dependency changed: ${changedPath}, rerunning hooks...`);
       const bootContext = getBootContext2();
       try {
-        const oldModule = await server.ssrLoadModule(bootModuleId);
+        const oldModule = await ssrImport(server, bootModuleId);
         await runShutdown(oldModule, bootContext);
       } catch (error) {
         logger.error(`Error during boot HMR shutdown: ${serializeError(error)}`);
       }
       server.moduleGraph.invalidateAll();
       try {
-        const newModule = await server.ssrLoadModule(bootModuleId);
+        const newModule = await ssrImport(server, bootModuleId);
         await runStartup(newModule, bootContext);
       } catch (error) {
         logger.error(`Error during boot HMR startup: ${serializeError(error)}`);
@@ -165,19 +176,15 @@ function getBootContext(server, config) {
   const { host, port } = getServerDefaults(config);
   return { dev: true, host, port };
 }
+var getState = perEnvironmentState(() => ({ bootChunkRef: null, warmupModules: null }));
 function boot(options = {}) {
   const entry = resolveEntry(options.entry);
   const hmr = options.hmr ?? false;
-  let isBuild = false;
-  let isSSR = false;
-  let bootChunkRef = null;
   let astroConfig = null;
-  let warmupModules = null;
   return {
     name: "@astroscope/boot",
     hooks: {
       "astro:config:setup": ({ command, updateConfig, logger, config }) => {
-        isBuild = command === "build";
         astroConfig = config;
         updateConfig({
           vite: {
@@ -185,19 +192,18 @@ function boot(options = {}) {
               // build plugin: handles entry.mjs injection, warmup manifest
               {
                 name: "@astroscope/boot",
-                configResolved(config2) {
-                  isSSR = !!config2.build?.ssr;
-                },
                 buildStart() {
-                  if (!isSSR) return;
+                  if (this.environment.name !== "ssr") return;
+                  const state = getState(this);
                   try {
-                    bootChunkRef = this.emitFile({ type: "chunk", id: entry, name: "boot" });
+                    state.bootChunkRef = this.emitFile({ type: "chunk", id: entry, name: "boot" });
                   } catch {
                   }
                 },
                 generateBundle(_, bundle) {
-                  if (!isSSR || !bootChunkRef) return;
-                  const bootChunkName = this.getFileName(bootChunkRef);
+                  const state = getState(this);
+                  if (!state.bootChunkRef) return;
+                  const bootChunkName = this.getFileName(state.bootChunkRef);
                   if (!bootChunkName) {
                     logger.warn("boot chunk not found");
                     return;
@@ -207,7 +213,7 @@ function boot(options = {}) {
                     logger.warn("entry.mjs not found - boot injection skipped");
                     return;
                   }
-                  warmupModules = collectWarmupModules(bundle);
+                  state.warmupModules = collectWarmupModules(bundle);
                   const { host, port } = getServerDefaults(astroConfig);
                   const prependCode = getPrependCode();
                   const prefix = prependCode.length ? `${prependCode.join("\n")}
@@ -226,10 +232,11 @@ await __astroscope_bootSetup(__astroscope_boot, ${JSON.stringify({ host, port })
                   logger.info(`injected ${bootChunkName} into entry.mjs`);
                 },
                 writeBundle(outputOptions) {
-                  if (!isSSR || !warmupModules) return;
+                  const state = getState(this);
+                  if (!state.warmupModules) return;
                   const outDir = outputOptions.dir;
                   if (!outDir) return;
-                  writeWarmupManifest(outDir, warmupModules, logger);
+                  writeWarmupManifest(outDir, state.warmupModules, logger);
                 }
               },
               // startup plugin: runs after all other configureServer hooks
@@ -237,10 +244,10 @@ await __astroscope_bootSetup(__astroscope_boot, ${JSON.stringify({ host, port })
                 name: "@astroscope/boot/startup",
                 enforce: "post",
                 async configureServer(server) {
-                  if (isBuild) return;
+                  if (command !== "dev") return;
                   try {
                     const bootContext = getBootContext(server, astroConfig);
-                    const module = await server.ssrLoadModule(`/${entry}`);
+                    const module = await ssrImport(server, `/${entry}`);
                     await runStartup(module, bootContext);
                   } catch (error) {
                     logger.error(`Error running startup script: ${serializeError(error)}`);
@@ -248,7 +255,7 @@ await __astroscope_bootSetup(__astroscope_boot, ${JSON.stringify({ host, port })
                   server.httpServer?.once("close", async () => {
                     try {
                       const bootContext = getBootContext(server, astroConfig);
-                      const module = await server.ssrLoadModule(`/${entry}`);
+                      const module = await ssrImport(server, `/${entry}`);
                       await runShutdown(module, bootContext);
                     } catch (error) {
                       logger.error(`Error running shutdown script: ${serializeError(error)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astroscope/boot",
-  "version": "0.3.3",
+  "version": "0.4.0",
   "description": "Startup and graceful shutdown hooks for Astro SSR",
   "type": "module",
   "main": "./dist/index.js",
@@ -55,17 +55,17 @@
   "scripts": {
     "build": "tsup src/index.ts src/warmup.ts src/events.ts src/lifecycle.ts src/setup.ts src/prepend.ts --format esm,cjs --dts",
     "typecheck": "tsc --noEmit",
-    "lint": "eslint 'src/**/*.{ts,tsx}'",
-    "lint:fix": "eslint 'src/**/*.{ts,tsx}' --fix"
+    "lint": "eslint src",
+    "lint:fix": "eslint src --fix"
   },
   "devDependencies": {
-    "astro": "^5.17.1",
+    "astro": "^6.0.2",
     "tsup": "^8.5.1",
-    "typescript": "^5.9.3",
-    "vite": "^6.4.1"
+    "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "astro": "^5.0.0"
+    "astro": "^6.0.0",
+    "vite": "^7.0.0"
   },
   "dependencies": {
     "magic-string": "^0.30.21"