Merge branch 'canary' into bump-swc

vercel · Jul 25, 2024 · ac5f86f · ac5f86f
2 parents 1fe16d6 + c7b6759
commit ac5f86f
Show file tree

Hide file tree

Showing 20 changed files with 98 additions and 115 deletions.
diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "15.0.0-canary.81"
+  "version": "15.0.0-canary.82"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "15.0.0-canary.81",
+  "version": "15.0.0-canary.82",
   "keywords": [
     "react",
     "next",

diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "15.0.0-canary.81",
+  "version": "15.0.0-canary.82",
   "description": "ESLint configuration used by Next.js.",
   "main": "index.js",
   "license": "MIT",
@@ -10,7 +10,7 @@
   },
   "homepage": "https://nextjs.org/docs/app/building-your-application/configuring/eslint#eslint-config",
   "dependencies": {
-    "@next/eslint-plugin-next": "15.0.0-canary.81",
+    "@next/eslint-plugin-next": "15.0.0-canary.82",
     "@rushstack/eslint-patch": "^1.3.3",
     "@typescript-eslint/eslint-plugin": "^5.4.2 || ^6.0.0 || ^7.0.0",
     "@typescript-eslint/parser": "^5.4.2 || ^6.0.0 || ^7.0.0",

diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "15.0.0-canary.81",
+  "version": "15.0.0-canary.82",
   "description": "ESLint plugin for Next.js.",
   "main": "dist/index.js",
   "license": "MIT",

diff --git a/packages/font/package.json b/packages/font/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@next/font",
   "private": true,
-  "version": "15.0.0-canary.81",
+  "version": "15.0.0-canary.82",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"

diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "15.0.0-canary.81",
+  "version": "15.0.0-canary.82",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",

diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "15.0.0-canary.81",
+  "version": "15.0.0-canary.82",
   "license": "MIT",
   "repository": {
     "type": "git",

diff --git a/packages/next-env/package.json b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "15.0.0-canary.81",
+  "version": "15.0.0-canary.82",
   "keywords": [
     "react",
     "next",

diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "15.0.0-canary.81",
+  "version": "15.0.0-canary.82",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "15.0.0-canary.81",
+  "version": "15.0.0-canary.82",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "15.0.0-canary.81",
+  "version": "15.0.0-canary.82",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",

diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "15.0.0-canary.81",
+  "version": "15.0.0-canary.82",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "15.0.0-canary.81",
+  "version": "15.0.0-canary.82",
   "private": true,
   "scripts": {
     "clean": "node ../../scripts/rm.mjs native",

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "15.0.0-canary.81",
+  "version": "15.0.0-canary.82",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -93,7 +93,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "15.0.0-canary.81",
+    "@next/env": "15.0.0-canary.82",
     "@swc/counter": "0.1.3",
     "@swc/helpers": "0.5.12",
     "busboy": "1.6.0",
@@ -158,10 +158,10 @@
     "@jest/types": "29.5.0",
     "@mswjs/interceptors": "0.23.0",
     "@napi-rs/triples": "1.2.0",
-    "@next/polyfill-module": "15.0.0-canary.81",
-    "@next/polyfill-nomodule": "15.0.0-canary.81",
-    "@next/react-refresh-utils": "15.0.0-canary.81",
-    "@next/swc": "15.0.0-canary.81",
+    "@next/polyfill-module": "15.0.0-canary.82",
+    "@next/polyfill-nomodule": "15.0.0-canary.82",
+    "@next/react-refresh-utils": "15.0.0-canary.82",
+    "@next/swc": "15.0.0-canary.82",
     "@opentelemetry/api": "1.6.0",
     "@playwright/test": "1.41.2",
     "@swc/core": "1.7.1",

diff --git a/packages/next/src/build/flying-shuttle/detect-changed-entries.ts b/packages/next/src/build/flying-shuttle/detect-changed-entries.ts
@@ -3,14 +3,40 @@ import path from 'path'
 import crypto from 'crypto'
 import { getPageFromPath } from '../entries'
 import { Sema } from 'next/dist/compiled/async-sema'
-import { generateShuttleManifest } from './store-shuttle'
+import { generateShuttleManifest, type ShuttleManifest } from './store-shuttle'
 import type { NextConfigComplete } from '../../server/config-shared'
 
 export interface DetectedEntriesResult {
   app: string[]
   pages: string[]
 }
 
+function deepEqual(obj1: any, obj2: any) {
+  if (obj1 === obj2) return true
+
+  if (
+    typeof obj1 !== 'object' ||
+    obj1 === null ||
+    typeof obj2 !== 'object' ||
+    obj2 === null
+  ) {
+    return false
+  }
+
+  let keys1 = Object.keys(obj1)
+  let keys2 = Object.keys(obj2)
+
+  if (keys1.length !== keys2.length) return false
+
+  for (let key of keys1) {
+    if (!keys2.includes(key) || !deepEqual(obj1[key], obj2[key])) {
+      return false
+    }
+  }
+
+  return true
+}
+
 let _hasShuttle: undefined | boolean = undefined
 export async function hasShuttle(
   config: NextConfigComplete,
@@ -19,44 +45,41 @@ export async function hasShuttle(
   if (typeof _hasShuttle === 'boolean') {
     return _hasShuttle
   }
-  let foundShuttleManifest:
-    | ReturnType<typeof generateShuttleManifest>
-    | undefined
+  let foundShuttleManifest: ShuttleManifest
 
   try {
     foundShuttleManifest = JSON.parse(
-      await fs.promises
-        .readFile(path.join(shuttleDir, 'shuttle-manifest.json'), 'utf8')
-        .catch(() => '{}')
+      await fs.promises.readFile(
+        path.join(shuttleDir, 'shuttle-manifest.json'),
+        'utf8'
+      )
     )
     _hasShuttle = true
   } catch (err: unknown) {
     _hasShuttle = false
+    console.log(`Failed to read shuttle manifest`)
     return _hasShuttle
   }
-  const currentShuttleManifest = generateShuttleManifest(config)
+  const currentShuttleManifest = JSON.parse(generateShuttleManifest(config))
 
-  if (
-    currentShuttleManifest.nextVersion !== foundShuttleManifest?.nextVersion
-  ) {
+  if (currentShuttleManifest.nextVersion !== foundShuttleManifest.nextVersion) {
     // we don't allow using shuttle from differing Next.js version
     // as it could have internal changes
     console.log(
-      `shuttle has differing Next.js version ${foundShuttleManifest?.nextVersion} versus current ${currentShuttleManifest.nextVersion}, skipping.`
+      `shuttle has differing Next.js version ${foundShuttleManifest.nextVersion} versus current ${currentShuttleManifest.nextVersion}, skipping.`
     )
     _hasShuttle = false
   }
 
-  if (
-    _hasShuttle !== false &&
-    currentShuttleManifest.globalHash !== foundShuttleManifest?.globalHash
-  ) {
-    // if the global hash was invalidated we bypass the cache to be safe
+  if (!deepEqual(currentShuttleManifest.config, foundShuttleManifest.config)) {
+    _hasShuttle = false
     console.log(
-      `shuttle has differing global hash ${foundShuttleManifest?.globalHash} versus current ${currentShuttleManifest.globalHash}, skipping.`
+      `Mismatching shuttle configs`,
+      currentShuttleManifest.config,
+      foundShuttleManifest.config
     )
-    _hasShuttle = false
   }
+
   return _hasShuttle
 }
 

diff --git a/packages/next/src/build/flying-shuttle/store-shuttle.ts b/packages/next/src/build/flying-shuttle/store-shuttle.ts
@@ -1,6 +1,5 @@
 import fs from 'fs'
 import path from 'path'
-import crypto from 'crypto'
 import { recursiveCopy } from '../../lib/recursive-copy'
 import { version as nextVersion } from 'next/package.json'
 import type { NextConfigComplete } from '../../server/config-shared'
@@ -12,58 +11,31 @@ import {
   PAGES_MANIFEST,
   ROUTES_MANIFEST,
 } from '../../shared/lib/constants'
-import { getNextPublicEnvironmentVariables } from '../webpack/plugins/define-env-plugin'
 
-export function generateShuttleManifest(config: NextConfigComplete) {
-  // NEXT_PUBLIC_ changes for now since they are inlined
-  // and specific next config values that can impact the build
-  const globalHash = crypto.createHash('sha256')
-  const nextPublicEnv = getNextPublicEnvironmentVariables()
-  // sort for deterministic order
-  const publicEnvKeys = Object.keys(nextPublicEnv).sort()
-
-  for (const key of publicEnvKeys) {
-    globalHash.update(`${key}=${nextPublicEnv[key]}`)
-  }
-
-  // TODO: make this opt-out list instead?
-  // also ensure this list is complete this is minimal set
-  const configsToInvalidateOn = [
-    'basePath',
-    'env',
-    'i18n',
-    'images',
-    'productionBrowserSourceMaps',
-    'webpack',
-    'sassOptions',
-    'trailingSlash',
-    'experimental.flyingShuttle',
-    'experimental.ppr',
-    'experimental.reactCompiler',
-  ].sort()
-
-  for (const key of configsToInvalidateOn) {
-    let value = config[key]
-
-    if (key.includes('.')) {
-      value = config
-
-      const keyParts = key.split('.')
-      for (let i = 0; i < keyParts.length; i++) {
-        value = value[keyParts[i]]
-      }
-    }
-
-    let serializedConfig =
-      typeof value === 'function' ? value.toString() : JSON.stringify(value)
-
-    globalHash.update(`${key}=${serializedConfig}`)
-  }
+export interface ShuttleManifest {
+  nextVersion: string
+  config: Record<string, any>
+}
 
-  return {
+export function generateShuttleManifest(config: NextConfigComplete) {
+  return JSON.stringify({
     nextVersion,
-    globalHash: globalHash.digest('hex'),
-  }
+    config: {
+      env: config.env,
+      i18n: config.i18n,
+      basePath: config.basePath,
+      sassOptions: config.sassOptions,
+      trailingSlash: config.trailingSlash,
+      productionBrowserSourceMaps: config.productionBrowserSourceMaps,
+
+      experimental: {
+        ppr: config.experimental.ppr,
+        reactCompiler: config.experimental.reactCompiler,
+        serverSourceMaps: config.experimental.serverSourceMaps,
+        serverMinification: config.experimental.serverMinification,
+      },
+    },
+  } satisfies ShuttleManifest)
 }
 
 // we can create a new shuttle with the outputs before env values have
@@ -80,10 +52,9 @@ export async function storeShuttle({
   await fs.promises.rm(shuttleDir, { force: true, recursive: true })
   await fs.promises.mkdir(shuttleDir, { recursive: true })
 
-  const shuttleManifest = generateShuttleManifest(config)
   await fs.promises.writeFile(
     path.join(shuttleDir, 'shuttle-manifest.json'),
-    JSON.stringify(shuttleManifest)
+    generateShuttleManifest(config)
   )
 
   // copy all server entries

diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-refresh-utils",
-  "version": "15.0.0-canary.81",
+  "version": "15.0.0-canary.82",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",

diff --git a/packages/third-parties/package.json b/packages/third-parties/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/third-parties",
-  "version": "15.0.0-canary.81",
+  "version": "15.0.0-canary.82",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/third-parties"
@@ -26,7 +26,7 @@
     "third-party-capital": "1.0.20"
   },
   "devDependencies": {
-    "next": "15.0.0-canary.81",
+    "next": "15.0.0-canary.82",
     "outdent": "0.8.0",
     "prettier": "2.5.1"
   },