Merge branch 'canary' into update-teamname

vercel · Oct 30, 2023 · fa760a9 · fa760a9
2 parents 774bfe8 + 5eb6607
commit fa760a9
Show file tree

Hide file tree

Showing 22 changed files with 56 additions and 49 deletions.
diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "14.0.1-canary.5"
+  "version": "14.0.2-canary.0"
 }
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": "14.0.1-canary.5",
+  "version": "14.0.2-canary.0",
   "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": "14.0.1-canary.5",
+  "version": "14.0.2-canary.0",
   "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": "14.0.1-canary.5",
+    "@next/eslint-plugin-next": "14.0.2-canary.0",
     "@rushstack/eslint-patch": "^1.3.3",
     "@typescript-eslint/parser": "^5.4.2 || ^6.0.0",
     "eslint-import-resolver-node": "^0.3.6",

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": "14.0.1-canary.5",
+  "version": "14.0.2-canary.0",
   "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,6 +1,6 @@
 {
   "name": "@next/font",
-  "version": "14.0.1-canary.5",
+  "version": "14.0.2-canary.0",
   "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": "14.0.1-canary.5",
+  "version": "14.0.2-canary.0",
   "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": "14.0.1-canary.5",
+  "version": "14.0.2-canary.0",
   "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": "14.0.1-canary.5",
+  "version": "14.0.2-canary.0",
   "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": "14.0.1-canary.5",
+  "version": "14.0.2-canary.0",
   "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": "14.0.1-canary.5",
+  "version": "14.0.2-canary.0",
   "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": "14.0.1-canary.5",
+  "version": "14.0.2-canary.0",
   "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": "14.0.1-canary.5",
+  "version": "14.0.2-canary.0",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next-swc/crates/next-core/src/next_app/metadata/mod.rs b/packages/next-swc/crates/next-core/src/next_app/metadata/mod.rs
@@ -258,7 +258,7 @@ fn djb2_hash(str: &str) -> u32 {
     })
 }
 
-// this is here to mirror next.js behaviour.
+// this is here to mirror next.js behaviour (`toString(36).slice(0, 6)`)
 fn format_radix(mut x: u32, radix: u32) -> String {
     let mut result = vec![];
 
@@ -273,7 +273,8 @@ fn format_radix(mut x: u32, radix: u32) -> String {
         }
     }
 
-    result.into_iter().rev().collect()
+    result.reverse();
+    result[..6].iter().collect()
 }
 
 /// If there's special convention like (...) or @ in the page path,

diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "14.0.1-canary.5",
+  "version": "14.0.2-canary.0",
   "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": "14.0.1-canary.5",
+  "version": "14.0.2-canary.0",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -92,7 +92,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "14.0.1-canary.5",
+    "@next/env": "14.0.2-canary.0",
     "@swc/helpers": "0.5.2",
     "busboy": "1.6.0",
     "caniuse-lite": "^1.0.30001406",
@@ -146,11 +146,11 @@
     "@mswjs/interceptors": "0.23.0",
     "@napi-rs/cli": "2.16.2",
     "@napi-rs/triples": "1.1.0",
-    "@next/polyfill-module": "14.0.1-canary.5",
-    "@next/polyfill-nomodule": "14.0.1-canary.5",
-    "@next/react-dev-overlay": "14.0.1-canary.5",
-    "@next/react-refresh-utils": "14.0.1-canary.5",
-    "@next/swc": "14.0.1-canary.5",
+    "@next/polyfill-module": "14.0.2-canary.0",
+    "@next/polyfill-nomodule": "14.0.2-canary.0",
+    "@next/react-dev-overlay": "14.0.2-canary.0",
+    "@next/react-refresh-utils": "14.0.2-canary.0",
+    "@next/swc": "14.0.2-canary.0",
     "@opentelemetry/api": "1.4.1",
     "@playwright/test": "^1.35.1",
     "@taskr/clear": "1.1.0",

diff --git a/packages/next/src/shared/lib/hash.ts b/packages/next/src/shared/lib/hash.ts
@@ -1,11 +1,17 @@
 // http://www.cse.yorku.ca/~oz/hash.html
+// More specifically, 32-bit hash via djbxor
+// (ref: https://gist.github.com/eplawless/52813b1d8ad9af510d85?permalink_comment_id=3367765#gistcomment-3367765)
+// This is due to number type differences between rust for turbopack to js number types,
+// where rust does not have easy way to repreesnt js's 53-bit float number type for the matching
+// overflow behavior. This is more `correct` in terms of having canonical hash across different runtime / implementation
+// as can gaurantee determinstic output from 32bit hash.
 export function djb2Hash(str: string) {
   let hash = 5381
   for (let i = 0; i < str.length; i++) {
     const char = str.charCodeAt(i)
-    hash = (hash << 5) + hash + char
+    hash = ((hash << 5) + hash + char) & 0xffffffff
   }
-  return Math.abs(hash)
+  return hash >>> 0
 }
 
 export function hexHash(str: string) {

diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-dev-overlay",
-  "version": "14.0.1-canary.5",
+  "version": "14.0.2-canary.0",
   "description": "A development-only overlay for developing React applications.",
   "repository": {
     "url": "vercel/next.js",

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": "14.0.1-canary.5",
+  "version": "14.0.2-canary.0",
   "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": "14.0.1-canary.5",
+  "version": "14.0.2-canary.0",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/third-parties"
@@ -22,7 +22,7 @@
     "third-party-capital": "1.0.20"
   },
   "devDependencies": {
-    "next": "14.0.1-canary.5",
+    "next": "14.0.2-canary.0",
     "outdent": "0.8.0",
     "prettier": "2.5.1"
   },

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/e2e/app-dir/metadata-dynamic-routes/index.test.ts b/test/e2e/app-dir/metadata-dynamic-routes/index.test.ts
@@ -8,7 +8,7 @@ const CACHE_HEADERS = {
   REVALIDATE: 'public, max-age=0, must-revalidate',
 }
 
-const hashRegex = /\?\w+$/
+const hashRegex = /\?\w+/
 
 createNextDescribe(
   'app dir - metadata dynamic routes',
@@ -160,12 +160,12 @@ createNextDescribe(
         // slug is id param from generateImageMetadata
         expect(iconUrls).toMatchObject([
           {
-            href: '/dynamic/big/icon-48jo90/small',
+            href: '/dynamic/big/icon-ahg52g/small',
             sizes: '48x48',
             type: 'image/png',
           },
           {
-            href: '/dynamic/big/icon-48jo90/medium',
+            href: '/dynamic/big/icon-ahg52g/medium',
             sizes: '72x72',
             type: 'image/png',
           },
@@ -183,12 +183,12 @@ createNextDescribe(
         // slug is index by default
         expect(appleTouchIconUrls).toEqual([
           {
-            href: '/dynamic/big/apple-icon-48jo90/0',
+            href: '/dynamic/big/apple-icon-ahg52g/0',
             sizes: '48x48',
             type: 'image/png',
           },
           {
-            href: '/dynamic/big/apple-icon-48jo90/1',
+            href: '/dynamic/big/apple-icon-ahg52g/1',
             sizes: '64x64',
             type: 'image/png',
           },
@@ -551,8 +551,8 @@ createNextDescribe(
           // dynamic
           '/gsp/sitemap/[__metadata_id__]/route':
             'app/gsp/sitemap/[__metadata_id__]/route.js',
-          '/(group)/dynamic/[size]/apple-icon-48jo90/[[...__metadata_id__]]/route':
-            'app/(group)/dynamic/[size]/apple-icon-48jo90/[[...__metadata_id__]]/route.js',
+          '/(group)/dynamic/[size]/apple-icon-ahg52g/[[...__metadata_id__]]/route':
+            'app/(group)/dynamic/[size]/apple-icon-ahg52g/[[...__metadata_id__]]/route.js',
         })
       })
 

diff --git a/test/turbopack-tests-manifest.json b/test/turbopack-tests-manifest.json
@@ -3314,13 +3314,13 @@
       "app dir - metadata dynamic routes social image routes should support generate multi sitemaps with generateSitemaps",
       "app dir - metadata dynamic routes text routes should handle robots.[ext] dynamic routes",
       "app dir - metadata dynamic routes text routes should handle sitemap.[ext] dynamic routes",
-      "app dir - metadata dynamic routes text routes should not throw if client components are imported but not used"
+      "app dir - metadata dynamic routes text routes should not throw if client components are imported but not used",
+      "app dir - metadata dynamic routes social image routes should fill params into routes groups url of static images",
+      "app dir - metadata dynamic routes social image routes should support params as argument in dynamic routes",
+      "app dir - metadata dynamic routes should generate unique path for image routes under group routes"
     ],
     "failed": [
-      "app dir - metadata dynamic routes should generate unique path for image routes under group routes",
-      "app dir - metadata dynamic routes social image routes should fill params into routes groups url of static images",
-      "app dir - metadata dynamic routes social image routes should handle custom fonts in both edge and nodejs runtime",
-      "app dir - metadata dynamic routes social image routes should support params as argument in dynamic routes"
+      "app dir - metadata dynamic routes social image routes should handle custom fonts in both edge and nodejs runtime"
     ],
     "pending": [],
     "flakey": [],