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

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.524d8794.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.2fd44d5b.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.524d8794.cjs');
 require('node:module');
 require('node:path');
 require('node:process');

package/dist/node.d.cts

@@ -1,9 +1,14 @@
-export { b as build } from './shared/vite-ssg-optimized.27bed688.cjs';
-import 'vite';
-import './shared/vite-ssg-optimized.341e382e.cjs';
+import { InlineConfig } from 'vite';
+import { b as ViteSSGOptions } from './shared/vite-ssg-optimized.341e382e.cjs';
 import '@unhead/vue';
 import 'beasties';
 import 'critters';
 import 'vue';
 import 'vue-router';
 import 'html-minifier-terser';
+
+declare function build(ssgOptions?: Partial<ViteSSGOptions & {
+    'skip-build'?: boolean;
+}>, viteConfig?: InlineConfig): Promise<void>;
+
+export { build };

package/dist/node.d.mts

@@ -1,9 +1,14 @@
-export { b as build } from './shared/vite-ssg-optimized.f03a17e6.mjs';
-import 'vite';
-import './shared/vite-ssg-optimized.341e382e.mjs';
+import { InlineConfig } from 'vite';
+import { b as ViteSSGOptions } from './shared/vite-ssg-optimized.341e382e.mjs';
 import '@unhead/vue';
 import 'beasties';
 import 'critters';
 import 'vue';
 import 'vue-router';
 import 'html-minifier-terser';
+
+declare function build(ssgOptions?: Partial<ViteSSGOptions & {
+    'skip-build'?: boolean;
+}>, viteConfig?: InlineConfig): Promise<void>;
+
+export { build };

package/dist/node.d.ts

@@ -1,9 +1,14 @@
-export { b as build } from './shared/vite-ssg-optimized.f1a9229c.js';
-import 'vite';
-import './shared/vite-ssg-optimized.341e382e.js';
+import { InlineConfig } from 'vite';
+import { b as ViteSSGOptions } from './shared/vite-ssg-optimized.341e382e.js';
 import '@unhead/vue';
 import 'beasties';
 import 'critters';
 import 'vue';
 import 'vue-router';
 import 'html-minifier-terser';
+
+declare function build(ssgOptions?: Partial<ViteSSGOptions & {
+    'skip-build'?: boolean;
+}>, viteConfig?: InlineConfig): Promise<void>;
+
+export { build };

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.2fd44d5b.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.524d8794.cjs');
 const kolorist = require('kolorist');
 const vite = require('vite');
 require('node:path');
@@ -13,30 +13,38 @@ require('./vite-ssg-optimized.bee8a5a9.cjs');
 require('html5parser');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
+async function getBeastiesOrCritters(outDir, options = {}) {
+  try {
+    const BeastiesClass = (await import('beasties')).default;
+    return new BeastiesClass({
+      path: outDir,
+      logLevel: "warn",
+      external: true,
+      inlineFonts: true,
+      preloadFonts: true,
+      ...options
+    });
+  } catch {
+  }
+  try {
+    const CrittersClass = (await import('critters')).default;
+    console.warn("`critters` is deprecated. Please use `beasties` instead.");
+    return new CrittersClass({
+      path: outDir,
+      logLevel: "warn",
+      external: true,
+      inlineFonts: true,
+      preloadFonts: true,
+      ...options
+    });
+  } catch {
+    return void 0;
+  }
+}
+
 (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);
+    const newMsg = msg.map(node.plainify);
     node_worker_threads.parentPort.postMessage({ type: "log", args: newMsg, level });
   };
   globalThis.console = Object.assign(globalThis.console, {
@@ -47,7 +55,7 @@ var _documentCurrentScript = typeof document !== 'undefined' ? document.currentS
     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 { format, out, dirStyle, viteConfig, mode, ...extraOpts } = node_worker_threads.workerData;
   const nodeEnv = process.env.NODE_ENV || "production";
   const config = await vite.resolveConfig(viteConfig, "build", mode, nodeEnv);
   const {
@@ -55,15 +63,18 @@ var _documentCurrentScript = typeof document !== 'undefined' ? document.currentS
     onBeforePageRender
     // onDonePageRender,
   } = config.ssgOptions || {};
+  let beasties = void 0;
   const { renderToString } = await import('vue/server-renderer');
   const outDir = out.replace(process.cwd(), "").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/build.worker.cjs', document.baseURI).href)));
-  const beasties = beastiesOptions !== false ? await node.getBeastiesOrCritters(outDir, beastiesOptions) : void 0;
-  if (beasties)
-    console.log(`${kolorist.gray("[vite-ssg]")} ${kolorist.blue("Critical CSS generation enabled via `beasties`")}`);
-  const { createApp } = format === "esm" ? await import(serverEntry) : _require(serverEntry);
   const execMap = {
     executeTaskFn: async (opts) => {
+      const { serverEntry } = opts;
+      const { createApp } = format === "esm" ? await import(serverEntry) : _require(serverEntry);
+      const beastiesOptions = opts.beastiesOptions;
+      beasties ?? (beasties = beastiesOptions !== false ? await getBeastiesOrCritters(outDir, beastiesOptions) : void 0);
+      if (beasties)
+        console.log(`${kolorist.gray("[vite-ssg]")} ${kolorist.blue("Critical CSS generation enabled via `beasties`")}`);
       const newOpts = {
         ...extraOpts,
         out,
@@ -80,6 +91,18 @@ var _documentCurrentScript = typeof document !== 'undefined' ? document.currentS
         ...opts
       };
       return node.executeTaskFn(newOpts);
+    },
+    buildClient: async (...args) => {
+      let [_config, _viteConfig] = args;
+      _config = Object.assign({}, config, _config);
+      _viteConfig = Object.assign({}, viteConfig, _viteConfig);
+      return await node.buildClient(_config, _viteConfig);
+    },
+    buildServer: async (...args) => {
+      let [_config, _viteConfig, _opts] = args;
+      _config = Object.assign({}, config, _config);
+      _viteConfig = Object.assign({}, viteConfig, _viteConfig);
+      return await node.buildServer(_config, _viteConfig, _opts);
     }
   };
   node_worker_threads.parentPort?.on("message", async (message) => {
@@ -87,12 +110,8 @@ var _documentCurrentScript = typeof document !== 'undefined' ? document.currentS
     if (type in execMap) {
       node_worker_threads.parentPort.postMessage(`running ${type}`);
       try {
-        const result = await execMap[type](...args ?? []);
-        if (result.appCtx) {
-          Object.assign(result, {
-            appCtx: result.appCtx.router.push(result.route)
-          });
-        }
+        let result = await execMap[type](...args ?? []);
+        result = node.plainify(result);
         node_worker_threads.parentPort.postMessage({ type: "result", id, result });
       } catch (e) {
         const message2 = e.message || e.toString();

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

@@ -1,27 +1,17 @@
-import { M as Manifest } from './vite-ssg-optimized.27bed688.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 { b as ViteSSGOptions } from './vite-ssg-optimized.341e382e.cjs';
 import '@unhead/vue';
+import 'beasties';
 import 'critters';
 import 'vue';
 import 'vue-router';
+import 'html-minifier-terser';
 
 interface WorkerDataEntry {
-    serverEntry: string;
     workerId: number | string;
     format: 'esm' | 'cjs';
     out: string;
     dirStyle: ViteSSGOptions['dirStyle'];
-    beastiesOptions: Options | false;
     mode?: string;
-    ssrManifest: Manifest;
-    indexHTML: string;
-    rootContainerId: string;
-    formatting: ViteSSGOptions['formatting'];
-    minifyOptions: Options$1;
     viteConfig: {
         configFile?: string;
     };

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

@@ -1,27 +1,17 @@
-import { M as Manifest } from './vite-ssg-optimized.f03a17e6.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 { b as ViteSSGOptions } from './vite-ssg-optimized.341e382e.mjs';
 import '@unhead/vue';
+import 'beasties';
 import 'critters';
 import 'vue';
 import 'vue-router';
+import 'html-minifier-terser';
 
 interface WorkerDataEntry {
-    serverEntry: string;
     workerId: number | string;
     format: 'esm' | 'cjs';
     out: string;
     dirStyle: ViteSSGOptions['dirStyle'];
-    beastiesOptions: Options | false;
     mode?: string;
-    ssrManifest: Manifest;
-    indexHTML: string;
-    rootContainerId: string;
-    formatting: ViteSSGOptions['formatting'];
-    minifyOptions: Options$1;
     viteConfig: {
         configFile?: string;
     };

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

@@ -1,27 +1,17 @@
-import { M as Manifest } from './vite-ssg-optimized.f1a9229c.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 { b as ViteSSGOptions } from './vite-ssg-optimized.341e382e.js';
 import '@unhead/vue';
+import 'beasties';
 import 'critters';
 import 'vue';
 import 'vue-router';
+import 'html-minifier-terser';
 
 interface WorkerDataEntry {
-    serverEntry: string;
     workerId: number | string;
     format: 'esm' | 'cjs';
     out: string;
     dirStyle: ViteSSGOptions['dirStyle'];
-    beastiesOptions: Options | false;
     mode?: string;
-    ssrManifest: Manifest;
-    indexHTML: string;
-    rootContainerId: string;
-    formatting: ViteSSGOptions['formatting'];
-    minifyOptions: Options$1;
     viteConfig: {
         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 { p as plainify, e as executeTaskFn, a as buildClient, c as buildServer } from './vite-ssg-optimized.2fd44d5b.mjs';
+import { red, gray, blue } from 'kolorist';
 import { resolveConfig } from 'vite';
 import 'node:path';
 import 'node:process';
@@ -10,30 +10,38 @@ import 'fs-extra';
 import './vite-ssg-optimized.579feabb.mjs';
 import 'html5parser';
 
+async function getBeastiesOrCritters(outDir, options = {}) {
+  try {
+    const BeastiesClass = (await import('beasties')).default;
+    return new BeastiesClass({
+      path: outDir,
+      logLevel: "warn",
+      external: true,
+      inlineFonts: true,
+      preloadFonts: true,
+      ...options
+    });
+  } catch {
+  }
+  try {
+    const CrittersClass = (await import('critters')).default;
+    console.warn("`critters` is deprecated. Please use `beasties` instead.");
+    return new CrittersClass({
+      path: outDir,
+      logLevel: "warn",
+      external: true,
+      inlineFonts: true,
+      preloadFonts: true,
+      ...options
+    });
+  } catch {
+    return void 0;
+  }
+}
+
 (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);
+    const newMsg = msg.map(plainify);
     parentPort.postMessage({ type: "log", args: newMsg, level });
   };
   globalThis.console = Object.assign(globalThis.console, {
@@ -44,7 +52,7 @@ import 'html5parser';
     trace: fnLog.bind(globalThis.console, "trace"),
     debug: fnLog.bind(globalThis.console, "debug")
   });
-  const { serverEntry, out, beastiesOptions, viteConfig, mode, format, dirStyle, ...extraOpts } = workerData;
+  const { format, out, dirStyle, viteConfig, mode, ...extraOpts } = workerData;
   const nodeEnv = process.env.NODE_ENV || "production";
   const config = await resolveConfig(viteConfig, "build", mode, nodeEnv);
   const {
@@ -52,15 +60,18 @@ import 'html5parser';
     onBeforePageRender
     // onDonePageRender,
   } = config.ssgOptions || {};
+  let beasties = void 0;
   const { renderToString } = await import('vue/server-renderer');
   const outDir = out.replace(process.cwd(), "").replace(/^\//g, "");
   const _require = createRequire(import.meta.url);
-  const beasties = beastiesOptions !== false ? await getBeastiesOrCritters(outDir, beastiesOptions) : void 0;
-  if (beasties)
-    console.log(`${gray("[vite-ssg]")} ${blue("Critical CSS generation enabled via `beasties`")}`);
-  const { createApp } = format === "esm" ? await import(serverEntry) : _require(serverEntry);
   const execMap = {
     executeTaskFn: async (opts) => {
+      const { serverEntry } = opts;
+      const { createApp } = format === "esm" ? await import(serverEntry) : _require(serverEntry);
+      const beastiesOptions = opts.beastiesOptions;
+      beasties ?? (beasties = beastiesOptions !== false ? await getBeastiesOrCritters(outDir, beastiesOptions) : void 0);
+      if (beasties)
+        console.log(`${gray("[vite-ssg]")} ${blue("Critical CSS generation enabled via `beasties`")}`);
       const newOpts = {
         ...extraOpts,
         out,
@@ -77,6 +88,18 @@ import 'html5parser';
         ...opts
       };
       return executeTaskFn(newOpts);
+    },
+    buildClient: async (...args) => {
+      let [_config, _viteConfig] = args;
+      _config = Object.assign({}, config, _config);
+      _viteConfig = Object.assign({}, viteConfig, _viteConfig);
+      return await buildClient(_config, _viteConfig);
+    },
+    buildServer: async (...args) => {
+      let [_config, _viteConfig, _opts] = args;
+      _config = Object.assign({}, config, _config);
+      _viteConfig = Object.assign({}, viteConfig, _viteConfig);
+      return await buildServer(_config, _viteConfig, _opts);
     }
   };
   parentPort?.on("message", async (message) => {
@@ -84,12 +107,8 @@ import 'html5parser';
     if (type in execMap) {
       parentPort.postMessage(`running ${type}`);
       try {
-        const result = await execMap[type](...args ?? []);
-        if (result.appCtx) {
-          Object.assign(result, {
-            appCtx: result.appCtx.router.push(result.route)
-          });
-        }
+        let result = await execMap[type](...args ?? []);
+        result = plainify(result);
         parentPort.postMessage({ type: "result", id, result });
       } catch (e) {
         const message2 = e.message || e.toString();

package/dist/shared/{vite-ssg-optimized.22da6b90.mjs → vite-ssg-optimized.2fd44d5b.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, reset, cyan, green, dim, 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';
@@ -830,35 +830,6 @@ class PQueue extends EventEmitter {
     }
 }
 
-async function getBeastiesOrCritters(outDir, options = {}) {
-  try {
-    const BeastiesClass = (await import('beasties')).default;
-    return new BeastiesClass({
-      path: outDir,
-      logLevel: "warn",
-      external: true,
-      inlineFonts: true,
-      preloadFonts: true,
-      ...options
-    });
-  } catch {
-  }
-  try {
-    const CrittersClass = (await import('critters')).default;
-    console.warn("`critters` is deprecated. Please use `beasties` instead.");
-    return new CrittersClass({
-      path: outDir,
-      logLevel: "warn",
-      external: true,
-      inlineFonts: true,
-      preloadFonts: true,
-      ...options
-    });
-  } catch {
-    return void 0;
-  }
-}
-
 function isMatchOption(node, opts) {
   if (opts.match.tag && !(node.name === opts.match.tag)) {
     return false;
@@ -1112,10 +1083,14 @@ async function buildClient(config, viteConfig) {
     mode: config.mode
   }));
 }
-async function buildServer(config, viteConfig, { ssrEntry, ssgOut, format }) {
+async function buildServer(config, viteConfig, { ssrEntry, ssgOut, format, mock }) {
   buildLog("Build for server...");
   process$1.env.VITE_SSG = "true";
   const { base } = config;
+  if (mock) {
+    const { jsdomGlobal } = await import('../chunks/jsdomGlobal.mjs');
+    jsdomGlobal();
+  }
   await build$1(mergeConfig(viteConfig, {
     base,
     build: {
@@ -1136,6 +1111,19 @@ async function buildServer(config, viteConfig, { ssrEntry, ssgOut, format }) {
     mode: config.mode
   }));
 }
+function createProxy(options) {
+  const workerExt = options.format === "esm" ? ".mjs" : ".cjs";
+  const workerProxy = new BuildWorkerProxy(new URL(`./build.worker${workerExt}`, import.meta.url), {
+    env: process$1.env,
+    workerData: options
+  });
+  process$1.on("SIGINT", workerProxy.terminate.bind(workerProxy));
+  process$1.on("SIGTERM", workerProxy.terminate.bind(workerProxy));
+  process$1.on("SIGBREAK", workerProxy.terminate.bind(workerProxy));
+  process$1.on("beforeExit", workerProxy.terminate.bind(workerProxy));
+  process$1.on("exit", workerProxy.terminate.bind(workerProxy));
+  return workerProxy;
+}
 async function build(ssgOptions = {}, viteConfig = {}) {
   const nodeEnv = process$1.env.NODE_ENV || "production";
   const mode = process$1.env.MODE || ssgOptions.mode || nodeEnv;
@@ -1165,6 +1153,42 @@ async function build(ssgOptions = {}, viteConfig = {}) {
     rootContainerId = "app"
   } = Object.assign({}, config.ssgOptions || {}, ssgOptions);
   const ssgOut = isAbsolute(_ssgOutDir) ? _ssgOutDir : join(root, _ssgOutDir);
+  const numberOfWorkers = Math.max(1, _numberOfWorkers);
+  console.log(`${gray("[vite-ssg]")} ${blue(`Using ${numberOfWorkers} workers`)}`);
+  const workers = Array.from({ length: numberOfWorkers }, (_, index) => createProxy({
+    format,
+    out,
+    dirStyle,
+    workerId: index,
+    viteConfig: {
+      configFile: config.configFile
+    }
+  }));
+  const terminateWorkers = () => {
+    workers.splice(0, workers.length).forEach((worker) => worker.terminate());
+  };
+  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;
+  };
   let willRunBuild = true;
   if (fs.existsSync(ssgOut)) {
     willRunBuild = !ssgOptions["skip-build"];
@@ -1172,15 +1196,15 @@ async function build(ssgOptions = {}, viteConfig = {}) {
       await fs.remove(ssgOut);
     }
   }
-  if (willRunBuild)
-    await buildClient(config, viteConfig);
-  if (mock) {
-    const { jsdomGlobal } = await import('../chunks/jsdomGlobal.mjs');
-    jsdomGlobal();
+  if (willRunBuild) {
+    const clientWorker = await selectWorker(0);
+    await execInWorker(clientWorker, buildClient, config, viteConfig);
   }
   const ssrEntry = await resolveAlias(config, entry);
-  if (willRunBuild)
-    await buildServer(config, viteConfig, { ssrEntry, ssgOut, format });
+  if (willRunBuild) {
+    const serverWorker = await selectWorker(1);
+    await execInWorker(serverWorker, buildServer, config, viteConfig, { ssrEntry, ssgOut, format, mock });
+  }
   const prefix = format === "esm" && process$1.platform === "win32" ? "file://" : "";
   const ext = format === "esm" ? ".mjs" : ".cjs";
   const serverEntry = prefix + join(ssgOut, parse(ssrEntry).name + ext).replace(/\\/g, "/");
@@ -1191,9 +1215,6 @@ async function build(ssgOptions = {}, viteConfig = {}) {
   let routesPaths = includeAllRoutes ? routesToPaths(routes) : await includedRoutes(routesToPaths(routes), routes || []);
   routesPaths = Array.from(new Set(routesPaths));
   buildLog("Rendering Pages...", routesPaths.length);
-  const beasties = beastiesOptions !== false ? await getBeastiesOrCritters(outDir, beastiesOptions) : void 0;
-  if (beasties)
-    console.log(`${gray("[vite-ssg]")} ${blue("Critical CSS generation enabled via `beasties`")}`);
   const {
     path: _ssrManifestPath,
     content: ssrManifestRaw
@@ -1209,68 +1230,30 @@ async function build(ssgOptions = {}, viteConfig = {}) {
   const IS_PROD = nodeEnv === "production";
   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}`, import.meta.url), {
-      env: process$1.env,
-      workerData: {
-        workerId: index,
-        serverEntry,
+  for (const route of routesPaths) {
+    await queue.onSizeLessThan(concurrency);
+    queue.add(async () => {
+      const workerProxy = await selectWorker(workerIndex++ % numberOfWorkers);
+      let retryCount = 0;
+      const maxRetries = 3;
+      const execOpts = {
+        route,
         ssrManifest,
-        format,
-        out,
-        beastiesOptions,
-        dirStyle,
         indexHTML,
         rootContainerId,
         formatting,
         minifyOptions,
-        viteConfig: {
-          configFile: config.configFile
+        // out,
+        // dirStyle,
+        beastiesOptions,
+        serverEntry
+      };
+      const taskPromise = executeTaskInWorker(workerProxy, execOpts).catch((e) => {
+        if (retryCount++ < maxRetries) {
+          console.log(`${gray("[vite-ssg]")} ${yellow(`Retrying ${retryCount} of ${maxRetries} for route: ${cyan(route)}`)}`);
+          return executeTaskInWorker(workerProxy, execOpts);
         }
-      }
-    });
-    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);
-  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);
-    queue.add(async () => {
-      const workerProxy = await selectWorker(workerIndex++ % numberOfWorkers);
-      const taskPromise = executeTaskInWorker(workerProxy, {
-        route
+        throw e;
       });
       const workerPromises = workersInUse.get(workerProxy) || [];
       workersInUse.set(workerProxy, workerPromises);
@@ -1302,14 +1285,10 @@ ${gray("[vite-ssg]")} ${green("Build finished.")}`);
   timeout.unref();
 }
 function executeTaskInWorker(worker, opts) {
-  opts = Object.entries(opts).reduce((acc, [key, value]) => {
-    if (typeof value === "function")
-      return acc;
-    const newKey = key;
-    acc[newKey] = value;
-    return acc;
-  }, {});
-  return worker.send("executeTaskFn", [opts]);
+  return execInWorker(worker, executeTaskFn, opts);
+}
+async function execInWorker(worker, fn, ...args) {
+  return await worker.send(fn.name, plainify(args ?? []));
 }
 async function executeTaskFn(opts) {
   const {
@@ -1385,6 +1364,27 @@ async function executeTaskFn(opts) {
 ${err.stack}`);
   }
 }
+function plainify(m) {
+  if (m instanceof Function) {
+    return void 0;
+  }
+  if (Array.isArray(m)) {
+    return m.map(plainify);
+  }
+  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] = plainify(value);
+      return acc;
+    }, {});
+  }
+  return m;
+}
 async function detectEntry(root) {
   const scriptSrcReg = /<script.*?src=["'](.+?)["'](?!<).*>\s*<\/script>/gi;
   const html = await fs.readFile(join(root, "index.html"), "utf-8");
@@ -1483,4 +1483,4 @@ async function readFiles(...paths) {
   throw new Error(`Could not find any of the following files: ${paths.join(", ")}`);
 }
 
-export { build as b, executeTaskFn as e, getBeastiesOrCritters as g };
+export { buildClient as a, build as b, buildServer as c, executeTaskFn as e, plainify as p };

package/dist/shared/{vite-ssg-optimized.79d27333.cjs → vite-ssg-optimized.524d8794.cjs}

@@ -839,35 +839,6 @@ class PQueue extends EventEmitter {
     }
 }
 
-async function getBeastiesOrCritters(outDir, options = {}) {
-  try {
-    const BeastiesClass = (await import('beasties')).default;
-    return new BeastiesClass({
-      path: outDir,
-      logLevel: "warn",
-      external: true,
-      inlineFonts: true,
-      preloadFonts: true,
-      ...options
-    });
-  } catch {
-  }
-  try {
-    const CrittersClass = (await import('critters')).default;
-    console.warn("`critters` is deprecated. Please use `beasties` instead.");
-    return new CrittersClass({
-      path: outDir,
-      logLevel: "warn",
-      external: true,
-      inlineFonts: true,
-      preloadFonts: true,
-      ...options
-    });
-  } catch {
-    return void 0;
-  }
-}
-
 function isMatchOption(node, opts) {
   if (opts.match.tag && !(node.name === opts.match.tag)) {
     return false;
@@ -1121,10 +1092,14 @@ async function buildClient(config, viteConfig) {
     mode: config.mode
   }));
 }
-async function buildServer(config, viteConfig, { ssrEntry, ssgOut, format }) {
+async function buildServer(config, viteConfig, { ssrEntry, ssgOut, format, mock }) {
   buildLog("Build for server...");
   process__default.env.VITE_SSG = "true";
   const { base } = config;
+  if (mock) {
+    const { jsdomGlobal } = await import('../chunks/jsdomGlobal.cjs');
+    jsdomGlobal();
+  }
   await vite.build(vite.mergeConfig(viteConfig, {
     base,
     build: {
@@ -1145,6 +1120,19 @@ async function buildServer(config, viteConfig, { ssrEntry, ssgOut, format }) {
     mode: config.mode
   }));
 }
+function createProxy(options) {
+  const workerExt = options.format === "esm" ? ".mjs" : ".cjs";
+  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.524d8794.cjs', document.baseURI).href))), {
+    env: process__default.env,
+    workerData: options
+  });
+  process__default.on("SIGINT", workerProxy.terminate.bind(workerProxy));
+  process__default.on("SIGTERM", workerProxy.terminate.bind(workerProxy));
+  process__default.on("SIGBREAK", workerProxy.terminate.bind(workerProxy));
+  process__default.on("beforeExit", workerProxy.terminate.bind(workerProxy));
+  process__default.on("exit", workerProxy.terminate.bind(workerProxy));
+  return workerProxy;
+}
 async function build(ssgOptions = {}, viteConfig = {}) {
   const nodeEnv = process__default.env.NODE_ENV || "production";
   const mode = process__default.env.MODE || ssgOptions.mode || nodeEnv;
@@ -1174,6 +1162,42 @@ async function build(ssgOptions = {}, viteConfig = {}) {
     rootContainerId = "app"
   } = Object.assign({}, config.ssgOptions || {}, ssgOptions);
   const ssgOut = node_path.isAbsolute(_ssgOutDir) ? _ssgOutDir : node_path.join(root, _ssgOutDir);
+  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({
+    format,
+    out,
+    dirStyle,
+    workerId: index,
+    viteConfig: {
+      configFile: config.configFile
+    }
+  }));
+  const terminateWorkers = () => {
+    workers.splice(0, workers.length).forEach((worker) => worker.terminate());
+  };
+  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;
+  };
   let willRunBuild = true;
   if (fs__default.existsSync(ssgOut)) {
     willRunBuild = !ssgOptions["skip-build"];
@@ -1181,28 +1205,25 @@ async function build(ssgOptions = {}, viteConfig = {}) {
       await fs__default.remove(ssgOut);
     }
   }
-  if (willRunBuild)
-    await buildClient(config, viteConfig);
-  if (mock) {
-    const { jsdomGlobal } = await import('../chunks/jsdomGlobal.cjs');
-    jsdomGlobal();
+  if (willRunBuild) {
+    const clientWorker = await selectWorker(0);
+    await execInWorker(clientWorker, buildClient, config, viteConfig);
   }
   const ssrEntry = await resolveAlias(config, entry);
-  if (willRunBuild)
-    await buildServer(config, viteConfig, { ssrEntry, ssgOut, format });
+  if (willRunBuild) {
+    const serverWorker = await selectWorker(1);
+    await execInWorker(serverWorker, buildServer, config, viteConfig, { ssrEntry, ssgOut, format, mock });
+  }
   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.524d8794.cjs', document.baseURI).href)));
   const { createApp, includedRoutes: serverEntryIncludedRoutes } = format === "esm" ? await import(serverEntry) : _require(serverEntry);
   const includedRoutes = serverEntryIncludedRoutes || configIncludedRoutes;
   const { routes } = await createApp(false);
   let routesPaths = includeAllRoutes ? routesToPaths(routes) : await includedRoutes(routesToPaths(routes), routes || []);
   routesPaths = Array.from(new Set(routesPaths));
   buildLog("Rendering Pages...", routesPaths.length);
-  const beasties = beastiesOptions !== false ? await getBeastiesOrCritters(outDir, beastiesOptions) : void 0;
-  if (beasties)
-    console.log(`${kolorist.gray("[vite-ssg]")} ${kolorist.blue("Critical CSS generation enabled via `beasties`")}`);
   const {
     path: _ssrManifestPath,
     content: ssrManifestRaw
@@ -1218,68 +1239,30 @@ async function build(ssgOptions = {}, viteConfig = {}) {
   const IS_PROD = nodeEnv === "production";
   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,
-      workerData: {
-        workerId: index,
-        serverEntry,
+  for (const route of routesPaths) {
+    await queue.onSizeLessThan(concurrency);
+    queue.add(async () => {
+      const workerProxy = await selectWorker(workerIndex++ % numberOfWorkers);
+      let retryCount = 0;
+      const maxRetries = 3;
+      const execOpts = {
+        route,
         ssrManifest,
-        format,
-        out,
-        beastiesOptions,
-        dirStyle,
         indexHTML,
         rootContainerId,
         formatting,
         minifyOptions,
-        viteConfig: {
-          configFile: config.configFile
+        // out,
+        // dirStyle,
+        beastiesOptions,
+        serverEntry
+      };
+      const taskPromise = executeTaskInWorker(workerProxy, execOpts).catch((e) => {
+        if (retryCount++ < maxRetries) {
+          console.log(`${kolorist.gray("[vite-ssg]")} ${kolorist.yellow(`Retrying ${retryCount} of ${maxRetries} for route: ${kolorist.cyan(route)}`)}`);
+          return executeTaskInWorker(workerProxy, execOpts);
         }
-      }
-    });
-    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);
-  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);
-    queue.add(async () => {
-      const workerProxy = await selectWorker(workerIndex++ % numberOfWorkers);
-      const taskPromise = executeTaskInWorker(workerProxy, {
-        route
+        throw e;
       });
       const workerPromises = workersInUse.get(workerProxy) || [];
       workersInUse.set(workerProxy, workerPromises);
@@ -1311,14 +1294,10 @@ ${kolorist.gray("[vite-ssg]")} ${kolorist.green("Build finished.")}`);
   timeout.unref();
 }
 function executeTaskInWorker(worker, opts) {
-  opts = Object.entries(opts).reduce((acc, [key, value]) => {
-    if (typeof value === "function")
-      return acc;
-    const newKey = key;
-    acc[newKey] = value;
-    return acc;
-  }, {});
-  return worker.send("executeTaskFn", [opts]);
+  return execInWorker(worker, executeTaskFn, opts);
+}
+async function execInWorker(worker, fn, ...args) {
+  return await worker.send(fn.name, plainify(args ?? []));
 }
 async function executeTaskFn(opts) {
   const {
@@ -1394,6 +1373,27 @@ async function executeTaskFn(opts) {
 ${err.stack}`);
   }
 }
+function plainify(m) {
+  if (m instanceof Function) {
+    return void 0;
+  }
+  if (Array.isArray(m)) {
+    return m.map(plainify);
+  }
+  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] = plainify(value);
+      return acc;
+    }, {});
+  }
+  return m;
+}
 async function detectEntry(root) {
   const scriptSrcReg = /<script.*?src=["'](.+?)["'](?!<).*>\s*<\/script>/gi;
   const html = await fs__default.readFile(node_path.join(root, "index.html"), "utf-8");
@@ -1493,5 +1493,7 @@ async function readFiles(...paths) {
 }
 
 exports.build = build;
+exports.buildClient = buildClient;
+exports.buildServer = buildServer;
 exports.executeTaskFn = executeTaskFn;
-exports.getBeastiesOrCritters = getBeastiesOrCritters;
+exports.plainify = plainify;

package/package.json

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

package/dist/shared/vite-ssg-optimized.27bed688.d.cts

@@ -1,9 +0,0 @@
-import { InlineConfig } from 'vite';
-import { b as ViteSSGOptions } from './vite-ssg-optimized.341e382e.cjs';
-
-type Manifest = Record<string, string[]>;
-declare function build(ssgOptions?: Partial<ViteSSGOptions & {
-    'skip-build'?: boolean;
-}>, viteConfig?: InlineConfig): Promise<void>;
-
-export { type Manifest as M, build as b };

package/dist/shared/vite-ssg-optimized.f03a17e6.d.mts

@@ -1,9 +0,0 @@
-import { InlineConfig } from 'vite';
-import { b as ViteSSGOptions } from './vite-ssg-optimized.341e382e.mjs';
-
-type Manifest = Record<string, string[]>;
-declare function build(ssgOptions?: Partial<ViteSSGOptions & {
-    'skip-build'?: boolean;
-}>, viteConfig?: InlineConfig): Promise<void>;
-
-export { type Manifest as M, build as b };

package/dist/shared/vite-ssg-optimized.f1a9229c.d.ts

@@ -1,9 +0,0 @@
-import { InlineConfig } from 'vite';
-import { b as ViteSSGOptions } from './vite-ssg-optimized.341e382e.js';
-
-type Manifest = Record<string, string[]>;
-declare function build(ssgOptions?: Partial<ViteSSGOptions & {
-    'skip-build'?: boolean;
-}>, viteConfig?: InlineConfig): Promise<void>;
-
-export { type Manifest as M, build as b };