Merge branch 'canary' into refactor/rename-args

.github/actions/next-stats-action/src/prepare/repo-setup.js

@@ -13,23 +13,23 @@ module.exports = (actionInfo) => {
         `git clone ${actionInfo.gitRoot}${repoPath} --single-branch --branch ${branch} --depth=${depth} ${dest}`
       )
     },
-    async getLastStable(repoDir = '') {
-      const { stdout } = await exec(`cd ${repoDir} && git describe`)
-      const tag = stdout.trim()
+    async getLastStable() {
+      const res = await fetch(
+        `https://api.github.com/repos/vercel/next.js/releases/latest`,
+        {
+          headers: {
+            'X-GitHub-Api-Version': '2022-11-28',
+          },
+        }
+      )
 
-      if (!tag || !tag.startsWith('v')) {
-        throw new Error(`Failed to get tag info: "${stdout}"`)
-      }
-      const [major, minor, patch] = tag.split('-canary')[0].split('.')
-      if (!major || !minor || !patch) {
+      if (!res.ok) {
         throw new Error(
-          `Failed to split tag into major/minor/patch: "${stdout}"`
+          `Failed to get latest stable tag ${res.status}: ${await res.text()}`
         )
       }
-      // last stable tag will always be 1 patch less than canary
-      return `${major}.${minor}.${
-        Number(patch) - tag.includes('-canary') ? 1 : 0
-      }`
+      const data = await res.json()
+      return data.tag_name
     },
     async getCommitId(repoDir = '') {
       const { stdout } = await exec(`cd ${repoDir} && git rev-parse HEAD`)

.github/workflows/trigger_release.yml

@@ -50,7 +50,9 @@ jobs:
           node-version: 18
           check-latest: true
 
-      - run: git clone https://github.com/vercel/next.js.git --depth=25 .
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 25
 
       - name: Get commit of the latest tag
         run: echo "LATEST_TAG_COMMIT=$(git rev-list -n 1 $(git describe --tags --abbrev=0))" >> $GITHUB_ENV

docs/02-app/02-api-reference/02-file-conventions/01-metadata/sitemap.mdx

@@ -171,7 +171,7 @@ export default async function sitemap({ id }) {
     `SELECT id, date FROM products WHERE id BETWEEN ${start} AND ${end}`
   )
   return products.map((product) => ({
-    url: `${BASE_URL}/product/${id}`
+    url: `${BASE_URL}/product/${id}`,
     lastModified: product.date,
   }))
 }

lerna.json

@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "14.1.2-canary.5"
+  "version": "14.2.0-canary.0"
 }

package.json

@@ -41,10 +41,6 @@
     "types": "lerna run types --stream",
     "check-precompiled": "./scripts/check-pre-compiled.sh",
     "prepublishOnly": "turbo run build",
-    "release-canary": "git checkout canary && git pull && lerna version prerelease --preid canary --force-publish && release --pre --skip-questions --show-url",
-    "release-stable": "lerna version --force-publish",
-    "publish-canary": "node -e 'import(\"open\").then(open => open.default(\"https://github.com/vercel/next.js/actions/workflows/trigger_release.yml\"))'",
-    "publish-stable": "pnpm publish-canary",
     "lint-staged": "lint-staged",
     "next-with-deps": "./scripts/next-with-deps.sh",
     "next": "cross-env NEXT_TELEMETRY_DISABLED=1 node --trace-deprecation --enable-source-maps packages/next/dist/bin/next",
@@ -182,7 +178,6 @@
     "npm-run-all": "4.1.5",
     "nprogress": "0.2.0",
     "octokit": "3.1.0",
-    "open": "9.0.0",
     "outdent": "0.8.0",
     "pixrem": "5.0.0",
     "playwright": "1.41.2",

packages/create-next-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "14.1.2-canary.5",
+  "version": "14.2.0-canary.0",
   "keywords": [
     "react",
     "next",

packages/eslint-config-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "14.1.2-canary.5",
+  "version": "14.2.0-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.1.2-canary.5",
+    "@next/eslint-plugin-next": "14.2.0-canary.0",
     "@rushstack/eslint-patch": "^1.3.3",
     "@typescript-eslint/parser": "^5.4.2 || ^6.0.0 || ^7.0.1",
     "eslint-import-resolver-node": "^0.3.6",

packages/eslint-plugin-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "14.1.2-canary.5",
+  "version": "14.2.0-canary.0",
   "description": "ESLint plugin for Next.js.",
   "main": "dist/index.js",
   "license": "MIT",

packages/font/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/font",
-  "version": "14.1.2-canary.5",
+  "version": "14.2.0-canary.0",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"

packages/next-bundle-analyzer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "14.1.2-canary.5",
+  "version": "14.2.0-canary.0",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",

packages/next-bundle-analyzer/readme.md

@@ -42,7 +42,7 @@ Then you can run the command below:
 ANALYZE=true yarn build
 ```
 
-When enabled two HTML files (client.html and server.html) will be outputted to `<distDir>/analyze/`. One will be for the server bundle, one for the browser bundle.
+When enabled three HTML files (client.html, edge.html and nodejs.html) will be outputted to `<distDir>/analyze/`. One will be for the nodejs server bundle, one for the edge server bundle, and one for the browser bundle.
 
 #### Options
 

packages/next-codemod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "14.1.2-canary.5",
+  "version": "14.2.0-canary.0",
   "license": "MIT",
   "repository": {
     "type": "git",

packages/next-env/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "14.1.2-canary.5",
+  "version": "14.2.0-canary.0",
   "keywords": [
     "react",
     "next",

packages/next-mdx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "14.1.2-canary.5",
+  "version": "14.2.0-canary.0",
   "main": "index.js",
   "license": "MIT",
   "repository": {

packages/next-plugin-storybook/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "14.1.2-canary.5",
+  "version": "14.2.0-canary.0",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

packages/next-polyfill-module/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "14.1.2-canary.5",
+  "version": "14.2.0-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",

packages/next-polyfill-nomodule/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "14.1.2-canary.5",
+  "version": "14.2.0-canary.0",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

packages/next-swc/crates/napi/Cargo.toml

@@ -76,8 +76,6 @@ napi = { version = "2", default-features = false, features = [
 napi-derive = "2"
 next-custom-transforms = { workspace = true }
 
-once_cell = { workspace = true }
-regex = { workspace = true }
 serde = "1"
 serde_json = "1"
 shadow-rs = { workspace = true }
@@ -111,7 +109,6 @@ turbopack-binding = { workspace = true, features = [
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 getrandom = { version = "0.2.9", default-features = false, features = ["js"] }
 iana-time-zone = { version = "*", features = ["fallback"] }
-swc_core = { workspace = true, features = ["ecma_visit_path"] }
 turbopack-binding = { workspace = true, features = [
   "__swc_core_binding_napi",
   "__swc_core_serde",