@resolid/dev 0.5.1 → 0.6.1

package/dist/http.d.mts

@@ -1,8 +1,7 @@
 import { RouterContextProvider, ServerBuild, UNSAFE_DataWithResponseInit } from "react-router";
-import { Context, Env, Env as Env$1, Hono, Hono as Hono$1, MiddlewareHandler } from "hono";
+import { Context, Context as Context$1, Env, Env as Env$1, Hono, Hono as Hono$1, MiddlewareHandler } from "hono";
 import { Http2Bindings, HttpBindings } from "@hono/node-server";
-import { RequestIdVariables } from "hono/request-id";
-import { Context as Context$1 } from "@netlify/types";
+import { Context as Context$2 } from "@netlify/types";
 import { HonoOptions } from "hono/hono-base";
 import { BlankEnv } from "hono/types";
 import { AddressInfo } from "node:net";
@@ -14,33 +13,6 @@ declare function httpProblem<E>(errors: E): UNSAFE_DataWithResponseInit<{
 declare function httpNotFound(message?: string): never;
 declare function httpRedirect(url: string, cookie?: string | null, status?: number): never;
 //#endregion
-//#region src/http/middlewares/client-ip.d.ts
-type ClientIpVariables = {
-  clientIp: string;
-};
-declare module "hono" {
-  interface ContextVariableMap extends ClientIpVariables {}
-}
-type ClientIpGetter = (c: Context) => string;
-declare function clientIp(getter: ClientIpGetter): MiddlewareHandler;
-//#endregion
-//#region src/http/middlewares/request-id.d.ts
-type RequestIdGenerator = (c: Context) => string;
-declare module "hono" {
-  interface ContextVariableMap extends RequestIdVariables {}
-}
-declare function requestId(generator?: RequestIdGenerator): MiddlewareHandler;
-//#endregion
-//#region src/http/middlewares/request-origin.d.ts
-type RequestOriginVariables = {
-  requestOrigin: string | undefined;
-};
-declare module "hono" {
-  interface ContextVariableMap extends RequestOriginVariables {}
-}
-type RequestOriginGetter = (c: Context) => string | undefined;
-declare function requestOrigin(getter: RequestOriginGetter): MiddlewareHandler;
-//#endregion
 //#region src/http/utils/server.d.ts
 type NodeEnv = {
   Bindings: HttpBindings | Http2Bindings;
@@ -48,7 +20,7 @@ type NodeEnv = {
 interface HonoServerOptions<E extends Env$1 = BlankEnv> {
   configure?: <E extends Env$1 = BlankEnv>(app: Hono$1<E>) => Promise<void> | void;
   honoOptions?: HonoOptions<E>;
-  getLoadContext?: (c: Context<E>, options: {
+  getLoadContext?: (c: Context$1<E>, options: {
     build: ServerBuild;
     mode?: string;
   }) => Promise<RouterContextProvider> | RouterContextProvider;
@@ -57,30 +29,17 @@ interface HonoServerOptions<E extends Env$1 = BlankEnv> {
 //#region src/http/platforms/netlify.d.ts
 type NetlifyEnv = {
   Bindings: {
-    context: Context$1;
+    context: Context$2;
   };
 };
 type HonoNetlifyServerOptions = HonoServerOptions<NetlifyEnv>;
-type HonoNetlifyServer = (req: Request, context: Context$1) => Response | Promise<Response>;
+type HonoNetlifyServer = (req: Request, context: Context$2) => Response | Promise<Response>;
 declare function createHonoNetlifyServer(options?: HonoNetlifyServerOptions): Promise<HonoNetlifyServer>;
-declare function netlifyClientIpGetter(): ClientIpGetter;
-declare function netlifyRequestIdGenerator(): RequestIdGenerator;
-declare function netlifyRequestOriginGetter(): RequestOriginGetter;
 //#endregion
 //#region src/http/platforms/vercel.d.ts
 type HonoVercelServerOptions = HonoServerOptions<NodeEnv>;
 type HonoVercelServer = Hono$1<NodeEnv>;
 declare function createHonoVercelServer(options?: HonoVercelServerOptions): Promise<HonoVercelServer>;
-declare function vercelClientIpGetter(): ClientIpGetter;
-declare function vercelRequestIdGenerator(): RequestIdGenerator;
-declare function vercelRequestOriginGetter(): RequestOriginGetter;
-//#endregion
-//#region src/http/utils/request.d.ts
-interface GetClientIpOptions {
-  proxy?: boolean;
-  proxyCount?: number;
-  ipHeaders?: string;
-}
 //#endregion
 //#region src/http/platforms/node.d.ts
 type HonoNodeServerOptions = HonoServerOptions<NodeEnv> & {
@@ -88,11 +47,12 @@ type HonoNodeServerOptions = HonoServerOptions<NodeEnv> & {
   defaultLogger?: boolean;
   listeningListener?: (info: AddressInfo) => void;
   onShutdown?: () => Promise<void> | void;
+  proxy?: boolean;
+  proxyCount?: number;
+  ipHeaders?: string;
 };
 type HonoNodeServer = Hono$1<NodeEnv>;
 declare function createHonoNodeServer(options?: HonoNodeServerOptions): Promise<HonoNodeServer>;
 declare function cacheControl(seconds: number, immutable?: boolean): MiddlewareHandler;
-declare function nodeClientIpGetter(getClientIpOptions?: GetClientIpOptions): ClientIpGetter;
-declare function nodeRequestOriginGetter(proxy?: boolean): RequestOriginGetter;
 //#endregion
-export { ClientIpGetter, type Env, type Hono, HonoNetlifyServer, HonoNetlifyServerOptions, HonoNodeServer, HonoNodeServerOptions, HonoVercelServer, HonoVercelServerOptions, NetlifyEnv, type NodeEnv, RequestIdGenerator, RequestOriginGetter, cacheControl, clientIp, createHonoNetlifyServer, createHonoNodeServer, createHonoVercelServer, httpNotFound, httpProblem, httpRedirect, netlifyClientIpGetter, netlifyRequestIdGenerator, netlifyRequestOriginGetter, nodeClientIpGetter, nodeRequestOriginGetter, requestId, requestOrigin, vercelClientIpGetter, vercelRequestIdGenerator, vercelRequestOriginGetter };
+export { type Context, type Env, type Hono, HonoNetlifyServer, HonoNetlifyServerOptions, HonoNodeServer, HonoNodeServerOptions, HonoVercelServer, HonoVercelServerOptions, NetlifyEnv, type NodeEnv, cacheControl, createHonoNetlifyServer, createHonoNodeServer, createHonoVercelServer, httpNotFound, httpProblem, httpRedirect };

package/dist/http.mjs

@@ -1 +1 @@
-import{RouterContextProvider as e,createRequestHandler as t,data as n}from"react-router";import{handle as r}from"hono/netlify";import{env as i}from"node:process";import{Hono as a}from"hono";import*as o from"virtual:react-router/server-build";import{serve as s}from"@hono/node-server";import{serveStatic as c}from"@hono/node-server/serve-static";import{logger as l}from"hono/logger";import{networkInterfaces as u}from"node:os";import{requestId as d}from"hono/request-id";import{randomBytes as f}from"node:crypto";function p(e){return n({errors:e},422)}function m(e=`页面未找到`){throw new Response(e,{status:404})}function h(e,t=null,n=302){let r=new Headers;throw r.set(`Location`,e),t&&r.set(`Set-Cookie`,t),new Response(null,{status:n,headers:r})}async function g(n,r){let i=import.meta.env.RESOLID_BASENAME,s=new a(r.honoOptions);r.configure&&await r.configure(s);let c=new a({strict:!1});return c.use(async i=>(async i=>{let a=t(o,n),s=r.getLoadContext?.(i,{build:o,mode:n}),c=(s instanceof Promise?await s:s)??new e;return Object.assign(c,{hono:i}),a(i.req.raw,c)})(i)),s.route(i,c),i&&s.route(`${i}.data`,c),s}async function _(e={}){return r(await g(i.NODE_ENV==`test`?`development`:i.NODE_ENV,{...e}))}function v(){return e=>e.env.context.ip}function y(){return e=>e.env.context.requestId}function b(){return e=>e.env.context.site.url}async function x(e={}){return await g(i.NODE_ENV==`test`?`development`:i.NODE_ENV,{...e})}function S(){return e=>e.req.raw.headers.get(`x-real-ip`)??``}function C(){return e=>e.req.raw.headers.get(`x-vercel-id`)??``}function w(){return()=>`https://${i.VERCEL_PROJECT_PRODUCTION_URL}`}function T(e,t,n){let{proxy:r=!1,proxyCount:i=0,ipHeaders:a=`x-forwarded-for`}=n??{},o=e.headers.get(a),s=r&&o?o.split(/\s*,\s*/):[];return i>0&&(s=s.slice(-i)),s[0]??t.remoteAddress??``}function E(e,t,n=!1){return`${t.encrypted?`https`:(n?e.headers.get(`x-forwarded-proto`):null)?.split(/\s*,\s*/)[0]??`http`}://${(n?e.headers.get(`x-forwarded-host`):null)?.split(/\s*,\s*/)[0]??e.headers.get(`host`)}`}async function D(e={}){let t=i.NODE_ENV==`test`?`development`:i.NODE_ENV,n=t==`production`,r=import.meta.env.RESOLID_BASENAME,a={port:e.port??3e3,listeningListener:e=>{console.log(`🚀 Server started on port ${e.port}`);let t=Object.values(u()).flat().find(e=>String(e?.family).includes(`4`)&&!e?.internal)?.address;console.log(`[resolid] http://localhost:${e.port}${r}${i.SERVER_PATH??``}${t&&` (http://${t}:${e.port})`}`)},...e,defaultLogger:e.defaultLogger??!n},o=null,d=await g(t,{configure:async e=>{if(n){let t=`${import.meta.env.RESOLID_BUILD_DIR}/client`;e.use(`/${import.meta.env.RESOLID_ASSETS_DIR}/*`,O(3600*24*365,!0),c({root:t})),e.use(`*`,O(3600),c({root:t}))}else e.use(`*`,O(3600),c({root:`./public`}));a.defaultLogger&&e.use(`*`,l()),await a.configure?.(e)},honoOptions:a.honoOptions,getLoadContext:a.getLoadContext});n&&(o=s({fetch:d.fetch,port:a.port},a.listeningListener));async function f(){o?.close(),await a.onShutdown?.(),process.removeListener(`SIGINT`,f),process.removeListener(`SIGTERM`,f),console.log(`[resolid] Node server shutdown.`),process.exit(0)}return process.on(`SIGTERM`,f),process.on(`SIGINT`,f),import.meta.hot&&(process.removeListener(`SIGINT`,f),process.removeListener(`SIGTERM`,f)),d}function O(e,t=!1){return async(n,r)=>{if(!n.req.path.match(/\.[a-zA-Z0-9]+$/)||n.req.path.endsWith(`.data`))return r();await r(),n.res.ok&&n.header(`Cache-Control`,`public, max-age=${e}${t?`, immutable`:``}`)}}function k(e={}){return t=>T(t.req.raw,t.env.incoming.socket,e)}function A(e=!1){return t=>E(t.req.raw,t.env.incoming.socket,e)}function j(e=()=>f(16).toString(`hex`)){return d({generator:e})}function M(e){return async(t,n)=>{t.set(`requestOrigin`,e(t)),await n()}}function N(e){return async(t,n)=>{t.set(`clientIp`,e(t)),await n()}}export{O as cacheControl,N as clientIp,_ as createHonoNetlifyServer,D as createHonoNodeServer,x as createHonoVercelServer,m as httpNotFound,p as httpProblem,h as httpRedirect,v as netlifyClientIpGetter,y as netlifyRequestIdGenerator,b as netlifyRequestOriginGetter,k as nodeClientIpGetter,A as nodeRequestOriginGetter,j as requestId,M as requestOrigin,S as vercelClientIpGetter,C as vercelRequestIdGenerator,w as vercelRequestOriginGetter};
+import{RouterContextProvider as e,createRequestHandler as t,data as n}from"react-router";import{handle as r}from"hono/netlify";import{env as i}from"node:process";import{requestId as a}from"hono/request-id";import{randomBytes as o}from"node:crypto";import{Hono as s}from"hono";import*as c from"virtual:react-router/server-build";import{serve as l}from"@hono/node-server";import{serveStatic as u}from"@hono/node-server/serve-static";import{logger as d}from"hono/logger";import{networkInterfaces as f}from"node:os";function p(e){return n({errors:e},422)}function m(e=`页面未找到`){throw new Response(e,{status:404})}function h(e,t=null,n=302){let r=new Headers;throw r.set(`Location`,e),t&&r.set(`Set-Cookie`,t),new Response(null,{status:n,headers:r})}function g(e){return async(t,n)=>{t.set(`clientIp`,e(t)),await n()}}function _(e=()=>o(16).toString(`hex`)){return a({generator:e})}function v(e){return async(t,n)=>{t.set(`requestOrigin`,e(t)),await n()}}async function y(n,r){let i=import.meta.env.RESOLID_BASENAME,a=new s(r.honoOptions);r.configure&&await r.configure(a);let o=new s({strict:!1});return o.use(async i=>(async i=>{let a=t(c,n),o=r.getLoadContext?.(i,{build:c,mode:n}),s=(o instanceof Promise?await o:o)??new e;return a(i.req.raw,s)})(i)),a.route(i,o),i&&a.route(`${i}.data`,o),a}async function b(e={}){let t=i.NODE_ENV==`test`?`development`:i.NODE_ENV,{configure:n,...a}=e;return r(await y(t,{configure:async e=>{e.use(g(e=>e.env.context.ip),_(e=>e.env.context.requestId),v(e=>e.env.context.site.url)),await n?.(e)},...a}))}async function x(e={}){let t=i.NODE_ENV==`test`?`development`:i.NODE_ENV,{configure:n,...r}=e;return await y(t,{configure:async e=>{e.use(g(e=>e.req.raw.headers.get(`x-real-ip`)??``),_(e=>e.req.raw.headers.get(`x-vercel-id`)??``),v(()=>`https://${i.VERCEL_PROJECT_PRODUCTION_URL}`)),await n?.(e)},...r})}function S(e,t,n){let{proxy:r=!1,proxyCount:i=0,ipHeaders:a=`x-forwarded-for`}=n??{},o=e.headers.get(a),s=r&&o?o.split(/\s*,\s*/):[];return i>0&&(s=s.slice(-i)),s[0]??t.remoteAddress??``}function C(e,t,n=!1){return`${t.encrypted?`https`:(n?e.headers.get(`x-forwarded-proto`):null)?.split(/\s*,\s*/)[0]??`http`}://${(n?e.headers.get(`x-forwarded-host`):null)?.split(/\s*,\s*/)[0]??e.headers.get(`host`)}`}async function w(e={}){let t=i.NODE_ENV==`test`?`development`:i.NODE_ENV,n=t==`production`,r=import.meta.env.RESOLID_BASENAME,{port:a,defaultLogger:o,proxy:s,proxyCount:c,ipHeaders:p,...m}=e,h={port:a??3e3,listeningListener:e=>{console.log(`🚀 Server started on port ${e.port}`);let t=Object.values(f()).flat().find(e=>String(e?.family).includes(`4`)&&!e?.internal)?.address;console.log(`[resolid] http://localhost:${e.port}${r}${i.SERVER_PATH??``}${t&&` (http://${t}:${e.port})`}`)},defaultLogger:o??!n,...m},b=null,x=await y(t,{configure:async e=>{if(n){let t=`${import.meta.env.RESOLID_BUILD_DIR}/client`;e.use(`/${import.meta.env.RESOLID_ASSETS_DIR}/*`,T(3600*24*365,!0),u({root:t})),e.use(`*`,T(3600),u({root:t}))}else e.use(`*`,T(3600),u({root:`./public`}));h.defaultLogger&&e.use(`*`,d()),e.use(g(e=>S(e.req.raw,e.env.incoming.socket,{proxy:s,proxyCount:c,ipHeaders:p})),_(),v(e=>C(e.req.raw,e.env.incoming.socket,s))),await h.configure?.(e)},honoOptions:h.honoOptions,getLoadContext:h.getLoadContext});n&&(b=l({fetch:x.fetch,port:h.port},h.listeningListener));async function w(){b?.close(),await h.onShutdown?.(),process.removeListener(`SIGINT`,w),process.removeListener(`SIGTERM`,w),console.log(`[resolid] Node server shutdown.`),process.exit(0)}return process.on(`SIGTERM`,w),process.on(`SIGINT`,w),import.meta.hot&&(process.removeListener(`SIGINT`,w),process.removeListener(`SIGTERM`,w)),x}function T(e,t=!1){return async(n,r)=>{if(!n.req.path.match(/\.[a-zA-Z0-9]+$/)||n.req.path.endsWith(`.data`))return r();await r(),n.res.ok&&n.header(`Cache-Control`,`public, max-age=${e}${t?`, immutable`:``}`)}}export{T as cacheControl,b as createHonoNetlifyServer,w as createHonoNodeServer,x as createHonoVercelServer,m as httpNotFound,p as httpProblem,h as httpRedirect};

package/dist/{index-CvMCdeds.d.mts → index-N6xMou5u.d.mts}

@@ -12,9 +12,7 @@ interface VitePluginOptions {
   entryFile: string;
   devExclude?: (string | RegExp)[];
 }
-type ReactRouterConfig = Simplify<Omit<Config, "appDirectory" | "ssr" | "serverModuleFormat" | "future"> & {
-  future?: Omit<Config["future"], "v8_middleware" | "v8_splitRouteModules" | "v8_viteEnvironmentApi" | "v8_passThroughRequests" | "v8_trailingSlashAwareDataRequests">;
-}>;
+type ReactRouterConfig = Simplify<Omit<Config, "appDirectory" | "ssr" | "serverModuleFormat">>;
 type DevConfigOptions = Simplify<Partial<VitePluginOptions> & {
   appDirectory?: string;
   includeFiles?: string[];

package/dist/index.d.mts

@@ -1,2 +1,2 @@
-import { a as defineDevConfig, i as VitePluginOptions, n as DevConfigOptions, r as ReactRouterConfig, t as DevConfig } from "./index-CvMCdeds.mjs";
+import { a as defineDevConfig, i as VitePluginOptions, n as DevConfigOptions, r as ReactRouterConfig, t as DevConfig } from "./index-N6xMou5u.mjs";
 export { DevConfig, DevConfigOptions, ReactRouterConfig, VitePluginOptions, defineDevConfig };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import{cp as e,mkdir as t,readFile as n,readdir as r,realpath as i,rm as a,stat as o,symlink as s,writeFile as c}from"node:fs/promises";import{basename as l,dirname as u,join as d,relative as f}from"node:path";import p from"fast-glob";import{existsSync as m}from"node:fs";import{build as h}from"rolldown";import{esmExternalRequirePlugin as g}from"rolldown/plugins";import{searchForWorkspaceRoot as _}from"vite";var v=`@resolid/dev`,y=`0.5.1`;async function b({includeFiles:t=[],nodeVersion:r,buildManifest:i,reactRouterConfig:o,viteConfig:s,buildStart:c,buildBundleEnd:l}){let m=s.root,{assetsDir:_}=s.build,v=JSON.parse(await n(d(m,`package.json`),`utf8`)),y=x(v.dependencies??{},s.ssr.external),b=d(o.buildDirectory,`server`),C=i?.serverBundles??{site:{id:`site`,file:f(m,d(b,o.serverBuildFile))}},w=t.length>0?await p(t,{cwd:m}):[],T=await c();await Promise.all(Object.entries(C).map(async([,t])=>{let n=t.id,i=d(m,t.file),o=u(i);await S(d(o,`package.json`),v,y,r),console.log(`Bundle file for ${n}...`);let s=d(o,`server.mjs`);await h({input:i,output:{file:s,codeSplitting:!1,minify:`dce-only`,comments:{legal:!1}},platform:`node`,transform:{define:{"process.env.NODE_ENV":JSON.stringify(`production`),"import.meta.env.NODE_ENV":JSON.stringify(`production`)},target:`node${r}`},external:[`vite`,...Object.keys(y)],plugins:[g({external:[`vite`,...Object.keys(y)],skipDuplicateCheck:!0})]}),await a(d(o,_),{force:!0,recursive:!0}),await a(i,{force:!0}),await Promise.all(w.map(t=>e(t,d(b,t),{recursive:!0}))),await l?.(T,o,n,s,y)}))}function x(e,t){let n=Array.isArray(t)?t.filter(e=>![`react-router`,`react-router-dom`,`@react-router/architect`,`@react-router/cloudflare`,`@react-router/dev`,`@react-router/express`,`@react-router/node`,`@react-router/serve`].includes(e)):t;return Object.keys(e).filter(e=>n===void 0?!1:n===!0?!0:n.includes(e)).reduce((t,n)=>(t[n]=e[n]??``,t),{})}async function S(e,t,n,r){let i={name:t.name,type:t.type,version:t.version,scripts:{postinstall:t.scripts?.postinstall??``},dependencies:n,engines:{node:`${r}.x`}};await c(e,JSON.stringify(i,null,2),`utf8`)}async function C(e,n=!1){let r=d(...e);return n&&await a(r,{recursive:!0,force:!0}),await t(r,{recursive:!0}),r}function w(e){if(e?.routeIdToServerBundleId){let t=Object.values(e.routes).filter(e=>e.id!=`root`).map(t=>{let n=[...T(e.routes,t.parentId),t.path].join(`/`);return{id:t.id,path:`/${n}`}}),n={};for(let[r,i]of Object.entries(e.routeIdToServerBundleId)){n[i]??=[];for(let e of t)e.id==r&&n[i].push(e.path)}let r={};for(let[e,t]of Object.entries(n)){t.sort((e,t)=>e.length<t.length?-1:1);for(let n of t)!r[n]&&!Object.keys(r).find(t=>r[t].bundleId==e&&n.startsWith(r[t].path))&&(r[n]={path:n,bundleId:e})}let i=Object.values(r).map(e=>({path:e.path.endsWith(`/`)?e.path.slice(0,-1):e.path,bundleId:e.bundleId}));return i.sort((e,t)=>e.path.length>t.path.length?-1:1),i}return[{path:``,bundleId:`site`}]}function T(e,t){if(t==null)return[];let n=[],r=t=>{let i=e[t];i.parentId&&r(i.parentId),i.path&&n.push(i.path)};return r(t),n}async function E(n,a,c){let p=_(n),{nodeFileTrace:h}=await import(`@vercel/nft`),g=await h([n],{base:p,cache:c}),v=Array.from(g.fileList).map(e=>d(p,e)),y=u(v[0]);for(let e of v.slice(1))for(;!e.startsWith(y);)y=u(y);return await Promise.all(v.map(async c=>{let p=d(a,f(y,c)),h=await i(c),g=h!==c,_=(await o(c)).isDirectory();if(await t(u(p),{recursive:!0}),c==n){let t=u(n),i=u(p);await Promise.all((await r(t)).filter(e=>e!==l(n)).map(n=>e(d(t,n),d(i,n),{recursive:!0})))}g?m(p)||await s(f(u(p),d(a,f(y,h))),p,_?`dir`:`file`):_||await e(c,p)})),f(y,n)}function D({nodeVersion:e,includeFiles:t}){return{name:`@resolid/react-router-hono-netlify-preset`,reactRouterConfig(){return{async buildEnd({buildManifest:n,reactRouterConfig:r,viteConfig:i}){await b({includeFiles:t,nodeVersion:e,buildManifest:n,reactRouterConfig:r,viteConfig:i,async buildStart(){let e=await C([i.root,`.netlify`,`v1`],!0);return await O(i.build.assetsDir,d(e,`config.json`)),{netlifyRoot:e,netlifyFunctionDir:await C([e,`functions`]),serverRoutes:w(n),nftCache:{}}},async buildBundleEnd(t,n,r,i){console.log(`Coping Netlify function files for ${r}...`);let a=await E(i,await C([t.netlifyFunctionDir,r],!0),t.nftCache),o=t.serverRoutes.find(e=>e.bundleId==r)?.path,s=o?[o,`${o}/*`]:`/*`;await c(d(t.netlifyFunctionDir,`${r}.mjs`),`export { default } from "./${d(r,a)}";
+import{cp as e,mkdir as t,readFile as n,readdir as r,realpath as i,rm as a,stat as o,symlink as s,writeFile as c}from"node:fs/promises";import{basename as l,dirname as u,join as d,relative as f}from"node:path";import p from"fast-glob";import{existsSync as m}from"node:fs";import{build as h}from"rolldown";import{esmExternalRequirePlugin as g}from"rolldown/plugins";import{searchForWorkspaceRoot as _}from"vite";var v=`@resolid/dev`,y=`0.6.1`;async function b({includeFiles:t=[],nodeVersion:r,serverPlatform:i,buildManifest:o,reactRouterConfig:s,viteConfig:c,buildStart:l,buildBundleEnd:m}){let _=c.root,{assetsDir:v}=c.build,y=JSON.parse(await n(d(_,`package.json`),`utf8`)),b=x(y.dependencies??{},c.ssr.external),C=d(s.buildDirectory,`server`),w=o?.serverBundles??{site:{id:`site`,file:f(_,d(C,s.serverBuildFile))}},T=t.length>0?await p(t,{cwd:_}):[],E=await l();await Promise.all(Object.entries(w).map(async([,t])=>{let n=t.id,o=d(_,t.file),s=u(o);await S(d(s,`package.json`),y,b,r),console.log(`Bundle file for ${n}...`);let c=d(s,`server.mjs`);await h({experimental:{lazyBarrel:!1},input:o,output:{file:c,codeSplitting:!1,minify:`dce-only`,comments:!1},platform:`node`,transform:{define:{"process.env.NODE_ENV":JSON.stringify(`production`),"import.meta.env.NODE_ENV":JSON.stringify(`production`),"import.meta.env.RESOLID_PLATFORM":JSON.stringify(i)},target:`node${r}`},external:[`vite`,...Object.keys(b)],plugins:[g({external:[`vite`,...Object.keys(b)],skipDuplicateCheck:!0})]}),await a(d(s,v),{force:!0,recursive:!0}),await a(o,{force:!0}),await Promise.all(T.map(t=>e(t,d(C,t),{recursive:!0}))),await m?.(E,s,n,c,b)}))}function x(e,t){let n=Array.isArray(t)?t.filter(e=>![`react-router`,`@react-router/architect`,`@react-router/cloudflare`,`@react-router/dev`,`@react-router/express`,`@react-router/node`,`@react-router/serve`].includes(e)):t;return Object.keys(e).filter(e=>n===void 0?!1:n===!0?!0:n.includes(e)).reduce((t,n)=>(t[n]=e[n]??``,t),{})}async function S(e,t,n,r){let i={name:t.name,type:t.type,version:t.version,scripts:{postinstall:t.scripts?.postinstall??``},dependencies:n,engines:{node:`${r}.x`}};await c(e,JSON.stringify(i,null,2),`utf8`)}async function C(e,n=!1){let r=d(...e);return n&&await a(r,{recursive:!0,force:!0}),await t(r,{recursive:!0}),r}function w(e){if(e?.routeIdToServerBundleId){let t=Object.values(e.routes).filter(e=>e.id!=`root`).map(t=>{let n=[...T(e.routes,t.parentId),t.path].join(`/`);return{id:t.id,path:`/${n}`}}),n={};for(let[r,i]of Object.entries(e.routeIdToServerBundleId)){n[i]??=[];for(let e of t)e.id==r&&n[i].push(e.path)}let r={};for(let[e,t]of Object.entries(n)){t.sort((e,t)=>e.length<t.length?-1:1);for(let n of t)!r[n]&&!Object.keys(r).find(t=>r[t].bundleId==e&&n.startsWith(r[t].path))&&(r[n]={path:n,bundleId:e})}let i=Object.values(r).map(e=>({path:e.path.endsWith(`/`)?e.path.slice(0,-1):e.path,bundleId:e.bundleId}));return i.sort((e,t)=>e.path.length>t.path.length?-1:1),i}return[{path:``,bundleId:`site`}]}function T(e,t){if(t==null)return[];let n=[],r=t=>{let i=e[t];i.parentId&&r(i.parentId),i.path&&n.push(i.path)};return r(t),n}async function E(n,a,c){let p=_(n),{nodeFileTrace:h}=await import(`@vercel/nft`),g=await h([n],{base:p,cache:c}),v=Array.from(g.fileList).map(e=>d(p,e)),y=u(v[0]);for(let e of v.slice(1))for(;!e.startsWith(y);)y=u(y);return await Promise.all(v.map(async c=>{let p=d(a,f(y,c)),h=await i(c),g=h!==c,_=(await o(c)).isDirectory();if(await t(u(p),{recursive:!0}),c==n){let t=u(n),i=u(p);await Promise.all((await r(t)).filter(e=>e!==l(n)).map(n=>e(d(t,n),d(i,n),{recursive:!0})))}g?m(p)||await s(f(u(p),d(a,f(y,h))),p,_?`dir`:`file`):_||await e(c,p)})),f(y,n)}function D({nodeVersion:e,includeFiles:t}){return{name:`@resolid/react-router-hono-netlify-preset`,reactRouterConfig(){return{async buildEnd({buildManifest:n,reactRouterConfig:r,viteConfig:i}){await b({nodeVersion:e,serverPlatform:`netlify`,includeFiles:t,buildManifest:n,reactRouterConfig:r,viteConfig:i,async buildStart(){let e=await C([i.root,`.netlify`,`v1`],!0);return await O(i.build.assetsDir,d(e,`config.json`)),{netlifyRoot:e,netlifyFunctionDir:await C([e,`functions`]),serverRoutes:w(n),nftCache:{}}},async buildBundleEnd(t,n,r,i){console.log(`Coping Netlify function files for ${r}...`);let a=await E(i,await C([t.netlifyFunctionDir,r],!0),t.nftCache),o=t.serverRoutes.find(e=>e.bundleId==r)?.path,s=o?[o,`${o}/*`]:`/*`;await c(d(t.netlifyFunctionDir,`${r}.mjs`),`export { default } from "./${d(r,a)}";
 
 export const config = {
   path: ${Array.isArray(s)?JSON.stringify(s):`"${s}"`},
@@ -7,4 +7,4 @@ export const config = {
   preferStatic: true,
   nodeVersion: ${e}
 };
-`,`utf8`)}})}}}}}async function O(e,t){console.log(`Writing Netlify config file...`);let n={headers:[]};n.headers.push({for:`^/${e}/.*`,values:{"Cache-Control":`public, max-age=31536000, immutable`}}),await c(t,JSON.stringify(n,null,2),`utf8`)}function k({nodeVersion:e,includeFiles:t}){return{name:`@resolid/react-router-hono-node-preset`,reactRouterConfig(){return{async buildEnd({buildManifest:n,reactRouterConfig:r,viteConfig:i}){await b({includeFiles:t,nodeVersion:e,buildManifest:n,reactRouterConfig:r,viteConfig:i,buildStart(){console.log(`Bundle Node Server for production...`)}})}}}}}function A({nodeVersion:e,includeFiles:t}){return{name:`@resolid/react-router-hono-vercel-preset`,reactRouterConfig(){return{buildEnd:async({buildManifest:n,reactRouterConfig:r,viteConfig:i})=>{await b({includeFiles:t,nodeVersion:e,buildManifest:n,reactRouterConfig:r,viteConfig:i,async buildStart(){let e=await C([i.root,`.vercel`,`output`],!0);return await j(d(r.buildDirectory,`client`),e),await M(i.build.assetsDir,n,d(e,`config.json`)),{vercelOutput:e,nftCache:{}}},async buildBundleEnd(t,n,r,i){console.log(`Coping Vercel function files for ${r}...`);let a=await C([t.vercelOutput,`functions`,`_${r}.func`],!0),o=await E(i,a,t.nftCache);await c(d(a,`.vc-config.json`),JSON.stringify({handler:o,runtime:`nodejs${e}.x`,launcherType:`Nodejs`,supportsResponseStreaming:!0},null,2),`utf8`)}})}}}}}async function j(t,n){console.log(`Copying assets...`);let r=await C([n,`static`]);await e(t,r,{recursive:!0,force:!0}),await a(d(r,`.vite`),{recursive:!0,force:!0})}async function M(e,t,n){console.log(`Writing Vercel config file...`);let r={version:3,routes:[],framework:{slug:`vite`}};r.routes.push({src:`^/${e}/.*`,headers:{"Cache-Control":`public, max-age=31536000, immutable`},continue:!0}),r.routes.push({handle:`filesystem`});let i=w(t);for(let e of i)e.path.length>0?r.routes.push({src:`^${e.path}(?:/.*)?$`,dest:`_${e.bundleId}`}):r.routes.push({src:`^/.*$`,dest:`_${e.bundleId}`});await c(n,JSON.stringify(r,null,2),`utf8`)}const N=({platform:e=`node`,nodeVersion:t=24,entryFile:n=`server.ts`,appDirectory:r=`src`,includeFiles:i=[],reactRouterConfig:a={},devExclude:o})=>{let s=(e==`netlify`?D:e==`vercel`?A:k)({nodeVersion:t,includeFiles:i}),{future:c,presets:l,...u}=a;return{vitePluginOptions:{platform:e,nodeVersion:t,entryFile:n,devExclude:o},reactRouterConfig:{...u,appDirectory:r,ssr:!0,serverModuleFormat:`esm`,presets:l?[...l,s]:[s],future:{v8_middleware:!0,v8_splitRouteModules:!0,v8_viteEnvironmentApi:!0,v8_passThroughRequests:!0,v8_trailingSlashAwareDataRequests:!0,...c}}}};export{N as defineDevConfig};
+`,`utf8`)}})}}}}}async function O(e,t){console.log(`Writing Netlify config file...`);let n={headers:[]};n.headers.push({for:`^/${e}/.*`,values:{"Cache-Control":`public, max-age=31536000, immutable`}}),await c(t,JSON.stringify(n,null,2),`utf8`)}function k({nodeVersion:e,includeFiles:t}){return{name:`@resolid/react-router-hono-node-preset`,reactRouterConfig(){return{async buildEnd({buildManifest:n,reactRouterConfig:r,viteConfig:i}){await b({nodeVersion:e,serverPlatform:`node`,includeFiles:t,buildManifest:n,reactRouterConfig:r,viteConfig:i,buildStart(){console.log(`Bundle Node Server for production...`)}})}}}}}function A({nodeVersion:e,includeFiles:t}){return{name:`@resolid/react-router-hono-vercel-preset`,reactRouterConfig(){return{buildEnd:async({buildManifest:n,reactRouterConfig:r,viteConfig:i})=>{await b({nodeVersion:e,serverPlatform:`vercel`,includeFiles:t,buildManifest:n,reactRouterConfig:r,viteConfig:i,async buildStart(){let e=await C([i.root,`.vercel`,`output`],!0);return await j(d(r.buildDirectory,`client`),e),await M(i.build.assetsDir,n,d(e,`config.json`)),{vercelOutput:e,nftCache:{}}},async buildBundleEnd(t,n,r,i){console.log(`Coping Vercel function files for ${r}...`);let a=await C([t.vercelOutput,`functions`,`_${r}.func`],!0),o=await E(i,a,t.nftCache);await c(d(a,`.vc-config.json`),JSON.stringify({handler:o,runtime:`nodejs${e}.x`,launcherType:`Nodejs`,supportsResponseStreaming:!0},null,2),`utf8`)}})}}}}}async function j(t,n){console.log(`Copying assets...`);let r=await C([n,`static`]);await e(t,r,{recursive:!0,force:!0}),await a(d(r,`.vite`),{recursive:!0,force:!0})}async function M(e,t,n){console.log(`Writing Vercel config file...`);let r={version:3,routes:[],framework:{slug:`vite`}};r.routes.push({src:`^/${e}/.*`,headers:{"Cache-Control":`public, max-age=31536000, immutable`},continue:!0}),r.routes.push({handle:`filesystem`});let i=w(t);for(let e of i)e.path.length>0?r.routes.push({src:`^${e.path}(?:/.*)?$`,dest:`_${e.bundleId}`}):r.routes.push({src:`^/.*$`,dest:`_${e.bundleId}`});await c(n,JSON.stringify(r,null,2),`utf8`)}const N=({platform:e=`node`,nodeVersion:t=24,entryFile:n=`server.ts`,appDirectory:r=`src`,includeFiles:i=[],reactRouterConfig:a={},devExclude:o})=>{let s=(e==`netlify`?D:e==`vercel`?A:k)({nodeVersion:t,includeFiles:i}),{future:c,presets:l,...u}=a;return{vitePluginOptions:{platform:e,nodeVersion:t,entryFile:n,devExclude:o},reactRouterConfig:{...u,appDirectory:r,ssr:!0,serverModuleFormat:`esm`,presets:l?[...l,s]:[s],future:c}}};export{N as defineDevConfig};

package/dist/router.mjs

@@ -1 +1 @@
-import{Link as e,NavLink as t,useLocation as n,useNavigate as r,useNavigation as i}from"react-router";import{jsx as a}from"react/jsx-runtime";import{useEffect as o,useRef as s,useState as c}from"react";function l(e,t=` - `){return n=>{let r=e(n),i=n.matches.reduceRight((e,t)=>{for(let n of t.meta)e.findIndex(e=>`name`in e&&`name`in n?e.name===n.name:`property`in e&&`property`in n?e.property===n.property:`title`in e&&`title`in n?e.title===n.title:!1)==-1&&e.push(n);return e},r),a=[],o=[];for(let e of i)`title`in e?typeof e.title==`string`&&e.title.length>0&&a.push(...e.title.split(t)):o.push(e);return o.unshift({title:[...new Set(a)].join(t)}),o}}function u(t){let{state:n,to:r,...i}=t;return a(e,{to:r,state:{...n,previous:!0},...i})}function d(e){let{state:n,to:r,...i}=e;return a(t,{to:r,state:{...n,previous:!0},...i})}function f(e=`/`){let t=r(),{state:i}=n();return async()=>{i?.previous?await t(-1):await t(e)}}function p(){let e=i(),t=e.state!==`idle`,n=s(null),[r,a]=c(!1);return o(()=>{if(!n.current)return;Promise.allSettled(n.current.getAnimations().map(({finished:e})=>e)).then(()=>{t||a(!1)});let e=t?setTimeout(()=>a(!0),100):null;return()=>{e&&clearTimeout(e)}},[t]),{ref:n,active:t,animating:r,state:e.state}}export{u as HistoryLink,d as HistoryNavLink,l as mergeMeta,f as useHistoryBack,p as useRouteProgress};
+import{Link as e,NavLink as t,useLocation as n,useNavigate as r,useNavigation as i}from"react-router";import{jsx as a}from"react/jsx-runtime";import{useEffect as o,useRef as s,useState as c}from"react";function l(e,t=` - `){return n=>{let r=e(n),i=n.matches.reduceRight((e,t)=>{for(let n of t.meta)e.findIndex(e=>`name`in e&&`name`in n?e.name===n.name:`property`in e&&`property`in n?e.property===n.property:`title`in e&&`title`in n?e.title===n.title:!1)==-1&&e.push(n);return e},r),a=[],o=[];for(let e of i)`title`in e?typeof e.title==`string`&&e.title.length>0&&a.push(...e.title.split(t)):o.push(e);return o.unshift({title:[...new Set(a)].join(t)}),o}}function u(t){let{state:n,to:r,...i}=t;return a(e,{to:r,state:{...n,previous:!0},...i})}function d(e){let{state:n,to:r,...i}=e;return a(t,{to:r,state:{...n,previous:!0},...i})}function f(e=`/`){let t=r(),{state:i}=n();return async()=>{await(i?.previous?t(-1):t(e))}}function p(){let e=i(),t=e.state!==`idle`,n=s(null),[r,a]=c(!1);return o(()=>{if(!n.current)return;Promise.allSettled(n.current.getAnimations().map(({finished:e})=>e)).then(()=>{t||a(!1)});let e=t?setTimeout(()=>a(!0),100):null;return()=>{e&&clearTimeout(e)}},[t]),{ref:n,active:t,animating:r,state:e.state}}export{u as HistoryLink,d as HistoryNavLink,l as mergeMeta,f as useHistoryBack,p as useRouteProgress};

package/dist/routes.mjs

@@ -1,3 +1,3 @@
-import{readdir as e}from"node:fs/promises";import{extname as t,join as n,relative as r,resolve as i,win32 as a}from"node:path";import{getAppDirectory as o,index as s,layout as c,route as l}from"@react-router/dev/routes";import{makeRe as u}from"minimatch";function d(e){let t=o();return{route:(n,a,...o)=>l(n,r(t,i(e,a)),...o),index:(n,...a)=>s(r(t,i(e,n)),...a),layout:(n,...a)=>c(r(t,i(e,n)),...a)}}async function f(t,i,a=t){let o=await e(t,{withFileTypes:!0,encoding:`utf8`});await Promise.all(o.map(async e=>{let o=n(t,e.name);if(e.isDirectory())return f(o,i,a);e.isFile()&&i(r(a,o))}))}function p(e,t=`root`){let n={};for(let[t,r]of Object.entries(e))n[t]={id:r.id,file:r.file,path:r.path,index:r.index,caseSensitive:r.caseSensitive};let r=[];for(let[,i]of Object.entries(n)){let{parentId:a}=e[i.id];if(a===t)r.push(i);else{let e=a&&n[a];e&&(e.children=e.children??[],e.children.push(i))}}return r}function m(e,r){let i={},a=new Map,o=new Map;for(let i of r){let r=y(n(e,i)),s=r.slice(0,-t(r).length),c=s.slice(-7)==`_layout`?s.slice(0,-8):s,l=a.get(c);if(l){let e=o.get(c)??[l];e.push(r),o.set(c,e);continue}a.set(c,r)}let s=new v,c=Array.from(a).sort(([e],[t])=>t.length-e.length);for(let[t,n]of c){let[r,a]=h(t.slice(e.length+1)),o=t.slice(-6)==`_index`;i[t]={file:n,id:t,path:g(r,a,o)},o&&(i[t].index=!0);let c=s.findAndRemove(t,e=>[`.`,`/`].includes(e.slice(t.length).charAt(0)));if(s.add(t),c.length>0)for(let e of c)i[e].parentId=t}let l=new Map;for(let[e]of c){let t=i[e];if(!t.parentId)continue;let n=l.get(t.parentId)??[];n.push(t),l.set(t.parentId,n)}let u=new Map,d=new Map;for(let[t]of c){let n=i[t],r=n.path??``,a=n.parentId?i[n.parentId]:null,o=n.path;a?.path&&o&&(o=o.slice(a.path.length).replace(/^\//,``).replace(/\/$/,``)),n.parentId??=`root`,n.path=o?.length==0?void 0:o;let s=n.id.replace(RegExp(`^${e}/`),``).split(/[./]/).pop();if(s?.[0]==`_`&&s!==`_index`)continue;let c=r+(n.index?`?index`:``),l=u.get(c);if(u.set(c,n),l&&(r||n.index)){let e=d.get(r);e??=[l],e.push(n),d.set(r,e)}}if(o.size>0)for(let[e,t]of o.entries()){let[n,...r]=t,i=r.map(e=>`⭕ ${e}`).join(`
+import{readdir as e}from"node:fs/promises";import{extname as t,join as n,relative as r,resolve as i,win32 as a}from"node:path";import{getAppDirectory as o,index as s,layout as c,route as l}from"@react-router/dev/routes";import{makeRe as u}from"minimatch";function d(e){let t=o();return{route:(n,a,...o)=>l(n,r(t,i(e,a)),...o),index:(n,...a)=>s(r(t,i(e,n)),...a),layout:(n,...a)=>c(r(t,i(e,n)),...a)}}async function f(t,i,a=t){let o=await e(t,{withFileTypes:!0,encoding:`utf8`});await Promise.all(o.map(async e=>{let o=n(t,e.name);if(e.isDirectory())return f(o,i,a);e.isFile()&&i(r(a,o))}))}function p(e,t=`root`){let n={};for(let[t,r]of Object.entries(e))n[t]={id:r.id,file:r.file,path:r.path,index:r.index,caseSensitive:r.caseSensitive};let r=[];for(let[,i]of Object.entries(n)){let{parentId:a}=e[i.id];if(a===t)r.push(i);else{let e=a&&n[a];e&&(e.children??=[],e.children.push(i))}}return r}function m(e,r){let i={},a=new Map,o=new Map;for(let i of r){let r=y(n(e,i)),s=r.slice(0,-t(r).length),c=s.slice(-7)==`_layout`?s.slice(0,-8):s,l=a.get(c);if(l){let e=o.get(c)??[l];e.push(r),o.set(c,e);continue}a.set(c,r)}let s=new v,c=Array.from(a).sort(([e],[t])=>t.length-e.length);for(let[t,n]of c){let[r,a]=h(t.slice(e.length+1)),o=t.slice(-6)==`_index`;i[t]={file:n,id:t,path:g(r,a,o)},o&&(i[t].index=!0);let c=s.findAndRemove(t,e=>[`.`,`/`].includes(e.slice(t.length).charAt(0)));if(s.add(t),c.length>0)for(let e of c)i[e].parentId=t}let l=new Map;for(let[e]of c){let t=i[e];if(!t.parentId)continue;let n=l.get(t.parentId)??[];n.push(t),l.set(t.parentId,n)}let u=new Map,d=new Map;for(let[t]of c){let n=i[t],r=n.path??``,a=n.parentId?i[n.parentId]:null,o=n.path;a?.path&&o&&(o=o.slice(a.path.length).replace(/^\//,``).replace(/\/$/,``)),n.parentId??=`root`,n.path=o?.length==0?void 0:o;let s=n.id.replace(RegExp(`^${e}/`),``).split(/[./]/).pop();if(s?.[0]==`_`&&s!==`_index`)continue;let c=r+(n.index?`?index`:``),l=u.get(c);if(u.set(c,n),l&&(r||n.index)){let e=d.get(r);e??=[l],e.push(n),d.set(r,e)}}if(o.size>0)for(let[e,t]of o.entries()){let[n,...r]=t,i=r.map(e=>`⭕ ${e}`).join(`
 `);console.error(`!Route ID 冲突: "${e}"\n\n下列路由都定义了相同的路由 ID，但只有第一个会生效\n\n🟢 ${n}\n${i}\n`)}if(d.size>0)for(let[e,t]of d.entries()){for(let e=1;e<t.length;e++)delete i[t[e].id];let[n,...r]=t.map(e=>e.file),a=e[0]==`/`?e:`/${e}`,o=r.map(e=>`⭕ ${e}`).join(`
 `);console.error(`! Route 路径冲突: "${a}"\n\n下列路由都定义了相同的 URL，但只有第一个会生效\n\n🟢 ${n}\n${o}\n`)}return i}function h(e){let t=[],n=[],r=0,i=``,a=``,o=`NORMAL`,s=(e,r)=>{if(e){if(r.includes(`*`)||r.includes(`:`)||r.includes(`?`))throw Error("路由文件或目录中不能存在 `*` `:` `?` 特殊字符");t.push(e),n.push(r)}};for(;r<e.length;){let t=e[r];switch(r++,o){case`NORMAL`:if(t&&[`.`,`/`].includes(t)){s(i,a),i=``,a=``,o=`NORMAL`;break}if(t===`[`){o=`ESCAPE`,a+=t;break}if(t===`(`){o=`OPTIONAL`,a+=t;break}if(!i&&t==`$`){r===e.length?(i+=`*`,a+=t):(i+=`:`,a+=t);break}i+=t,a+=t;break;case`ESCAPE`:if(t===`]`){o=`NORMAL`,a+=t;break}i+=t,a+=t;break;case`OPTIONAL`:if(t===`)`){i+=`?`,a+=t,o=`NORMAL`;break}if(t===`[`){o=`OPTIONAL_ESCAPE`,a+=t;break}if(!i&&t===`$`){r===e.length?(i+=`*`,a+=t):(i+=`:`,a+=t);break}i+=t,a+=t;break;case`OPTIONAL_ESCAPE`:if(t===`]`){o=`OPTIONAL`,a+=t;break}i+=t,a+=t;break}}return s(i,a),[t,n]}function g(e,t,n){let r=[],i=n?e.slice(0,-1):e;for(let e=0;e<i.length;e++){let n=t[e],a=i[e];a.startsWith(`_`)&&n.startsWith(`_`)||(a.endsWith(`_`)&&n.endsWith(`_`)&&(a=a.slice(0,-1)),r.push(a))}return r.length?r.join(`/`):void 0}const _=Symbol(`PrefixLookupTrieEndSymbol`);var v=class{root={[_]:!1};add(e){if(!e)throw Error(`Cannot add empty string to PrefixLookupTrie`);let t=this.root;for(let n of e)t[n]??={[_]:!1},t=t[n];t[_]=!0}findAndRemove(e,t){let n=this.root;for(let t of e){if(!n[t])return[];n=n[t]}return this.#e([],n,e,t)}#e(e,t,n,r){for(let i of Object.keys(t))this.#e(e,t[i],n+i,r);return t[_]&&r(n)&&(t[_]=!1,e.push(n)),e}};function y(e){return e.split(a.sep).join(`/`)}const b=[`.js`,`.jsx`,`.ts`,`.tsx`,`.md`,`.mdx`];async function x(e={}){let{routesDirectory:r=`routes`,ignoredRouteFiles:i=[]}=e,a=o(),s=i.map(e=>u(e)).filter(e=>!!e),c=[];return await f(n(a,r),e=>{s.some(t=>t.test(e))||b.includes(t(e))&&c.push(e)}),p(m(r,c))}export{x as flexRoutes,d as relativeFactory};

package/dist/vite.d.mts

@@ -1,4 +1,4 @@
-import { i as VitePluginOptions } from "./index-CvMCdeds.mjs";
+import { i as VitePluginOptions } from "./index-N6xMou5u.mjs";
 import { Plugin } from "vite";
 
 //#region src/vite/index.d.ts

package/dist/vite.mjs

@@ -1 +1 @@
-import{join as e,relative as t}from"node:path";import{existsSync as n,statSync as r}from"node:fs";import{normalizePath as i}from"vite";import{getRequestListener as a}from"@hono/node-server";import{makeRe as o}from"minimatch";import{reactRouter as s}from"@react-router/dev/vite";function c(n,r){if(!(`__reactRouterPluginContext`in n))return;let{reactRouterConfig:i,rootDirectory:a,buildManifest:o,environmentBuildContext:s}=n.__reactRouterPluginContext,c=t(a,i.appDirectory);return{entryFile:e(c,r.entryFile),appDir:c,buildDir:t(a,i.buildDirectory),assetsDir:n.build?.assetsDir??`assets`,ssrBuild:s?.name===`ssr`,basename:i.basename,future:i.future,buildManifest:o}}function l(e,t){let n=i(e),[r]=n.split(`/`),a=[RegExp(`^(?=\\/${n}\\/)((?!.*\\.data(\\?|$)).*\\..*(\\?.*)?$)`),RegExp(`^(?=\\/${n}\\/.*\\/\\..*\\/.*)`)];if(n!=r&&(a.push(RegExp(`^(?=\\/${r}\\/)((?!.*\\.data(\\?|$)).*\\..*(\\?.*)?$)`)),a.push(RegExp(`^(?=\\/${r}\\/.*\\/\\..*\\/.*)`))),t)for(let e of t)if(e instanceof RegExp)a.push(e);else try{a.push(o(e))}catch{}return a}function u(e,t){if(e.includes(`/node_modules/`)||e.startsWith(`/@`)||e.includes(`?import`))return!0;for(let n of t)if(n.test(e))return!0;return!1}function d(t){let i=``,o;return{name:`@resolid/vite-dev-plugin`,enforce:`post`,config(e){if(o=c(e,t),!o)return;let n={define:{"import.meta.env.RESOLID_PLATFORM":JSON.stringify(t.platform),"import.meta.env.RESOLID_BASENAME":JSON.stringify(o.basename),"import.meta.env.RESOLID_BUILD_DIR":JSON.stringify(o.buildDir),"import.meta.env.RESOLID_ASSETS_DIR":JSON.stringify(o.assetsDir)},ssr:{noExternal:[`@resolid/dev`]},optimizeDeps:{exclude:[`@resolid/dev/http.server`]}};if(!o.future?.v8_viteEnvironmentApi&&!o.ssrBuild)return n;let r={build:{target:`node${t.nodeVersion}`,rolldownOptions:{input:o.entryFile,output:{codeSplitting:!1},onwarn(e,t){e.code===`UNUSED_EXTERNAL_IMPORT`&&e.message.includes(`react`)||t(e)}}}};return o.future?.v8_viteEnvironmentApi?{...n,environments:{ssr:r}}:{...n,...r}},configResolved(e){if(i=e.publicDir,o?.buildManifest?.serverBundles)for(let t of Object.keys(o.buildManifest.serverBundles))e.environments[`ssrBundle_${t}`]&&(e.environments[`ssrBundle_${t}`].build.rolldownOptions.input=o.entryFile)},async configureServer(s){if(!o)return;let c=l(o.appDir,t.devExclude);s.middlewares.use(await(async t=>async(s,l,d)=>{if(s.url){let t=e(i,s.url);try{if(n(t)&&r(t).isFile())return d()}catch{}}if(s.url&&u(s.url,c))return d();let f=o.entryFile,p=o.future?.v8_viteEnvironmentApi?(await t.environments.ssr.runner.import(f)).default:(await t.ssrLoadModule(f)).default;if(!p)return d(Error(`Failed to find default export from ${f}`));await a(async e=>{let t=await p.fetch(e,{incoming:s,outgoing:l});if(!(t instanceof Response))throw t;return t},{overrideGlobalObjects:!1,errorHandler:e=>{let n;e instanceof Error?(n=e,t.ssrFixStacktrace(n)):n=Error(typeof e==`string`?`The response is not an instance of "Response", but: ${e}`:`Unknown error: ${String(e)}`),d(n)}})(s,l)})(s))},handleHotUpdate({server:e,modules:t}){if(t.some(e=>e._ssrModule))return e.hot.send({type:`full-reload`}),[]}}}function f(e){return[d(e),...s()]}export{f as resolidVite};
+import{join as e,relative as t}from"node:path";import{existsSync as n,statSync as r}from"node:fs";import{normalizePath as i}from"vite";import{getRequestListener as a}from"@hono/node-server";import{makeRe as o}from"minimatch";import{reactRouter as s}from"@react-router/dev/vite";function c(n,r){if(!(`__reactRouterPluginContext`in n))return;let{reactRouterConfig:i,rootDirectory:a,buildManifest:o}=n.__reactRouterPluginContext,s=t(a,i.appDirectory);return{entryFile:e(s,r.entryFile),appDir:s,buildDir:t(a,i.buildDirectory),assetsDir:n.build?.assetsDir??`assets`,ssrBuild:i.ssr,basename:i.basename,future:i.future,buildManifest:o}}function l(e,t){let n=i(e),[r]=n.split(`/`),a=[RegExp(`^(?=\\/${n}\\/)((?!.*\\.data(\\?|$)).*\\..*(\\?.*)?$)`),RegExp(`^(?=\\/${n}\\/.*\\/\\..*\\/.*)`)];if(n!=r&&(a.push(RegExp(`^(?=\\/${r}\\/)((?!.*\\.data(\\?|$)).*\\..*(\\?.*)?$)`)),a.push(RegExp(`^(?=\\/${r}\\/.*\\/\\..*\\/.*)`))),t)for(let e of t)if(e instanceof RegExp)a.push(e);else try{a.push(o(e))}catch{}return a}function u(e,t){if(e.includes(`/node_modules/`)||e.startsWith(`/@`)||e.includes(`?import`))return!0;for(let n of t)if(n.test(e))return!0;return!1}function d(t){let i=``,o;return{name:`@resolid/vite-dev-plugin`,enforce:`post`,config(e){if(o=c(e,t),!o)return;let n={define:{"import.meta.env.RESOLID_PLATFORM":JSON.stringify(t.platform),"import.meta.env.RESOLID_BASENAME":JSON.stringify(o.basename),"import.meta.env.RESOLID_BUILD_DIR":JSON.stringify(o.buildDir),"import.meta.env.RESOLID_ASSETS_DIR":JSON.stringify(o.assetsDir)},ssr:{noExternal:[`@resolid/dev`]},optimizeDeps:{exclude:[`@resolid/dev/http.server`]}};if(!o.ssrBuild)return n;let r={build:{target:`node${t.nodeVersion}`,rolldownOptions:{input:o.entryFile,output:{codeSplitting:!1},onwarn(e,t){e.code===`UNUSED_EXTERNAL_IMPORT`&&e.message.includes(`react`)||t(e)}}}};return{...n,environments:{ssr:r}}},configResolved(e){if(i=e.publicDir,o?.buildManifest?.serverBundles)for(let t of Object.keys(o.buildManifest.serverBundles))e.environments[`ssrBundle_${t}`]&&(e.environments[`ssrBundle_${t}`].build.rolldownOptions.input=o.entryFile)},async configureServer(s){if(!o)return;let c=l(o.appDir,t.devExclude);s.middlewares.use(await(async t=>async(s,l,d)=>{if(s.url){let t=e(i,s.url);try{if(n(t)&&r(t).isFile())return d()}catch{}}if(s.url&&u(s.url,c))return d();let f=o.entryFile,p=(await t.environments.ssr.runner.import(f)).default;if(!p)return d(Error(`Failed to find default export from ${f}`));await a(async e=>{let t=await p.fetch(e,{incoming:s,outgoing:l});if(!(t instanceof Response))throw t;return t},{overrideGlobalObjects:!1,errorHandler:e=>{let n;e instanceof Error?(n=e,t.ssrFixStacktrace(n)):n=Error(typeof e==`string`?`The response is not an instance of "Response", but: ${e}`:`Unknown error: ${String(e)}`),d(n)}})(s,l)})(s))},handleHotUpdate({server:e,modules:t}){if(t.some(e=>e._ssrModule))return e.hot.send({type:`full-reload`}),[]}}}function f(e){return[d(e),...s()]}export{f as resolidVite};

package/env.d.ts

@@ -1,4 +1,4 @@
-import type { Context } from "hono";
+import type { RequestIdVariables } from "hono/request-id";
 
 interface ImportMetaEnv {
   readonly RESOLID_PLATFORM: "node" | "vercel" | "netlify";
@@ -8,11 +8,12 @@ interface ImportMeta {
   readonly env: ImportMetaEnv;
 }
 
-type HonoContext = {
-  hono: Context;
-};
+type ClientVariables = {
+  clientIp: string;
+  requestOrigin: string | undefined;
+} & RequestIdVariables;
 
-declare module "react-router" {
+declare module "hono" {
   // oxlint-disable-next-line typescript/no-empty-object-type
-  interface RouterContextProvider extends HonoContext {}
+  interface ContextVariableMap extends ClientVariables {}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@resolid/dev",
-  "version": "0.5.1",
+  "version": "0.6.1",
   "private": false,
   "description": "Development utils for Resolid applications",
   "keywords": [
@@ -60,34 +60,34 @@
     "provenance": true
   },
   "dependencies": {
-    "@hono/node-server": "^2.0.4",
-    "@resolid/utils": "^1.5.0",
+    "@hono/node-server": "^2.0.5",
+    "@resolid/utils": "^1.6.1",
     "@vercel/nft": "^1.10.2",
     "fast-glob": "^3.3.3",
-    "hono": "^4.12.23",
+    "hono": "^4.12.25",
     "minimatch": "^10.2.5",
-    "rolldown": "^1.0.3"
+    "rolldown": "^1.1.1"
   },
   "devDependencies": {
-    "@react-router/dev": "^7.16.0",
-    "@types/react": "^19.2.16",
+    "@react-router/dev": "^8.0.0",
+    "@types/react": "^19.2.17",
     "@types/react-dom": "^19.2.3",
     "react": "^19.2.7",
     "react-dom": "^19.2.7",
-    "tsdown": "^0.22.1"
+    "tsdown": "^0.22.3"
   },
   "peerDependencies": {
-    "@netlify/types": "^2.6.0",
-    "@react-router/dev": "^7.16.0",
-    "@react-router/node": "^7.16.0",
-    "isbot": "^5.1.40",
+    "@netlify/types": "^2.8.0",
+    "@react-router/dev": "^8.0.0",
+    "@react-router/node": "^8.0.0",
+    "isbot": "^5.1.43",
     "react": "^19.2.7",
     "react-dom": "^19.2.7",
-    "react-router": "^7.16.0",
+    "react-router": "^8.0.0",
     "vite": "^8.0.16"
   },
   "engines": {
-    "node": "^22.13.0 || >=24"
+    "node": "^22.22.0 || >=24"
   },
   "scripts": {
     "build": "tsdown",