@cedarjs/vite 6.0.0-canary.2733 → 6.0.0-canary.2734

package/dist/cedar-unified-dev.d.ts

@@ -1,3 +1,20 @@
+interface ShutdownHandlerOptions {
+    /** Closes the running servers. Called once, on the first signal. */
+    close: () => Promise<void>;
+    timeoutMs?: number;
+    exit?: (code: number) => void;
+    logger?: Pick<typeof console, 'warn' | 'error'>;
+}
+/**
+ * Build the SIGINT/SIGTERM handler for the unified dev server.
+ *
+ * The handler always terminates the process, and does so promptly. Vite's
+ * `close()` waits for in-flight requests and open HMR websocket connections to
+ * drain, which is not guaranteed to finish, so the graceful path is bounded by
+ * a timeout. A second signal skips the wait entirely, which is what a user
+ * pressing Ctrl+C twice is asking for.
+ */
+export declare function createShutdownHandler({ close, timeoutMs, exit, logger, }: ShutdownHandlerOptions): () => Promise<void>;
 export declare function parseCliArgs(argv?: string[]): {
     forceOptimize: any;
     debug: any;
@@ -11,4 +28,5 @@ export declare function parseCliArgs(argv?: string[]): {
 };
 export declare function openDebugger(port: number, waitForDebugger?: boolean): Promise<void>;
 export declare function startUnifiedDevServer(): Promise<void>;
+export {};
 //# sourceMappingURL=cedar-unified-dev.d.ts.map

package/dist/cedar-unified-dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cedar-unified-dev.d.ts","sourceRoot":"","sources":["../src/cedar-unified-dev.ts"],"names":[],"mappings":"AA+BA,wBAAgB,YAAY,CAAC,IAAI,WAAe;;;;;;;;;;EAwB/C;AAuCD,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,UAAQ,iBAkKvE;AAED,wBAAsB,qBAAqB,kBAiI1C"}
+{"version":3,"file":"cedar-unified-dev.d.ts","sourceRoot":"","sources":["../src/cedar-unified-dev.ts"],"names":[],"mappings":"AAgBA,UAAU,sBAAsB;IAC9B,oEAAoE;IACpE,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;IAC7B,MAAM,CAAC,EAAE,IAAI,CAAC,OAAO,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,CAAA;CAChD;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,EACpC,KAAK,EACL,SAA+B,EAC/B,IAAmC,EACnC,MAAgB,GACjB,EAAE,sBAAsB,uBAoCxB;AAuBD,wBAAgB,YAAY,CAAC,IAAI,WAAe;;;;;;;;;;EAwB/C;AAuCD,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,UAAQ,iBAkKvE;AAED,wBAAsB,qBAAqB,kBAkI1C"}

package/dist/cedar-unified-dev.js

@@ -3,6 +3,38 @@ import { createServer } from "vite";
 import yargsParser from "yargs-parser";
 import { getPaths, getConfig } from "@cedarjs/project-config";
 import { startApiDevMiddleware } from "./apiDevMiddleware.js";
+const SHUTDOWN_TIMEOUT_MS = 5e3;
+function createShutdownHandler({
+  close,
+  timeoutMs = SHUTDOWN_TIMEOUT_MS,
+  exit = (code) => process.exit(code),
+  logger = console
+}) {
+  let shuttingDown = false;
+  return async function shutdown() {
+    if (shuttingDown) {
+      exit(0);
+      return;
+    }
+    shuttingDown = true;
+    const forceExitTimer = setTimeout(() => {
+      logger.warn(
+        `Dev server did not shut down within ${timeoutMs}ms. Forcing exit.`
+      );
+      exit(0);
+    }, timeoutMs);
+    forceExitTimer.unref();
+    try {
+      await close();
+    } catch (e) {
+      const message = e instanceof Error ? e.message : String(e);
+      logger.error(`Error while shutting down the dev server: ${message}`);
+    } finally {
+      clearTimeout(forceExitTimer);
+    }
+    exit(0);
+  };
+}
 function isViteInternalRequest(url) {
   const pathname = url.split("?")[0];
   return pathname.startsWith("/@") || pathname.startsWith("/__vite") || pathname.startsWith("/__hmr");
@@ -259,15 +291,17 @@ async function startUnifiedDevServer() {
     console.log(JSON.stringify(devServer.config, null, 2));
     console.log("~~~~~~~~~~~~~~~~~~~~~~~~~~");
   }
-  const shutdown = async () => {
-    await devServer.close();
-    await closeApi();
-    process.exit(0);
-  };
+  const shutdown = createShutdownHandler({
+    close: async () => {
+      await devServer.close();
+      await closeApi();
+    }
+  });
   process.on("SIGINT", shutdown);
   process.on("SIGTERM", shutdown);
 }
 export {
+  createShutdownHandler,
   openDebugger,
   parseCliArgs,
   startUnifiedDevServer

package/dist/cjs/cedar-unified-dev.js

@@ -28,6 +28,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var cedar_unified_dev_exports = {};
 __export(cedar_unified_dev_exports, {
+  createShutdownHandler: () => createShutdownHandler,
   openDebugger: () => openDebugger,
   parseCliArgs: () => parseCliArgs,
   startUnifiedDevServer: () => startUnifiedDevServer
@@ -38,6 +39,38 @@ var import_vite = require("vite");
 var import_yargs_parser = __toESM(require("yargs-parser"), 1);
 var import_project_config = require("@cedarjs/project-config");
 var import_apiDevMiddleware = require("./apiDevMiddleware.js");
+const SHUTDOWN_TIMEOUT_MS = 5e3;
+function createShutdownHandler({
+  close,
+  timeoutMs = SHUTDOWN_TIMEOUT_MS,
+  exit = (code) => process.exit(code),
+  logger = console
+}) {
+  let shuttingDown = false;
+  return async function shutdown() {
+    if (shuttingDown) {
+      exit(0);
+      return;
+    }
+    shuttingDown = true;
+    const forceExitTimer = setTimeout(() => {
+      logger.warn(
+        `Dev server did not shut down within ${timeoutMs}ms. Forcing exit.`
+      );
+      exit(0);
+    }, timeoutMs);
+    forceExitTimer.unref();
+    try {
+      await close();
+    } catch (e) {
+      const message = e instanceof Error ? e.message : String(e);
+      logger.error(`Error while shutting down the dev server: ${message}`);
+    } finally {
+      clearTimeout(forceExitTimer);
+    }
+    exit(0);
+  };
+}
 function isViteInternalRequest(url) {
   const pathname = url.split("?")[0];
   return pathname.startsWith("/@") || pathname.startsWith("/__vite") || pathname.startsWith("/__hmr");
@@ -294,16 +327,18 @@ async function startUnifiedDevServer() {
     console.log(JSON.stringify(devServer.config, null, 2));
     console.log("~~~~~~~~~~~~~~~~~~~~~~~~~~");
   }
-  const shutdown = async () => {
-    await devServer.close();
-    await closeApi();
-    process.exit(0);
-  };
+  const shutdown = createShutdownHandler({
+    close: async () => {
+      await devServer.close();
+      await closeApi();
+    }
+  });
   process.on("SIGINT", shutdown);
   process.on("SIGTERM", shutdown);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  createShutdownHandler,
   openDebugger,
   parseCliArgs,
   startUnifiedDevServer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/vite",
-  "version": "6.0.0-canary.2733",
+  "version": "6.0.0-canary.2734",
   "description": "Vite configuration package for CedarJS",
   "repository": {
     "type": "git",
@@ -63,16 +63,16 @@
     "@babel/parser": "7.29.7",
     "@babel/traverse": "7.29.7",
     "@babel/types": "7.29.7",
-    "@cedarjs/api": "6.0.0-canary.2733",
-    "@cedarjs/api-server": "6.0.0-canary.2733",
-    "@cedarjs/babel-config": "6.0.0-canary.2733",
-    "@cedarjs/context": "6.0.0-canary.2733",
-    "@cedarjs/cookie-jar": "6.0.0-canary.2733",
-    "@cedarjs/graphql-server": "6.0.0-canary.2733",
-    "@cedarjs/internal": "6.0.0-canary.2733",
-    "@cedarjs/project-config": "6.0.0-canary.2733",
-    "@cedarjs/server-store": "6.0.0-canary.2733",
-    "@cedarjs/testing": "6.0.0-canary.2733",
+    "@cedarjs/api": "6.0.0-canary.2734",
+    "@cedarjs/api-server": "6.0.0-canary.2734",
+    "@cedarjs/babel-config": "6.0.0-canary.2734",
+    "@cedarjs/context": "6.0.0-canary.2734",
+    "@cedarjs/cookie-jar": "6.0.0-canary.2734",
+    "@cedarjs/graphql-server": "6.0.0-canary.2734",
+    "@cedarjs/internal": "6.0.0-canary.2734",
+    "@cedarjs/project-config": "6.0.0-canary.2734",
+    "@cedarjs/server-store": "6.0.0-canary.2734",
+    "@cedarjs/testing": "6.0.0-canary.2734",
     "@fastify/url-data": "6.0.3",
     "@swc/core": "1.15.46",
     "@universal-deploy/store": "^0.2.1",
@@ -109,9 +109,9 @@
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.5",
-    "@cedarjs/auth": "6.0.0-canary.2733",
-    "@cedarjs/router": "6.0.0-canary.2733",
-    "@cedarjs/web": "6.0.0-canary.2733",
+    "@cedarjs/auth": "6.0.0-canary.2734",
+    "@cedarjs/router": "6.0.0-canary.2734",
+    "@cedarjs/web": "6.0.0-canary.2734",
     "@hyrious/esbuild-plugin-commonjs": "0.2.6",
     "@jridgewell/trace-mapping": "0.3.31",
     "@types/aws-lambda": "8.10.162",
@@ -130,9 +130,9 @@
     "vitest": "4.1.10"
   },
   "peerDependencies": {
-    "@cedarjs/auth": "6.0.0-canary.2733",
-    "@cedarjs/router": "6.0.0-canary.2733",
-    "@cedarjs/web": "6.0.0-canary.2733"
+    "@cedarjs/auth": "6.0.0-canary.2734",
+    "@cedarjs/router": "6.0.0-canary.2734",
+    "@cedarjs/web": "6.0.0-canary.2734"
   },
   "engines": {
     "node": ">=24"