Merge branch 'main' into michalpiechowiak/frb-1363-nextjs-i18n-middleware-redirect-not-working

Author: pieh

package-lock.json

@@ -50,13 +50,13 @@
   "devDependencies": {
     "@fastly/http-compute-js": "1.1.4",
     "@netlify/blobs": "^8.0.1",
-    "@netlify/build": "^29.54.7",
+    "@netlify/build": "^29.54.8",
     "@netlify/edge-bundler": "^12.2.3",
     "@netlify/edge-functions": "^2.11.0",
     "@netlify/eslint-config-node": "^7.0.1",
     "@netlify/functions": "^2.8.2",
-    "@netlify/serverless-functions-api": "^1.27.0",
-    "@netlify/zip-it-and-ship-it": "^9.39.5",
+    "@netlify/serverless-functions-api": "^1.28.1",
+    "@netlify/zip-it-and-ship-it": "^9.39.6",
     "@opentelemetry/api": "^1.8.0",
     "@opentelemetry/exporter-trace-otlp-http": "^0.51.0",
     "@opentelemetry/resources": "^1.24.0",

package.json

@@ -3,7 +3,7 @@
 import { readFile, writeFile } from 'node:fs/promises'
 
 import fg from 'fast-glob'
-import { gte, satisfies, valid } from 'semver'
+import { coerce, gt, gte, satisfies, valid } from 'semver'
 import { execaCommand } from 'execa'
 
 const FUTURE_NEXT_PATCH_VERSION = '14.999.0'
@@ -105,10 +105,36 @@ export async function setNextVersionInFixture(
         const nextPeerDependencies = JSON.parse(stdout)
 
         if (updateReact && nextVersionRequiresReact19(checkVersion)) {
+          // canaries started reporting peerDependencies as `^18.2.0 || 19.0.0-rc-<hash>-<date>`
+          // with https://github.com/vercel/next.js/pull/70219 which is valid range for package managers
+          // but not for @nx/next which checks dependencies and tries to assure that at least React 18 is used
+          // but the check doesn't handle the alternative in version selector which thinks it's not valid:
+          // https://github.com/nrwl/nx/blob/8fa7065cf14df6a90896442f90659b00baa1b5b9/packages/next/src/executors/build/build.impl.ts#L48
+          // https://github.com/nrwl/nx/blob/8fa7065cf14df6a90896442f90659b00baa1b5b9/packages/devkit/src/utils/semver.ts#L17
+          // so to workaround this nx/next issue we modify next peerDeps to extract highest version alternative to use
+          const nextReactPeerDependency = nextPeerDependencies['react'] ?? '^18.2.0'
+          const highestNextReactPeerDependencySelector = nextReactPeerDependency
+            .split('||')
+            .map((alternative) => {
+              const selector = alternative.trim()
+              const coerced = coerce(selector)?.format()
+              return {
+                selector,
+                coerced,
+              }
+            })
+            .sort((a, b) => {
+              return gt(a.coerced, b.coerced) ? -1 : 1
+            })[0].selector
+
           const reactVersion =
-            operation === 'update' ? nextPeerDependencies['react'] : REACT_18_VERSION
+            operation === 'update' ? highestNextReactPeerDependencySelector : REACT_18_VERSION
           packageJson.dependencies.react = reactVersion
           packageJson.dependencies['react-dom'] = reactVersion
+
+          if (!silent) {
+            console.log(`${logPrefix}▲ Setting react(-dom)@${reactVersion}`)
+          }
         }
 
         await writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n')