vite-react-ssg 0.6.0 → 0.6.1

package/README.md

@@ -13,6 +13,7 @@ See demo(also document): [docs](https://vite-react-ssg.netlify.app/)
 - [Extra route options](#extra-route-options)
   - [`entry`](#entry)
   - [`getStaticPaths`](#getstaticpaths)
+- [Data fetch](#data-fetch)
 - [lazy](#lazy)
 - [`<ClientOnly/>`](#clientonly)
 - [Document head](#document-head)
@@ -135,7 +136,8 @@ The RouteObject of vite-react-ssg is based on react-router, and vite-react-ssg r
 
 #### `entry`
 
-Used to obtain static resources.If you introduce static resources (such as css files) in that route and use lazy loading (such as React.lazy or route.lazy), you should set the entry field. It should be the path from root to the target file.
+Used to obtain static resources.If you introduce static resources (such as css files) in that route and use lazy loading (such as React.lazy or route.lazy), you should set the entry field.
+It should be the path from root to the target file.
 
 eg: `src/pages/page1.tsx`
 
@@ -187,6 +189,12 @@ const routes = [
 
 See [example](./examples/lazy-pages/src/App.tsx).
 
+## Data fetch
+
+You can use react-router-dom's `loader` to fetch data at build time and use `useLoaderData` to get the data in the component.
+
+See [example | with-loader](./examples/with-loader/src/pages/[docs].tsx).
+
 ## `<ClientOnly/>`
 
 If you need to render some component in browser only, you can wrap your component with `<ClientOnly>`.
@@ -539,7 +547,6 @@ export default defineConfig({
 - [x] SSR in dev environment
 - [x] More Client components, such as `<ClientOnly />`
 - [x] `getStaticPaths` for dynamic routes
-- [ ] Initial State
 
 ## Credits
 

package/dist/client/single-page.cjs

@@ -3,7 +3,7 @@
 const client = require('react-dom/client');
 const reactHelmetAsync = require('react-helmet-async');
 const React = require('react');
-const ClientOnly = require('../shared/vite-react-ssg.c639b3fe.cjs');
+const ClientOnly = require('../shared/vite-react-ssg.c1d49976.cjs');
 const state = require('../shared/vite-react-ssg.e6991406.cjs');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }

package/dist/client/single-page.mjs

@@ -1,8 +1,8 @@
 import { createRoot, hydrateRoot } from 'react-dom/client';
 import { HelmetProvider } from 'react-helmet-async';
 import React from 'react';
-import { d as documentReady } from '../shared/vite-react-ssg.8cdb31f1.mjs';
-export { C as ClientOnly, H as Head } from '../shared/vite-react-ssg.8cdb31f1.mjs';
+import { d as documentReady } from '../shared/vite-react-ssg.a292c181.mjs';
+export { C as ClientOnly, H as Head } from '../shared/vite-react-ssg.a292c181.mjs';
 import { d as deserializeState } from '../shared/vite-react-ssg.a009fbf1.mjs';
 
 function ViteReactSSG(App, fn, options = {}) {

package/dist/index.cjs

@@ -4,7 +4,7 @@ const React = require('react');
 const client = require('react-dom/client');
 const reactHelmetAsync = require('react-helmet-async');
 const reactRouterDom = require('react-router-dom');
-const ClientOnly = require('./shared/vite-react-ssg.c639b3fe.cjs');
+const ClientOnly = require('./shared/vite-react-ssg.c1d49976.cjs');
 const state = require('./shared/vite-react-ssg.e6991406.cjs');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }

package/dist/index.mjs

@@ -2,8 +2,8 @@ import React, { forwardRef } from 'react';
 import { createRoot, hydrateRoot } from 'react-dom/client';
 import { HelmetProvider } from 'react-helmet-async';
 import { useLinkClickHandler, Link as Link$1, NavLink as NavLink$1, matchRoutes, createBrowserRouter, RouterProvider } from 'react-router-dom';
-import { d as documentReady } from './shared/vite-react-ssg.8cdb31f1.mjs';
-export { C as ClientOnly, H as Head } from './shared/vite-react-ssg.8cdb31f1.mjs';
+import { d as documentReady } from './shared/vite-react-ssg.a292c181.mjs';
+export { C as ClientOnly, H as Head } from './shared/vite-react-ssg.a292c181.mjs';
 import { d as deserializeState } from './shared/vite-react-ssg.a009fbf1.mjs';
 
 const Link = forwardRef((props, ref) => {

package/dist/node.cjs

@@ -872,7 +872,7 @@ async function routesToPaths(routes) {
     for (const route of routes2) {
       let path = route.path;
       path = handlePath(path, prefix, route.entry);
-      if (route.getStaticPaths && path?.includes(":")) {
+      if (route.getStaticPaths && isDynamicSegmentsRoute(path)) {
         const staticPaths = await route.getStaticPaths();
         for (let staticPath of staticPaths) {
           staticPath = handlePath(staticPath, prefix, route.entry);
@@ -964,6 +964,12 @@ const postfixRE = /[?#].*$/s;
 function cleanUrl(url) {
   return url.replace(postfixRE, "");
 }
+const dynamicRE = /[:*?]/;
+function isDynamicSegmentsRoute(route) {
+  if (!route)
+    return false;
+  return dynamicRE.test(route);
+}
 
 async function getCritters(outDir, options = {}) {
   try {

package/dist/node.mjs

@@ -863,7 +863,7 @@ async function routesToPaths(routes) {
     for (const route of routes2) {
       let path = route.path;
       path = handlePath(path, prefix, route.entry);
-      if (route.getStaticPaths && path?.includes(":")) {
+      if (route.getStaticPaths && isDynamicSegmentsRoute(path)) {
         const staticPaths = await route.getStaticPaths();
         for (let staticPath of staticPaths) {
           staticPath = handlePath(staticPath, prefix, route.entry);
@@ -955,6 +955,12 @@ const postfixRE = /[?#].*$/s;
 function cleanUrl(url) {
   return url.replace(postfixRE, "");
 }
+const dynamicRE = /[:*?]/;
+function isDynamicSegmentsRoute(route) {
+  if (!route)
+    return false;
+  return dynamicRE.test(route);
+}
 
 async function getCritters(outDir, options = {}) {
   try {

package/dist/shared/{vite-react-ssg.8cdb31f1.mjs → vite-react-ssg.a292c181.mjs}

@@ -29,8 +29,10 @@ function ClientOnly({
   const isBrowser = useIsClient();
   if (isBrowser) {
     if (typeof children !== "function" && process.env.NODE_ENV === "development") {
-      throw new Error(`vite-react-ssg error: The children of <ClientOnly> must be a "render function", e.g. <ClientOnly>{() => <span>{window.location.href}</span>}</ClientOnly>.
-Current type: ${isValidElement(children) ? "React element" : typeof children}`);
+      throw new Error(
+        `vite-react-ssg error: The children of <ClientOnly> must be a "render function", e.g. <ClientOnly>{() => <span>{window.location.href}</span>}</ClientOnly>.
+Current type: ${isValidElement(children) ? "React element" : typeof children}`
+      );
     }
     return /* @__PURE__ */ React.createElement(React.Fragment, null, children?.());
   }

package/dist/shared/{vite-react-ssg.c639b3fe.cjs → vite-react-ssg.c1d49976.cjs}

@@ -35,8 +35,10 @@ function ClientOnly({
   const isBrowser = useIsClient();
   if (isBrowser) {
     if (typeof children !== "function" && process.env.NODE_ENV === "development") {
-      throw new Error(`vite-react-ssg error: The children of <ClientOnly> must be a "render function", e.g. <ClientOnly>{() => <span>{window.location.href}</span>}</ClientOnly>.
-Current type: ${React.isValidElement(children) ? "React element" : typeof children}`);
+      throw new Error(
+        `vite-react-ssg error: The children of <ClientOnly> must be a "render function", e.g. <ClientOnly>{() => <span>{window.location.href}</span>}</ClientOnly>.
+Current type: ${React.isValidElement(children) ? "React element" : typeof children}`
+      );
     }
     return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, children?.());
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-react-ssg",
   "type": "module",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "packageManager": "pnpm@8.6.6",
   "description": "",
   "author": "Riri <Daydreamerriri@outlook.com>",
@@ -105,15 +105,15 @@
     "fs-extra": "^11.2.0",
     "html-minifier": "^4.0.0",
     "html5parser": "^2.0.2",
-    "jsdom": "^23.0.1",
+    "jsdom": "^24.0.0",
     "kolorist": "^1.8.0",
-    "prettier": "^3.0.0",
+    "prettier": "^3.2.4",
     "react-helmet-async": "^1.3.0",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
     "@childrentime/devcert": "^1.2.5",
-    "@ririd/eslint-config": "^1.0.0",
+    "@ririd/eslint-config": "^1.0.4",
     "@types/express": "^4.17.17",
     "@types/fs-extra": "^11.0.1",
     "@types/html-minifier": "^4.0.2",
@@ -122,12 +122,12 @@
     "@types/react": "^18.2.14",
     "@types/react-dom": "^18.2.6",
     "@types/yargs": "^17.0.24",
-    "bumpp": "^9.1.0",
-    "critters": "^0.0.20",
+    "bumpp": "^9.4.0",
+    "critters": "^0.0.22",
     "eslint": "^8.56.0",
-    "esno": "^4.0.0",
-    "fast-glob": "3.3.1",
-    "p-queue": "^8.0.0",
+    "esno": "^4.7.0",
+    "fast-glob": "3.3.2",
+    "p-queue": "^8.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router-dom": "^6.15.0",
@@ -135,7 +135,7 @@
     "styled-components": "6.0.5",
     "typescript": "5.1.6",
     "unbuild": "^2.0.0",
-    "vite": "^5.0.7",
+    "vite": "^5.0.12",
     "vite-plugin-pwa": "^0.17.4",
     "vitest": "1.0.4"
   }