+middleware example with enhance util

test/middleware-config/express-entry.ts

@@ -1,10 +1,10 @@
 import { dirname } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
-import { createMiddleware } from '@universal-middleware/express'
+import type { EnhancedMiddleware } from '@universal-middleware/core'
+import { apply } from '@universal-middleware/express'
 import express from 'express'
 import { getMiddlewares } from 'vike/__internal'
-import type { Middleware } from './pages/Middleware'
 import { createDevMiddleware } from 'vike/server'
 
 const __filename = fileURLToPath(import.meta.url)
@@ -24,22 +24,13 @@ async function startServer() {
     app.use(devMiddleware)
   }
 
-  const middlewares = (await getMiddlewares()) as Middleware[]
-  middlewares.sort((m1, m2) => getOrder(m1.order) - getOrder(m2.order))
-  middlewares.forEach((middlewareSpec) => {
-    const middleware = middlewareSpec.value
-    app.all('*', createMiddleware(() => middleware)())
-  })
+  const middlewares = (await getMiddlewares()) as EnhancedMiddleware[]
+  // @ts-ignore Typescript seems to think that apply requires express 5
+  apply(app, middlewares)
 
   app.listen(port, () => {
     console.log(`Server listening on http://localhost:${port}`)
   })
 
   return app
 }
-
-function getOrder(order: Middleware['order']): number {
-  if (order === 'post') return 100
-  if (order === 'pre') return -100
-  return order
-}

test/middleware-config/package.json

@@ -5,13 +5,13 @@
     "preview": "cross-env NODE_ENV=production tsx ./express-entry.ts"
   },
   "dependencies": {
-    "@universal-middleware/express": "^0.3.1",
+    "@universal-middleware/express": "^0.4.0",
     "express": "^4.21.2",
     "@vitejs/plugin-react": "^4.3.4",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "vike-react": "^0.5.12",
-    "@universal-middleware/core": "^0.3.1",
+    "@universal-middleware/core": "^0.4.0",
     "telefunc": "^0.1.82"
   },
   "devDependencies": {

test/middleware-config/pages/middlewareTelefunc.ts

@@ -1,14 +1,10 @@
 export { middlewareTelefunc }
 
+import { type UniversalMiddleware, enhance } from '@universal-middleware/core'
 import { telefunc } from 'telefunc'
-import type { UniversalMiddleware } from '@universal-middleware/core'
-import type { Middleware } from './Middleware'
 
 const telefuncUniversalMiddleware: UniversalMiddleware = async (request, context, runtime) => {
   const url = request.url.toString()
-  const urlParsed = new URL(url)
-
-  if (urlParsed.pathname !== '/_telefunc') return
 
   const httpResponse = await telefunc({
     url,
@@ -28,10 +24,8 @@ const telefuncUniversalMiddleware: UniversalMiddleware = async (request, context
   })
 }
 
-const middlewareTelefunc: Middleware[] = [
-  {
-    name: 'telefunc',
-    order: 'pre',
-    value: telefuncUniversalMiddleware
-  }
-]
+const middlewareTelefunc = enhance(telefuncUniversalMiddleware, {
+  name: 'telefunc',
+  method: 'POST',
+  path: '/_telefunc'
+})

test/middleware-config/pages/middlewareVike.ts

@@ -1,9 +1,8 @@
 export { middlewareVike }
 
-import { renderPage } from 'vike/server'
 // TODO: stop using universal-middleware and directly integrate server middlewares instead. (Bati generates boilerplates that use universal-middleware https://github.com/magne4000/universal-middleware to make Bati's internal logic easier. This is temporary and will be removed soon.)
-import type { UniversalMiddleware } from '@universal-middleware/core'
-import type { Middleware } from './Middleware'
+import { type UniversalMiddleware, enhance } from '@universal-middleware/core'
+import { renderPage } from 'vike/server'
 
 const vikeUniversalMiddleware: UniversalMiddleware = async (request, context, runtime) => {
   const pageContextInit = { ...context, ...runtime, urlOriginal: request.url, headersOriginal: request.headers }
@@ -19,10 +18,8 @@ const vikeUniversalMiddleware: UniversalMiddleware = async (request, context, ru
   })
 }
 
-const middlewareVike: Middleware[] = [
-  {
-    name: 'vike',
-    order: 'post',
-    value: vikeUniversalMiddleware
-  }
-]
+const middlewareVike = enhance(vikeUniversalMiddleware, {
+  name: 'vike',
+  method: 'GET',
+  path: '/**'
+})