vite-ssg-optimized 0.24.2-optimized.26 → 0.24.2-optimized.28

package/dist/client/single-page.cjs

@@ -17,7 +17,7 @@ function ViteSSG(App, fn, options = {}) {
     const app = client ? vue.createApp(App) : vue.createSSRApp(App);
     let head;
     if (useHead) {
-      head = client ? vue$1.createHead() : vue$1.createServerHead();
+      head = vue$1.createHead();
       app.use(head);
     }
     const appRenderCallbacks = [];

package/dist/client/single-page.mjs

@@ -1,4 +1,4 @@
-import { createHead, createServerHead } from '@unhead/vue';
+import { createHead } from '@unhead/vue';
 import { createApp, createSSRApp } from 'vue';
 import { C as ClientOnly, d as documentReady } from '../shared/vite-ssg-optimized.5912142e.mjs';
 import { d as deserializeState } from '../shared/vite-ssg-optimized.579feabb.mjs';
@@ -15,7 +15,7 @@ function ViteSSG(App, fn, options = {}) {
     const app = client ? createApp(App) : createSSRApp(App);
     let head;
     if (useHead) {
-      head = client ? createHead() : createServerHead();
+      head = createHead();
       app.use(head);
     }
     const appRenderCallbacks = [];

package/dist/index.cjs

@@ -19,7 +19,7 @@ function ViteSSG(App, routerOptions, fn, options = {}) {
     const app = client && !isHydrationMode ? vue.createApp(App) : vue.createSSRApp(App);
     let head;
     if (useHead) {
-      head = client ? vue$1.createHead() : vue$1.createServerHead();
+      head = vue$1.createHead();
       app.use(head);
     }
     const router = vueRouter.createRouter({

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { createHead, createServerHead } from '@unhead/vue';
+import { createHead } from '@unhead/vue';
 import { createApp, createSSRApp } from 'vue';
 import { createRouter, createWebHistory, createMemoryHistory } from 'vue-router';
 import { C as ClientOnly, d as documentReady } from './shared/vite-ssg-optimized.5912142e.mjs';
@@ -17,7 +17,7 @@ function ViteSSG(App, routerOptions, fn, options = {}) {
     const app = client && !isHydrationMode ? createApp(App) : createSSRApp(App);
     let head;
     if (useHead) {
-      head = client ? createHead() : createServerHead();
+      head = createHead();
       app.use(head);
     }
     const router = createRouter({

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.ea83ea83.cjs');
+const node = require('../shared/vite-ssg-optimized.1efabb47.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.1ce2784c.mjs';
+import { b as build } from '../shared/vite-ssg-optimized.44cef1f4.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.ea83ea83.cjs');
+const node = require('./shared/vite-ssg-optimized.1efabb47.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.1ce2784c.mjs';
+export { b as build } from './shared/vite-ssg-optimized.44cef1f4.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.ea83ea83.cjs');
+const node = require('./vite-ssg-optimized.1efabb47.cjs');
 const kolorist = require('kolorist');
 const vite = require('vite');
 require('node:path');
@@ -73,25 +73,24 @@ async function getBeastiesOrCritters(outDir, options = {}) {
     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)));
-  let createApp = void 0;
+  let createAppPromise = void 0;
+  let beastiesPromise = void 0;
   const execMap = {
     executeTaskFn: async (opts) => {
       const { serverEntry } = opts;
-      if (!createApp) {
-        const mod = format === "esm" ? await import(serverEntry) : _require(serverEntry);
-        createApp = mod.createApp;
-      }
+      createAppPromise ?? (createAppPromise = Promise.resolve(format === "esm" ? import(serverEntry) : _require(serverEntry)).then(({ createApp: createApp2 }) => createApp2));
+      const createApp = await createAppPromise;
       const beastiesOptions = opts.beastiesOptions;
-      if (beasties === void 0) {
-        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`")}`);
-        }
-      }
+      beastiesPromise ?? (beastiesPromise = Promise.resolve(beastiesOptions !== false ? getBeastiesOrCritters(outDir, beastiesOptions) : void 0).then((beasties3) => {
+        if (!beasties3)
+          return;
+        console.log(`${kolorist.gray("[vite-ssg]")} ${kolorist.blue("Critical CSS generation enabled via `beasties`")}`);
+        return beasties3;
+      }));
+      const beasties2 = await beastiesPromise;
       const newOpts = {
         ...extraOpts,
         out,
@@ -101,7 +100,7 @@ async function getBeastiesOrCritters(outDir, options = {}) {
         onPageRendered,
         onBeforePageRender,
         // onDonePageRender: onDonePageRender,
-        beasties,
+        beasties: beasties2,
         config: { logger: { info: (msg) => {
           node_worker_threads.parentPort.postMessage({ type: "log", args: [msg] });
         } } },

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.1ce2784c.mjs';
+import { p as plainify, e as executeTaskFn, a as buildClient, c as buildServer } from './vite-ssg-optimized.44cef1f4.mjs';
 import { red, gray, blue } from 'kolorist';
 import { resolveConfig } from 'vite';
 import 'node:path';
@@ -70,25 +70,24 @@ async function getBeastiesOrCritters(outDir, options = {}) {
     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);
-  let createApp = void 0;
+  let createAppPromise = void 0;
+  let beastiesPromise = void 0;
   const execMap = {
     executeTaskFn: async (opts) => {
       const { serverEntry } = opts;
-      if (!createApp) {
-        const mod = format === "esm" ? await import(serverEntry) : _require(serverEntry);
-        createApp = mod.createApp;
-      }
+      createAppPromise ?? (createAppPromise = Promise.resolve(format === "esm" ? import(serverEntry) : _require(serverEntry)).then(({ createApp: createApp2 }) => createApp2));
+      const createApp = await createAppPromise;
       const beastiesOptions = opts.beastiesOptions;
-      if (beasties === void 0) {
-        beasties = beastiesOptions !== false ? await getBeastiesOrCritters(outDir, beastiesOptions) : void 0;
-        if (beasties) {
-          console.log(`${gray("[vite-ssg]")} ${blue("Critical CSS generation enabled via `beasties`")}`);
-        }
-      }
+      beastiesPromise ?? (beastiesPromise = Promise.resolve(beastiesOptions !== false ? getBeastiesOrCritters(outDir, beastiesOptions) : void 0).then((beasties3) => {
+        if (!beasties3)
+          return;
+        console.log(`${gray("[vite-ssg]")} ${blue("Critical CSS generation enabled via `beasties`")}`);
+        return beasties3;
+      }));
+      const beasties2 = await beastiesPromise;
       const newOpts = {
         ...extraOpts,
         out,
@@ -98,7 +97,7 @@ async function getBeastiesOrCritters(outDir, options = {}) {
         onPageRendered,
         onBeforePageRender,
         // onDonePageRender: onDonePageRender,
-        beasties,
+        beasties: beasties2,
         config: { logger: { info: (msg) => {
           parentPort.postMessage({ type: "log", args: [msg] });
         } } },

package/dist/shared/{vite-ssg-optimized.ea83ea83.cjs → vite-ssg-optimized.1efabb47.cjs}

@@ -1122,7 +1122,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.ea83ea83.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.1efabb47.cjs', document.baseURI).href))), {
     env: process__default.env,
     workerData: options
   });
@@ -1162,16 +1162,47 @@ 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({
+  const createProxyOptions = {
     format,
     out,
     dirStyle,
-    workerId: index,
     viteConfig: {
       configFile: config.configFile
     }
+  };
+  let willRunBuild = true;
+  if (fs__default.existsSync(ssgOut)) {
+    willRunBuild = !ssgOptions["skip-build"];
+    if (willRunBuild) {
+      await fs__default.remove(ssgOut);
+    }
+  }
+  const buildPromises = [];
+  if (willRunBuild) {
+    const clientWorker = createProxy({
+      ...createProxyOptions,
+      workerId: "client"
+    });
+    const cpBuildClient = execInWorker(clientWorker, buildClient, config, viteConfig).finally(() => clientWorker.terminate());
+    buildPromises.push(cpBuildClient);
+  }
+  const ssrEntry = await resolveAlias(config, entry);
+  if (willRunBuild) {
+    const serverWorker = createProxy({
+      ...createProxyOptions,
+      workerId: "server"
+    });
+    const cpBuildServer = execInWorker(serverWorker, buildServer, config, viteConfig, { ssrEntry, ssgOut, format, mock }).finally(() => serverWorker.terminate());
+    buildPromises.push(cpBuildServer);
+  }
+  await Promise.all(buildPromises);
+  const prefix = format === "esm" && process__default.platform === "win32" ? "file://" : "";
+  const ext = format === "esm" ? ".mjs" : ".cjs";
+  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({
+    ...createProxyOptions,
+    workerId: index
   }));
   const terminateWorkers = () => {
     workers.splice(0, workers.length).forEach((worker) => worker.terminate());
@@ -1198,30 +1229,8 @@ async function build(ssgOptions = {}, viteConfig = {}) {
     });
     return worker;
   };
-  let willRunBuild = true;
-  if (fs__default.existsSync(ssgOut)) {
-    willRunBuild = !ssgOptions["skip-build"];
-    if (willRunBuild) {
-      await fs__default.remove(ssgOut);
-    }
-  }
-  const buildPromises = [];
-  if (willRunBuild) {
-    const clientWorker = await selectWorker(0);
-    const cpBuildClient = execInWorker(clientWorker, buildClient, config, viteConfig);
-    buildPromises.push(cpBuildClient);
-  }
-  const ssrEntry = await resolveAlias(config, entry);
-  if (willRunBuild) {
-    const serverWorker = await selectWorker(1);
-    const cpBuildServer = execInWorker(serverWorker, buildServer, config, viteConfig, { ssrEntry, ssgOut, format, mock });
-    buildPromises.push(cpBuildServer);
-  }
-  await Promise.all(buildPromises);
-  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.ea83ea83.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.1efabb47.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/dist/shared/{vite-ssg-optimized.1ce2784c.mjs → vite-ssg-optimized.44cef1f4.mjs}

@@ -1153,16 +1153,47 @@ 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({
+  const createProxyOptions = {
     format,
     out,
     dirStyle,
-    workerId: index,
     viteConfig: {
       configFile: config.configFile
     }
+  };
+  let willRunBuild = true;
+  if (fs.existsSync(ssgOut)) {
+    willRunBuild = !ssgOptions["skip-build"];
+    if (willRunBuild) {
+      await fs.remove(ssgOut);
+    }
+  }
+  const buildPromises = [];
+  if (willRunBuild) {
+    const clientWorker = createProxy({
+      ...createProxyOptions,
+      workerId: "client"
+    });
+    const cpBuildClient = execInWorker(clientWorker, buildClient, config, viteConfig).finally(() => clientWorker.terminate());
+    buildPromises.push(cpBuildClient);
+  }
+  const ssrEntry = await resolveAlias(config, entry);
+  if (willRunBuild) {
+    const serverWorker = createProxy({
+      ...createProxyOptions,
+      workerId: "server"
+    });
+    const cpBuildServer = execInWorker(serverWorker, buildServer, config, viteConfig, { ssrEntry, ssgOut, format, mock }).finally(() => serverWorker.terminate());
+    buildPromises.push(cpBuildServer);
+  }
+  await Promise.all(buildPromises);
+  const prefix = format === "esm" && process$1.platform === "win32" ? "file://" : "";
+  const ext = format === "esm" ? ".mjs" : ".cjs";
+  const numberOfWorkers = Math.max(1, _numberOfWorkers);
+  console.log(`${gray("[vite-ssg]")} ${blue(`Using ${numberOfWorkers} workers`)}`);
+  const workers = Array.from({ length: numberOfWorkers }, (_, index) => createProxy({
+    ...createProxyOptions,
+    workerId: index
   }));
   const terminateWorkers = () => {
     workers.splice(0, workers.length).forEach((worker) => worker.terminate());
@@ -1189,28 +1220,6 @@ async function build(ssgOptions = {}, viteConfig = {}) {
     });
     return worker;
   };
-  let willRunBuild = true;
-  if (fs.existsSync(ssgOut)) {
-    willRunBuild = !ssgOptions["skip-build"];
-    if (willRunBuild) {
-      await fs.remove(ssgOut);
-    }
-  }
-  const buildPromises = [];
-  if (willRunBuild) {
-    const clientWorker = await selectWorker(0);
-    const cpBuildClient = execInWorker(clientWorker, buildClient, config, viteConfig);
-    buildPromises.push(cpBuildClient);
-  }
-  const ssrEntry = await resolveAlias(config, entry);
-  if (willRunBuild) {
-    const serverWorker = await selectWorker(1);
-    const cpBuildServer = execInWorker(serverWorker, buildServer, config, viteConfig, { ssrEntry, ssgOut, format, mock });
-    buildPromises.push(cpBuildServer);
-  }
-  await Promise.all(buildPromises);
-  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, "/");
   const _require = createRequire(import.meta.url);
   const { createApp, includedRoutes: serverEntryIncludedRoutes } = format === "esm" ? await import(serverEntry) : _require(serverEntry);

package/package.json

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