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

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.635b4c57.cjs');
+const node = require('../shared/vite-ssg-optimized.e58a8d97.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.0dfc50c9.mjs';
+import { b as build } from '../shared/vite-ssg-optimized.65f46348.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.635b4c57.cjs');
+const node = require('./shared/vite-ssg-optimized.e58a8d97.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.0dfc50c9.mjs';
+export { b as build } from './shared/vite-ssg-optimized.65f46348.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.635b4c57.cjs');
+const node = require('./vite-ssg-optimized.e58a8d97.cjs');
 const kolorist = require('kolorist');
 const vite = require('vite');
 require('node:path');
@@ -79,19 +79,29 @@ async function getBeastiesOrCritters(outDir, options = {}) {
   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)));
   let createAppPromise = void 0;
   let beastiesPromise = void 0;
+  function cancelablePromise(promise) {
+    let cancel = () => void 0;
+    const newPromise = new Promise((resolve, reject) => {
+      cancel = () => void reject(new Error("Cancelled"));
+      promise.then((result) => {
+        resolve(result);
+      });
+    });
+    return Object.assign(newPromise, { cancel });
+  }
   const execMap = {
     executeTaskFn: async (opts) => {
       const { serverEntry } = opts;
       createAppPromise ?? (createAppPromise = Promise.resolve(format === "esm" ? import(serverEntry) : _require(serverEntry)).then(({ createApp: createApp2 }) => createApp2));
       const createApp = await createAppPromise;
       const beastiesOptions = opts.beastiesOptions;
-      beastiesPromise ?? (beastiesPromise = Promise.resolve(beastiesOptions !== false ? getBeastiesOrCritters(outDir, beastiesOptions) : void 0).then((beasties3) => {
-        if (!beasties3)
+      beastiesPromise ?? (beastiesPromise = Promise.resolve(beastiesOptions !== false ? getBeastiesOrCritters(outDir, beastiesOptions) : void 0).then((beasties2) => {
+        if (!beasties2)
           return;
         console.log(`${kolorist.gray("[vite-ssg]")} ${kolorist.blue("Critical CSS generation enabled via `beasties`")}`);
-        return beasties3;
+        return beasties2;
       }));
-      const beasties2 = await beastiesPromise;
+      const beasties = await beastiesPromise;
       const newOpts = {
         ...extraOpts,
         out,
@@ -101,13 +111,20 @@ async function getBeastiesOrCritters(outDir, options = {}) {
         onPageRendered,
         onBeforePageRender,
         // onDonePageRender: onDonePageRender,
-        beasties: beasties2,
+        beasties,
         config: { logger: { info: (msg) => {
           node_worker_threads.parentPort.postMessage({ type: "log", args: [msg] });
         } } },
         ...opts
       };
-      return node.executeTaskFn(newOpts);
+      const resultPromise = cancelablePromise(node.executeTaskFn(newOpts));
+      const cancel = async () => {
+        resultPromise.cancel();
+      };
+      process.once("beforeExit", cancel);
+      process.once("SIGINT", cancel);
+      process.once("SIGTERM", cancel);
+      return resultPromise;
     },
     onFinished,
     buildClient: async (...args) => {

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.0dfc50c9.mjs';
+import { p as plainify, e as executeTaskFn, a as buildClient, c as buildServer } from './vite-ssg-optimized.65f46348.mjs';
 import { red, gray, blue } from 'kolorist';
 import { resolveConfig } from 'vite';
 import 'node:path';
@@ -76,19 +76,29 @@ async function getBeastiesOrCritters(outDir, options = {}) {
   const _require = createRequire(import.meta.url);
   let createAppPromise = void 0;
   let beastiesPromise = void 0;
+  function cancelablePromise(promise) {
+    let cancel = () => void 0;
+    const newPromise = new Promise((resolve, reject) => {
+      cancel = () => void reject(new Error("Cancelled"));
+      promise.then((result) => {
+        resolve(result);
+      });
+    });
+    return Object.assign(newPromise, { cancel });
+  }
   const execMap = {
     executeTaskFn: async (opts) => {
       const { serverEntry } = opts;
       createAppPromise ?? (createAppPromise = Promise.resolve(format === "esm" ? import(serverEntry) : _require(serverEntry)).then(({ createApp: createApp2 }) => createApp2));
       const createApp = await createAppPromise;
       const beastiesOptions = opts.beastiesOptions;
-      beastiesPromise ?? (beastiesPromise = Promise.resolve(beastiesOptions !== false ? getBeastiesOrCritters(outDir, beastiesOptions) : void 0).then((beasties3) => {
-        if (!beasties3)
+      beastiesPromise ?? (beastiesPromise = Promise.resolve(beastiesOptions !== false ? getBeastiesOrCritters(outDir, beastiesOptions) : void 0).then((beasties2) => {
+        if (!beasties2)
           return;
         console.log(`${gray("[vite-ssg]")} ${blue("Critical CSS generation enabled via `beasties`")}`);
-        return beasties3;
+        return beasties2;
       }));
-      const beasties2 = await beastiesPromise;
+      const beasties = await beastiesPromise;
       const newOpts = {
         ...extraOpts,
         out,
@@ -98,13 +108,20 @@ async function getBeastiesOrCritters(outDir, options = {}) {
         onPageRendered,
         onBeforePageRender,
         // onDonePageRender: onDonePageRender,
-        beasties: beasties2,
+        beasties,
         config: { logger: { info: (msg) => {
           parentPort.postMessage({ type: "log", args: [msg] });
         } } },
         ...opts
       };
-      return executeTaskFn(newOpts);
+      const resultPromise = cancelablePromise(executeTaskFn(newOpts));
+      const cancel = async () => {
+        resultPromise.cancel();
+      };
+      process.once("beforeExit", cancel);
+      process.once("SIGINT", cancel);
+      process.once("SIGTERM", cancel);
+      return resultPromise;
     },
     onFinished,
     buildClient: async (...args) => {

package/dist/shared/{vite-ssg-optimized.0dfc50c9.mjs → vite-ssg-optimized.65f46348.mjs}

@@ -1184,6 +1184,10 @@ async function build(ssgOptions = {}, viteConfig = {}) {
       ...createProxyOptions,
       workerId: "client"
     });
+    clientWorker.on("unhandledRejection", (error) => {
+      console.error(error);
+      clientWorker.terminate();
+    });
     const cpBuildClient = execInWorker(clientWorker, buildClient, config, viteConfig).finally(() => clientWorker.terminate());
     buildPromises.push(cpBuildClient);
   }

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

@@ -1132,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.635b4c57.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.e58a8d97.cjs', document.baseURI).href))), {
     env: process__default.env,
     workerData: options
   });
@@ -1193,6 +1193,10 @@ async function build(ssgOptions = {}, viteConfig = {}) {
       ...createProxyOptions,
       workerId: "client"
     });
+    clientWorker.on("unhandledRejection", (error) => {
+      console.error(error);
+      clientWorker.terminate();
+    });
     const cpBuildClient = execInWorker(clientWorker, buildClient, config, viteConfig).finally(() => clientWorker.terminate());
     buildPromises.push(cpBuildClient);
   }
@@ -1257,7 +1261,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.635b4c57.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.e58a8d97.cjs', document.baseURI).href)));
   const { createApp, includedRoutes: serverEntryIncludedRoutes } = format === "esm" ? await import(serverEntry) : _require(serverEntry);
   const includedRoutes = serverEntryIncludedRoutes || configIncludedRoutes;
   const { routes } = await createApp(false);

package/package.json

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