@rooted-adapters/express 1.0.0-alpha.6 → 1.0.0-alpha.7

package/dist/{index.d.mts → express.d.mts}

@@ -1,29 +1,7 @@
+import { t as ExpressMiddleware } from "./middleware-BkXcT-qH.mjs";
 import { AdapterRoutes } from "@rooted/adapter";
-import { Express } from "express";
 import { Plugin } from "vite";
-//#region src/index.d.mts
-/**
- * An Express middleware function for use with {@link ExpressAdapterOptions.middlewarePath}.
- * Receives the Express instance and may register middleware or routes on it.
- */
-type ExpressMiddleware = (app: Express) => Promise<void> | void;
-/**
- * Identity helper that types a middleware function for the express adapter.
- * Use it as the default export of a file under your `middlewarePath` folder so
- * editors pick up the Express instance type without extra annotations.
- *
- * @example
- * ```ts
- * // src/server-middleware/01-api-proxy.mts
- * import { createMiddleware } from '@rooted-adapters/express'
- * import { createProxyMiddleware } from 'http-proxy-middleware'
- *
- * export default createMiddleware((app) => {
- *   app.use('/api', createProxyMiddleware({ target: process.env.API_URL }))
- * })
- * ```
- */
-declare function createMiddleware(handler: ExpressMiddleware): ExpressMiddleware;
+//#region src/adapter.d.mts
 /**
  * Options for {@link expressAdapter}.
  */
@@ -41,6 +19,11 @@ type ExpressAdapterOptions = {
    * order, so numeric prefixes (`01-auth.mts`, `02-proxy.mts`) control load order.
    * Middleware runs before the rooted static-file and route handlers.
    *
+   * The same files also run during `vite dev` and `vite preview`, on Vite's own
+   * port, so you don't need a second process to reach them. Dev loads the
+   * sources through Vite, preview runs the built `dist/middleware/*.mjs`.
+   * See the [server middleware guide](https://github.com/Marvin-Brouwer/rooted/blob/main/docs/advanced/server-middleware.md).
+   *
    * @example
    * ```ts
    * expressAdapter({ middlewarePath: './src/server-middleware' })
@@ -48,7 +31,7 @@ type ExpressAdapterOptions = {
    *
    * ```ts
    * // src/server-middleware/01-api-proxy.mts
-   * import { createMiddleware } from '@rooted-adapters/express'
+   * import { createMiddleware } from '@rooted-adapters/express/middleware'
    * import { createProxyMiddleware } from 'http-proxy-middleware'
    *
    * export default createMiddleware((app) => {
@@ -70,13 +53,19 @@ type ExpressAdapterOptions = {
  * Users start the server with `node dist/server.mjs`. The `PORT` environment variable
  * controls the port (default: 3000).
  *
+ * Returns several plugins: the build-time adapter, the not-found handler that
+ * gives `vite dev` and `vite preview` the same 404s and redirects as the
+ * generated server, and one that runs `middlewarePath` on Vite's own port. Vite
+ * flattens nested plugin arrays, so it still goes straight into `plugins` as
+ * one entry.
+ *
  * Requires `express >= 5.0.0` in the project.
  *
  * @example `vite.config.ts`
  * ```ts
  * import { rootedManifest } from '@rooted/application'
  * import { generateRouteManifest } from '@rooted/router/manifest'
- * import { expressAdapter } from '@rooted-adapters/express'
+ * import { expressAdapter } from '@rooted-adapters/express/middleware'
  *
  * export default rootedManifest({
  *   plugins: [
@@ -86,7 +75,7 @@ type ExpressAdapterOptions = {
  * })
  * ```
  */
-declare function expressAdapter(options?: ExpressAdapterOptions): Plugin;
+declare function expressAdapter(options?: ExpressAdapterOptions): Plugin[];
 //#endregion
-export { ExpressAdapterOptions, ExpressMiddleware, createMiddleware, expressAdapter };
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC5tdHMiLCJuYW1lcyI6W10sInNvdXJjZXMiOlsiLi4vc3JjL2luZGV4Lm10cyJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7S0FlWSxxQkFBcUIsS0FBSyxZQUFZOzs7Ozs7Ozs7Ozs7Ozs7OztpQkFrQmxDLGlCQUFpQixTQUFTLG9CQUFvQjs7OztLQU9sRDs7Ozs7RUFLWCxTQUFTOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7RUF3QlQ7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztpQkErQmUsZUFBZSxVQUFVLHdCQUF3QiJ9
+export { ExpressAdapterOptions, type ExpressMiddleware, expressAdapter };
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhwcmVzcy5kLm10cyIsIm5hbWVzIjpbXSwic291cmNlcyI6WyIuLi9zcmMvYWRhcHRlci5tdHMiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7S0FlWTs7Ozs7RUFLWCxTQUFTOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztFQTZCVDs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O2lCQXFDZSxlQUFlLFVBQVUsd0JBQXdCIn0=

package/dist/express.mjs

@@ -0,0 +1,109 @@
+import { writeFile } from "node:fs/promises";
+import path from "node:path";
+import { buildMiddlewareBlock, buildServerPreamble, routedAdapter } from "@rooted/adapter";
+//#region src/development-server.mts
+/**
+* Builds the Express instance that runs the `middlewarePath` files during
+* `vite dev` and `vite preview`. Anything Express has no route for falls back
+* to Vite.
+*/
+async function createExpressServer(middleware) {
+	const { default: express } = await import("express");
+	const app = express();
+	for (const register of middleware) await register(app);
+	return { handle: app };
+}
+//#endregion
+//#region src/server-template.mts
+/**
+* Builds the `server.mjs` that ships in the output directory. Everything up to
+* the Express instance is shared with the other node adapters; what follows is
+* the part only Express does.
+*/
+function buildExpressTemplate(hasMiddleware) {
+	return `${buildServerPreamble({
+		frameworkImports: `import express from 'express'`,
+		hasMiddleware
+	})}const app = express()
+${buildMiddlewareBlock(hasMiddleware)}
+// Canonical slash, after your middleware so an API route it owns is never
+// redirected out from under it.
+app.use((req, res, next) => {
+  const target = (req.method === 'GET' || req.method === 'HEAD') ? canonicalRedirect(req.url) : undefined
+  if (target) return res.redirect(301, target)
+  next()
+})
+
+// Serves all pre-rendered HTML files and static assets automatically
+app.use(base, express.static(__dirname))
+
+// Parameterized routes: Express uses the same :param syntax as the rooted router
+for (const route of dynamicRoutes) {
+  app.get(prefix + route, (_req, res) =>
+    res.status(200).type('html').send(fallbackHtml)
+  )
+}
+
+// Anything else is a real 404. Navigations still get the SPA shell so the
+// browser-side router can render a 404 page; everything else gets an empty
+// body, because answering an image request with HTML only confuses things.
+app.use((req, res) => {
+  if (!(req.headers.accept ?? '').includes('text/html')) return res.status(404).end()
+  res.status(404).type('html').send(fallbackHtml)
+})
+
+const port = Number(process.env.PORT ?? 3000)
+app.listen(port, '0.0.0.0', () => console.log(\`Listening on http://0.0.0.0:\${port}\`))
+`;
+}
+//#endregion
+//#region src/adapter.mts
+/**
+* Adapter for server-side hosting with Express.
+*
+* Writes `routes.json` and a ready-to-run `server.mjs` to the output directory.
+* The server uses `express.static` to serve pre-rendered HTML files and registers
+* explicit handlers for parameterized routes (which serve the `404.html` SPA shell
+* so the browser-side router renders the correct content). Express uses the same
+* `:param` syntax as the rooted router, so patterns map directly.
+*
+* Users start the server with `node dist/server.mjs`. The `PORT` environment variable
+* controls the port (default: 3000).
+*
+* Returns several plugins: the build-time adapter, the not-found handler that
+* gives `vite dev` and `vite preview` the same 404s and redirects as the
+* generated server, and one that runs `middlewarePath` on Vite's own port. Vite
+* flattens nested plugin arrays, so it still goes straight into `plugins` as
+* one entry.
+*
+* Requires `express >= 5.0.0` in the project.
+*
+* @example `vite.config.ts`
+* ```ts
+* import { rootedManifest } from '@rooted/application'
+* import { generateRouteManifest } from '@rooted/router/manifest'
+* import { expressAdapter } from '@rooted-adapters/express/middleware'
+*
+* export default rootedManifest({
+*   plugins: [
+*     generateRouteManifest({ glob: './src/**\/_routes.mts', root: './src/_routes.g.mts' }),
+*     expressAdapter(),
+*   ],
+* })
+* ```
+*/
+function expressAdapter(options) {
+	return routedAdapter({
+		name: "rooted:express",
+		routes: options?.routes,
+		middlewarePath: options?.middlewarePath,
+		createServer: createExpressServer,
+		async setup({ outputDirectory }) {
+			await writeFile(path.join(outputDirectory, "server.mjs"), buildExpressTemplate(!!options?.middlewarePath), "utf8");
+		}
+	});
+}
+//#endregion
+export { expressAdapter };
+
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"express.mjs","names":[],"sources":["../src/development-server.mts","../src/server-template.mts","../src/adapter.mts"],"sourcesContent":["import type { NodeMiddlewareHandler } from '@rooted/adapter'\nimport type { Express } from 'express'\nimport type { Connect } from 'vite'\n\n/**\n * Builds the Express instance that runs the `middlewarePath` files during\n * `vite dev` and `vite preview`. Anything Express has no route for falls back\n * to Vite.\n */\nexport async function createExpressServer(\n\tmiddleware: ReadonlyArray<(app: Express) => Promise<void>>,\n): Promise<NodeMiddlewareHandler> {\n\tconst { default: express } = await import('express')\n\tconst app = express()\n\n\tfor (const register of middleware) await register(app)\n\n\t// An Express app is already a connect handler. Handed a third\n\t// argument its router calls that instead of sending its own 404, so\n\t// unmatched paths fall through. The cast is because the types only\n\t// declare the two-argument form.\n\treturn { handle: app as unknown as Connect.NextHandleFunction }\n}\n","import { buildMiddlewareBlock, buildServerPreamble } from '@rooted/adapter'\n\n/**\n * Builds the `server.mjs` that ships in the output directory. Everything up to\n * the Express instance is shared with the other node adapters; what follows is\n * the part only Express does.\n */\nexport function buildExpressTemplate(hasMiddleware: boolean): string {\n\tconst preamble = buildServerPreamble({\n\t\tframeworkImports: `import express from 'express'`,\n\t\thasMiddleware,\n\t})\n\n\treturn `${preamble}const app = express()\n${buildMiddlewareBlock(hasMiddleware)}\n// Canonical slash, after your middleware so an API route it owns is never\n// redirected out from under it.\napp.use((req, res, next) => {\n  const target = (req.method === 'GET' || req.method === 'HEAD') ? canonicalRedirect(req.url) : undefined\n  if (target) return res.redirect(301, target)\n  next()\n})\n\n// Serves all pre-rendered HTML files and static assets automatically\napp.use(base, express.static(__dirname))\n\n// Parameterized routes: Express uses the same :param syntax as the rooted router\nfor (const route of dynamicRoutes) {\n  app.get(prefix + route, (_req, res) =>\n    res.status(200).type('html').send(fallbackHtml)\n  )\n}\n\n// Anything else is a real 404. Navigations still get the SPA shell so the\n// browser-side router can render a 404 page; everything else gets an empty\n// body, because answering an image request with HTML only confuses things.\napp.use((req, res) => {\n  if (!(req.headers.accept ?? '').includes('text/html')) return res.status(404).end()\n  res.status(404).type('html').send(fallbackHtml)\n})\n\nconst port = Number(process.env.PORT ?? 3000)\napp.listen(port, '0.0.0.0', () => console.log(\\`Listening on http://0.0.0.0:\\${port}\\`))\n`\n}\n","import { writeFile } from 'node:fs/promises'\nimport path from 'node:path'\n\nimport { routedAdapter } from '@rooted/adapter'\n\nimport { createExpressServer } from './development-server.mts'\nimport { buildExpressTemplate } from './server-template.mts'\n\nimport type { AdapterRoutes } from '@rooted/adapter'\nimport type { Express } from 'express'\nimport type { Plugin } from 'vite'\n\n/**\n * Options for {@link expressAdapter}.\n */\nexport type ExpressAdapterOptions = {\n\t/**\n\t * Manual route list for projects that don't use `generateRouteManifest`.\n\t * See {@link AdapterRoutes}.\n\t */\n\troutes?: AdapterRoutes\n\t/**\n\t * Path to a folder of middleware files, relative to the Vite project root.\n\t * Files can be `.mts`, `.ts`, `.mjs`, or `.js` -- TypeScript is transpiled with\n\t * rolldown at build time. Each file must export a default `function(app)` that\n\t * registers middleware on the Express instance. Files are loaded in lexicographic\n\t * order, so numeric prefixes (`01-auth.mts`, `02-proxy.mts`) control load order.\n\t * Middleware runs before the rooted static-file and route handlers.\n\t *\n\t * The same files also run during `vite dev` and `vite preview`, on Vite's own\n\t * port, so you don't need a second process to reach them. Dev loads the\n\t * sources through Vite, preview runs the built `dist/middleware/*.mjs`.\n\t * See the [server middleware guide](https://github.com/Marvin-Brouwer/rooted/blob/main/docs/advanced/server-middleware.md).\n\t *\n\t * @example\n\t * ```ts\n\t * expressAdapter({ middlewarePath: './src/server-middleware' })\n\t * ```\n\t *\n\t * ```ts\n\t * // src/server-middleware/01-api-proxy.mts\n\t * import { createMiddleware } from '@rooted-adapters/express/middleware'\n\t * import { createProxyMiddleware } from 'http-proxy-middleware'\n\t *\n\t * export default createMiddleware((app) => {\n\t *   app.use('/api', createProxyMiddleware({ target: process.env.API_URL }))\n\t * })\n\t * ```\n\t */\n\tmiddlewarePath?: string\n}\n\n/**\n * Adapter for server-side hosting with Express.\n *\n * Writes `routes.json` and a ready-to-run `server.mjs` to the output directory.\n * The server uses `express.static` to serve pre-rendered HTML files and registers\n * explicit handlers for parameterized routes (which serve the `404.html` SPA shell\n * so the browser-side router renders the correct content). Express uses the same\n * `:param` syntax as the rooted router, so patterns map directly.\n *\n * Users start the server with `node dist/server.mjs`. The `PORT` environment variable\n * controls the port (default: 3000).\n *\n * Returns several plugins: the build-time adapter, the not-found handler that\n * gives `vite dev` and `vite preview` the same 404s and redirects as the\n * generated server, and one that runs `middlewarePath` on Vite's own port. Vite\n * flattens nested plugin arrays, so it still goes straight into `plugins` as\n * one entry.\n *\n * Requires `express >= 5.0.0` in the project.\n *\n * @example `vite.config.ts`\n * ```ts\n * import { rootedManifest } from '@rooted/application'\n * import { generateRouteManifest } from '@rooted/router/manifest'\n * import { expressAdapter } from '@rooted-adapters/express/middleware'\n *\n * export default rootedManifest({\n *   plugins: [\n *     generateRouteManifest({ glob: './src/**\\/_routes.mts', root: './src/_routes.g.mts' }),\n *     expressAdapter(),\n *   ],\n * })\n * ```\n */\nexport function expressAdapter(options?: ExpressAdapterOptions): Plugin[] {\n\treturn routedAdapter<Express>({\n\t\tname: 'rooted:express',\n\t\troutes: options?.routes,\n\t\tmiddlewarePath: options?.middlewarePath,\n\t\tcreateServer: createExpressServer,\n\t\tasync setup({ outputDirectory }) {\n\t\t\tawait writeFile(\n\t\t\t\tpath.join(outputDirectory, 'server.mjs'),\n\t\t\t\tbuildExpressTemplate(!!options?.middlewarePath),\n\t\t\t\t'utf8',\n\t\t\t)\n\t\t},\n\t})\n}\n"],"mappings":";;;;;;;;;AASA,eAAsB,oBACrB,YACiC;CACjC,MAAM,EAAE,SAAS,YAAY,MAAM,OAAO;CAC1C,MAAM,MAAM,QAAQ;CAEpB,KAAK,MAAM,YAAY,YAAY,MAAM,SAAS,GAAG;CAMrD,OAAO,EAAE,QAAQ,IAA6C;AAC/D;;;;;;;;ACfA,SAAgB,qBAAqB,eAAgC;CAMpE,OAAO,GALU,oBAAoB;EACpC,kBAAkB;EAClB;CACD,CAEiB,EAAE;EAClB,qBAAqB,aAAa,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8BtC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AC0CA,SAAgB,eAAe,SAA2C;CACzE,OAAO,cAAuB;EAC7B,MAAM;EACN,QAAQ,SAAS;EACjB,gBAAgB,SAAS;EACzB,cAAc;EACd,MAAM,MAAM,EAAE,mBAAmB;GAChC,MAAM,UACL,KAAK,KAAK,iBAAiB,YAAY,GACvC,qBAAqB,CAAC,CAAC,SAAS,cAAc,GAC9C,MACD;EACD;CACD,CAAC;AACF"}

package/dist/middleware-BkXcT-qH.d.mts

@@ -0,0 +1,31 @@
+import { Express } from "express";
+//#region src/middleware.d.mts
+/**
+ * An Express middleware function for use with the adapter's `middlewarePath`.
+ * Receives the Express instance and may register middleware or routes on it.
+ */
+type ExpressMiddleware = (app: Express) => Promise<void> | void;
+/**
+ * Identity helper that types a middleware function for the express adapter.
+ * Use it as the default export of a file under your `middlewarePath` folder so
+ * editors pick up the Express instance type without extra annotations.
+ *
+ * It's imported from `@rooted-adapters/express/middleware` rather than the
+ * package root on purpose: the root is the Vite plugin, and your middleware
+ * files get run by the server, not by Vite.
+ *
+ * @example
+ * ```ts
+ * // src/server-middleware/01-api-proxy.mts
+ * import { createMiddleware } from '@rooted-adapters/express/middleware'
+ * import { createProxyMiddleware } from 'http-proxy-middleware'
+ *
+ * export default createMiddleware((app) => {
+ *   app.use('/api', createProxyMiddleware({ target: process.env.API_URL }))
+ * })
+ * ```
+ */
+declare function createMiddleware(handler: ExpressMiddleware): ExpressMiddleware;
+//#endregion
+export { createMiddleware as n, ExpressMiddleware as t };
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZS1Ca1hjVC1xSC5kLm10cyIsIm5hbWVzIjpbXSwic291cmNlcyI6WyIuLi9zcmMvbWlkZGxld2FyZS5tdHMiXSwibWFwcGluZ3MiOiI7Ozs7OztLQVVZLHFCQUFxQixLQUFLLFlBQVk7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztpQkFzQmxDLGlCQUFpQixTQUFTLG9CQUFvQiJ9

package/dist/middleware.d.mts

@@ -0,0 +1,2 @@
+import { n as createMiddleware, t as ExpressMiddleware } from "./middleware-BkXcT-qH.mjs";
+export { ExpressMiddleware, createMiddleware };

package/dist/middleware.mjs

@@ -0,0 +1,28 @@
+//#region src/middleware.mts
+/**
+* Identity helper that types a middleware function for the express adapter.
+* Use it as the default export of a file under your `middlewarePath` folder so
+* editors pick up the Express instance type without extra annotations.
+*
+* It's imported from `@rooted-adapters/express/middleware` rather than the
+* package root on purpose: the root is the Vite plugin, and your middleware
+* files get run by the server, not by Vite.
+*
+* @example
+* ```ts
+* // src/server-middleware/01-api-proxy.mts
+* import { createMiddleware } from '@rooted-adapters/express/middleware'
+* import { createProxyMiddleware } from 'http-proxy-middleware'
+*
+* export default createMiddleware((app) => {
+*   app.use('/api', createProxyMiddleware({ target: process.env.API_URL }))
+* })
+* ```
+*/
+function createMiddleware(handler) {
+	return handler;
+}
+//#endregion
+export { createMiddleware };
+
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZS5tanMiLCJuYW1lcyI6W10sInNvdXJjZXMiOlsiLi4vc3JjL21pZGRsZXdhcmUubXRzIl0sInNvdXJjZXNDb250ZW50IjpbIi8vIERlbGliZXJhdGVseSBmcmVlIG9mIHJ1bnRpbWUgaW1wb3J0cy4gVGhpcyBtb2R1bGUgaXMgbG9hZGVkIGJ5IHRoZSBidWlsdFxuLy8gc2VydmVyIGFuZCBieSBhbnl0aGluZyBlbHNlIHRoYXQgcnVucyBhIG1pZGRsZXdhcmUgZmlsZSwgc28gcHVsbGluZyBpbiB0aGVcbi8vIFZpdGUgcGx1Z2luIChhbmQgdGhyb3VnaCBpdCBAcm9vdGVkL2FkYXB0ZXIgYW5kIGhhcHB5LWRvbSkgd291bGQgYmUgZGVhZFxuLy8gd2VpZ2h0IGF0IHN0YXJ0dXAuIEtlZXAgZXZlcnkgaW1wb3J0IGluIGhlcmUgdHlwZS1vbmx5LlxuaW1wb3J0IHR5cGUgeyBFeHByZXNzIH0gZnJvbSAnZXhwcmVzcydcblxuLyoqXG4gKiBBbiBFeHByZXNzIG1pZGRsZXdhcmUgZnVuY3Rpb24gZm9yIHVzZSB3aXRoIHRoZSBhZGFwdGVyJ3MgYG1pZGRsZXdhcmVQYXRoYC5cbiAqIFJlY2VpdmVzIHRoZSBFeHByZXNzIGluc3RhbmNlIGFuZCBtYXkgcmVnaXN0ZXIgbWlkZGxld2FyZSBvciByb3V0ZXMgb24gaXQuXG4gKi9cbmV4cG9ydCB0eXBlIEV4cHJlc3NNaWRkbGV3YXJlID0gKGFwcDogRXhwcmVzcykgPT4gUHJvbWlzZTx2b2lkPiB8IHZvaWRcblxuLyoqXG4gKiBJZGVudGl0eSBoZWxwZXIgdGhhdCB0eXBlcyBhIG1pZGRsZXdhcmUgZnVuY3Rpb24gZm9yIHRoZSBleHByZXNzIGFkYXB0ZXIuXG4gKiBVc2UgaXQgYXMgdGhlIGRlZmF1bHQgZXhwb3J0IG9mIGEgZmlsZSB1bmRlciB5b3VyIGBtaWRkbGV3YXJlUGF0aGAgZm9sZGVyIHNvXG4gKiBlZGl0b3JzIHBpY2sgdXAgdGhlIEV4cHJlc3MgaW5zdGFuY2UgdHlwZSB3aXRob3V0IGV4dHJhIGFubm90YXRpb25zLlxuICpcbiAqIEl0J3MgaW1wb3J0ZWQgZnJvbSBgQHJvb3RlZC1hZGFwdGVycy9leHByZXNzL21pZGRsZXdhcmVgIHJhdGhlciB0aGFuIHRoZVxuICogcGFja2FnZSByb290IG9uIHB1cnBvc2U6IHRoZSByb290IGlzIHRoZSBWaXRlIHBsdWdpbiwgYW5kIHlvdXIgbWlkZGxld2FyZVxuICogZmlsZXMgZ2V0IHJ1biBieSB0aGUgc2VydmVyLCBub3QgYnkgVml0ZS5cbiAqXG4gKiBAZXhhbXBsZVxuICogYGBgdHNcbiAqIC8vIHNyYy9zZXJ2ZXItbWlkZGxld2FyZS8wMS1hcGktcHJveHkubXRzXG4gKiBpbXBvcnQgeyBjcmVhdGVNaWRkbGV3YXJlIH0gZnJvbSAnQHJvb3RlZC1hZGFwdGVycy9leHByZXNzL21pZGRsZXdhcmUnXG4gKiBpbXBvcnQgeyBjcmVhdGVQcm94eU1pZGRsZXdhcmUgfSBmcm9tICdodHRwLXByb3h5LW1pZGRsZXdhcmUnXG4gKlxuICogZXhwb3J0IGRlZmF1bHQgY3JlYXRlTWlkZGxld2FyZSgoYXBwKSA9PiB7XG4gKiAgIGFwcC51c2UoJy9hcGknLCBjcmVhdGVQcm94eU1pZGRsZXdhcmUoeyB0YXJnZXQ6IHByb2Nlc3MuZW52LkFQSV9VUkwgfSkpXG4gKiB9KVxuICogYGBgXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBjcmVhdGVNaWRkbGV3YXJlKGhhbmRsZXI6IEV4cHJlc3NNaWRkbGV3YXJlKTogRXhwcmVzc01pZGRsZXdhcmUge1xuXHRyZXR1cm4gaGFuZGxlclxufVxuIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFnQ0EsU0FBZ0IsaUJBQWlCLFNBQStDO0NBQy9FLE9BQU87QUFDUiJ9

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rooted-adapters/express",
-	"version": "1.0.0-alpha.6",
+	"version": "1.0.0-alpha.7",
 	"description": "Adapter for server-side hosting with Express",
 	"keywords": [
 		"web-components",
@@ -31,12 +31,16 @@
 	},
 	"exports": {
 		".": {
-			"import": "./dist/index.mjs",
-			"types": "./dist/index.d.mts"
+			"import": "./dist/express.mjs",
+			"types": "./dist/express.d.mts"
+		},
+		"./middleware": {
+			"import": "./dist/middleware.mjs",
+			"types": "./dist/middleware.d.mts"
 		}
 	},
 	"peerDependencies": {
-		"@rooted/adapter": "1.0.0-alpha.6",
+		"@rooted/adapter": "1.0.0-alpha.7",
 		"express": ">= 5.0.0",
 		"rolldown": ">= 1.0.0",
 		"vite": ">= 8.0.1"
@@ -47,12 +51,12 @@
 		}
 	},
 	"devDependencies": {
-		"@rooted/adapter": "1.0.0-alpha.6",
+		"@rooted/adapter": "1.0.0-alpha.7",
 		"@rooted/development": "workspace:*",
 		"@rooted/tsdown": "workspace:^",
 		"@types/express": "^5.0.6",
-		"@types/node": "^26.4.0",
-		"tsx": "^4.23.12",
+		"@types/node": "^26.4.1",
+		"tsx": "^4.23.13",
 		"typescript": "^6.0.3",
 		"vite": "^8.2.2"
 	},

package/readme.md

@@ -29,7 +29,7 @@ export default rootedManifest({
 
 ## Adding middleware
 
-If you need to register Express middleware (proxies, auth, rate-limiting), point `middlewarePath` at a folder of `.mjs` files. Use the `createMiddleware` helper so editors pick up the Express instance type:
+If you need to register Express middleware (proxies, auth, rate-limiting), point `middlewarePath` at a folder of `.mjs` files. Use the `createMiddleware` helper so editors pick up the Express instance type. It comes from the `/middleware` subpath, which carries no dependencies, so your middleware files don't load the Vite plugin at runtime:
 
 ```ts
 expressAdapter({ middlewarePath: './src/server-middleware' })
@@ -37,7 +37,7 @@ expressAdapter({ middlewarePath: './src/server-middleware' })
 
 ```ts
 // src/server-middleware/01-api-proxy.mts
-import { createMiddleware } from '@rooted-adapters/express'
+import { createMiddleware } from '@rooted-adapters/express/middleware'
 import { createProxyMiddleware } from 'http-proxy-middleware'
 
 export default createMiddleware((app) => {
@@ -47,6 +47,8 @@ export default createMiddleware((app) => {
 
 Files can be `.mts`, `.ts`, `.mjs`, or `.js` -- TypeScript is transpiled with rolldown at build time.
 
+The same files run during `vite dev` and `vite preview` too, inside Vite's own process and on Vite's own port. No second entry point and no `server.proxy` entry. Anything the framework has no route for falls through to Vite.
+
 Full details in [advanced/server-middleware](https://github.com/Marvin-Brouwer/rooted/blob/main/docs/advanced/server-middleware.md).
 
 More in the [adapters guide](https://github.com/Marvin-Brouwer/rooted/blob/main/docs/guide/adapters.md).

package/dist/index.mjs

@@ -1,122 +0,0 @@
-import { mkdir, readdir, writeFile } from "node:fs/promises";
-import path from "node:path";
-import { build } from "rolldown";
-import { routedAdapter } from "@rooted/adapter";
-//#region src/index.mts
-/**
-* Identity helper that types a middleware function for the express adapter.
-* Use it as the default export of a file under your `middlewarePath` folder so
-* editors pick up the Express instance type without extra annotations.
-*
-* @example
-* ```ts
-* // src/server-middleware/01-api-proxy.mts
-* import { createMiddleware } from '@rooted-adapters/express'
-* import { createProxyMiddleware } from 'http-proxy-middleware'
-*
-* export default createMiddleware((app) => {
-*   app.use('/api', createProxyMiddleware({ target: process.env.API_URL }))
-* })
-* ```
-*/
-function createMiddleware(handler) {
-	return handler;
-}
-/**
-* Adapter for server-side hosting with Express.
-*
-* Writes `routes.json` and a ready-to-run `server.mjs` to the output directory.
-* The server uses `express.static` to serve pre-rendered HTML files and registers
-* explicit handlers for parameterized routes (which serve the `404.html` SPA shell
-* so the browser-side router renders the correct content). Express uses the same
-* `:param` syntax as the rooted router, so patterns map directly.
-*
-* Users start the server with `node dist/server.mjs`. The `PORT` environment variable
-* controls the port (default: 3000).
-*
-* Requires `express >= 5.0.0` in the project.
-*
-* @example `vite.config.ts`
-* ```ts
-* import { rootedManifest } from '@rooted/application'
-* import { generateRouteManifest } from '@rooted/router/manifest'
-* import { expressAdapter } from '@rooted-adapters/express'
-*
-* export default rootedManifest({
-*   plugins: [
-*     generateRouteManifest({ glob: './src/**\/_routes.mts', root: './src/_routes.g.mts' }),
-*     expressAdapter(),
-*   ],
-* })
-* ```
-*/
-function expressAdapter(options) {
-	return routedAdapter({
-		name: "rooted:express",
-		routes: options?.routes,
-		async setup({ outputDirectory }) {
-			if (options?.middlewarePath) {
-				const sourceDirectory = path.resolve(process.cwd(), options.middlewarePath);
-				const files = (await readdir(sourceDirectory)).filter((f) => MIDDLEWARE_EXTENSIONS.test(f));
-				if (files.length === 0) throw new Error(`[rooted:express] No middleware files (.mts, .ts, .mjs, .js) found in middlewarePath "${options.middlewarePath}"`);
-				const middlewareDirectory = path.join(outputDirectory, "middleware");
-				await mkdir(middlewareDirectory, { recursive: true });
-				for (const file of files) await build({
-					input: path.join(sourceDirectory, file),
-					platform: "node",
-					external: (id) => !id.startsWith(".") && !path.isAbsolute(id),
-					logLevel: "silent",
-					output: {
-						file: path.join(middlewareDirectory, file.replace(MIDDLEWARE_EXTENSIONS, ".mjs")),
-						format: "esm"
-					}
-				});
-			}
-			await writeFile(path.join(outputDirectory, "server.mjs"), buildExpressTemplate(!!options?.middlewarePath), "utf8");
-		}
-	});
-}
-const MIDDLEWARE_EXTENSIONS = /\.(mts|ts|mjs|js)$/;
-function buildExpressTemplate(hasMiddleware) {
-	return `\
-import express from 'express'
-${hasMiddleware ? `import { readFileSync, readdirSync } from 'node:fs'` : `import { readFileSync } from 'node:fs'`}
-import { fileURLToPath } from 'node:url'
-import path from 'node:path'
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
-const { base, dynamicRoutes, fallback } = JSON.parse(
-  readFileSync(path.join(__dirname, 'routes.json'), 'utf8')
-)
-
-const prefix = base.replace(/\\/$/, '')
-const app = express()
-${hasMiddleware ? `
-// User middleware -- applied before rooted handlers
-const middlewareDir = path.join(__dirname, 'middleware')
-for (const file of readdirSync(middlewareDir).filter(f => f.endsWith('.mjs')).sort()) {
-  const mod = await import(path.join(middlewareDir, file))
-  if (mod.default) await mod.default(app)
-}
-` : ""}
-// Serves all pre-rendered HTML files and static assets automatically
-app.use(base, express.static(__dirname))
-
-// Parameterized routes: Express uses the same :param syntax as the rooted router
-for (const route of dynamicRoutes) {
-  app.get(prefix + route, (_req, res) =>
-    res.sendFile(path.join(__dirname, fallback))
-  )
-}
-
-// Anything else: SPA shell (browser-side router shows the correct content or 404)
-app.use((_req, res) => res.sendFile(path.join(__dirname, fallback)))
-
-const port = Number(process.env.PORT ?? 3000)
-app.listen(port, '0.0.0.0', () => console.log(\`Listening on http://0.0.0.0:\${port}\`))
-`;
-}
-//#endregion
-export { createMiddleware, expressAdapter };
-
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"index.mjs","names":[],"sources":["../src/index.mts"],"sourcesContent":["import { mkdir, readdir, writeFile } from 'node:fs/promises'\nimport path from 'node:path'\n\nimport { build } from 'rolldown'\n\nimport { routedAdapter } from '@rooted/adapter'\n\nimport type { AdapterRoutes } from '@rooted/adapter'\nimport type { Express } from 'express'\nimport type { Plugin } from 'vite'\n\n/**\n * An Express middleware function for use with {@link ExpressAdapterOptions.middlewarePath}.\n * Receives the Express instance and may register middleware or routes on it.\n */\nexport type ExpressMiddleware = (app: Express) => Promise<void> | void\n\n/**\n * Identity helper that types a middleware function for the express adapter.\n * Use it as the default export of a file under your `middlewarePath` folder so\n * editors pick up the Express instance type without extra annotations.\n *\n * @example\n * ```ts\n * // src/server-middleware/01-api-proxy.mts\n * import { createMiddleware } from '@rooted-adapters/express'\n * import { createProxyMiddleware } from 'http-proxy-middleware'\n *\n * export default createMiddleware((app) => {\n *   app.use('/api', createProxyMiddleware({ target: process.env.API_URL }))\n * })\n * ```\n */\nexport function createMiddleware(handler: ExpressMiddleware): ExpressMiddleware {\n\treturn handler\n}\n\n/**\n * Options for {@link expressAdapter}.\n */\nexport type ExpressAdapterOptions = {\n\t/**\n\t * Manual route list for projects that don't use `generateRouteManifest`.\n\t * See {@link AdapterRoutes}.\n\t */\n\troutes?: AdapterRoutes\n\t/**\n\t * Path to a folder of middleware files, relative to the Vite project root.\n\t * Files can be `.mts`, `.ts`, `.mjs`, or `.js` -- TypeScript is transpiled with\n\t * rolldown at build time. Each file must export a default `function(app)` that\n\t * registers middleware on the Express instance. Files are loaded in lexicographic\n\t * order, so numeric prefixes (`01-auth.mts`, `02-proxy.mts`) control load order.\n\t * Middleware runs before the rooted static-file and route handlers.\n\t *\n\t * @example\n\t * ```ts\n\t * expressAdapter({ middlewarePath: './src/server-middleware' })\n\t * ```\n\t *\n\t * ```ts\n\t * // src/server-middleware/01-api-proxy.mts\n\t * import { createMiddleware } from '@rooted-adapters/express'\n\t * import { createProxyMiddleware } from 'http-proxy-middleware'\n\t *\n\t * export default createMiddleware((app) => {\n\t *   app.use('/api', createProxyMiddleware({ target: process.env.API_URL }))\n\t * })\n\t * ```\n\t */\n\tmiddlewarePath?: string\n}\n\n/**\n * Adapter for server-side hosting with Express.\n *\n * Writes `routes.json` and a ready-to-run `server.mjs` to the output directory.\n * The server uses `express.static` to serve pre-rendered HTML files and registers\n * explicit handlers for parameterized routes (which serve the `404.html` SPA shell\n * so the browser-side router renders the correct content). Express uses the same\n * `:param` syntax as the rooted router, so patterns map directly.\n *\n * Users start the server with `node dist/server.mjs`. The `PORT` environment variable\n * controls the port (default: 3000).\n *\n * Requires `express >= 5.0.0` in the project.\n *\n * @example `vite.config.ts`\n * ```ts\n * import { rootedManifest } from '@rooted/application'\n * import { generateRouteManifest } from '@rooted/router/manifest'\n * import { expressAdapter } from '@rooted-adapters/express'\n *\n * export default rootedManifest({\n *   plugins: [\n *     generateRouteManifest({ glob: './src/**\\/_routes.mts', root: './src/_routes.g.mts' }),\n *     expressAdapter(),\n *   ],\n * })\n * ```\n */\nexport function expressAdapter(options?: ExpressAdapterOptions): Plugin {\n\treturn routedAdapter({\n\t\tname: 'rooted:express',\n\t\troutes: options?.routes,\n\t\tasync setup({ outputDirectory }) {\n\t\t\tif (options?.middlewarePath) {\n\t\t\t\tconst sourceDirectory = path.resolve(process.cwd(), options.middlewarePath)\n\t\t\t\tconst files = (await readdir(sourceDirectory)).filter(f => MIDDLEWARE_EXTENSIONS.test(f))\n\t\t\t\tif (files.length === 0)\n\t\t\t\t\tthrow new Error(\n\t\t\t\t\t\t`[rooted:express] No middleware files (.mts, .ts, .mjs, .js) found in middlewarePath \"${options.middlewarePath}\"`,\n\t\t\t\t\t)\n\t\t\t\tconst middlewareDirectory = path.join(outputDirectory, 'middleware')\n\t\t\t\tawait mkdir(middlewareDirectory, { recursive: true })\n\t\t\t\tfor (const file of files) {\n\t\t\t\t\tawait build({\n\t\t\t\t\t\tinput: path.join(sourceDirectory, file),\n\t\t\t\t\t\tplatform: 'node',\n\t\t\t\t\t\texternal: id => !id.startsWith('.') && !path.isAbsolute(id),\n\t\t\t\t\t\tlogLevel: 'silent',\n\t\t\t\t\t\toutput: {\n\t\t\t\t\t\t\tfile: path.join(middlewareDirectory, file.replace(MIDDLEWARE_EXTENSIONS, '.mjs')),\n\t\t\t\t\t\t\tformat: 'esm',\n\t\t\t\t\t\t},\n\t\t\t\t\t})\n\t\t\t\t}\n\t\t\t}\n\t\t\tawait writeFile(\n\t\t\t\tpath.join(outputDirectory, 'server.mjs'),\n\t\t\t\tbuildExpressTemplate(!!options?.middlewarePath),\n\t\t\t\t'utf8',\n\t\t\t)\n\t\t},\n\t})\n}\n\nconst MIDDLEWARE_EXTENSIONS = /\\.(mts|ts|mjs|js)$/\n\nfunction buildExpressTemplate(hasMiddleware: boolean): string {\n\tconst fsImport = hasMiddleware\n\t\t? `import { readFileSync, readdirSync } from 'node:fs'`\n\t\t: `import { readFileSync } from 'node:fs'`\n\n\tconst middlewareBlock = hasMiddleware\n\t\t? `\n// User middleware -- applied before rooted handlers\nconst middlewareDir = path.join(__dirname, 'middleware')\nfor (const file of readdirSync(middlewareDir).filter(f => f.endsWith('.mjs')).sort()) {\n  const mod = await import(path.join(middlewareDir, file))\n  if (mod.default) await mod.default(app)\n}\n`\n\t\t: ''\n\n\treturn `\\\nimport express from 'express'\n${fsImport}\nimport { fileURLToPath } from 'node:url'\nimport path from 'node:path'\n\nconst __dirname = path.dirname(fileURLToPath(import.meta.url))\nconst { base, dynamicRoutes, fallback } = JSON.parse(\n  readFileSync(path.join(__dirname, 'routes.json'), 'utf8')\n)\n\nconst prefix = base.replace(/\\\\/$/, '')\nconst app = express()\n${middlewareBlock}\n// Serves all pre-rendered HTML files and static assets automatically\napp.use(base, express.static(__dirname))\n\n// Parameterized routes: Express uses the same :param syntax as the rooted router\nfor (const route of dynamicRoutes) {\n  app.get(prefix + route, (_req, res) =>\n    res.sendFile(path.join(__dirname, fallback))\n  )\n}\n\n// Anything else: SPA shell (browser-side router shows the correct content or 404)\napp.use((_req, res) => res.sendFile(path.join(__dirname, fallback)))\n\nconst port = Number(process.env.PORT ?? 3000)\napp.listen(port, '0.0.0.0', () => console.log(\\`Listening on http://0.0.0.0:\\${port}\\`))\n`\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAiCA,SAAgB,iBAAiB,SAA+C;CAC/E,OAAO;AACR;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiEA,SAAgB,eAAe,SAAyC;CACvE,OAAO,cAAc;EACpB,MAAM;EACN,QAAQ,SAAS;EACjB,MAAM,MAAM,EAAE,mBAAmB;GAChC,IAAI,SAAS,gBAAgB;IAC5B,MAAM,kBAAkB,KAAK,QAAQ,QAAQ,IAAI,GAAG,QAAQ,cAAc;IAC1E,MAAM,SAAS,MAAM,QAAQ,eAAe,EAAA,CAAG,QAAO,MAAK,sBAAsB,KAAK,CAAC,CAAC;IACxF,IAAI,MAAM,WAAW,GACpB,MAAM,IAAI,MACT,wFAAwF,QAAQ,eAAe,EAChH;IACD,MAAM,sBAAsB,KAAK,KAAK,iBAAiB,YAAY;IACnE,MAAM,MAAM,qBAAqB,EAAE,WAAW,KAAK,CAAC;IACpD,KAAK,MAAM,QAAQ,OAClB,MAAM,MAAM;KACX,OAAO,KAAK,KAAK,iBAAiB,IAAI;KACtC,UAAU;KACV,WAAU,OAAM,CAAC,GAAG,WAAW,GAAG,KAAK,CAAC,KAAK,WAAW,EAAE;KAC1D,UAAU;KACV,QAAQ;MACP,MAAM,KAAK,KAAK,qBAAqB,KAAK,QAAQ,uBAAuB,MAAM,CAAC;MAChF,QAAQ;KACT;IACD,CAAC;GAEH;GACA,MAAM,UACL,KAAK,KAAK,iBAAiB,YAAY,GACvC,qBAAqB,CAAC,CAAC,SAAS,cAAc,GAC9C,MACD;EACD;CACD,CAAC;AACF;AAEA,MAAM,wBAAwB;AAE9B,SAAS,qBAAqB,eAAgC;CAgB7D,OAAO;;EAfU,gBACd,wDACA,yCAeO;;;;;;;;;;;EAbc,gBACrB;;;;;;;IAQA,GAec;;;;;;;;;;;;;;;;;AAiBlB"}