merge canary

Author: huozhi

.eslintignore

@@ -20,9 +20,6 @@ packages/react-refresh-utils/**/*.js
 packages/react-dev-overlay/lib/**
 **/__tmp__/**
 .github/actions/next-stats-action/.work
-.github/actions/validate-docs-links/lib/index.js
-.github/actions/needs-triage/index.js
-.github/actions/*/index.mjs
 packages/next-codemod/transforms/__testfixtures__/**/*
 packages/next-codemod/transforms/__tests__/**/*
 packages/next-codemod/**/*.js
@@ -40,4 +37,5 @@ bench/nested-deps/**
 bench/nested-deps-app-router/**
 packages/next-bundle-analyzer/index.d.ts
 examples/with-typescript-graphql/lib/gql/
-test/development/basic/hmr/components/parse-error.js
+test/development/basic/hmr/components/parse-error.js
+packages/next-swc/docs/assets/**/*

.eslintrc.json

@@ -113,14 +113,6 @@
         "jsdoc/no-undefined-types": "error"
       }
     },
-    {
-      "files": [
-        "test/**/*",
-        "examples/**/*",
-        "packages/create-next-app/templates/**/*"
-      ],
-      "rules": { "react/react-in-jsx-scope": "off" }
-    },
     {
       "files": ["examples/**/*"],
       "rules": {
@@ -351,7 +343,7 @@
     "react/no-direct-mutation-state": "warn",
     "react/no-is-mounted": "warn",
     "react/no-typos": "error",
-    "react/react-in-jsx-scope": "error",
+    "react/react-in-jsx-scope": "off",
     "react/require-render-return": "error",
     "react/style-prop-object": "warn",
     "react-hooks/rules-of-hooks": "error",

.git-blame-ignore-revs

@@ -0,0 +1,6 @@
+# All revisions specified in the `.git-blame-ignore-revs` file, are hidden from the blame
+# when running `git blame --ignore-revs-file .git-blame-ignore-revs`.
+# https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
+
+# chore(examples): use default prettier for examples/templates (#60530)
+4466ba436b996263307171d344cca199e8087744

.github/ISSUE_TEMPLATE/1.bug_report.yml

@@ -40,13 +40,6 @@ body:
       placeholder: 'Following the steps from the previous section, I expected A to happen, but I observed B instead'
     validations:
       required: true
-  - type: checkboxes
-    attributes:
-      label: Verify canary release
-      description: 'Please run `npm install next@canary` to try the canary version of Next.js that ships daily. It includes all features and fixes that have not been released to the stable version yet. Some issues may already be fixed in the canary version, so please verify that your issue reproduces before opening a new issue.'
-      options:
-        - label: I verified that the issue exists in the latest Next.js canary release
-          required: true
   - type: textarea
     attributes:
       label: Provide environment information
@@ -90,6 +83,7 @@ body:
         - 'MDX (@next/mdx)'
         - 'Metadata (metadata, generateMetadata, next/head)'
         - 'Middleware / Edge (API routes, runtime)'
+        - 'Module resolution (CJS / ESM, module resolving)'
         - 'Operating System (Windows, MacOS, Linux)'
         - 'Package manager (npm, pnpm, Yarn)'
         - 'Routing (next/router, next/navigation, next/link)'
@@ -102,6 +96,18 @@ body:
         - 'TypeScript (plugin, built-in types)'
     validations:
       required: true
+  - type: dropdown
+    attributes:
+      label: Which stage(s) are affected? (Select all that apply)
+      multiple: true
+      options:
+        - 'next dev (local)'
+        - 'next build (local)'
+        - 'next start (local)'
+        - 'Vercel (Deployed)'
+        - 'Other (Deployed)'
+    validations:
+      required: true
   - type: markdown
     attributes:
       value: |

.github/actions/needs-triage/.gitignore

@@ -3,4 +3,4 @@ description: 'vercel/next.js specific auto-labeling action'
 author: 'Next.js team'
 runs:
   using: 'node20'
-  main: 'index.js'
+  main: 'dist/index.js'

.github/actions/needs-triage/action.yaml

@@ -1,11 +1,11 @@
 {
   "private": true,
-  "exports": "./index.js",
+  "exports": "./dist/index.js",
   "files": [
     "src"
   ],
   "scripts": {
-    "build": "pnpm types && ncc -m -o . build lib/index.js --license licenses.txt",
+    "build": "pnpm types && ncc build lib/index.js -m -o dist --license licenses.txt",
     "types": "tsc"
   },
   "devDependencies": {