vite-react-ssg 0.1.1 → 0.1.2

package/dist/node/cli.cjs

@@ -3,7 +3,7 @@
 const kolorist = require('kolorist');
 const yargs = require('yargs');
 const helpers = require('yargs/helpers');
-const dev = require('../shared/vite-react-ssg.8cbf43cc.cjs');
+const dev = require('../shared/vite-react-ssg.b0fd1823.cjs');
 require('node:path');
 require('node:module');
 require('fs-extra');

package/dist/node/cli.mjs

@@ -1,7 +1,7 @@
 import { gray, bold, red, reset, underline } from 'kolorist';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
-import { b as build, d as dev } from '../shared/vite-react-ssg.5291bf32.mjs';
+import { b as build, d as dev } from '../shared/vite-react-ssg.b83f6ed3.mjs';
 import 'node:path';
 import 'node:module';
 import 'fs-extra';

package/dist/node.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const dev = require('./shared/vite-react-ssg.8cbf43cc.cjs');
+const dev = require('./shared/vite-react-ssg.b0fd1823.cjs');
 require('node:path');
 require('node:module');
 require('kolorist');

package/dist/node.mjs

@@ -1,4 +1,4 @@
-export { b as build, d as dev } from './shared/vite-react-ssg.5291bf32.mjs';
+export { b as build, d as dev } from './shared/vite-react-ssg.b83f6ed3.mjs';
 import 'node:path';
 import 'node:module';
 import 'kolorist';

package/dist/shared/{vite-react-ssg.8cbf43cc.cjs → vite-react-ssg.b0fd1823.cjs}

@@ -934,7 +934,7 @@ async function resolveAlias(config, entry) {
   return result || node_path.join(config.root, entry);
 }
 const { version } = JSON.parse(
-  node_fs.readFileSync(new URL("../../package.json", (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('shared/vite-react-ssg.8cbf43cc.cjs', document.baseURI).href)))).toString()
+  node_fs.readFileSync(new URL("../../package.json", (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('shared/vite-react-ssg.b0fd1823.cjs', document.baseURI).href)))).toString()
 );
 
 async function getCritters(outDir, options = {}) {
@@ -1019,9 +1019,8 @@ async function render(routes, request, styleCollector) {
     helmet.script.toString()
   ];
   const styleTag = styleCollector?.toString?.(appHTML) ?? "";
-  metaStrings.push(styleTag);
   const metaAttributes = metaStrings.filter(Boolean);
-  return { appHTML, htmlAttributes, bodyAttributes, metaAttributes };
+  return { appHTML, htmlAttributes, bodyAttributes, metaAttributes, styleTag };
 }
 
 function renderPreloadLinks(document, modules, ssrManifest) {
@@ -1201,7 +1200,7 @@ async function build(ssgOptions = {}, viteConfig = {}) {
   const prefix = format === "esm" && process.platform === "win32" ? "file://" : "";
   const ext = format === "esm" ? ".mjs" : ".cjs";
   const serverEntry = node_path.join(prefix, ssgOut, node_path.parse(ssrEntry).name + ext);
-  const _require = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('shared/vite-react-ssg.8cbf43cc.cjs', document.baseURI).href)));
+  const _require = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('shared/vite-react-ssg.b0fd1823.cjs', document.baseURI).href)));
   const { createRoot, includedRoutes: serverEntryIncludedRoutes } = format === "esm" ? await import(serverEntry) : _require(serverEntry);
   const includedRoutes = serverEntryIncludedRoutes || configIncludedRoutes;
   const { routes } = await createRoot(false);
@@ -1229,7 +1228,7 @@ async function build(ssgOptions = {}, viteConfig = {}) {
         url.hash = "";
         url.pathname = route;
         const request = new Request(url.href);
-        const { appHTML, bodyAttributes, htmlAttributes, metaAttributes } = await render([...routes2], request, styleCollector);
+        const { appHTML, bodyAttributes, htmlAttributes, metaAttributes, styleTag } = await render([...routes2], request, styleCollector);
         await triggerOnSSRAppRendered?.(route, appHTML, appCtx);
         const renderedHTML = await renderHTML({
           rootContainerId,
@@ -1247,6 +1246,8 @@ async function build(ssgOptions = {}, viteConfig = {}) {
         let transformed = await onPageRendered?.(route, html, appCtx) || html;
         if (critters)
           transformed = await critters.process(transformed);
+        if (styleTag)
+          transformed = transformed.replace("<head>", `<head>${styleTag}`);
         const formatted = await formatHtml(transformed, formatting);
         const relativeRouteFile = `${(route.endsWith("/") ? `${route}index` : route).replace(/^\//g, "")}.html`;
         const filename = dirStyle === "nested" ? node_path.join(route.replace(/^\//g, ""), "index.html") : relativeRouteFile;
@@ -1426,7 +1427,8 @@ async function dev(ssgOptions = {}, viteConfig = {}) {
         const { routes, getStyleCollector } = appCtx;
         const transformedIndexHTML = await onBeforePageRender?.(url, indexHTML, appCtx) || indexHTML;
         const styleCollector = getStyleCollector ? await getStyleCollector() : null;
-        const { appHTML, bodyAttributes, htmlAttributes, metaAttributes } = await render([...routes], createFetchRequest(req), styleCollector);
+        const { appHTML, bodyAttributes, htmlAttributes, metaAttributes, styleTag } = await render([...routes], createFetchRequest(req), styleCollector);
+        metaAttributes.push(styleTag);
         const mod = await viteServer.moduleGraph.getModuleByUrl(entry);
         const assetsUrls = /* @__PURE__ */ new Set();
         const collectAssets = async (mod2) => {

package/dist/shared/{vite-react-ssg.5291bf32.mjs → vite-react-ssg.b83f6ed3.mjs}

@@ -1011,9 +1011,8 @@ async function render(routes, request, styleCollector) {
     helmet.script.toString()
   ];
   const styleTag = styleCollector?.toString?.(appHTML) ?? "";
-  metaStrings.push(styleTag);
   const metaAttributes = metaStrings.filter(Boolean);
-  return { appHTML, htmlAttributes, bodyAttributes, metaAttributes };
+  return { appHTML, htmlAttributes, bodyAttributes, metaAttributes, styleTag };
 }
 
 function renderPreloadLinks(document, modules, ssrManifest) {
@@ -1221,7 +1220,7 @@ async function build(ssgOptions = {}, viteConfig = {}) {
         url.hash = "";
         url.pathname = route;
         const request = new Request(url.href);
-        const { appHTML, bodyAttributes, htmlAttributes, metaAttributes } = await render([...routes2], request, styleCollector);
+        const { appHTML, bodyAttributes, htmlAttributes, metaAttributes, styleTag } = await render([...routes2], request, styleCollector);
         await triggerOnSSRAppRendered?.(route, appHTML, appCtx);
         const renderedHTML = await renderHTML({
           rootContainerId,
@@ -1239,6 +1238,8 @@ async function build(ssgOptions = {}, viteConfig = {}) {
         let transformed = await onPageRendered?.(route, html, appCtx) || html;
         if (critters)
           transformed = await critters.process(transformed);
+        if (styleTag)
+          transformed = transformed.replace("<head>", `<head>${styleTag}`);
         const formatted = await formatHtml(transformed, formatting);
         const relativeRouteFile = `${(route.endsWith("/") ? `${route}index` : route).replace(/^\//g, "")}.html`;
         const filename = dirStyle === "nested" ? join(route.replace(/^\//g, ""), "index.html") : relativeRouteFile;
@@ -1418,7 +1419,8 @@ async function dev(ssgOptions = {}, viteConfig = {}) {
         const { routes, getStyleCollector } = appCtx;
         const transformedIndexHTML = await onBeforePageRender?.(url, indexHTML, appCtx) || indexHTML;
         const styleCollector = getStyleCollector ? await getStyleCollector() : null;
-        const { appHTML, bodyAttributes, htmlAttributes, metaAttributes } = await render([...routes], createFetchRequest(req), styleCollector);
+        const { appHTML, bodyAttributes, htmlAttributes, metaAttributes, styleTag } = await render([...routes], createFetchRequest(req), styleCollector);
+        metaAttributes.push(styleTag);
         const mod = await viteServer.moduleGraph.getModuleByUrl(entry);
         const assetsUrls = /* @__PURE__ */ new Set();
         const collectAssets = async (mod2) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-react-ssg",
   "type": "module",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "packageManager": "pnpm@8.6.6",
   "description": "",
   "author": "Riri <Daydreamerriri@outlook.com>",