@platformatic/react-router 3.29.1 → 3.30.0

package/lib/capability.js

@@ -1,3 +1,4 @@
+import fastifyStatic from '@fastify/static'
 import {
   cleanBasePath,
   createServerListener,
@@ -8,13 +9,12 @@ import {
   resolvePackageViaCJS
 } from '@platformatic/basic'
 import { ViteCapability } from '@platformatic/vite'
-import { createRequestHandler } from '@react-router/express'
-import express from 'express'
-import inject from 'light-my-request'
+import fastify from 'fastify'
 import { existsSync } from 'node:fs'
 import { readFile, writeFile } from 'node:fs/promises'
-import { dirname, resolve } from 'node:path'
-import { pinoHttp } from 'pino-http'
+import { dirname, join, resolve } from 'node:path'
+import { Readable } from 'node:stream'
+import { createRequestHandler } from 'react-router'
 import { satisfies } from 'semver'
 import { packageJson } from './schema.js'
 
@@ -22,7 +22,6 @@ const supportedVersions = '^7.0.0'
 
 export class ReactRouterCapability extends ViteCapability {
   #app
-  #server
   #reactRouter
   #basePath
 
@@ -83,22 +82,6 @@ export class ReactRouterCapability extends ViteCapability {
     return super.start({ listen })
   }
 
-  async stop () {
-    const reactRouterConfig = await this.#getReactRouterConfig()
-
-    if (reactRouterConfig.ssr) {
-      await this._stop()
-
-      if (this.#server?.listening) {
-        await this._closeServer(this.#server)
-      }
-
-      return
-    }
-
-    return super.stop()
-  }
-
   async build () {
     const config = this.config
     const command = config.application.commands.build
@@ -116,7 +99,7 @@ export class ReactRouterCapability extends ViteCapability {
 
     await writeFile(
       resolve(this.root, config.reactRouter.outputDirectory, '.platformatic-build.json'),
-      JSON.stringify({ basePath: reactRouterConfig.basename ?? '/' }),
+      JSON.stringify({ basePath: basePath ?? reactRouterConfig.basename ?? '/' }),
       'utf-8'
     )
   }
@@ -126,16 +109,6 @@ export class ReactRouterCapability extends ViteCapability {
     return super.getMeta(reactRouterConfig.basename)
   }
 
-  async inject (injectParams, onInject) {
-    const reactRouterConfig = await this.#getReactRouterConfig()
-
-    if (this.isProduction && reactRouterConfig.ssr) {
-      return this.#inject(injectParams, onInject)
-    }
-
-    return super.inject(injectParams, onInject)
-  }
-
   async #getReactRouterConfig () {
     const ext = ['ts', 'js'].find(ext => existsSync(resolve(this.root, `react-router.config.${ext}`)))
 
@@ -157,16 +130,8 @@ export class ReactRouterCapability extends ViteCapability {
         createServerListener(false, false, { backlog: serverOptions.backlog })
       }
 
-      this.#server = await new Promise((resolve, reject) => {
-        return this.#app
-          .listen(listenOptions, function () {
-            resolve(this)
-          })
-          .on('error', reject)
-      })
-
-      this.url = getServerUrl(this.#server)
-
+      await this.#app.listen(listenOptions)
+      this.url = getServerUrl(this.#app.server)
       return this.url
     }
 
@@ -178,33 +143,110 @@ export class ReactRouterCapability extends ViteCapability {
     this.verifyOutputDirectory(serverRoot)
     this.#basePath = await this._getBasePathFromBuildInfo()
 
-    const { entrypoint } = await importFile(resolve(serverRoot, 'index.js'))
+    const serverModule = await importFile(resolve(serverRoot, 'index.js'))
 
-    // Setup express app
-    this.#app = express()
+    // Setup fastify
+    this.#app = fastify({ loggerInstance: this.logger })
     this._setApp(this.#app)
-    this.#app.disable('x-powered-by')
-    this.#app.use(pinoHttp({ logger: this.logger }))
-    this.#app.use(this.#basePath, express.static(clientRoot))
-    this.#app.all(
-      `${ensureTrailingSlash(cleanBasePath(this.#basePath))}*`,
-      createRequestHandler({ build: () => entrypoint })
-    )
 
+    let assetsRoot = clientRoot
+    let publicPath = '/'
+    let mainHandler
+
+    // Since it uses the Fetch API, we don't need to parse the request body.
+    this.#app.removeAllContentTypeParsers()
+    this.#app.addContentTypeParser('*', function (_, payload, done) {
+      done(null, payload)
+    })
+
+    // Custom entrypoint
+    if (serverModule.entrypoint) {
+      mainHandler = createRequestHandler(() => serverModule.entrypoint, process.env.NODE_ENV)
+      // Adapts @react-router/serve to fastify
+    } else {
+      if (serverModule.assetsBuildDirectory) {
+        assetsRoot = resolve(this.root, serverModule.assetsBuildDirectory)
+      }
+
+      if (serverModule.publicPath) {
+        publicPath = serverModule.publicPath ?? '/'
+      }
+
+      // RSC build
+      if (typeof serverModule.default === 'function') {
+        if (serverModule.unstable_reactRouterServeConfig) {
+          if (serverModule.unstable_reactRouterServeConfig.assetsBuildDirectory) {
+            assetsRoot = resolve(this.root, serverModule.unstable_reactRouterServeConfig.assetsBuildDirectory)
+          }
+          if (serverModule.unstable_reactRouterServeConfig.publicPath) {
+            publicPath = serverModule.unstable_reactRouterServeConfig.publicPath
+          }
+        }
+
+        mainHandler = serverModule.default
+      } else {
+        mainHandler = createRequestHandler(serverModule, process.env.NODE_ENV)
+      }
+    }
+
+    await this.#app.register(fastifyStatic, {
+      root: resolve(assetsRoot, 'assets'),
+      prefix: join(this.#basePath, 'assets'),
+      prefixAvoidTrailingSlash: true,
+      schemaHide: true,
+      decorateReply: false
+    })
+
+    if (publicPath !== '/') {
+      await this.#app.register(fastifyStatic, {
+        root: resolve(assetsRoot, 'assets'),
+        prefix: join(this.#basePath, publicPath),
+        prefixAvoidTrailingSlash: true,
+        schemaHide: true,
+        decorateReply: false
+      })
+    }
+
+    this.#app.all(`${ensureTrailingSlash(cleanBasePath(this.#basePath))}*`, this.#handleRequest.bind(this, mainHandler))
+
+    await this.#app.ready()
     await this._collectMetrics()
-    return this.url
   }
 
-  async #inject (injectParams, onInject) {
-    const res = await inject(this.#app, injectParams, onInject)
+  #handleRequest (handle, req) {
+    // Support aborting
+    const ac = new AbortController()
+    let ended = false
+
+    req.raw.on('aborted', () => ac.abort())
+    req.raw.on('end', () => { ended = true })
+    req.raw.on('close', () => {
+      if (!ended) {
+        ac.abort()
+      }
+    })
 
-    /* c8 ignore next 3 */
-    if (onInject) {
-      return
+    const headers = new Headers()
+    for (const [key, value] of Object.entries(req.headers)) {
+      if (value) {
+        headers.set(key, Array.isArray(value) ? value.join(',') : value)
+      }
     }
 
-    // Since inject might be called from the main thread directly via ITC, let's clean it up
-    const { statusCode, headers, body, payload, rawPayload } = res
-    return { statusCode, headers, body, payload, rawPayload }
+    let body
+
+    if (!['GET', 'HEAD'].includes(req.method)) {
+      body = Readable.toWeb(req.raw)
+    }
+
+    return handle(
+      new Request(`${req.protocol}://${req.hostname}${req.raw.url}`, {
+        method: req.method,
+        headers,
+        body,
+        duplex: body ? 'half' : undefined,
+        signal: ac.signal
+      })
+    )
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/react-router",
-  "version": "3.29.1",
+  "version": "3.30.0",
   "description": "Platformatic React Router Capability",
   "main": "index.js",
   "type": "module",
@@ -15,23 +15,21 @@
   },
   "homepage": "https://github.com/platformatic/platformatic#readme",
   "dependencies": {
-    "express": "^4.19.2",
-    "light-my-request": "^6.0.0",
-    "pino-http": "^10.2.0",
+    "@fastify/static": "^8.0.0",
+    "fastify": "^5.7.0",
     "semver": "^7.6.3",
-    "@platformatic/foundation": "3.29.1",
-    "@platformatic/basic": "3.29.1",
-    "@platformatic/vite": "3.29.1"
+    "@platformatic/basic": "3.30.0",
+    "@platformatic/foundation": "3.30.0",
+    "@platformatic/vite": "3.30.0"
   },
   "devDependencies": {
     "@react-router/dev": "^7.10.0",
-    "@react-router/express": "^7.10.1",
     "@react-router/node": "^7.10.0",
     "@types/react": "^19.1.11",
     "@types/react-dom": "^19.1.7",
     "cleaner-spec-reporter": "^0.5.0",
     "eslint": "9",
-    "fastify": "^5.0.0",
+    "fastify": "^5.7.0",
     "isbot": "^5.1.17",
     "json-schema-to-typescript": "^15.0.1",
     "neostandard": "^0.12.0",
@@ -42,8 +40,8 @@
     "typescript": "^5.5.4",
     "vite": "^7.1.7",
     "ws": "^8.18.0",
-    "@platformatic/gateway": "3.29.1",
-    "@platformatic/service": "3.29.1"
+    "@platformatic/gateway": "3.30.0",
+    "@platformatic/service": "3.30.0"
   },
   "engines": {
     "node": ">=22.19.0"

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/react-router/3.29.1.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/react-router/3.30.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic React Router Config",
   "type": "object",