one 1.1.441 → 1.1.443

package/src/fork/getStateFromPath.ts

@@ -461,6 +461,7 @@ const matchAgainstConfigs = (remaining: string, configs: RouteConfig[]) => {
           }, {})
 
         if (params && Object.keys(params).length) {
+          Object.assign(allParams, params) // @modified: let page access layout params
           return { name, params }
         }
 

package/src/serve-worker.ts

@@ -17,7 +17,7 @@ export async function serve(buildInfo: One.BuildInfo) {
 
   await createProdServer(app, serverOptions)
 
-  await oneServe(buildInfo.oneOptions, buildInfo, app, false)
+  await oneServe(buildInfo.oneOptions, buildInfo, app)
 
   return app
 }

package/src/serve.ts

@@ -1,6 +1,7 @@
 import './polyfills-server'
 
 import FSExtra from 'fs-extra'
+import type { Hono } from 'hono'
 import type { VXRNOptions } from 'vxrn'
 import { setServerGlobals } from './server/setServerGlobals'
 import { setupBuildInfo } from './server/setupBuildOptions'
@@ -11,7 +12,7 @@ process.on('uncaughtException', (err) => {
   console.error(`[one] Uncaught exception`, err?.stack || err)
 })
 
-export async function serve(args: VXRNOptions['server'] = {}) {
+export async function serve(args: VXRNOptions['server'] & { app?: Hono } = {}) {
   const buildInfo = (await FSExtra.readJSON(`dist/buildInfo.json`)) as One.BuildInfo
   const { oneOptions } = buildInfo
 
@@ -32,6 +33,7 @@ export async function serve(args: VXRNOptions['server'] = {}) {
   }
 
   return await vxrnServe({
+    app: args.app,
     // fallback to one plugin
     ...oneOptions.server,
     // override with any flags given to cli

package/src/server/oneServe.ts

@@ -11,12 +11,7 @@ import { toAbsolute } from '../utils/toAbsolute'
 import type { One } from '../vite/types'
 import type { RouteInfoCompiled } from './createRoutesManifest'
 
-export async function oneServe(
-  oneOptions: One.PluginOptions,
-  buildInfo: One.BuildInfo,
-  app: Hono,
-  serveStatic = true
-) {
+export async function oneServe(oneOptions: One.PluginOptions, buildInfo: One.BuildInfo, app: Hono) {
   const { resolveAPIRoute, resolveLoaderRoute, resolvePageRoute } = await import(
     '../createHandleRequest'
   )

package/src/utils/getHonoPath.ts

@@ -1,17 +1,20 @@
 export function getHonoPath(page: string) {
-  return (
-    page
-      // /(param) => (empty)
-      .replaceAll(/\/\(([^\)]+)\)/gi, '')
-      // [...params] => *
-      .replace(/\[...([^\]]+)\]/gi, '*')
-      // [param] => :param
-      .replaceAll(/\[([^\]]+)\]/gi, ':$1')
-      // +not-found => *
-      .replace('+not-found', '*')
-      // /index => /
-      .replace(/\/index$/, '/')
-      // remove trailing / for non / paths
-      .replace(/.+\/$/, '')
-  )
+  const cleaned = page
+    // /(param) => (empty)
+    .replaceAll(/\/\(([^\)]+)\)/gi, '')
+    // [...params] => *
+    .replace(/\[\.\.\.([^\]]+)\]/gi, '*')
+    // [param] => :param
+    .replaceAll(/\[([^\]]+)\]/gi, ':$1')
+    // +not-found => *
+    .replace('+not-found', '*')
+    // /index => /
+    .replace(/\/index$/, '/')
+
+  if (cleaned !== '/') {
+    // remove trailing / for non / paths
+    return cleaned.replace(/\/$/, '')
+  }
+
+  return cleaned
 }

package/src/vite/plugins/clientTreeShakePlugin.ts

@@ -2,9 +2,9 @@ import BabelGenerate from '@babel/generator'
 import { parse } from '@babel/parser'
 import BabelTraverse from '@babel/traverse'
 import { deadCodeElimination, findReferencedIdentifiers } from 'babel-dead-code-elimination'
+import { extname, relative } from 'node:path'
 import type { Plugin } from 'vite'
 import { EMPTY_LOADER_STRING } from '../constants'
-import { extname, relative } from 'node:path'
 
 const traverse = BabelTraverse['default'] as typeof BabelTraverse
 const generate = BabelGenerate['default'] as any as typeof BabelGenerate
@@ -45,7 +45,9 @@ export async function transformTreeShakeClient(code: string, id: string) {
     return
   }
 
-  const ast = parse(code, { sourceType: 'module', plugins: ['typescript', 'jsx'] })
+  // `as any` because babel-dead-code-elimination using @types and it conflicts :/
+  const ast = parse(code, { sourceType: 'module', plugins: ['typescript', 'jsx'] }) as any
+
   const referenced = findReferencedIdentifiers(ast)
 
   const removed = {

package/types/Root.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Root.d.ts","sourceRoot":"","sources":["../src/Root.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,wBAAwB,EAC9B,MAAM,0BAA0B,CAAA;AAEjC,OAAO,EAOL,KAAK,iBAAiB,EACtB,KAAK,SAAS,EACf,MAAM,OAAO,CAAA;AAOd,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAKlD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAEvC,KAAK,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG;IAC7C,UAAU,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAA;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,EAAE,mBAAmB,CAAA;IAC3B,YAAY,CAAC,EAAE,GAAG,CAAC,YAAY,CAAA;CAChC,CAAA;AAED,KAAK,UAAU,GAAG;IAChB,OAAO,EAAE,GAAG,CAAC,YAAY,CAAA;IACzB,QAAQ,CAAC,EAAE,GAAG,CAAA;IACd,OAAO,CAAC,EAAE,iBAAiB,CAAC;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,CAAC,CAAA;IACpD,wBAAwB,CAAC,EAAE,wBAAwB,GAAG;QACpD,KAAK,CAAC,EAAE;YACN,IAAI,EAAE,OAAO,CAAA;YACb,MAAM,EAAE;gBACN,OAAO,EAAE,MAAM,CAAA;gBACf,UAAU,EAAE,MAAM,CAAA;gBAClB,IAAI,EAAE,MAAM,CAAA;gBACZ,IAAI,EAAE,MAAM,CAAA;gBACZ,MAAM,EAAE,MAAM,CAAA;gBACd,YAAY,EAAE,MAAM,CAAA;aACrB,CAAA;SACF,CAAA;KACF,CAAA;CACF,CAAA;AAOD,wBAAgB,IAAI,CAAC,KAAK,EAAE,SAAS,kDAsFpC"}
+{"version":3,"file":"Root.d.ts","sourceRoot":"","sources":["../src/Root.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,wBAAwB,EAC9B,MAAM,0BAA0B,CAAA;AAEjC,OAAO,EAOL,KAAK,iBAAiB,EACtB,KAAK,SAAS,EACf,MAAM,OAAO,CAAA;AAOd,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAKlD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAEvC,KAAK,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG;IAC7C,UAAU,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAA;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,EAAE,mBAAmB,CAAA;IAC3B,YAAY,CAAC,EAAE,GAAG,CAAC,YAAY,CAAA;CAChC,CAAA;AAED,KAAK,UAAU,GAAG;IAChB,OAAO,EAAE,GAAG,CAAC,YAAY,CAAA;IACzB,QAAQ,CAAC,EAAE,GAAG,CAAA;IACd,OAAO,CAAC,EAAE,iBAAiB,CAAC;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,CAAC,CAAA;IACpD,wBAAwB,CAAC,EAAE,wBAAwB,GAAG;QACpD,KAAK,CAAC,EAAE;YACN,IAAI,EAAE,OAAO,CAAA;YACb,MAAM,EAAE;gBACN,OAAO,EAAE,MAAM,CAAA;gBACf,UAAU,EAAE,MAAM,CAAA;gBAClB,IAAI,EAAE,MAAM,CAAA;gBACZ,IAAI,EAAE,MAAM,CAAA;gBACZ,MAAM,EAAE,MAAM,CAAA;gBACd,YAAY,EAAE,MAAM,CAAA;aACrB,CAAA;SACF,CAAA;KACF,CAAA;CACF,CAAA;AAOD,wBAAgB,IAAI,CAAC,KAAK,EAAE,SAAS,kDAwFpC"}

package/types/serve.d.ts

@@ -1,6 +1,9 @@
 import './polyfills-server';
+import type { Hono } from 'hono';
 import type { VXRNOptions } from 'vxrn';
-export declare function serve(args?: VXRNOptions['server']): Promise<void | import("hono").Hono<import("hono/types").BlankEnv, import("hono/types").BlankSchema, "/"> | {
+export declare function serve(args?: VXRNOptions['server'] & {
+    app?: Hono;
+}): Promise<void | Hono<import("hono/types").BlankEnv, import("hono/types").BlankSchema, "/"> | {
     handler: (req: Request) => Response | Promise<Response>;
     GET: (req: Request) => Response | Promise<Response>;
     POST: (req: Request) => Response | Promise<Response>;

package/types/serve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../src/serve.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,CAAA;AAG3B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,MAAM,CAAA;AAUvC,wBAAsB,KAAK,CAAC,IAAI,GAAE,WAAW,CAAC,QAAQ,CAAM;;;;;;;GAqC3D"}
+{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../src/serve.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,CAAA;AAG3B,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAChC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,MAAM,CAAA;AAUvC,wBAAsB,KAAK,CAAC,IAAI,GAAE,WAAW,CAAC,QAAQ,CAAC,GAAG;IAAE,GAAG,CAAC,EAAE,IAAI,CAAA;CAAO;;;;;;;GAsC5E"}

package/types/server/oneServe.d.ts

@@ -1,4 +1,4 @@
 import type { Hono } from 'hono';
 import type { One } from '../vite/types';
-export declare function oneServe(oneOptions: One.PluginOptions, buildInfo: One.BuildInfo, app: Hono, serveStatic?: boolean): Promise<void>;
+export declare function oneServe(oneOptions: One.PluginOptions, buildInfo: One.BuildInfo, app: Hono): Promise<void>;
 //# sourceMappingURL=oneServe.d.ts.map

package/types/server/oneServe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oneServe.d.ts","sourceRoot":"","sources":["../../src/server/oneServe.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAqB,MAAM,MAAM,CAAA;AASnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAGxC,wBAAsB,QAAQ,CAC5B,UAAU,EAAE,GAAG,CAAC,aAAa,EAC7B,SAAS,EAAE,GAAG,CAAC,SAAS,EACxB,GAAG,EAAE,IAAI,EACT,WAAW,UAAO,iBAyOnB"}
+{"version":3,"file":"oneServe.d.ts","sourceRoot":"","sources":["../../src/server/oneServe.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAqB,MAAM,MAAM,CAAA;AASnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAGxC,wBAAsB,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,iBAwOhG"}

package/types/utils/getHonoPath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getHonoPath.d.ts","sourceRoot":"","sources":["../../src/utils/getHonoPath.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,UAgBvC"}
+{"version":3,"file":"getHonoPath.d.ts","sourceRoot":"","sources":["../../src/utils/getHonoPath.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,UAmBvC"}

package/types/vite/plugins/clientTreeShakePlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clientTreeShakePlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/clientTreeShakePlugin.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAOlC,eAAO,MAAM,qBAAqB,QAAO,MA6BxC,CAAA;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;;;;;;;;;;;eAqEtE"}
+{"version":3,"file":"clientTreeShakePlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/clientTreeShakePlugin.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAMlC,eAAO,MAAM,qBAAqB,QAAO,MA6BxC,CAAA;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;;;;;;;;;;;eAuEtE"}