vite-ssg-optimized 0.24.2-optimized.48 → 0.24.2-optimized.49

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.bb5ba938.cjs');
+const node = require('../shared/vite-ssg-optimized.635b4c57.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.72fc9757.mjs';
+import { b as build } from '../shared/vite-ssg-optimized.0dfc50c9.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.bb5ba938.cjs');
+const node = require('./shared/vite-ssg-optimized.635b4c57.cjs');
 require('node:module');
 require('node:path');
 require('node:process');

package/dist/node.mjs

@@ -1,4 +1,4 @@
-export { b as build } from './shared/vite-ssg-optimized.72fc9757.mjs';
+export { b as build } from './shared/vite-ssg-optimized.0dfc50c9.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.bb5ba938.cjs');
+const node = require('./vite-ssg-optimized.635b4c57.cjs');
 const kolorist = require('kolorist');
 const vite = require('vite');
 require('node:path');

package/dist/shared/build.worker.mjs

@@ -1,6 +1,6 @@
 import { createRequire } from 'node:module';
 import { parentPort, workerData } from 'node:worker_threads';
-import { p as plainify, e as executeTaskFn, a as buildClient, c as buildServer } from './vite-ssg-optimized.72fc9757.mjs';
+import { p as plainify, e as executeTaskFn, a as buildClient, c as buildServer } from './vite-ssg-optimized.0dfc50c9.mjs';
 import { red, gray, blue } from 'kolorist';
 import { resolveConfig } from 'vite';
 import 'node:path';

package/dist/shared/{vite-ssg-optimized.72fc9757.mjs → vite-ssg-optimized.0dfc50c9.mjs}

@@ -1015,7 +1015,9 @@ class BuildWorkerProxy {
   constructor(path, options) {
     __publicField(this, "worker");
     __publicField(this, "pending", /* @__PURE__ */ new Map());
+    __publicField(this, "_id");
     this.worker = new Worker(path, options);
+    this._id = options.workerData.workerId;
     this.worker.on("message", (message) => {
       const { type, level = "info", args = [] } = message;
       if (type !== "log")
@@ -1037,6 +1039,9 @@ class BuildWorkerProxy {
       }
     });
   }
+  get id() {
+    return this._id;
+  }
   on(type, listener) {
     this.worker.on(type, listener);
   }
@@ -1265,7 +1270,7 @@ async function build(ssgOptions = {}, viteConfig = {}) {
   const IS_PROD = nodeEnv === "production";
   indexHTML = await formatHtml(indexHTML, IS_PROD ? "minify" : formatting, minifyOptions);
   const workerRunCount = /* @__PURE__ */ new WeakMap();
-  const MAX_RUNS_PER_WORKER = 50;
+  const MAX_RUNS_PER_WORKER = 100;
   let lastWorkerIndex = workers.length - 1;
   function replaceWorker(workerProxy) {
     const index = workers.indexOf(workerProxy);
@@ -1273,14 +1278,14 @@ async function build(ssgOptions = {}, viteConfig = {}) {
       return workerProxy;
     }
     ++lastWorkerIndex;
-    config.logger.info(`${blue("[vite-ssg]")} ${yellow(`Replace worker #${index} => #${lastWorkerIndex}`)}`);
+    config.logger.info(`${blue("[vite-ssg]")} ${yellow(`Replace worker #${workerProxy.id} => #${lastWorkerIndex}`)}`);
     const workerPromises = workersInUse.get(workerProxy) || [];
     const newWorkerProxy = createProxy({
       ...createProxyOptions,
       workerId: lastWorkerIndex
     });
     workers[index] = newWorkerProxy;
-    Promise.allSettled(workerPromises).then(async () => {
+    Promise.allSettled([...workerPromises, Promise.resolve()]).then(async () => {
       await terminateWorker(workerProxy, onFinished);
     });
     return newWorkerProxy;

package/dist/shared/{vite-ssg-optimized.bb5ba938.cjs → vite-ssg-optimized.635b4c57.cjs}

@@ -1024,7 +1024,9 @@ class BuildWorkerProxy {
   constructor(path, options) {
     __publicField(this, "worker");
     __publicField(this, "pending", /* @__PURE__ */ new Map());
+    __publicField(this, "_id");
     this.worker = new node_worker_threads.Worker(path, options);
+    this._id = options.workerData.workerId;
     this.worker.on("message", (message) => {
       const { type, level = "info", args = [] } = message;
       if (type !== "log")
@@ -1046,6 +1048,9 @@ class BuildWorkerProxy {
       }
     });
   }
+  get id() {
+    return this._id;
+  }
   on(type, listener) {
     this.worker.on(type, listener);
   }
@@ -1127,7 +1132,7 @@ async function buildServer(config, viteConfig, { ssrEntry, ssgOut, format, mock
 }
 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.bb5ba938.cjs', document.baseURI).href))), {
+  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.635b4c57.cjs', document.baseURI).href))), {
     env: process__default.env,
     workerData: options
   });
@@ -1252,7 +1257,7 @@ async function build(ssgOptions = {}, viteConfig = {}) {
     return worker;
   };
   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.bb5ba938.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.635b4c57.cjs', document.baseURI).href)));
   const { createApp, includedRoutes: serverEntryIncludedRoutes } = format === "esm" ? await import(serverEntry) : _require(serverEntry);
   const includedRoutes = serverEntryIncludedRoutes || configIncludedRoutes;
   const { routes } = await createApp(false);
@@ -1274,7 +1279,7 @@ async function build(ssgOptions = {}, viteConfig = {}) {
   const IS_PROD = nodeEnv === "production";
   indexHTML = await formatHtml(indexHTML, IS_PROD ? "minify" : formatting, minifyOptions);
   const workerRunCount = /* @__PURE__ */ new WeakMap();
-  const MAX_RUNS_PER_WORKER = 50;
+  const MAX_RUNS_PER_WORKER = 100;
   let lastWorkerIndex = workers.length - 1;
   function replaceWorker(workerProxy) {
     const index = workers.indexOf(workerProxy);
@@ -1282,14 +1287,14 @@ async function build(ssgOptions = {}, viteConfig = {}) {
       return workerProxy;
     }
     ++lastWorkerIndex;
-    config.logger.info(`${kolorist.blue("[vite-ssg]")} ${kolorist.yellow(`Replace worker #${index} => #${lastWorkerIndex}`)}`);
+    config.logger.info(`${kolorist.blue("[vite-ssg]")} ${kolorist.yellow(`Replace worker #${workerProxy.id} => #${lastWorkerIndex}`)}`);
     const workerPromises = workersInUse.get(workerProxy) || [];
     const newWorkerProxy = createProxy({
       ...createProxyOptions,
       workerId: lastWorkerIndex
     });
     workers[index] = newWorkerProxy;
-    Promise.allSettled(workerPromises).then(async () => {
+    Promise.allSettled([...workerPromises, Promise.resolve()]).then(async () => {
       await terminateWorker(workerProxy, onFinished);
     });
     return newWorkerProxy;

package/package.json

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