vocs 2.0.2 → 2.0.3

package/dist/waku/internal/middleware/trailing-slash.d.ts

@@ -3,12 +3,18 @@ import type { MiddlewareHandler } from 'hono';
  * Removes trailing slashes from URLs.
  *
  * Redirects `/about/` → `/about` with a 308 Permanent Redirect.
- * Skips the root path (`/`) and paths with file extensions.
+ * Skips the root path (`/`), configured base path root, and paths with file
+ * extensions.
  *
  * Uses relative Location values so redirects work correctly behind
  * TLS-terminating reverse proxies, where the internal request URL
  * may use `http://`.
  */
-export declare const trailingSlash: () => MiddlewareHandler;
+export declare const trailingSlash: (options?: trailingSlash.Options) => MiddlewareHandler;
 export default trailingSlash;
+export declare namespace trailingSlash {
+    type Options = {
+        basePath?: string | undefined;
+    };
+}
 //# sourceMappingURL=trailing-slash.d.ts.map

package/dist/waku/internal/middleware/trailing-slash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trailing-slash.d.ts","sourceRoot":"","sources":["../../../../src/waku/internal/middleware/trailing-slash.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAA;AAG7C;;;;;;;;;GASG;AACH,eAAO,MAAM,aAAa,QAAO,iBAgBhC,CAAA;AAED,eAAe,aAAa,CAAA"}
+{"version":3,"file":"trailing-slash.d.ts","sourceRoot":"","sources":["../../../../src/waku/internal/middleware/trailing-slash.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAA;AAM7C;;;;;;;;;;GAUG;AACH,eAAO,MAAM,aAAa,GAAI,UAAS,aAAa,CAAC,OAAY,KAAG,iBAuBnE,CAAA;AAED,eAAe,aAAa,CAAA;AAE5B,MAAM,CAAC,OAAO,WAAW,aAAa,CAAC;IACrC,KAAK,OAAO,GAAG;QACb,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAC9B,CAAA;CACF"}

package/dist/waku/internal/middleware/trailing-slash.js

@@ -1,19 +1,26 @@
+import * as Config from '../../../internal/config.js';
 import { appendSearch } from '../../../internal/redirects.js';
+const normalizeBasePath = (basePath) => (basePath.endsWith('/') ? basePath : `${basePath}/`);
 /**
  * Removes trailing slashes from URLs.
  *
  * Redirects `/about/` → `/about` with a 308 Permanent Redirect.
- * Skips the root path (`/`) and paths with file extensions.
+ * Skips the root path (`/`), configured base path root, and paths with file
+ * extensions.
  *
  * Uses relative Location values so redirects work correctly behind
  * TLS-terminating reverse proxies, where the internal request URL
  * may use `http://`.
  */
-export const trailingSlash = () => {
+export const trailingSlash = (options = {}) => {
+    const basePathPromise = options.basePath !== undefined
+        ? Promise.resolve(normalizeBasePath(options.basePath))
+        : Config.resolve({ server: true }).then((config) => normalizeBasePath(config.basePath));
     return async (context, next) => {
         const url = new URL(context.req.url);
-        // Skip root path and paths with file extensions
-        if (url.pathname === '/' || /\.\w+$/.test(url.pathname))
+        const basePath = await basePathPromise;
+        // Skip root path, base path root, and paths with file extensions
+        if (url.pathname === '/' || url.pathname === basePath || /\.\w+$/.test(url.pathname))
             return next();
         // Redirect trailing slash to non-trailing slash
         if (url.pathname.endsWith('/')) {

package/dist/waku/internal/middleware/trailing-slash.js.map

@@ -1 +1 @@
-{"version":3,"file":"trailing-slash.js","sourceRoot":"","sources":["../../../../src/waku/internal/middleware/trailing-slash.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAA;AAE7D;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,GAAsB,EAAE;IACnD,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QAC7B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAEpC,gDAAgD;QAChD,IAAI,GAAG,CAAC,QAAQ,KAAK,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC;YAAE,OAAO,IAAI,EAAE,CAAA;QAEtE,gDAAgD;QAChD,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;YACvE,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,CAAA;YAChD,OAAM;QACR,CAAC;QAED,OAAO,IAAI,EAAE,CAAA;IACf,CAAC,CAAA;AACH,CAAC,CAAA;AAED,eAAe,aAAa,CAAA"}
+{"version":3,"file":"trailing-slash.js","sourceRoot":"","sources":["../../../../src/waku/internal/middleware/trailing-slash.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAA;AAE7D,MAAM,iBAAiB,GAAG,CAAC,QAAgB,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,GAAG,CAAC,CAAA;AAEpG;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,UAAiC,EAAE,EAAqB,EAAE;IACtF,MAAM,eAAe,GACnB,OAAO,CAAC,QAAQ,KAAK,SAAS;QAC5B,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACtD,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAA;IAE3F,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QAC7B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACpC,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAA;QAEtC,iEAAiE;QACjE,IAAI,GAAG,CAAC,QAAQ,KAAK,GAAG,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClF,OAAO,IAAI,EAAE,CAAA;QAEf,gDAAgD;QAChD,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;YACvE,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,CAAA;YAChD,OAAM;QACR,CAAC;QAED,OAAO,IAAI,EAAE,CAAA;IACf,CAAC,CAAA;AACH,CAAC,CAAA;AAED,eAAe,aAAa,CAAA"}

package/dist/waku/middleware.d.ts

@@ -1,7 +1,7 @@
 import * as middleware from './internal/middleware/index.js';
 export declare function middlewareModules(overrides?: Record<string, () => Promise<unknown>>): {
     [x: string]: (() => Promise<unknown>) | (() => Promise<{
-        default: typeof middleware.mdRouter | (() => import("hono").MiddlewareHandler) | (() => import("hono").MiddlewareHandler);
+        default: typeof middleware.mdRouter | (() => import("hono").MiddlewareHandler) | ((options?: middleware.trailingSlash.Options) => import("hono").MiddlewareHandler);
     }>);
 };
 //# sourceMappingURL=middleware.d.ts.map

package/dist/waku/vite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite.d.ts","sourceRoot":"","sources":["../../src/waku/vite.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AACxC,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,aAAa,CAAA;AAMvD;;;;;GAKG;AACH,wBAAsB,IAAI,CAAC,OAAO,GAAE,IAAI,CAAC,OAAY,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CA8C9E;AAED,MAAM,CAAC,OAAO,WAAW,IAAI,CAAC;IAC5B,KAAK,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,QAAQ,GAAG,MAAM,CAAC,CAAA;CAChE"}
+{"version":3,"file":"vite.d.ts","sourceRoot":"","sources":["../../src/waku/vite.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AACxC,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,aAAa,CAAA;AAMvD;;;;;GAKG;AACH,wBAAsB,IAAI,CAAC,OAAO,GAAE,IAAI,CAAC,OAAY,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CA+C9E;AAED,MAAM,CAAC,OAAO,WAAW,IAAI,CAAC;IAC5B,KAAK,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,QAAQ,GAAG,MAAM,CAAC,CAAA;CAChE"}

package/dist/waku/vite.js

@@ -13,8 +13,9 @@ export async function vocs(options = {}) {
     const { privateDir = 'private', rscBase = 'RSC', unstable_adapter = getDefaultAdapter(), } = options;
     const config = await Config.resolve();
     const { basePath, srcDir, outDir } = config;
+    const wakuBasePath = basePath.endsWith('/') ? basePath : `${basePath}/`;
     const wakuConfig = {
-        basePath,
+        basePath: wakuBasePath,
         srcDir,
         distDir: outDir,
         privateDir,

package/dist/waku/vite.js.map

@@ -1 +1 @@
-{"version":3,"file":"vite.js","sourceRoot":"","sources":["../../src/waku/vite.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,oBAAoB,CAAA;AAG1C,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAA;AAC/C,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAA;AAC/E,OAAO,KAAK,OAAO,MAAM,4BAA4B,CAAA;AAErD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,UAAwB,EAAE;IACnD,MAAM,EACJ,UAAU,GAAG,SAAS,EACtB,OAAO,GAAG,KAAK,EACf,gBAAgB,GAAG,iBAAiB,EAAE,GACvC,GAAG,OAAO,CAAA;IAEX,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,CAAA;IACrC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;IAE3C,MAAM,UAAU,GAAG;QACjB,QAAQ;QACR,MAAM;QACN,OAAO,EAAE,MAAM;QACf,UAAU;QACV,OAAO;QACP,gBAAgB;QAChB,IAAI,EAAE,EAAE;KACT,CAAA;IAED,OAAO;QACL,SAAS,EAAE;QACX,OAAO,CAAC,WAAW,EAAE;QACrB,SAAS,CAAC;YACR,aAAa,EAAE,KAAK;YACpB,iBAAiB,EAAE,IAAI;YACvB,eAAe,EAAE,IAAI;YACrB,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW;SACzC,CAAC;QACF,OAAO,CAAC,MAAM,EAAE;QAChB,OAAO,CAAC,OAAO,EAAE;QACjB,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC;QAChC,OAAO,CAAC,WAAW,CAAC,UAAU,EAAE,MAAM,CAAC;QACvC,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC;QACjC,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC;QAChC,OAAO,CAAC,QAAQ,EAAE;QAClB,OAAO,CAAC,SAAS,EAAE;QACnB,OAAO,CAAC,mBAAmB,EAAE;QAC7B,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC;QACjC,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC;QAC/B,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC;QAC9B,OAAO,CAAC,SAAS,EAAE;QACnB,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC;QACnC,OAAO,CAAC,OAAO,EAAE;QACjB,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC;KAC3B,CAAA;AACH,CAAC"}
+{"version":3,"file":"vite.js","sourceRoot":"","sources":["../../src/waku/vite.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,oBAAoB,CAAA;AAG1C,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAA;AAC/C,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAA;AAC/E,OAAO,KAAK,OAAO,MAAM,4BAA4B,CAAA;AAErD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,UAAwB,EAAE;IACnD,MAAM,EACJ,UAAU,GAAG,SAAS,EACtB,OAAO,GAAG,KAAK,EACf,gBAAgB,GAAG,iBAAiB,EAAE,GACvC,GAAG,OAAO,CAAA;IAEX,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,CAAA;IACrC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;IAC3C,MAAM,YAAY,GAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,GAAG,CAAA;IAEvE,MAAM,UAAU,GAAG;QACjB,QAAQ,EAAE,YAAY;QACtB,MAAM;QACN,OAAO,EAAE,MAAM;QACf,UAAU;QACV,OAAO;QACP,gBAAgB;QAChB,IAAI,EAAE,EAAE;KACT,CAAA;IAED,OAAO;QACL,SAAS,EAAE;QACX,OAAO,CAAC,WAAW,EAAE;QACrB,SAAS,CAAC;YACR,aAAa,EAAE,KAAK;YACpB,iBAAiB,EAAE,IAAI;YACvB,eAAe,EAAE,IAAI;YACrB,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW;SACzC,CAAC;QACF,OAAO,CAAC,MAAM,EAAE;QAChB,OAAO,CAAC,OAAO,EAAE;QACjB,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC;QAChC,OAAO,CAAC,WAAW,CAAC,UAAU,EAAE,MAAM,CAAC;QACvC,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC;QACjC,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC;QAChC,OAAO,CAAC,QAAQ,EAAE;QAClB,OAAO,CAAC,SAAS,EAAE;QACnB,OAAO,CAAC,mBAAmB,EAAE;QAC7B,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC;QACjC,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC;QAC/B,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC;QAC9B,OAAO,CAAC,SAAS,EAAE;QACnB,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC;QACnC,OAAO,CAAC,OAAO,EAAE;QACjB,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC;KAC3B,CAAA;AACH,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vocs",
   "type": "module",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "main": "./dist/index.js",
   "license": "MIT",
   "repository": {

package/src/waku/internal/middleware/trailing-slash.test.ts

@@ -6,9 +6,9 @@ import { trailingSlash } from './trailing-slash.js'
  * Creates a Hono app with trailing-slash middleware and a catch-all handler,
  * then sends a request to the given path.
  */
-function request(path: string) {
+function request(path: string, options?: trailingSlash.Options) {
   const app = new Hono()
-  app.use('*', trailingSlash())
+  app.use('*', trailingSlash(options))
   app.get('*', (c) => c.text('ok'))
   return app.request(path)
 }
@@ -31,6 +31,13 @@ describe('trailingSlash', () => {
     expect(res.status).toBe(200)
   })
 
+  it('skips configured base path root', async () => {
+    const res = await request('http://localhost/open-source/', {
+      basePath: '/open-source',
+    })
+    expect(res.status).toBe(200)
+  })
+
   it('skips paths with file extensions', async () => {
     const res = await request('http://localhost/styles.css')
     expect(res.status).toBe(200)

package/src/waku/internal/middleware/trailing-slash.ts

@@ -1,22 +1,33 @@
 import type { MiddlewareHandler } from 'hono'
+import * as Config from '../../../internal/config.js'
 import { appendSearch } from '../../../internal/redirects.js'
 
+const normalizeBasePath = (basePath: string) => (basePath.endsWith('/') ? basePath : `${basePath}/`)
+
 /**
  * Removes trailing slashes from URLs.
  *
  * Redirects `/about/` → `/about` with a 308 Permanent Redirect.
- * Skips the root path (`/`) and paths with file extensions.
+ * Skips the root path (`/`), configured base path root, and paths with file
+ * extensions.
  *
  * Uses relative Location values so redirects work correctly behind
  * TLS-terminating reverse proxies, where the internal request URL
  * may use `http://`.
  */
-export const trailingSlash = (): MiddlewareHandler => {
+export const trailingSlash = (options: trailingSlash.Options = {}): MiddlewareHandler => {
+  const basePathPromise =
+    options.basePath !== undefined
+      ? Promise.resolve(normalizeBasePath(options.basePath))
+      : Config.resolve({ server: true }).then((config) => normalizeBasePath(config.basePath))
+
   return async (context, next) => {
     const url = new URL(context.req.url)
+    const basePath = await basePathPromise
 
-    // Skip root path and paths with file extensions
-    if (url.pathname === '/' || /\.\w+$/.test(url.pathname)) return next()
+    // Skip root path, base path root, and paths with file extensions
+    if (url.pathname === '/' || url.pathname === basePath || /\.\w+$/.test(url.pathname))
+      return next()
 
     // Redirect trailing slash to non-trailing slash
     if (url.pathname.endsWith('/')) {
@@ -30,3 +41,9 @@ export const trailingSlash = (): MiddlewareHandler => {
 }
 
 export default trailingSlash
+
+export declare namespace trailingSlash {
+  type Options = {
+    basePath?: string | undefined
+  }
+}

package/src/waku/vite.ts

@@ -21,9 +21,10 @@ export async function vocs(options: vocs.Options = {}): Promise<PluginOption[]>
 
   const config = await Config.resolve()
   const { basePath, srcDir, outDir } = config
+  const wakuBasePath = basePath.endsWith('/') ? basePath : `${basePath}/`
 
   const wakuConfig = {
-    basePath,
+    basePath: wakuBasePath,
     srcDir,
     distDir: outDir,
     privateDir,