fix typescript setup

Author: jarle

packages/adapter/package.json

@@ -72,6 +72,7 @@
     "cross-env": "^7.0.3",
     "del-cli": "^6.0.0",
     "eslint": "^8.57.0",
+    "execa": "^9.6.0",
     "get-port": "^7.1.0",
     "node-mocks-http": "^1.16.1",
     "np": "^10.0.7",

packages/adapter/src/hooks/build_hook.ts

@@ -1,5 +1,6 @@
 import app from '@adonisjs/core/services/app'
 import type { AssemblerHookHandler } from '@adonisjs/core/types/app'
+import { execa } from 'execa'
 import { spawn } from 'node:child_process'
 import fs from 'node:fs'
 import path from 'node:path'
@@ -10,7 +11,10 @@ import path from 'node:path'
  */
 export default async function remixBuildHook({ logger }: Parameters<AssemblerHookHandler>[0]) {
   logger.info('building React Router app with vite')
-  await runCommand('npx react-router build')
+  await execa('react-router', ['build'], {
+    preferLocal: true,   // use ./node_modules/.bin/react-router
+    stdio: 'inherit',
+  })
   const config = await resolveViteConfig()
   // const cli = await import('@remix-run/dev')
   // await cli.run(['vite:build'])

packages/adapter/tests/adapter/stream_conversion.spec.ts

@@ -41,8 +41,8 @@
     "@japa/file-system": "^2.3.2",
     "@japa/plugin-adonisjs": "^3.0.1",
     "@japa/runner": "^3.1.4",
-    "@react-router/dev": "^7.6.0",
-    "@react-router/fs-routes": "^7.6.0",
+    "@react-router/dev": "^7.9.1",
+    "@react-router/fs-routes": "^7.9.1",
     "@swc/core": "^1.10.7",
     "@types/luxon": "^3.4.2",
     "@types/node": "^22.10.6",
@@ -67,17 +67,16 @@
     "@japa/api-client": "^2.0.4",
     "@japa/browser-client": "^2.1.1",
     "@matstack/remix-adonisjs": "workspace:*",
-    "@react-router/node": "^7.6.0",
-    "@react-router/serve": "^7.6.0",
+    "@react-router/node": "^7.9.1",
+    "@react-router/serve": "^7.9.1",
     "@vinejs/vine": "^3.0.0",
     "edge.js": "^6.2.0",
     "isbot": "^5",
     "luxon": "^3.5.0",
     "pino-pretty": "^13.0.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router": "^7.6.0",
-    "react-router-dom": "^7.6.0",
+    "react-router": "^7.9.1",
     "reflect-metadata": "^0.2.2",
     "sqlite3": "^5.1.7"
   },

packages/reference-app/package.json

@@ -1,10 +1,9 @@
 {
-  "extends": "@adonisjs/tsconfig/tsconfig.app.json",
   "include": [
-    "**/*",
-    "resources/remix_app/**/.server/**/*",
-    "resources/remix_app/**/.client/**/*",
-    ".react-router/types/**/*",
+    "../../**/*",
+    "**/.server/**/*",
+    "**/.client/**/*",
+    "../../.react-router/types/**/*",
   ],
   "compilerOptions": {
     "lib": [
@@ -21,13 +20,13 @@
     "moduleResolution": "bundler",
     "jsx": "react-jsx",
     "rootDirs": [
-      "resources/remix_app",
-      ".react-router/types/resources/remix_app"
+      ".",
+      "../../.react-router/types/resources/remix_app"
     ],
     "baseUrl": ".",
     "paths": {
       "~/*": [
-        "./resources/remix_app/*"
+        "./app/*"
       ]
     },
     "esModuleInterop": true,

…ckages/reference-app/tsconfig.remix.json …ce-app/resources/remix_app/tsconfig.jsonpackages/reference-app/tsconfig.remix.json renamed to packages/reference-app/resources/remix_app/tsconfig.json packages/reference-app/tsconfig.remix.json renamed to packages/reference-app/resources/remix_app/tsconfig.json

@@ -1,12 +1,13 @@
 {
   "extends": "@adonisjs/tsconfig/tsconfig.app.json",
-  "files": [],
-  "references": [
-    {
-      "path": "./tsconfig.remix.json"
-    },
-    {
-      "path": "./tsconfig.adonis.json"
-    }
-  ]
-}
+  "include": [
+    "**/*"
+  ],
+  "exclude": [
+    "resources/remix_app/**"
+  ],
+  "compilerOptions": {
+    "rootDir": "./",
+    "outDir": "./build"
+  }
+}