Merge branch 'main' into ci/pin-os-and-node-images

.release-please-manifest.json

@@ -1,5 +1,5 @@
 {
-  "packages/build-info": "7.16.0",
+  "packages/build-info": "7.17.0",
   "packages/build": "29.58.0",
   "packages/edge-bundler": "12.3.1",
   "packages/cache-utils": "5.2.0",

packages/build-info/CHANGELOG.md

@@ -64,6 +64,13 @@
   * dependencies
     * @netlify/framework-info bumped from ^9.8.8 to ^9.8.9
 
+## [7.17.0](https://github.com/netlify/build/compare/build-info-v7.16.0...build-info-v7.17.0) (2024-12-16)
+
+
+### Features
+
+* **@netlify/build-info:** add React Router 7 detection ([#5930](https://github.com/netlify/build/issues/5930)) ([2289a78](https://github.com/netlify/build/commit/2289a7884fc0a2fc34b86b60464441d8cb70d4bd))
+
 ## [7.16.0](https://github.com/netlify/build/compare/build-info-v7.15.2...build-info-v7.16.0) (2024-12-11)
 
 

packages/build-info/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build-info",
-  "version": "7.16.0",
+  "version": "7.17.0",
   "description": "Build info utility",
   "type": "module",
   "exports": {

packages/build-info/src/frameworks/index.ts

@@ -28,6 +28,7 @@ import { Parcel } from './parcel.js'
 import { Phenomic } from './phenomic.js'
 import { Quasar } from './quasar.js'
 import { Qwik } from './qwik.js'
+import { ReactRouter } from './react-router.js'
 import { ReactStatic } from './react-static.js'
 import { CreateReactApp } from './react.js'
 import { RedwoodJS } from './redwoodjs.js'
@@ -65,6 +66,7 @@ export const frameworks = [
   Nuxt,
   Phenomic,
   Qwik,
+  ReactRouter,
   ReactStatic,
   RedwoodJS,
   Remix,

packages/build-info/src/frameworks/react-router.test.ts

@@ -0,0 +1,101 @@
+import { beforeEach, expect, test } from 'vitest'
+
+import { mockFileSystem } from '../../tests/mock-file-system.js'
+import { NodeFS } from '../node/file-system.js'
+import { Project } from '../project.js'
+
+beforeEach((ctx) => {
+  ctx.fs = new NodeFS()
+})
+test('detects a site using React Router v7 as a framework', async ({ fs }) => {
+  const cwd = mockFileSystem({
+    'react-router.config.ts': '',
+    'vite.config.ts': '',
+    'package.json': JSON.stringify({
+      scripts: {
+        build: 'react-router build',
+        dev: 'react-router dev',
+        start: 'react-router-serve ./build/server/index.js',
+        typecheck: 'react-router typegen && tsc',
+      },
+      dependencies: {
+        '@react-router/node': '^7.0.2',
+        '@react-router/serve': '^7.0.2',
+        react: '^18.3.1',
+        'react-dom': '^18.3.1',
+        'react-router': '^7.0.2',
+      },
+      devDependencies: {
+        '@netlify/vite-plugin-react-router': '^1.0.0',
+        '@react-router/dev': '^7.0.2',
+        typescript: '^5.6.3',
+        vite: '^5.4.11',
+        'vite-tsconfig-paths': '^5.1.2',
+      },
+    }),
+  })
+  const detected = await new Project(fs, cwd).detectFrameworks()
+
+  const detectedFrameworks = (detected ?? []).map((framework) => framework.id)
+  expect(detectedFrameworks).not.toContain('remix')
+
+  expect(detected?.[0]?.id).toBe('react-router')
+  expect(detected?.[0]?.build?.command).toBe('react-router build')
+  expect(detected?.[0]?.build?.directory).toBe('build/client')
+  expect(detected?.[0]?.dev?.command).toBe('react-router dev')
+  expect(detected?.[0]?.dev?.port).toBe(5173)
+})
+
+test('does NOT detect a site using React Router v7 as a library', async ({ fs }) => {
+  const cwd = mockFileSystem({
+    'rollup.config.ts': '',
+    'package.json': JSON.stringify({
+      scripts: {
+        build: 'rollup build',
+        dev: 'rollup dev',
+        typecheck: 'react-router typegen && tsc',
+      },
+      dependencies: {
+        react: '^18.3.1',
+        'react-dom': '^18.3.1',
+        'react-router': '^7.0.2',
+      },
+      devDependencies: {
+        rollup: '^4.28.1',
+        typescript: '^5.6.3',
+      },
+    }),
+  })
+  const detected = await new Project(fs, cwd).detectFrameworks()
+
+  const detectedFrameworks = (detected ?? []).map((framework) => framework.id)
+  expect(detectedFrameworks).not.toContain('react-router')
+})
+
+test('does NOT detect a React Router <v7 site', async ({ fs }) => {
+  const cwd = mockFileSystem({
+    'vite.config.ts': '',
+    'package.json': JSON.stringify({
+      scripts: {
+        build: 'vite build',
+        dev: 'vite dev',
+      },
+      dependencies: {
+        react: '^18.2.0',
+        'react-dom': '^18.2.0',
+        'react-router-dom': '^6.15.0',
+      },
+      devDependencies: {
+        '@vitejs/plugin-react': '^3.0.1',
+        typescript: '^4.9.5',
+        vite: '^4.0.4',
+      },
+    }),
+  })
+  const detected = await new Project(fs, cwd).detectFrameworks()
+
+  const detectedFrameworks = (detected ?? []).map((framework) => framework.id)
+  expect(detectedFrameworks).not.toContain('react-router')
+
+  expect(detected?.[0]?.id).toBe('vite')
+})