vite-ssg-optimized 0.24.2-optimized.21 → 0.24.2-optimized.3

package/README.md

@@ -1,4 +1,4 @@
-# Vite SSG Optimized
+# Vite SSG
 
 Static-site generation for Vue 3 on Vite.
 
@@ -6,37 +6,6 @@ Static-site generation for Vue 3 on Vite.
 
 > ℹ️ **Vite 2 is supported from `v0.2.x`, Vite 1's support is discontinued.**
 
-> ℹ️  This is a fork from vite-ssg
-
-## Optimizations
-
-* Replaced @unhead/dom by @unhead/ssr
-* Used a custom injectInHtml instead of jsdom with is faster
-* Added worker threads to avoid locking main event loop
-* Avoid grow the number of tasks in queue when we have many routes
-* Added teleport support, the original vite-ssg don't writes teleports to the final file causing SSR mismatches
-* Detect if is in isHydrationMode by quering [data-server-rendered] on client
-* Creates SSRApp or App accord with environment and hydration
-
-
-
-#### Thread Workers
-
-To configure `workerThreads`  `ssgOptions.numberOfWorkers` in `vite.config.ts`
-
-Each thread accept the `Math.ceil(concurrency / numberOfWorkers )` concurrent tasks at max.
-
-```ts
- defineConfig({
-   ssgOptions: {
-      concurrency: 50,
-      numberOfWorkers: 5 // 5 is the default
-    }
- })
- ```
- 
-
-
 ## Install
 
 > **This library requires Node.js version >= 14**

package/dist/client/single-page.d.cts

@@ -1,6 +1,6 @@
 import { Component } from 'vue';
-import { V as ViteSSGContext, a as ViteSSGClientOptions } from '../shared/vite-ssg-optimized.341e382e.cjs';
-export { R as RouterOptions, b as ViteSSGOptions } from '../shared/vite-ssg-optimized.341e382e.cjs';
+import { V as ViteSSGContext, a as ViteSSGClientOptions } from '../shared/vite-ssg-optimized.cf5cb4ee.cjs';
+export { R as RouterOptions, b as ViteSSGOptions } from '../shared/vite-ssg-optimized.cf5cb4ee.cjs';
 import '@unhead/vue';
 import 'beasties';
 import 'critters';

package/dist/client/single-page.d.mts

@@ -1,6 +1,6 @@
 import { Component } from 'vue';
-import { V as ViteSSGContext, a as ViteSSGClientOptions } from '../shared/vite-ssg-optimized.341e382e.mjs';
-export { R as RouterOptions, b as ViteSSGOptions } from '../shared/vite-ssg-optimized.341e382e.mjs';
+import { V as ViteSSGContext, a as ViteSSGClientOptions } from '../shared/vite-ssg-optimized.cf5cb4ee.mjs';
+export { R as RouterOptions, b as ViteSSGOptions } from '../shared/vite-ssg-optimized.cf5cb4ee.mjs';
 import '@unhead/vue';
 import 'beasties';
 import 'critters';

package/dist/client/single-page.d.ts

@@ -1,6 +1,6 @@
 import { Component } from 'vue';
-import { V as ViteSSGContext, a as ViteSSGClientOptions } from '../shared/vite-ssg-optimized.341e382e.js';
-export { R as RouterOptions, b as ViteSSGOptions } from '../shared/vite-ssg-optimized.341e382e.js';
+import { V as ViteSSGContext, a as ViteSSGClientOptions } from '../shared/vite-ssg-optimized.cf5cb4ee.js';
+export { R as RouterOptions, b as ViteSSGOptions } from '../shared/vite-ssg-optimized.cf5cb4ee.js';
 import '@unhead/vue';
 import 'beasties';
 import 'critters';

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import { Component } from 'vue';
-import { R as RouterOptions, V as ViteSSGContext, a as ViteSSGClientOptions } from './shared/vite-ssg-optimized.341e382e.cjs';
-export { b as ViteSSGOptions } from './shared/vite-ssg-optimized.341e382e.cjs';
+import { R as RouterOptions, V as ViteSSGContext, a as ViteSSGClientOptions } from './shared/vite-ssg-optimized.cf5cb4ee.cjs';
+export { b as ViteSSGOptions } from './shared/vite-ssg-optimized.cf5cb4ee.cjs';
 import '@unhead/vue';
 import 'beasties';
 import 'critters';

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { Component } from 'vue';
-import { R as RouterOptions, V as ViteSSGContext, a as ViteSSGClientOptions } from './shared/vite-ssg-optimized.341e382e.mjs';
-export { b as ViteSSGOptions } from './shared/vite-ssg-optimized.341e382e.mjs';
+import { R as RouterOptions, V as ViteSSGContext, a as ViteSSGClientOptions } from './shared/vite-ssg-optimized.cf5cb4ee.mjs';
+export { b as ViteSSGOptions } from './shared/vite-ssg-optimized.cf5cb4ee.mjs';
 import '@unhead/vue';
 import 'beasties';
 import 'critters';

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { Component } from 'vue';
-import { R as RouterOptions, V as ViteSSGContext, a as ViteSSGClientOptions } from './shared/vite-ssg-optimized.341e382e.js';
-export { b as ViteSSGOptions } from './shared/vite-ssg-optimized.341e382e.js';
+import { R as RouterOptions, V as ViteSSGContext, a as ViteSSGClientOptions } from './shared/vite-ssg-optimized.cf5cb4ee.js';
+export { b as ViteSSGOptions } from './shared/vite-ssg-optimized.cf5cb4ee.js';
 import '@unhead/vue';
 import 'beasties';
 import 'critters';

package/dist/node/cli.cjs

@@ -4,7 +4,7 @@ const process = require('node:process');
 const kolorist = require('kolorist');
 const yargs = require('yargs');
 const helpers = require('yargs/helpers');
-const node = require('../shared/vite-ssg-optimized.79d27333.cjs');
+const node = require('../shared/vite-ssg-optimized.31f4c9de.cjs');
 require('node:module');
 require('node:path');
 require('@unhead/ssr');

package/dist/node/cli.mjs

@@ -2,7 +2,7 @@ import process from 'node:process';
 import { gray, bold, red, reset, underline } from 'kolorist';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
-import { b as build } from '../shared/vite-ssg-optimized.22da6b90.mjs';
+import { b as build } from '../shared/vite-ssg-optimized.dc2a4a38.mjs';
 import 'node:module';
 import 'node:path';
 import '@unhead/ssr';

package/dist/node.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const node = require('./shared/vite-ssg-optimized.79d27333.cjs');
+const node = require('./shared/vite-ssg-optimized.31f4c9de.cjs');
 require('node:module');
 require('node:path');
 require('node:process');

package/dist/node.d.cts

@@ -1,6 +1,6 @@
-export { b as build } from './shared/vite-ssg-optimized.27bed688.cjs';
+export { b as build } from './shared/vite-ssg-optimized.12fd9d22.cjs';
 import 'vite';
-import './shared/vite-ssg-optimized.341e382e.cjs';
+import './shared/vite-ssg-optimized.cf5cb4ee.cjs';
 import '@unhead/vue';
 import 'beasties';
 import 'critters';

package/dist/node.d.mts

@@ -1,6 +1,6 @@
-export { b as build } from './shared/vite-ssg-optimized.f03a17e6.mjs';
+export { b as build } from './shared/vite-ssg-optimized.892682c8.mjs';
 import 'vite';
-import './shared/vite-ssg-optimized.341e382e.mjs';
+import './shared/vite-ssg-optimized.cf5cb4ee.mjs';
 import '@unhead/vue';
 import 'beasties';
 import 'critters';

package/dist/node.d.ts

@@ -1,6 +1,6 @@
-export { b as build } from './shared/vite-ssg-optimized.f1a9229c.js';
+export { b as build } from './shared/vite-ssg-optimized.950926bc.js';
 import 'vite';
-import './shared/vite-ssg-optimized.341e382e.js';
+import './shared/vite-ssg-optimized.cf5cb4ee.js';
 import '@unhead/vue';
 import 'beasties';
 import 'critters';

package/dist/node.mjs

@@ -1,4 +1,4 @@
-export { b as build } from './shared/vite-ssg-optimized.22da6b90.mjs';
+export { b as build } from './shared/vite-ssg-optimized.dc2a4a38.mjs';
 import 'node:module';
 import 'node:path';
 import 'node:process';

package/dist/shared/build.worker.cjs

@@ -2,7 +2,7 @@
 
 const node_module = require('node:module');
 const node_worker_threads = require('node:worker_threads');
-const node = require('./vite-ssg-optimized.79d27333.cjs');
+const node = require('./vite-ssg-optimized.31f4c9de.cjs');
 const kolorist = require('kolorist');
 const vite = require('vite');
 require('node:path');
@@ -14,46 +14,13 @@ require('html5parser');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 (async () => {
-  const plainnify = (m) => {
-    if (m instanceof Function) {
-      return void 0;
-    }
-    if (Array.isArray(m)) {
-      return m.map(plainnify);
-    }
-    if (typeof m === "object" && m !== null) {
-      if (m instanceof Error || "stack" in m) {
-        return {
-          message: m.message,
-          stack: m.stack
-        };
-      }
-      return Object.entries(m).reduce((acc, [key, value]) => {
-        acc[key] = plainnify(value);
-        return acc;
-      }, {});
-    }
-    return m?.toString();
-  };
-  const fnLog = (level = "info", ...msg) => {
-    const newMsg = msg.map(plainnify);
-    node_worker_threads.parentPort.postMessage({ type: "log", args: newMsg, level });
-  };
-  globalThis.console = Object.assign(globalThis.console, {
-    info: fnLog.bind(globalThis.console, "info"),
-    warn: fnLog.bind(globalThis.console, "warn"),
-    error: fnLog.bind(globalThis.console, "error"),
-    log: fnLog.bind(globalThis.console, "log"),
-    trace: fnLog.bind(globalThis.console, "trace"),
-    debug: fnLog.bind(globalThis.console, "debug")
-  });
   const { serverEntry, out, beastiesOptions, viteConfig, mode, format, dirStyle, ...extraOpts } = node_worker_threads.workerData;
   const nodeEnv = process.env.NODE_ENV || "production";
   const config = await vite.resolveConfig(viteConfig, "build", mode, nodeEnv);
   const {
     onPageRendered,
-    onBeforePageRender
-    // onDonePageRender,
+    onBeforePageRender,
+    onDonePageRender
   } = config.ssgOptions || {};
   const { renderToString } = await import('vue/server-renderer');
   const outDir = out.replace(process.cwd(), "").replace(/^\//g, "");
@@ -72,7 +39,7 @@ var _documentCurrentScript = typeof document !== 'undefined' ? document.currentS
         renderToString,
         onPageRendered,
         onBeforePageRender,
-        // onDonePageRender: onDonePageRender,
+        onDonePageRender,
         beasties,
         config: { logger: { info: (msg) => {
           node_worker_threads.parentPort.postMessage({ type: "log", args: [msg] });
@@ -95,12 +62,7 @@ var _documentCurrentScript = typeof document !== 'undefined' ? document.currentS
         }
         node_worker_threads.parentPort.postMessage({ type: "result", id, result });
       } catch (e) {
-        const message2 = e.message || e.toString();
-        const stack = e.stack || "";
-        const error = { message: message2, stack };
-        process.stderr.write(`${kolorist.red("[vite-ssg-worker]")} ${message2} ${stack}
-`);
-        node_worker_threads.parentPort.postMessage({ type: "error", id, error });
+        node_worker_threads.parentPort.postMessage({ type: "error", id, error: e.toString() });
       }
     }
   });

package/dist/shared/build.worker.d.cts

@@ -1,9 +1,9 @@
-import { M as Manifest } from './vite-ssg-optimized.27bed688.cjs';
+import { M as Manifest } from './vite-ssg-optimized.12fd9d22.cjs';
 import { ViteSSGOptions } from 'vite-ssg';
 import { Options } from 'beasties';
 import { Options as Options$1 } from 'html-minifier-terser';
 import 'vite';
-import './vite-ssg-optimized.341e382e.cjs';
+import './vite-ssg-optimized.cf5cb4ee.cjs';
 import '@unhead/vue';
 import 'critters';
 import 'vue';
@@ -11,7 +11,6 @@ import 'vue-router';
 
 interface WorkerDataEntry {
     serverEntry: string;
-    workerId: number | string;
     format: 'esm' | 'cjs';
     out: string;
     dirStyle: ViteSSGOptions['dirStyle'];
@@ -23,7 +22,7 @@ interface WorkerDataEntry {
     formatting: ViteSSGOptions['formatting'];
     minifyOptions: Options$1;
     viteConfig: {
-        configFile?: string;
+        configFile: string;
     };
 }
 

package/dist/shared/build.worker.d.mts

@@ -1,9 +1,9 @@
-import { M as Manifest } from './vite-ssg-optimized.f03a17e6.mjs';
+import { M as Manifest } from './vite-ssg-optimized.892682c8.mjs';
 import { ViteSSGOptions } from 'vite-ssg';
 import { Options } from 'beasties';
 import { Options as Options$1 } from 'html-minifier-terser';
 import 'vite';
-import './vite-ssg-optimized.341e382e.mjs';
+import './vite-ssg-optimized.cf5cb4ee.mjs';
 import '@unhead/vue';
 import 'critters';
 import 'vue';
@@ -11,7 +11,6 @@ import 'vue-router';
 
 interface WorkerDataEntry {
     serverEntry: string;
-    workerId: number | string;
     format: 'esm' | 'cjs';
     out: string;
     dirStyle: ViteSSGOptions['dirStyle'];
@@ -23,7 +22,7 @@ interface WorkerDataEntry {
     formatting: ViteSSGOptions['formatting'];
     minifyOptions: Options$1;
     viteConfig: {
-        configFile?: string;
+        configFile: string;
     };
 }
 

package/dist/shared/build.worker.d.ts

@@ -1,9 +1,9 @@
-import { M as Manifest } from './vite-ssg-optimized.f1a9229c.js';
+import { M as Manifest } from './vite-ssg-optimized.950926bc.js';
 import { ViteSSGOptions } from 'vite-ssg';
 import { Options } from 'beasties';
 import { Options as Options$1 } from 'html-minifier-terser';
 import 'vite';
-import './vite-ssg-optimized.341e382e.js';
+import './vite-ssg-optimized.cf5cb4ee.js';
 import '@unhead/vue';
 import 'critters';
 import 'vue';
@@ -11,7 +11,6 @@ import 'vue-router';
 
 interface WorkerDataEntry {
     serverEntry: string;
-    workerId: number | string;
     format: 'esm' | 'cjs';
     out: string;
     dirStyle: ViteSSGOptions['dirStyle'];
@@ -23,7 +22,7 @@ interface WorkerDataEntry {
     formatting: ViteSSGOptions['formatting'];
     minifyOptions: Options$1;
     viteConfig: {
-        configFile?: string;
+        configFile: string;
     };
 }
 

package/dist/shared/build.worker.mjs

@@ -1,7 +1,7 @@
 import { createRequire } from 'node:module';
 import { parentPort, workerData } from 'node:worker_threads';
-import { g as getBeastiesOrCritters, e as executeTaskFn } from './vite-ssg-optimized.22da6b90.mjs';
-import { gray, blue, red } from 'kolorist';
+import { g as getBeastiesOrCritters, e as executeTaskFn } from './vite-ssg-optimized.dc2a4a38.mjs';
+import { gray, blue } from 'kolorist';
 import { resolveConfig } from 'vite';
 import 'node:path';
 import 'node:process';
@@ -11,46 +11,13 @@ import './vite-ssg-optimized.579feabb.mjs';
 import 'html5parser';
 
 (async () => {
-  const plainnify = (m) => {
-    if (m instanceof Function) {
-      return void 0;
-    }
-    if (Array.isArray(m)) {
-      return m.map(plainnify);
-    }
-    if (typeof m === "object" && m !== null) {
-      if (m instanceof Error || "stack" in m) {
-        return {
-          message: m.message,
-          stack: m.stack
-        };
-      }
-      return Object.entries(m).reduce((acc, [key, value]) => {
-        acc[key] = plainnify(value);
-        return acc;
-      }, {});
-    }
-    return m?.toString();
-  };
-  const fnLog = (level = "info", ...msg) => {
-    const newMsg = msg.map(plainnify);
-    parentPort.postMessage({ type: "log", args: newMsg, level });
-  };
-  globalThis.console = Object.assign(globalThis.console, {
-    info: fnLog.bind(globalThis.console, "info"),
-    warn: fnLog.bind(globalThis.console, "warn"),
-    error: fnLog.bind(globalThis.console, "error"),
-    log: fnLog.bind(globalThis.console, "log"),
-    trace: fnLog.bind(globalThis.console, "trace"),
-    debug: fnLog.bind(globalThis.console, "debug")
-  });
   const { serverEntry, out, beastiesOptions, viteConfig, mode, format, dirStyle, ...extraOpts } = workerData;
   const nodeEnv = process.env.NODE_ENV || "production";
   const config = await resolveConfig(viteConfig, "build", mode, nodeEnv);
   const {
     onPageRendered,
-    onBeforePageRender
-    // onDonePageRender,
+    onBeforePageRender,
+    onDonePageRender
   } = config.ssgOptions || {};
   const { renderToString } = await import('vue/server-renderer');
   const outDir = out.replace(process.cwd(), "").replace(/^\//g, "");
@@ -69,7 +36,7 @@ import 'html5parser';
         renderToString,
         onPageRendered,
         onBeforePageRender,
-        // onDonePageRender: onDonePageRender,
+        onDonePageRender,
         beasties,
         config: { logger: { info: (msg) => {
           parentPort.postMessage({ type: "log", args: [msg] });
@@ -92,12 +59,7 @@ import 'html5parser';
         }
         parentPort.postMessage({ type: "result", id, result });
       } catch (e) {
-        const message2 = e.message || e.toString();
-        const stack = e.stack || "";
-        const error = { message: message2, stack };
-        process.stderr.write(`${red("[vite-ssg-worker]")} ${message2} ${stack}
-`);
-        parentPort.postMessage({ type: "error", id, error });
+        parentPort.postMessage({ type: "error", id, error: e.toString() });
       }
     }
   });

package/dist/shared/{vite-ssg-optimized.f03a17e6.d.mts → vite-ssg-optimized.12fd9d22.d.cts}

@@ -1,5 +1,5 @@
 import { InlineConfig } from 'vite';
-import { b as ViteSSGOptions } from './vite-ssg-optimized.341e382e.mjs';
+import { b as ViteSSGOptions } from './vite-ssg-optimized.cf5cb4ee.cjs';
 
 type Manifest = Record<string, string[]>;
 declare function build(ssgOptions?: Partial<ViteSSGOptions & {

package/dist/shared/{vite-ssg-optimized.79d27333.cjs → vite-ssg-optimized.31f4c9de.cjs}

@@ -1059,8 +1059,9 @@ class BuildWorkerProxy {
       if (type !== "log")
         return;
       const fn = console[level]?.bind(console);
-      const workerId = options.workerData.workerId;
-      fn?.(`[woker #${workerId}] `, ...args, kolorist.reset(""));
+      let msg = args.map((arg) => typeof arg === "object" && !!arg ? "[object]" : arg).join(" ");
+      process.stdout.write(msg);
+      fn?.(msg);
     });
     this.worker.on("message", (message) => {
       const { id, type, result = void 0, error = void 0 } = message;
@@ -1159,13 +1160,12 @@ async function build(ssgOptions = {}, viteConfig = {}) {
     ssgOut: _ssgOutDir = node_path.join(root, ".vite-ssg-temp", Math.random().toString(36).substring(2, 12)),
     formatting = "none",
     minifyOptions = {},
-    // crittersOptions = {},
+    crittersOptions = {},
     beastiesOptions = {},
     includedRoutes: configIncludedRoutes = DefaultIncludedRoutes,
-    // onBeforePageRender,
-    // onPageRendered,
-    // onDonePageRender,
-    numberOfWorkers: _numberOfWorkers = 5,
+    onBeforePageRender,
+    onPageRendered,
+    onDonePageRender,
     onFinished,
     dirStyle = "flat",
     includeAllRoutes = false,
@@ -1193,7 +1193,7 @@ async function build(ssgOptions = {}, viteConfig = {}) {
   const prefix = format === "esm" && process__default.platform === "win32" ? "file://" : "";
   const ext = format === "esm" ? ".mjs" : ".cjs";
   const serverEntry = prefix + node_path.join(ssgOut, node_path.parse(ssrEntry).name + ext).replace(/\\/g, "/");
-  const _require = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/vite-ssg-optimized.79d27333.cjs', document.baseURI).href)));
+  const _require = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/vite-ssg-optimized.31f4c9de.cjs', document.baseURI).href)));
   const { createApp, includedRoutes: serverEntryIncludedRoutes } = format === "esm" ? await import(serverEntry) : _require(serverEntry);
   const includedRoutes = serverEntryIncludedRoutes || configIncludedRoutes;
   const { routes } = await createApp(false);
@@ -1219,11 +1219,9 @@ async function build(ssgOptions = {}, viteConfig = {}) {
   indexHTML = await formatHtml(indexHTML, IS_PROD ? "minify" : formatting, minifyOptions);
   const queue = new PQueue({ concurrency });
   const workerExt = format === "esm" ? ".mjs" : ".cjs";
-  const createProxy = (index) => {
-    const workerProxy = new BuildWorkerProxy(new URL(`./build.worker${workerExt}`, (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/vite-ssg-optimized.79d27333.cjs', document.baseURI).href))), {
-      env: process__default.env,
+  const createProxy = () => {
+    const workerProxy = new BuildWorkerProxy(new URL(`./build.worker${workerExt}`, (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/vite-ssg-optimized.31f4c9de.cjs', document.baseURI).href))), {
       workerData: {
-        workerId: index,
         serverEntry,
         ssrManifest,
         format,
@@ -1235,63 +1233,28 @@ async function build(ssgOptions = {}, viteConfig = {}) {
         formatting,
         minifyOptions,
         viteConfig: {
-          configFile: config.configFile
+          configFile: config.configFile || "vite.config.ts"
         }
       }
     });
     return workerProxy;
   };
-  const numberOfWorkers = Math.max(1, _numberOfWorkers);
-  console.log(`${kolorist.gray("[vite-ssg]")} ${kolorist.blue(`Using ${numberOfWorkers} workers`)}`);
-  const workers = Array.from({ length: numberOfWorkers }, (_, index) => createProxy(index));
-  const terminateWorkers = () => {
-    workers.splice(0, workers.length).forEach((worker) => worker.terminate());
-  };
-  process__default.on("SIGINT", terminateWorkers);
-  process__default.on("SIGTERM", terminateWorkers);
-  process__default.on("SIGBREAK", terminateWorkers);
-  process__default.on("beforeExit", terminateWorkers);
-  process__default.on("exit", terminateWorkers);
+  const numberOfWorkers = 5;
+  const workers = Array.from({ length: numberOfWorkers }, createProxy);
   let workerIndex = 0;
-  const maxTasksPerWorker = Math.ceil(concurrency / numberOfWorkers);
-  const workersInUse = /* @__PURE__ */ new Map();
-  const workerTasksRunning = (w) => workersInUse.get(w)?.length || 0;
-  const selectIdleWorker = () => workers.filter((w) => workerTasksRunning(w) < maxTasksPerWorker).sort((a, b) => workerTasksRunning(a) - workerTasksRunning(b))[0];
-  const selectWorker = async (workerIndex2) => {
-    const index = workerIndex2 ?? Math.round(Math.random() * numberOfWorkers);
-    const maybeWorker = workers[index % numberOfWorkers];
-    const worker = maybeWorker && workerTasksRunning(maybeWorker) < maxTasksPerWorker ? maybeWorker : selectIdleWorker();
-    if (!worker) {
-      await Promise.race(Array.from(workersInUse.values()).flat());
-      return selectWorker(workerIndex2);
-    }
-    const workerPromises = workersInUse.get(worker) || [];
-    const delayPromise = new Promise((resolve) => setImmediate(resolve));
-    workersInUse.set(worker, [...workerPromises, delayPromise]);
-    delayPromise.finally(() => {
-      workerPromises.splice(workerPromises.indexOf(delayPromise), 1);
-      workersInUse.set(worker, workerPromises);
-    });
-    return worker;
-  };
   for (const route of routesPaths) {
-    await queue.onSizeLessThan(concurrency);
+    await queue.onSizeLessThan(concurrency + 5);
+    const workerProxy = workers[workerIndex];
+    workerIndex = (workerIndex + 1) % numberOfWorkers;
     queue.add(async () => {
-      const workerProxy = await selectWorker(workerIndex++ % numberOfWorkers);
       const taskPromise = executeTaskInWorker(workerProxy, {
         route
       });
-      const workerPromises = workersInUse.get(workerProxy) || [];
-      workersInUse.set(workerProxy, workerPromises);
-      taskPromise.finally(() => {
-        workerPromises.splice(workerPromises.indexOf(taskPromise), 1);
-        workersInUse.set(workerProxy, workerPromises);
-      });
       return taskPromise;
     });
   }
   await queue.start().onIdle();
-  terminateWorkers();
+  workers.forEach((worker) => worker.terminate());
   if (!ssgOptions["skip-build"]) {
     await fs__default.remove(ssgOut);
   }
@@ -1327,7 +1290,7 @@ async function executeTaskFn(opts) {
     renderToString,
     indexHTML,
     onBeforePageRender,
-    // onDonePageRender, 
+    onDonePageRender,
     onPageRendered,
     ssrManifest,
     rootContainerId,
@@ -1383,10 +1346,10 @@ async function executeTaskFn(opts) {
     const filename = dirStyle === "nested" ? node_path.join(route.replace(/^\//g, ""), "index.html") : relativeRouteFile;
     await fs__default.ensureDir(node_path.join(out, node_path.dirname(filename)));
     return fs__default.writeFile(node_path.join(out, filename), formatted, "utf-8").then(() => {
-      const outDir = out.replace(process__default.cwd(), "").replace(/^\//, "");
       config.logger.info(
-        `${kolorist.dim(`${outDir}/`)}${kolorist.cyan(filename.padEnd(15, " "))}  ${kolorist.dim(getSize(formatted))}`
+        `${kolorist.dim(`${out}/`)}${kolorist.cyan(filename.padEnd(15, " "))}  ${kolorist.dim(getSize(formatted))}`
       );
+      onDonePageRender?.(route, html, appCtx);
       return { route, html };
     });
   } catch (err) {

package/dist/shared/{vite-ssg-optimized.27bed688.d.cts → vite-ssg-optimized.892682c8.d.mts}

@@ -1,5 +1,5 @@
 import { InlineConfig } from 'vite';
-import { b as ViteSSGOptions } from './vite-ssg-optimized.341e382e.cjs';
+import { b as ViteSSGOptions } from './vite-ssg-optimized.cf5cb4ee.mjs';
 
 type Manifest = Record<string, string[]>;
 declare function build(ssgOptions?: Partial<ViteSSGOptions & {

package/dist/shared/{vite-ssg-optimized.f1a9229c.d.ts → vite-ssg-optimized.950926bc.d.ts}

@@ -1,5 +1,5 @@
 import { InlineConfig } from 'vite';
-import { b as ViteSSGOptions } from './vite-ssg-optimized.341e382e.js';
+import { b as ViteSSGOptions } from './vite-ssg-optimized.cf5cb4ee.js';
 
 type Manifest = Record<string, string[]>;
 declare function build(ssgOptions?: Partial<ViteSSGOptions & {

package/dist/shared/{vite-ssg-optimized.341e382e.d.ts → vite-ssg-optimized.cf5cb4ee.d.cts}

@@ -113,13 +113,8 @@ interface ViteSSGOptions {
        * It's useful to debug memory leaks
        *
        */
+    onDonePageRender?: (route: string, renderedHTML: string, appCtx: ViteSSGContext<true>) => Promise<void> | void;
     onFinished?: () => Promise<void> | void;
-    /**
-     * The number of workers to use.
-     *
-     * @default 5
-     */
-    numberOfWorkers?: number;
     /**
      * The application's root container `id`.
      *

package/dist/shared/{vite-ssg-optimized.341e382e.d.cts → vite-ssg-optimized.cf5cb4ee.d.mts}

@@ -113,13 +113,8 @@ interface ViteSSGOptions {
        * It's useful to debug memory leaks
        *
        */
+    onDonePageRender?: (route: string, renderedHTML: string, appCtx: ViteSSGContext<true>) => Promise<void> | void;
     onFinished?: () => Promise<void> | void;
-    /**
-     * The number of workers to use.
-     *
-     * @default 5
-     */
-    numberOfWorkers?: number;
     /**
      * The application's root container `id`.
      *

package/dist/shared/{vite-ssg-optimized.341e382e.d.mts → vite-ssg-optimized.cf5cb4ee.d.ts}

@@ -113,13 +113,8 @@ interface ViteSSGOptions {
        * It's useful to debug memory leaks
        *
        */
+    onDonePageRender?: (route: string, renderedHTML: string, appCtx: ViteSSGContext<true>) => Promise<void> | void;
     onFinished?: () => Promise<void> | void;
-    /**
-     * The number of workers to use.
-     *
-     * @default 5
-     */
-    numberOfWorkers?: number;
     /**
      * The application's root container `id`.
      *

package/dist/shared/{vite-ssg-optimized.22da6b90.mjs → vite-ssg-optimized.dc2a4a38.mjs}

@@ -3,7 +3,7 @@ import { isAbsolute, join, parse, dirname } from 'node:path';
 import process$1 from 'node:process';
 import { renderSSRHead } from '@unhead/ssr';
 import fs from 'fs-extra';
-import { gray, yellow, blue, reset, green, dim, cyan, red } from 'kolorist';
+import { gray, yellow, blue, green, dim, cyan, red } from 'kolorist';
 import { resolveConfig, build as build$1, mergeConfig } from 'vite';
 import { s as serializeState } from './vite-ssg-optimized.579feabb.mjs';
 import html5Parser, { SyntaxKind } from 'html5parser';
@@ -1050,8 +1050,9 @@ class BuildWorkerProxy {
       if (type !== "log")
         return;
       const fn = console[level]?.bind(console);
-      const workerId = options.workerData.workerId;
-      fn?.(`[woker #${workerId}] `, ...args, reset(""));
+      let msg = args.map((arg) => typeof arg === "object" && !!arg ? "[object]" : arg).join(" ");
+      process.stdout.write(msg);
+      fn?.(msg);
     });
     this.worker.on("message", (message) => {
       const { id, type, result = void 0, error = void 0 } = message;
@@ -1150,13 +1151,12 @@ async function build(ssgOptions = {}, viteConfig = {}) {
     ssgOut: _ssgOutDir = join(root, ".vite-ssg-temp", Math.random().toString(36).substring(2, 12)),
     formatting = "none",
     minifyOptions = {},
-    // crittersOptions = {},
+    crittersOptions = {},
     beastiesOptions = {},
     includedRoutes: configIncludedRoutes = DefaultIncludedRoutes,
-    // onBeforePageRender,
-    // onPageRendered,
-    // onDonePageRender,
-    numberOfWorkers: _numberOfWorkers = 5,
+    onBeforePageRender,
+    onPageRendered,
+    onDonePageRender,
     onFinished,
     dirStyle = "flat",
     includeAllRoutes = false,
@@ -1210,11 +1210,9 @@ async function build(ssgOptions = {}, viteConfig = {}) {
   indexHTML = await formatHtml(indexHTML, IS_PROD ? "minify" : formatting, minifyOptions);
   const queue = new PQueue({ concurrency });
   const workerExt = format === "esm" ? ".mjs" : ".cjs";
-  const createProxy = (index) => {
+  const createProxy = () => {
     const workerProxy = new BuildWorkerProxy(new URL(`./build.worker${workerExt}`, import.meta.url), {
-      env: process$1.env,
       workerData: {
-        workerId: index,
         serverEntry,
         ssrManifest,
         format,
@@ -1226,63 +1224,28 @@ async function build(ssgOptions = {}, viteConfig = {}) {
         formatting,
         minifyOptions,
         viteConfig: {
-          configFile: config.configFile
+          configFile: config.configFile || "vite.config.ts"
         }
       }
     });
     return workerProxy;
   };
-  const numberOfWorkers = Math.max(1, _numberOfWorkers);
-  console.log(`${gray("[vite-ssg]")} ${blue(`Using ${numberOfWorkers} workers`)}`);
-  const workers = Array.from({ length: numberOfWorkers }, (_, index) => createProxy(index));
-  const terminateWorkers = () => {
-    workers.splice(0, workers.length).forEach((worker) => worker.terminate());
-  };
-  process$1.on("SIGINT", terminateWorkers);
-  process$1.on("SIGTERM", terminateWorkers);
-  process$1.on("SIGBREAK", terminateWorkers);
-  process$1.on("beforeExit", terminateWorkers);
-  process$1.on("exit", terminateWorkers);
+  const numberOfWorkers = 5;
+  const workers = Array.from({ length: numberOfWorkers }, createProxy);
   let workerIndex = 0;
-  const maxTasksPerWorker = Math.ceil(concurrency / numberOfWorkers);
-  const workersInUse = /* @__PURE__ */ new Map();
-  const workerTasksRunning = (w) => workersInUse.get(w)?.length || 0;
-  const selectIdleWorker = () => workers.filter((w) => workerTasksRunning(w) < maxTasksPerWorker).sort((a, b) => workerTasksRunning(a) - workerTasksRunning(b))[0];
-  const selectWorker = async (workerIndex2) => {
-    const index = workerIndex2 ?? Math.round(Math.random() * numberOfWorkers);
-    const maybeWorker = workers[index % numberOfWorkers];
-    const worker = maybeWorker && workerTasksRunning(maybeWorker) < maxTasksPerWorker ? maybeWorker : selectIdleWorker();
-    if (!worker) {
-      await Promise.race(Array.from(workersInUse.values()).flat());
-      return selectWorker(workerIndex2);
-    }
-    const workerPromises = workersInUse.get(worker) || [];
-    const delayPromise = new Promise((resolve) => setImmediate(resolve));
-    workersInUse.set(worker, [...workerPromises, delayPromise]);
-    delayPromise.finally(() => {
-      workerPromises.splice(workerPromises.indexOf(delayPromise), 1);
-      workersInUse.set(worker, workerPromises);
-    });
-    return worker;
-  };
   for (const route of routesPaths) {
-    await queue.onSizeLessThan(concurrency);
+    await queue.onSizeLessThan(concurrency + 5);
+    const workerProxy = workers[workerIndex];
+    workerIndex = (workerIndex + 1) % numberOfWorkers;
     queue.add(async () => {
-      const workerProxy = await selectWorker(workerIndex++ % numberOfWorkers);
       const taskPromise = executeTaskInWorker(workerProxy, {
         route
       });
-      const workerPromises = workersInUse.get(workerProxy) || [];
-      workersInUse.set(workerProxy, workerPromises);
-      taskPromise.finally(() => {
-        workerPromises.splice(workerPromises.indexOf(taskPromise), 1);
-        workersInUse.set(workerProxy, workerPromises);
-      });
       return taskPromise;
     });
   }
   await queue.start().onIdle();
-  terminateWorkers();
+  workers.forEach((worker) => worker.terminate());
   if (!ssgOptions["skip-build"]) {
     await fs.remove(ssgOut);
   }
@@ -1318,7 +1281,7 @@ async function executeTaskFn(opts) {
     renderToString,
     indexHTML,
     onBeforePageRender,
-    // onDonePageRender, 
+    onDonePageRender,
     onPageRendered,
     ssrManifest,
     rootContainerId,
@@ -1374,10 +1337,10 @@ async function executeTaskFn(opts) {
     const filename = dirStyle === "nested" ? join(route.replace(/^\//g, ""), "index.html") : relativeRouteFile;
     await fs.ensureDir(join(out, dirname(filename)));
     return fs.writeFile(join(out, filename), formatted, "utf-8").then(() => {
-      const outDir = out.replace(process$1.cwd(), "").replace(/^\//, "");
       config.logger.info(
-        `${dim(`${outDir}/`)}${cyan(filename.padEnd(15, " "))}  ${dim(getSize(formatted))}`
+        `${dim(`${out}/`)}${cyan(filename.padEnd(15, " "))}  ${dim(getSize(formatted))}`
       );
+      onDonePageRender?.(route, html, appCtx);
       return { route, html };
     });
   } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-ssg-optimized",
-  "version": "0.24.2-optimized.21",
+  "version": "0.24.2-optimized.3",
   "description": "Server-side generation for Vite",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",