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

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.31f4c9de.cjs');
+const node = require('../shared/vite-ssg-optimized.46e3caf6.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.dc2a4a38.mjs';
+import { b as build } from '../shared/vite-ssg-optimized.62fed880.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.31f4c9de.cjs');
+const node = require('./shared/vite-ssg-optimized.46e3caf6.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.dc2a4a38.mjs';
+export { b as build } from './shared/vite-ssg-optimized.62fed880.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.31f4c9de.cjs');
+const node = require('./vite-ssg-optimized.46e3caf6.cjs');
 const kolorist = require('kolorist');
 const vite = require('vite');
 require('node:path');
@@ -14,6 +14,17 @@ require('html5parser');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 (async () => {
+  const fnLog = (level = "info", msg) => {
+    node_worker_threads.parentPort.postMessage({ type: "log", args: [msg], 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);

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

@@ -11,6 +11,7 @@ import 'vue-router';
 
 interface WorkerDataEntry {
     serverEntry: string;
+    workerId: number | string;
     format: 'esm' | 'cjs';
     out: string;
     dirStyle: ViteSSGOptions['dirStyle'];

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

@@ -11,6 +11,7 @@ import 'vue-router';
 
 interface WorkerDataEntry {
     serverEntry: string;
+    workerId: number | string;
     format: 'esm' | 'cjs';
     out: string;
     dirStyle: ViteSSGOptions['dirStyle'];

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

@@ -11,6 +11,7 @@ import 'vue-router';
 
 interface WorkerDataEntry {
     serverEntry: string;
+    workerId: number | string;
     format: 'esm' | 'cjs';
     out: string;
     dirStyle: ViteSSGOptions['dirStyle'];

package/dist/shared/build.worker.mjs

@@ -1,6 +1,6 @@
 import { createRequire } from 'node:module';
 import { parentPort, workerData } from 'node:worker_threads';
-import { g as getBeastiesOrCritters, e as executeTaskFn } from './vite-ssg-optimized.dc2a4a38.mjs';
+import { g as getBeastiesOrCritters, e as executeTaskFn } from './vite-ssg-optimized.62fed880.mjs';
 import { gray, blue } from 'kolorist';
 import { resolveConfig } from 'vite';
 import 'node:path';
@@ -11,6 +11,17 @@ import './vite-ssg-optimized.579feabb.mjs';
 import 'html5parser';
 
 (async () => {
+  const fnLog = (level = "info", msg) => {
+    parentPort.postMessage({ type: "log", args: [msg], 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);

package/dist/shared/{vite-ssg-optimized.31f4c9de.cjs → vite-ssg-optimized.46e3caf6.cjs}

@@ -1060,8 +1060,8 @@ class BuildWorkerProxy {
         return;
       const fn = console[level]?.bind(console);
       let msg = args.map((arg) => typeof arg === "object" && !!arg ? "[object]" : arg).join(" ");
-      process.stdout.write(msg);
-      fn?.(msg);
+      const workerId = options.workerData.workerId;
+      fn?.(`[woker #${workerId}] ${msg}`);
     });
     this.worker.on("message", (message) => {
       const { id, type, result = void 0, error = void 0 } = message;
@@ -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.31f4c9de.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.46e3caf6.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,9 +1219,11 @@ 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 = () => {
-    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))), {
+  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.46e3caf6.cjs', document.baseURI).href))), {
+      env: process__default.env,
       workerData: {
+        workerId: index,
         serverEntry,
         ssrManifest,
         format,
@@ -1240,7 +1242,7 @@ async function build(ssgOptions = {}, viteConfig = {}) {
     return workerProxy;
   };
   const numberOfWorkers = 5;
-  const workers = Array.from({ length: numberOfWorkers }, createProxy);
+  const workers = Array.from({ length: numberOfWorkers }, (_, index) => createProxy(index));
   let workerIndex = 0;
   for (const route of routesPaths) {
     await queue.onSizeLessThan(concurrency + 5);
@@ -1346,8 +1348,9 @@ 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(`${out}/`)}${kolorist.cyan(filename.padEnd(15, " "))}  ${kolorist.dim(getSize(formatted))}`
+        `${kolorist.dim(`${outDir}/`)}${kolorist.cyan(filename.padEnd(15, " "))}  ${kolorist.dim(getSize(formatted))}`
       );
       onDonePageRender?.(route, html, appCtx);
       return { route, html };

package/dist/shared/{vite-ssg-optimized.dc2a4a38.mjs → vite-ssg-optimized.62fed880.mjs}

@@ -1051,8 +1051,8 @@ class BuildWorkerProxy {
         return;
       const fn = console[level]?.bind(console);
       let msg = args.map((arg) => typeof arg === "object" && !!arg ? "[object]" : arg).join(" ");
-      process.stdout.write(msg);
-      fn?.(msg);
+      const workerId = options.workerData.workerId;
+      fn?.(`[woker #${workerId}] ${msg}`);
     });
     this.worker.on("message", (message) => {
       const { id, type, result = void 0, error = void 0 } = message;
@@ -1210,9 +1210,11 @@ 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 = () => {
+  const createProxy = (index) => {
     const workerProxy = new BuildWorkerProxy(new URL(`./build.worker${workerExt}`, import.meta.url), {
+      env: process$1.env,
       workerData: {
+        workerId: index,
         serverEntry,
         ssrManifest,
         format,
@@ -1231,7 +1233,7 @@ async function build(ssgOptions = {}, viteConfig = {}) {
     return workerProxy;
   };
   const numberOfWorkers = 5;
-  const workers = Array.from({ length: numberOfWorkers }, createProxy);
+  const workers = Array.from({ length: numberOfWorkers }, (_, index) => createProxy(index));
   let workerIndex = 0;
   for (const route of routesPaths) {
     await queue.onSizeLessThan(concurrency + 5);
@@ -1337,8 +1339,9 @@ 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(`${out}/`)}${cyan(filename.padEnd(15, " "))}  ${dim(getSize(formatted))}`
+        `${dim(`${outDir}/`)}${cyan(filename.padEnd(15, " "))}  ${dim(getSize(formatted))}`
       );
       onDonePageRender?.(route, html, appCtx);
       return { route, html };

package/package.json

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