vite-react-ssg 0.3.1 → 0.3.3

package/README.md

@@ -2,6 +2,8 @@
 
 Static-site generation for React on Vite.
 
+See demo(also document): [docs](https://vite-react-ssg.netlify.app/)
+
 [![NPM version](https://img.shields.io/npm/v/vite-react-ssg?color=a1b858&label=)](https://www.npmjs.com/package/vite-react-ssg)
 
 # Table of contents

package/dist/index.cjs

@@ -149,6 +149,17 @@ function ViteReactSSG(routerOptions, fn, options = {}) {
   if (isClient) {
     (async () => {
       const container = typeof rootContainer === "string" ? document.querySelector(rootContainer) : rootContainer;
+      const lazeMatches = reactRouterDom.matchRoutes(routerOptions.routes, window.location)?.filter(
+        (m) => m.route.lazy
+      );
+      if (lazeMatches && lazeMatches?.length > 0) {
+        await Promise.all(
+          lazeMatches.map(async (m) => {
+            const routeModule = await m.route.lazy();
+            Object.assign(m.route, { ...routeModule, lazy: void 0 });
+          })
+        );
+      }
       const { router } = await createRoot(true);
       const app = /* @__PURE__ */ React__default.createElement(reactHelmetAsync.HelmetProvider, null, /* @__PURE__ */ React__default.createElement(SiteMetadataDefaults.SiteMetadataDefaults, null), /* @__PURE__ */ React__default.createElement(reactRouterDom.RouterProvider, { router }));
       if (!ssrWhenDev && undefined.DEV) {
@@ -157,17 +168,6 @@ function ViteReactSSG(routerOptions, fn, options = {}) {
           root.render(app);
         });
       } else {
-        const lazeMatches = reactRouterDom.matchRoutes(routerOptions.routes, window.location)?.filter(
-          (m) => m.route.lazy
-        );
-        if (lazeMatches && lazeMatches?.length > 0) {
-          await Promise.all(
-            lazeMatches.map(async (m) => {
-              const routeModule = await m.route.lazy();
-              Object.assign(m.route, { ...routeModule, lazy: void 0 });
-            })
-          );
-        }
         React__default.startTransition(() => {
           client.hydrateRoot(container, app);
         });

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { R as RouterOptions, V as ViteReactSSGContext, a as ViteReactSSGClientOptions } from './types-c03d6a58.js';
-export { I as IndexRouteRecord, N as NonIndexRouteRecord, c as RouteRecord, S as StyleCollector, b as ViteReactSSGOptions } from './types-c03d6a58.js';
+import { R as RouterOptions, V as ViteReactSSGContext, a as ViteReactSSGClientOptions } from './types-3aee4b6b.js';
+export { I as IndexRouteRecord, N as NonIndexRouteRecord, c as RouteRecord, S as StyleCollector, b as ViteReactSSGOptions } from './types-3aee4b6b.js';
 import React, { ReactNode } from 'react';
 import { HelmetProps } from 'react-helmet-async';
 import { LinkProps, NavLinkProps } from 'react-router-dom';

package/dist/index.mjs

@@ -144,6 +144,17 @@ function ViteReactSSG(routerOptions, fn, options = {}) {
   if (isClient) {
     (async () => {
       const container = typeof rootContainer === "string" ? document.querySelector(rootContainer) : rootContainer;
+      const lazeMatches = matchRoutes(routerOptions.routes, window.location)?.filter(
+        (m) => m.route.lazy
+      );
+      if (lazeMatches && lazeMatches?.length > 0) {
+        await Promise.all(
+          lazeMatches.map(async (m) => {
+            const routeModule = await m.route.lazy();
+            Object.assign(m.route, { ...routeModule, lazy: void 0 });
+          })
+        );
+      }
       const { router } = await createRoot$1(true);
       const app = /* @__PURE__ */ React.createElement(HelmetProvider, null, /* @__PURE__ */ React.createElement(SiteMetadataDefaults, null), /* @__PURE__ */ React.createElement(RouterProvider, { router }));
       if (!ssrWhenDev && import.meta.env.DEV) {
@@ -152,17 +163,6 @@ function ViteReactSSG(routerOptions, fn, options = {}) {
           root.render(app);
         });
       } else {
-        const lazeMatches = matchRoutes(routerOptions.routes, window.location)?.filter(
-          (m) => m.route.lazy
-        );
-        if (lazeMatches && lazeMatches?.length > 0) {
-          await Promise.all(
-            lazeMatches.map(async (m) => {
-              const routeModule = await m.route.lazy();
-              Object.assign(m.route, { ...routeModule, lazy: void 0 });
-            })
-          );
-        }
         React.startTransition(() => {
           hydrateRoot(container, app);
         });

package/dist/node/cli.cjs

@@ -4,7 +4,7 @@ const kolorist = require('kolorist');
 const yargs = require('yargs');
 const helpers = require('yargs/helpers');
 const webFetch = require('@remix-run/web-fetch');
-const dev = require('../shared/vite-react-ssg.9cf631b2.cjs');
+const dev = require('../shared/vite-react-ssg.69de2462.cjs');
 require('node:path');
 require('node:module');
 require('fs-extra');

package/dist/node/cli.mjs

@@ -2,7 +2,7 @@ import { gray, bold, red, reset, underline } from 'kolorist';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 import { Request, Response, fetch as fetch$1, Headers, FormData } from '@remix-run/web-fetch';
-import { b as build, d as dev } from '../shared/vite-react-ssg.f12aa7be.mjs';
+import { b as build, d as dev } from '../shared/vite-react-ssg.f8eacfb1.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.9cf631b2.cjs');
+const dev = require('./shared/vite-react-ssg.69de2462.cjs');
 require('node:path');
 require('node:module');
 require('kolorist');

package/dist/node.d.ts

@@ -1,5 +1,5 @@
 import { InlineConfig } from 'vite';
-import { b as ViteReactSSGOptions } from './types-c03d6a58.js';
+import { b as ViteReactSSGOptions } from './types-3aee4b6b.js';
 import 'critters';
 import 'react';
 import 'react-router-dom';

package/dist/node.mjs

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

package/dist/shared/{vite-react-ssg.9cf631b2.cjs → vite-react-ssg.69de2462.cjs}

@@ -867,7 +867,7 @@ ${kolorist.gray("[vite-react-ssg]")} ${kolorist.yellow(text)}${count ? kolorist.
 function getSize(str) {
   return `${(str.length / 1024).toFixed(2)} KiB`;
 }
-function routesToPaths(routes) {
+async function routesToPaths(routes) {
   const pathToEntry = {};
   function addEntry(path, entry) {
     if (!entry)
@@ -883,17 +883,17 @@ function routesToPaths(routes) {
     return { paths: ["/"], pathToEntry };
   const paths = /* @__PURE__ */ new Set();
   const lazyPaths = /* @__PURE__ */ new Set();
-  const getPaths = (routes2, prefix = "") => {
+  const getPaths = async (routes2, prefix = "") => {
     prefix = prefix.replace(/\/$/g, "");
     for (const route of routes2) {
       let path = route.path;
       path = handlePath(path, prefix, route.entry);
       if (route.getStaticPaths && path?.includes(":")) {
-        const staticPaths = route.getStaticPaths();
+        const staticPaths = await route.getStaticPaths();
         for (let staticPath of staticPaths) {
           staticPath = handlePath(staticPath, prefix, route.entry);
           if (Array.isArray(route.children))
-            getPaths(route.children, staticPath);
+            await getPaths(route.children, staticPath);
         }
       }
       if (route.lazy)
@@ -901,10 +901,10 @@ function routesToPaths(routes) {
       if (route.index)
         addEntry(prefix, route.entry);
       if (Array.isArray(route.children))
-        getPaths(route.children, path);
+        await getPaths(route.children, path);
     }
   };
-  getPaths(routes);
+  await getPaths(routes);
   return { paths: Array.from(paths), pathToEntry, lazyPaths: Array.from(lazyPaths) };
   function handlePath(path, prefix, entry) {
     if (path != null) {
@@ -950,7 +950,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.9cf631b2.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.69de2462.cjs', document.baseURI).href)))).toString()
 );
 function createRequest(path) {
   const url = new URL(path, "http://vite-react-ssg.com");
@@ -1233,13 +1233,13 @@ 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.9cf631b2.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.69de2462.cjs', document.baseURI).href)));
   const { createRoot, includedRoutes: serverEntryIncludedRoutes } = format === "esm" ? await import(serverEntry) : _require(serverEntry);
   const includedRoutes = serverEntryIncludedRoutes || configIncludedRoutes;
   const { routes } = await createRoot(false);
-  const { lazyPaths } = routesToPaths(routes);
+  const { lazyPaths } = await routesToPaths(routes);
   const dataRoutes = await preLoad([...routes], lazyPaths);
-  const { paths, pathToEntry } = routesToPaths(dataRoutes);
+  const { paths, pathToEntry } = await routesToPaths(dataRoutes);
   let routesPaths = includeAllRoutes ? paths : await includedRoutes(paths, routes || []);
   routesPaths = DefaultIncludedRoutes(routesPaths);
   routesPaths = Array.from(new Set(routesPaths));

package/dist/shared/{vite-react-ssg.f12aa7be.mjs → vite-react-ssg.f8eacfb1.mjs}

@@ -859,7 +859,7 @@ ${gray("[vite-react-ssg]")} ${yellow(text)}${count ? blue(` (${count})`) : ""}`)
 function getSize(str) {
   return `${(str.length / 1024).toFixed(2)} KiB`;
 }
-function routesToPaths(routes) {
+async function routesToPaths(routes) {
   const pathToEntry = {};
   function addEntry(path, entry) {
     if (!entry)
@@ -875,17 +875,17 @@ function routesToPaths(routes) {
     return { paths: ["/"], pathToEntry };
   const paths = /* @__PURE__ */ new Set();
   const lazyPaths = /* @__PURE__ */ new Set();
-  const getPaths = (routes2, prefix = "") => {
+  const getPaths = async (routes2, prefix = "") => {
     prefix = prefix.replace(/\/$/g, "");
     for (const route of routes2) {
       let path = route.path;
       path = handlePath(path, prefix, route.entry);
       if (route.getStaticPaths && path?.includes(":")) {
-        const staticPaths = route.getStaticPaths();
+        const staticPaths = await route.getStaticPaths();
         for (let staticPath of staticPaths) {
           staticPath = handlePath(staticPath, prefix, route.entry);
           if (Array.isArray(route.children))
-            getPaths(route.children, staticPath);
+            await getPaths(route.children, staticPath);
         }
       }
       if (route.lazy)
@@ -893,10 +893,10 @@ function routesToPaths(routes) {
       if (route.index)
         addEntry(prefix, route.entry);
       if (Array.isArray(route.children))
-        getPaths(route.children, path);
+        await getPaths(route.children, path);
     }
   };
-  getPaths(routes);
+  await getPaths(routes);
   return { paths: Array.from(paths), pathToEntry, lazyPaths: Array.from(lazyPaths) };
   function handlePath(path, prefix, entry) {
     if (path != null) {
@@ -1229,9 +1229,9 @@ async function build(ssgOptions = {}, viteConfig = {}) {
   const { createRoot, includedRoutes: serverEntryIncludedRoutes } = format === "esm" ? await import(serverEntry) : _require(serverEntry);
   const includedRoutes = serverEntryIncludedRoutes || configIncludedRoutes;
   const { routes } = await createRoot(false);
-  const { lazyPaths } = routesToPaths(routes);
+  const { lazyPaths } = await routesToPaths(routes);
   const dataRoutes = await preLoad([...routes], lazyPaths);
-  const { paths, pathToEntry } = routesToPaths(dataRoutes);
+  const { paths, pathToEntry } = await routesToPaths(dataRoutes);
   let routesPaths = includeAllRoutes ? paths : await includedRoutes(paths, routes || []);
   routesPaths = DefaultIncludedRoutes(routesPaths);
   routesPaths = Array.from(new Set(routesPaths));

package/dist/{types-c03d6a58.d.ts → types-3aee4b6b.d.ts}

@@ -153,7 +153,7 @@ interface CommonRouteOptions {
      *
      * @example () => ['path1', 'path2']
      */
-    getStaticPaths?: () => string[];
+    getStaticPaths?: () => string[] | Promise<string[]>;
 }
 type NonIndexRouteRecord = Omit<NonIndexRouteObject, 'children'> & {
     children?: RouteRecord[];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-react-ssg",
   "type": "module",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "packageManager": "pnpm@8.6.6",
   "description": "",
   "author": "Riri <Daydreamerriri@outlook.com>",
@@ -62,6 +62,7 @@
     "build": "unbuild",
     "dev": "unbuild --stub",
     "lint": "eslint .",
+    "test": "pnpm -r --filter=./examples/* build && vitest run",
     "prepublishOnly": "nr build",
     "release": "bumpp && npm publish",
     "start": "esno src/index.ts",
@@ -110,9 +111,10 @@
     "@types/react-dom": "^18.2.6",
     "@types/yargs": "^17.0.24",
     "bumpp": "^9.1.0",
-    "critters": "^0.0.19",
+    "critters": "^0.0.20",
     "eslint": "^8.45.0",
     "esno": "^0.17.0",
+    "fast-glob": "3.3.1",
     "p-queue": "^7.3.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -121,8 +123,8 @@
     "styled-components": "6.0.5",
     "typescript": "5.1.6",
     "unbuild": "^1.2.1",
-    "vite": "^4.4.0",
+    "vite": "^4.4.9",
     "vite-plugin-pwa": "^0.16.4",
-    "vitest": "0.33.0"
+    "vitest": "0.34.1"
   }
 }