vite-react-ssg 0.8.3-beta.2 → 0.8.4

package/README.md

@@ -24,7 +24,9 @@ For usage examples, see: [`main`/examples/tanstack/src/main.tsx](https://github.
 - [`<ClientOnly/>`](#clientonly)
 - [Document head](#document-head)
   - [Reactive head](#reactive-head)
+- [Redirect](#redirect)
 - [Public Base Path](#public-base-path)
+- [Future config](#future-config)
 - [CSS in JS](#css-in-js)
 - [Critical CSS](#critical-css)
 - [Configuration](#configuration)
@@ -337,6 +339,36 @@ export default function MyHead() {
 }
 ```
 
+## Redirect
+
+You should not use redirect in the loader.
+In vite-react-ssg, the loader only executes during the build process for data fetching.
+If you need to perform a redirect in certain situations, you can use the following method to redirect on the client side:
+
+```tsx
+export const routes: RouteRecord[] = [
+  {
+    path: '/:lng',
+    Component: Layout,
+    getStaticPaths: () => Object.keys(resources),
+    children: [
+      // ... some routes
+    ],
+  },
+  {
+    path: '/',
+    Component: () => {
+      const navigate = useNavigate()
+      useEffect(() => {
+        navigate('/en', { replace: true })
+      }, [navigate])
+
+      return null
+    },
+  },
+]
+```
+
 ## Public Base Path
 
 Just set `base` in vite.config.ts like:

package/dist/client/single-page.cjs

@@ -2,7 +2,7 @@
 
 const jsxRuntime = require('react/jsx-runtime');
 const reactHelmetAsync = require('react-helmet-async');
-const ClientOnly = require('../shared/vite-react-ssg.0S4Yj_HC.cjs');
+const ClientOnly = require('../shared/vite-react-ssg.B4jDfvXh.cjs');
 const state = require('../shared/vite-react-ssg.CjsEygxB.cjs');
 require('react');
 require('react-dom');

package/dist/client/single-page.mjs

@@ -1,7 +1,7 @@
 import { jsx } from 'react/jsx-runtime';
 import { HelmetProvider } from 'react-helmet-async';
-import { r as render, h as hydrate, d as documentReady } from '../shared/vite-react-ssg.DQEe2Gi_.mjs';
-export { C as ClientOnly, H as Head } from '../shared/vite-react-ssg.DQEe2Gi_.mjs';
+import { r as render, h as hydrate, d as documentReady } from '../shared/vite-react-ssg.CfJcpdWF.mjs';
+export { C as ClientOnly, H as Head } from '../shared/vite-react-ssg.CfJcpdWF.mjs';
 import { d as deserializeState } from '../shared/vite-react-ssg.C6pK7rvr.mjs';
 import 'react';
 import 'react-dom';

package/dist/index.cjs

@@ -3,7 +3,7 @@
 const jsxRuntime = require('react/jsx-runtime');
 const reactHelmetAsync = require('react-helmet-async');
 const reactRouterDom = require('react-router-dom');
-const ClientOnly = require('./shared/vite-react-ssg.0S4Yj_HC.cjs');
+const ClientOnly = require('./shared/vite-react-ssg.B4jDfvXh.cjs');
 const state = require('./shared/vite-react-ssg.CjsEygxB.cjs');
 const path = require('./shared/vite-react-ssg.CFQGqC60.cjs');
 const remixRouter = require('./shared/vite-react-ssg.C2GpVZF1.cjs');
@@ -88,7 +88,7 @@ function ViteReactSSG(routerOptions, fn, options = {}) {
     console.warn("[vite-react-ssg] `ssrWhenDev` option is no longer needed. If you want to use csr, just replace `vite-react-ssg dev` with `vite`.");
   const isClient = typeof window !== "undefined";
   const BASE_URL = routerOptions.basename ?? "/";
-  const { v7_startTransition, ...routerFeature } = routerOptions.future ?? {};
+  const { v7_startTransition = true, ...routerFeature } = routerOptions.future ?? {};
   async function createRoot(client = false, routePath) {
     const browserRouter = client ? reactRouterDom.createBrowserRouter(
       remixRouter.convertRoutesToDataRoutes(routerOptions.routes, transformStaticLoaderRoute),

package/dist/index.d.cts

@@ -6,7 +6,13 @@ import { LinkProps, NavLinkProps } from 'react-router-dom';
 import 'beasties';
 import 'react-helmet-async';
 
+/**
+ * @deprecated Please use `Link` from 'react-router-dom' instead.
+ */
 declare const Link: React.ForwardRefExoticComponent<LinkProps & React.RefAttributes<HTMLAnchorElement>>;
+/**
+ * @deprecated Please use `NavLink` from 'react-router-dom' instead.
+ */
 declare const NavLink: React.ForwardRefExoticComponent<NavLinkProps & React.RefAttributes<HTMLAnchorElement>>;
 
 declare function ViteReactSSG(routerOptions: RouterOptions, fn?: (context: ViteReactSSGContext<true>) => Promise<void> | void, options?: ViteReactSSGClientOptions): (client?: boolean, routePath?: string) => Promise<ViteReactSSGContext<true>>;

package/dist/index.d.mts

@@ -6,7 +6,13 @@ import { LinkProps, NavLinkProps } from 'react-router-dom';
 import 'beasties';
 import 'react-helmet-async';
 
+/**
+ * @deprecated Please use `Link` from 'react-router-dom' instead.
+ */
 declare const Link: React.ForwardRefExoticComponent<LinkProps & React.RefAttributes<HTMLAnchorElement>>;
+/**
+ * @deprecated Please use `NavLink` from 'react-router-dom' instead.
+ */
 declare const NavLink: React.ForwardRefExoticComponent<NavLinkProps & React.RefAttributes<HTMLAnchorElement>>;
 
 declare function ViteReactSSG(routerOptions: RouterOptions, fn?: (context: ViteReactSSGContext<true>) => Promise<void> | void, options?: ViteReactSSGClientOptions): (client?: boolean, routePath?: string) => Promise<ViteReactSSGContext<true>>;

package/dist/index.d.ts

@@ -6,7 +6,13 @@ import { LinkProps, NavLinkProps } from 'react-router-dom';
 import 'beasties';
 import 'react-helmet-async';
 
+/**
+ * @deprecated Please use `Link` from 'react-router-dom' instead.
+ */
 declare const Link: React.ForwardRefExoticComponent<LinkProps & React.RefAttributes<HTMLAnchorElement>>;
+/**
+ * @deprecated Please use `NavLink` from 'react-router-dom' instead.
+ */
 declare const NavLink: React.ForwardRefExoticComponent<NavLinkProps & React.RefAttributes<HTMLAnchorElement>>;
 
 declare function ViteReactSSG(routerOptions: RouterOptions, fn?: (context: ViteReactSSGContext<true>) => Promise<void> | void, options?: ViteReactSSGClientOptions): (client?: boolean, routePath?: string) => Promise<ViteReactSSGContext<true>>;

package/dist/index.mjs

@@ -1,8 +1,8 @@
 import { jsx } from 'react/jsx-runtime';
 import { HelmetProvider } from 'react-helmet-async';
 import { useLinkClickHandler, Link as Link$1, NavLink as NavLink$1, matchRoutes, createBrowserRouter, RouterProvider } from 'react-router-dom';
-import { r as render, h as hydrate, d as documentReady } from './shared/vite-react-ssg.DQEe2Gi_.mjs';
-export { C as ClientOnly, H as Head } from './shared/vite-react-ssg.DQEe2Gi_.mjs';
+import { r as render, h as hydrate, d as documentReady } from './shared/vite-react-ssg.CfJcpdWF.mjs';
+export { C as ClientOnly, H as Head } from './shared/vite-react-ssg.CfJcpdWF.mjs';
 import { d as deserializeState } from './shared/vite-react-ssg.C6pK7rvr.mjs';
 import { j as joinUrlSegments, w as withLeadingSlash, s as stripBase } from './shared/vite-react-ssg.CjIppNIS.mjs';
 import { c as convertRoutesToDataRoutes } from './shared/vite-react-ssg.C0y5wbxl.mjs';
@@ -83,7 +83,7 @@ function ViteReactSSG(routerOptions, fn, options = {}) {
     console.warn("[vite-react-ssg] `ssrWhenDev` option is no longer needed. If you want to use csr, just replace `vite-react-ssg dev` with `vite`.");
   const isClient = typeof window !== "undefined";
   const BASE_URL = routerOptions.basename ?? "/";
-  const { v7_startTransition, ...routerFeature } = routerOptions.future ?? {};
+  const { v7_startTransition = true, ...routerFeature } = routerOptions.future ?? {};
   async function createRoot(client = false, routePath) {
     const browserRouter = client ? createBrowserRouter(
       convertRoutesToDataRoutes(routerOptions.routes, transformStaticLoaderRoute),

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.CjMwYAJ_.cjs');
+const dev = require('../shared/vite-react-ssg.Dus0yLsZ.cjs');
 const webFetch = require('@remix-run/web-fetch');
 require('node:path');
 require('node:module');

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.DH605nuR.mjs';
+import { b as build, d as dev } from '../shared/vite-react-ssg.CKcl-j8g.mjs';
 import { Headers, Request, Response, fetch, FormData } from '@remix-run/web-fetch';
 import 'node:path';
 import 'node:module';

package/dist/node.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const dev = require('./shared/vite-react-ssg.CjMwYAJ_.cjs');
+const dev = require('./shared/vite-react-ssg.Dus0yLsZ.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.DH605nuR.mjs';
+export { b as build, d as dev } from './shared/vite-react-ssg.CKcl-j8g.mjs';
 import 'node:path';
 import 'node:module';
 import 'kolorist';

package/dist/shared/{vite-react-ssg.0S4Yj_HC.cjs → vite-react-ssg.B4jDfvXh.cjs}

@@ -27,32 +27,36 @@ const CopyReactDOM = {
 };
 const { version, render: reactRender, hydrate: reactHydrate } = CopyReactDOM;
 const isReact18 = Number((version || "").split(".")[0]) > 17;
-async function render(app, container, renderOptions = {}) {
+function render(app, container, renderOptions = {}) {
   const { useLegacyRender } = renderOptions;
   if (useLegacyRender || !isReact18) {
     reactRender(app, container);
   } else {
-    const { createRoot } = await import('react-dom/client');
+    CopyReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.usingClientEntryPoint = true;
+    const { createRoot } = CopyReactDOM;
     if (!createRoot) {
       throw new Error("createRoot not found");
     }
     const root = createRoot(container);
+    CopyReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.usingClientEntryPoint = false;
     React__default.startTransition(() => {
       root.render(app);
     });
   }
 }
-async function hydrate(app, container, renderOptions = {}) {
+function hydrate(app, container, renderOptions = {}) {
   const { useLegacyRender } = renderOptions;
   if (useLegacyRender || !isReact18) {
     reactHydrate(app, container);
   } else {
-    const { hydrateRoot } = await import('react-dom/client');
+    CopyReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.usingClientEntryPoint = true;
+    const { hydrateRoot } = CopyReactDOM;
     if (!hydrateRoot) {
       throw new Error("hydrateRoot not found");
     }
     React__default.startTransition(() => {
       hydrateRoot(container, app);
+      CopyReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.usingClientEntryPoint = false;
     });
   }
 }

package/dist/shared/{vite-react-ssg.DH605nuR.mjs → vite-react-ssg.CKcl-j8g.mjs}

@@ -15,7 +15,7 @@ import { once } from 'node:events';
 import { c as convertRoutesToDataRoutes } from './vite-react-ssg.C0y5wbxl.mjs';
 import { M as META_CONTAINER_ID } from './vite-react-ssg.B-j07kW6.mjs';
 
-const version = "0.8.3-beta.2";
+const version = "0.8.4";
 
 function buildLog(text, count) {
   console.log(`
@@ -152,7 +152,7 @@ async function renderHTML({
         const attributesStringified = [...node.attributes.map(({ name: { value: name }, value }) => `${name}="${value.value}"`)].join(" ");
         const indexHTMLBefore = indexHTML.slice(0, node.start);
         const indexHTMLAfter = indexHTML.slice(node.end);
-        renderedOutput = `${indexHTMLBefore}<${node.name} ${attributesStringified} data-server-rendered="true">${appHTML}</${node.name}>${stateScript}${indexHTMLAfter}`;
+        renderedOutput = `${indexHTMLBefore}<${node.name} ${attributesStringified} data-server-rendered="true">${appHTML}</${node.name}>${stateScript}${scriptPlaceHolder}${indexHTMLAfter}`;
       }
     }
   });
@@ -752,9 +752,11 @@ async function build(ssgOptions = {}, viteConfig = {}) {
     customLogger: clientLogger,
     mode: config.mode
   }));
+  let unmock = () => {
+  };
   if (mock) {
     const { jsdomGlobal } = await import('../chunks/jsdomGlobal.mjs');
-    jsdomGlobal();
+    unmock = jsdomGlobal();
   }
   buildLog("Build for server...");
   process.env.VITE_SSG = "true";
@@ -861,6 +863,7 @@ ${err.stack}`);
     `${dim(`${outDir}/`)}${cyan(`static-loader-data-manifest-${hash}.json`.padEnd(15, " "))}  ${dim(getSize(staticLoaderDataManifestString))}`
   );
   await fs.remove(join(root, ".vite-react-ssg-temp"));
+  unmock();
   const pwaPlugin = config.plugins.find((i) => i.name === "vite-plugin-pwa")?.api;
   if (pwaPlugin && !pwaPlugin.disabled && pwaPlugin.generateSW) {
     buildLog("Regenerate PWA...");

package/dist/shared/{vite-react-ssg.DQEe2Gi_.mjs → vite-react-ssg.CfJcpdWF.mjs}

@@ -8,32 +8,36 @@ const CopyReactDOM = {
 };
 const { version, render: reactRender, hydrate: reactHydrate } = CopyReactDOM;
 const isReact18 = Number((version || "").split(".")[0]) > 17;
-async function render(app, container, renderOptions = {}) {
+function render(app, container, renderOptions = {}) {
   const { useLegacyRender } = renderOptions;
   if (useLegacyRender || !isReact18) {
     reactRender(app, container);
   } else {
-    const { createRoot } = await import('react-dom/client');
+    CopyReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.usingClientEntryPoint = true;
+    const { createRoot } = CopyReactDOM;
     if (!createRoot) {
       throw new Error("createRoot not found");
     }
     const root = createRoot(container);
+    CopyReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.usingClientEntryPoint = false;
     React.startTransition(() => {
       root.render(app);
     });
   }
 }
-async function hydrate(app, container, renderOptions = {}) {
+function hydrate(app, container, renderOptions = {}) {
   const { useLegacyRender } = renderOptions;
   if (useLegacyRender || !isReact18) {
     reactHydrate(app, container);
   } else {
-    const { hydrateRoot } = await import('react-dom/client');
+    CopyReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.usingClientEntryPoint = true;
+    const { hydrateRoot } = CopyReactDOM;
     if (!hydrateRoot) {
       throw new Error("hydrateRoot not found");
     }
     React.startTransition(() => {
       hydrateRoot(container, app);
+      CopyReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.usingClientEntryPoint = false;
     });
   }
 }

package/dist/shared/{vite-react-ssg.CjMwYAJ_.cjs → vite-react-ssg.Dus0yLsZ.cjs}

@@ -36,7 +36,7 @@ const PQueue__default = /*#__PURE__*/_interopDefaultCompat(PQueue);
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 const ReactDomServer__namespace = /*#__PURE__*/_interopNamespaceCompat(ReactDomServer);
 
-const version = "0.8.3-beta.2";
+const version = "0.8.4";
 
 function buildLog(text, count) {
   console.log(`
@@ -173,7 +173,7 @@ async function renderHTML({
         const attributesStringified = [...node.attributes.map(({ name: { value: name }, value }) => `${name}="${value.value}"`)].join(" ");
         const indexHTMLBefore = indexHTML.slice(0, node.start);
         const indexHTMLAfter = indexHTML.slice(node.end);
-        renderedOutput = `${indexHTMLBefore}<${node.name} ${attributesStringified} data-server-rendered="true">${appHTML}</${node.name}>${stateScript}${indexHTMLAfter}`;
+        renderedOutput = `${indexHTMLBefore}<${node.name} ${attributesStringified} data-server-rendered="true">${appHTML}</${node.name}>${stateScript}${scriptPlaceHolder}${indexHTMLAfter}`;
       }
     }
   });
@@ -773,9 +773,11 @@ async function build(ssgOptions = {}, viteConfig = {}) {
     customLogger: clientLogger,
     mode: config.mode
   }));
+  let unmock = () => {
+  };
   if (mock) {
     const { jsdomGlobal } = await import('../chunks/jsdomGlobal.cjs');
-    jsdomGlobal();
+    unmock = jsdomGlobal();
   }
   buildLog("Build for server...");
   process.env.VITE_SSG = "true";
@@ -809,7 +811,7 @@ async function build(ssgOptions = {}, viteConfig = {}) {
   const ext = format === "esm" ? ".mjs" : ".cjs";
   const serverEntry = node_path.join(prefix, ssgOut, node_path.parse(ssrEntry).name + ext);
   const serverManifest = JSON.parse(await fs__default.readFile(node_path.join(ssgOut, ...dotVitedir, "manifest.json"), "utf-8"));
-  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-react-ssg.CjMwYAJ_.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-react-ssg.Dus0yLsZ.cjs', document.baseURI).href)));
   const { createRoot, includedRoutes: serverEntryIncludedRoutes } = format === "esm" ? await import(serverEntry) : _require(serverEntry);
   const includedRoutes = serverEntryIncludedRoutes || configIncludedRoutes;
   const { routes } = await createRoot(false);
@@ -882,6 +884,7 @@ ${err.stack}`);
     `${kolorist.dim(`${outDir}/`)}${kolorist.cyan(`static-loader-data-manifest-${hash}.json`.padEnd(15, " "))}  ${kolorist.dim(getSize(staticLoaderDataManifestString))}`
   );
   await fs__default.remove(node_path.join(root, ".vite-react-ssg-temp"));
+  unmock();
   const pwaPlugin = config.plugins.find((i) => i.name === "vite-plugin-pwa")?.api;
   if (pwaPlugin && !pwaPlugin.disabled && pwaPlugin.generateSW) {
     buildLog("Regenerate PWA...");

package/dist/tanstack.cjs

@@ -4,7 +4,7 @@ const jsxRuntime = require('react/jsx-runtime');
 const reactHelmetAsync = require('react-helmet-async');
 const reactRouter = require('@tanstack/react-router');
 const start = require('@tanstack/start');
-const ClientOnly = require('./shared/vite-react-ssg.0S4Yj_HC.cjs');
+const ClientOnly = require('./shared/vite-react-ssg.B4jDfvXh.cjs');
 const state = require('./shared/vite-react-ssg.CjsEygxB.cjs');
 const tanstackRouter = require('./shared/vite-react-ssg.DWHmkjdM.cjs');
 const path = require('./shared/vite-react-ssg.CFQGqC60.cjs');

package/dist/tanstack.mjs

@@ -2,8 +2,8 @@ import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { HelmetProvider } from 'react-helmet-async';
 import { RouterProvider } from '@tanstack/react-router';
 import { Meta, StartClient } from '@tanstack/start';
-import { r as render, h as hydrate, d as documentReady } from './shared/vite-react-ssg.DQEe2Gi_.mjs';
-export { C as ClientOnly, H as Head } from './shared/vite-react-ssg.DQEe2Gi_.mjs';
+import { r as render, h as hydrate, d as documentReady } from './shared/vite-react-ssg.CfJcpdWF.mjs';
+export { C as ClientOnly, H as Head } from './shared/vite-react-ssg.CfJcpdWF.mjs';
 import { d as deserializeState } from './shared/vite-react-ssg.C6pK7rvr.mjs';
 import { M as META_CONTAINER_ID, c as convertRouteTreeToRouteOption } from './shared/vite-react-ssg.B-j07kW6.mjs';
 export { r as registerPaths } from './shared/vite-react-ssg.B-j07kW6.mjs';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-react-ssg",
   "type": "module",
-  "version": "0.8.3-beta.2",
+  "version": "0.8.4",
   "packageManager": "pnpm@9.12.3",
   "description": "Static-site generation for React on Vite.",
   "author": "Riri <Daydreamerriri@outlook.com>",