@cedarjs/vite 5.0.7-next.258 → 5.0.7-next.310

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

@@ -21,6 +21,7 @@ export declare function parseCliArgs(argv?: string[]): {
     portArg: any;
     debugPort: any;
     debugBrk: any;
+    jobsArg: any;
     serverArgs: {
         [argName: string]: any;
         "--"?: Array<string | number>;

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":"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,kBAyI1C"}
+{"version":3,"file":"cedar-unified-dev.d.ts","sourceRoot":"","sources":["../src/cedar-unified-dev.ts"],"names":[],"mappings":"AAiBA,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;;;;;;;;;;;EAkC/C;AAuCD,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,UAAQ,iBAkKvE;AAED,wBAAsB,qBAAqB,kBAkK1C"}

package/dist/cedar-unified-dev.js

@@ -3,6 +3,7 @@ import { createServer } from "vite";
 import yargsParser from "yargs-parser";
 import { getPaths, getConfig } from "@cedarjs/project-config";
 import { startApiDevMiddleware } from "./apiDevMiddleware.js";
+import { startJobsDevWorkers } from "./jobsDevMiddleware.js";
 const SHUTDOWN_TIMEOUT_MS = 5e3;
 function createShutdownHandler({
   close,
@@ -50,6 +51,7 @@ function parseCliArgs(argv = process.argv) {
     apiPort: _apiPortArg,
     "debug-port": debugPort,
     "debug-brk": debugBrk,
+    jobs: jobsArg,
     _: _positional,
     ...serverArgs
   } = yargsParser(argv.slice(2), {
@@ -60,11 +62,20 @@ function parseCliArgs(argv = process.argv) {
       "force",
       "cors",
       "debug",
-      "debug-brk"
+      "debug-brk",
+      "jobs"
     ],
     number: ["port", "apiPort", "debug-port"]
   });
-  return { forceOptimize, debug, portArg, debugPort, debugBrk, serverArgs };
+  return {
+    forceOptimize,
+    debug,
+    portArg,
+    debugPort,
+    debugBrk,
+    jobsArg,
+    serverArgs
+  };
 }
 async function clearPendingPause() {
   const inspector = await import("node:inspector");
@@ -212,7 +223,15 @@ async function startUnifiedDevServer() {
   if (!configFile) {
     throw new Error("Could not locate your web/vite.config.{js,ts} file");
   }
-  const { forceOptimize, debug, portArg, debugPort, debugBrk, serverArgs } = parseCliArgs();
+  const {
+    forceOptimize,
+    debug,
+    portArg,
+    debugPort,
+    debugBrk,
+    jobsArg,
+    serverArgs
+  } = parseCliArgs();
   if (serverArgs.open === void 0 && !process.stdout.isTTY) {
     serverArgs.open = false;
   }
@@ -220,8 +239,13 @@ async function startUnifiedDevServer() {
     await openDebugger(debugPort, debugBrk);
   }
   const webPort = portArg ?? cedarConfig.web.port ?? 8910;
-  const { close: closeApi, handler: apiHandler } = await startApiDevMiddleware();
+  const {
+    viteServer: apiViteServer,
+    close: closeApi,
+    handler: apiHandler
+  } = await startApiDevMiddleware();
   const apiAdapter = createServerAdapter(apiHandler);
+  const jobsWorkerPool = jobsArg === false ? null : await startJobsDevWorkers(apiViteServer);
   const devServer = await createServer({
     configFile,
     // env file is handled by Cedar's plugins
@@ -297,7 +321,11 @@ async function startUnifiedDevServer() {
   const shutdown = createShutdownHandler({
     close: async () => {
       await devServer.close();
-      await closeApi();
+      try {
+        await jobsWorkerPool?.stop();
+      } finally {
+        await closeApi();
+      }
     }
   });
   process.on("SIGINT", shutdown);

package/dist/jobsDevMiddleware.d.ts

@@ -0,0 +1,17 @@
+import type { ViteDevServer } from 'vite';
+export interface JobsWorkerPool {
+    stop: () => Promise<void>;
+}
+type SsrModuleLoader = Pick<ViteDevServer, 'ssrLoadModule'>;
+/**
+ * Starts the configured background jobs workers in-process, loading both the
+ * jobs config and job implementations through the given (already-running)
+ * api Vite dev server instead of from compiled `api/dist` output.
+ *
+ * Returns `null` (and logs nothing) when no jobs are configured, mirroring
+ * the "just works, opt-in already happened at `cedar setup jobs` time"
+ * behaviour of classic dev's nodemon-wrapped worker.
+ */
+export declare function startJobsDevWorkers(viteServer: SsrModuleLoader): Promise<JobsWorkerPool | null>;
+export {};
+//# sourceMappingURL=jobsDevMiddleware.d.ts.map

package/dist/jobsDevMiddleware.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"jobsDevMiddleware.d.ts","sourceRoot":"","sources":["../src/jobsDevMiddleware.ts"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAA;AAyEzC,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAC1B;AAKD,KAAK,eAAe,GAAG,IAAI,CAAC,aAAa,EAAE,eAAe,CAAC,CAAA;AAE3D;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,eAAe,GAC1B,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CA8FhC"}

package/dist/jobsDevMiddleware.js

@@ -0,0 +1,106 @@
+import { pathToFileURL } from "node:url";
+import ansis from "ansis";
+import {
+  JobNotFoundError,
+  JobsLibNotFoundError,
+  setJobLoaderOverrides
+} from "@cedarjs/jobs";
+import { getPaths } from "@cedarjs/project-config";
+function buildNumWorkers(workers) {
+  const numWorkers = [];
+  workers.forEach((worker, index) => {
+    const count = worker.count ?? 1;
+    for (let id = 0; id < count; id++) {
+      numWorkers.push([index, id]);
+    }
+  });
+  return numWorkers;
+}
+async function loadJobsManagerViaVite(viteServer) {
+  const jobsConfigPath = getPaths().api.jobsConfig;
+  if (!jobsConfigPath) {
+    throw new JobsLibNotFoundError();
+  }
+  const mod = await viteServer.ssrLoadModule(pathToFileURL(jobsConfigPath).href);
+  if (!mod.jobs) {
+    throw new JobsLibNotFoundError();
+  }
+  return mod.jobs;
+}
+async function loadJobViaVite(viteServer, { name: jobName, path: jobPath }) {
+  const completeJobPath = `${getPaths().api.jobs}/${jobPath}`;
+  let mod;
+  try {
+    mod = await viteServer.ssrLoadModule(pathToFileURL(completeJobPath).href);
+  } catch {
+    throw new JobNotFoundError(jobName);
+  }
+  if (!mod[jobName]) {
+    throw new JobNotFoundError(jobName);
+  }
+  return mod[jobName];
+}
+async function startJobsDevWorkers(viteServer) {
+  setJobLoaderOverrides({
+    loadJobsManager: () => loadJobsManagerViaVite(viteServer),
+    loadJob: (computedProperties) => loadJobViaVite(viteServer, computedProperties)
+  });
+  let jobsManager;
+  try {
+    jobsManager = await loadJobsManagerViaVite(viteServer);
+  } catch (e) {
+    if (e instanceof JobsLibNotFoundError) {
+      setJobLoaderOverrides(void 0);
+      return null;
+    }
+    throw e;
+  }
+  const numWorkers = buildNumWorkers(jobsManager.workers);
+  const logger = jobsManager.logger ?? console;
+  if (numWorkers.length === 0) {
+    setJobLoaderOverrides(void 0);
+    return null;
+  }
+  logger.warn(
+    `[CedarJS Jobs] Starting ${numWorkers.length} worker(s) in-process (Unified Dev)...`
+  );
+  const workers = numWorkers.map(([index, id]) => {
+    const workerConfig = jobsManager.workers[index];
+    const processName = `ud-jobs.${[workerConfig.queue].flat().join("-")}.${id}`;
+    return jobsManager.createWorker({
+      index,
+      clear: false,
+      workoff: false,
+      processName
+    });
+  });
+  const workerRunPromises = workers.map(
+    (worker) => worker.run().catch((e) => {
+      logger.error("[CedarJS Jobs] A worker stopped unexpectedly", e);
+    })
+  );
+  console.log(
+    ansis.dim.italic(
+      `[CedarJS Jobs] ${workers.length} worker(s) running: ` + workers.map((w) => w.processName).join(", ")
+    )
+  );
+  const stop = async () => {
+    console.log(
+      ansis.dim.italic(
+        "[CedarJS Jobs] Waiting for in-progress jobs to finish..."
+      )
+    );
+    workers.forEach((worker) => {
+      worker.forever = false;
+    });
+    try {
+      await Promise.all(workerRunPromises);
+    } finally {
+      setJobLoaderOverrides(void 0);
+    }
+  };
+  return { stop };
+}
+export {
+  startJobsDevWorkers
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/vite",
-  "version": "5.0.7-next.258",
+  "version": "5.0.7-next.310",
   "description": "Vite configuration package for CedarJS",
   "repository": {
     "type": "git",
@@ -52,23 +52,24 @@
     "@babel/parser": "7.29.7",
     "@babel/traverse": "7.29.7",
     "@babel/types": "7.29.7",
-    "@cedarjs/api": "5.0.7-next.258",
-    "@cedarjs/api-server": "5.0.7-next.258",
-    "@cedarjs/babel-config": "5.0.7-next.258",
-    "@cedarjs/context": "5.0.7-next.258",
-    "@cedarjs/graphql-server": "5.0.7-next.258",
-    "@cedarjs/internal": "5.0.7-next.258",
-    "@cedarjs/project-config": "5.0.7-next.258",
-    "@cedarjs/server-store": "5.0.7-next.258",
-    "@cedarjs/structure": "5.0.7-next.258",
-    "@cedarjs/testing": "5.0.7-next.258",
+    "@cedarjs/api": "5.0.7-next.310",
+    "@cedarjs/api-server": "5.0.7-next.310",
+    "@cedarjs/babel-config": "5.0.7-next.310",
+    "@cedarjs/context": "5.0.7-next.310",
+    "@cedarjs/graphql-server": "5.0.7-next.310",
+    "@cedarjs/internal": "5.0.7-next.310",
+    "@cedarjs/jobs": "5.0.7-next.310",
+    "@cedarjs/project-config": "5.0.7-next.310",
+    "@cedarjs/server-store": "5.0.7-next.310",
+    "@cedarjs/structure": "5.0.7-next.310",
+    "@cedarjs/testing": "5.0.7-next.310",
     "@swc/core": "1.15.47",
     "@universal-deploy/store": "^0.2.1",
     "@universal-deploy/vite": "^0.1.9",
     "@vitejs/plugin-react": "4.7.0",
     "@whatwg-node/fetch": "0.10.13",
     "@whatwg-node/server": "0.11.0",
-    "acorn": "8.17.0",
+    "acorn": "8.18.0",
     "acorn-loose": "8.5.2",
     "ansis": "4.3.1",
     "busboy": "^1.6.0",
@@ -79,7 +80,7 @@
     "http-proxy-middleware": "3.0.7",
     "isbot": "5.2.1",
     "magic-string": "0.30.21",
-    "oxc-parser": "0.141.0",
+    "oxc-parser": "0.144.0",
     "react": "18.3.1",
     "react-server-dom-webpack": "19.2.7",
     "unimport": "5.7.0",
@@ -92,14 +93,14 @@
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "@cedarjs/auth": "5.0.7-next.258",
-    "@cedarjs/framework-tools": "5.0.7-next.258",
-    "@cedarjs/router": "5.0.7-next.258",
-    "@cedarjs/web": "5.0.7-next.258",
+    "@cedarjs/auth": "5.0.7-next.310",
+    "@cedarjs/framework-tools": "5.0.7-next.310",
+    "@cedarjs/router": "5.0.7-next.310",
+    "@cedarjs/web": "5.0.7-next.310",
     "@dr.pogodin/react-helmet": "2.0.4",
     "@hyrious/esbuild-plugin-commonjs": "0.2.6",
     "@jridgewell/trace-mapping": "0.3.31",
-    "@oxc-project/types": "^0.141.0",
+    "@oxc-project/types": "^0.144.0",
     "@types/aws-lambda": "8.10.162",
     "@types/busboy": "^1",
     "@types/express": "4",
@@ -107,7 +108,7 @@
     "@types/ws": "^8",
     "@types/yargs-parser": "21.0.3",
     "concurrently": "9.2.4",
-    "memfs": "4.64.0",
+    "memfs": "4.68.1",
     "publint": "0.3.23",
     "rollup": "4.60.4",
     "ts-dedent": "2.3.0",
@@ -115,9 +116,9 @@
     "vitest": "4.1.10"
   },
   "peerDependencies": {
-    "@cedarjs/auth": "5.0.7-next.258",
-    "@cedarjs/router": "5.0.7-next.258",
-    "@cedarjs/web": "5.0.7-next.258"
+    "@cedarjs/auth": "5.0.7-next.310",
+    "@cedarjs/router": "5.0.7-next.310",
+    "@cedarjs/web": "5.0.7-next.310"
   },
   "engines": {
     "node": ">=24"