Merge branch 'canary' into canary

.cargo/config.toml

@@ -2,15 +2,25 @@
 CARGO_WORKSPACE_DIR = { value = "", relative = true }
 
 [build]
-
+rustflags = [
+  "--cfg",
+  "tokio_unstable",
+  "-Zshare-generics=y", # make the current crate share its generic instantiations
+  "-Zthreads=8", # parallel frontend https://blog.rust-lang.org/2023/11/09/parallel-rustc.html
+  "-Csymbol-mangling-version=v0",
+]
 rustdocflags = []
 
 [target.x86_64-pc-windows-msvc]
 linker = "rust-lld"
 rustflags = ["-C", "target-feature=+crt-static"]
+
 [target.i686-pc-windows-msvc]
 rustflags = ["-C", "target-feature=+crt-static"]
 
+[target.aarch64-apple-darwin]
+linker = "rust-lld"
+
 [target.aarch64-unknown-linux-gnu]
 linker = "aarch64-linux-gnu-gcc"
 
@@ -27,11 +37,3 @@ rustflags = [
 
 [target.armv7-unknown-linux-gnueabihf]
 linker = "arm-linux-gnueabihf-gcc"
-
-[target.'cfg(all())']
-rustflags = [
-  "--cfg",
-  "tokio_unstable",
-  "-Zshare-generics=y",
-  "-Csymbol-mangling-version=v0",
-]

.eslintignore

@@ -4,6 +4,7 @@ node_modules
 **/.vscode/**
 **/dist/**
 e2e-tests/**
+examples/cms-sanity/sanity.types.ts
 examples/with-eslint/**
 examples/with-typescript-eslint-jest/**
 examples/with-kea/**
@@ -38,3 +39,6 @@ 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
+packages/next-swc/docs/assets/**/*
+test/lib/amp-validator-wasm.js
+test/production/pages-dir/production/fixture/amp-validator-wasm.js

.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/CODEOWNERS

@@ -16,6 +16,11 @@
 /packages/create-next-app/                    @vercel/next-js
 /pnpm-lock.yaml                               @vercel/next-js @vercel/turbopack
 
+# Next.js CLI
+
+/packages/next/src/bin                        @timneutkens @ijjk @shuding @samcx
+/packages/next/src/cli                        @timneutkens @ijjk @shuding @samcx
+
 # Image Component (@styfle)
 
 /**/*image*                                   @timneutkens @ijjk @shuding @styfle @huozhi @ztanner @vercel/devex
@@ -36,5 +41,5 @@ Cargo.toml                                                       @timneutkens @i
 Cargo.lock                                                       @timneutkens @ijjk @shuding @huozhi @vercel/turbopack
 /.cargo/config.toml                                              @timneutkens @ijjk @shuding @huozhi @vercel/turbopack
 /.config/nextest.toml                                            @timneutkens @ijjk @shuding @huozhi @vercel/turbopack
-/test/build-turbopack-tests-manifest.js                          @timneutkens @ijjk @shuding @huozhi @vercel/turbopack
-/test/turbopack-tests-manifest.json                              @timneutkens @ijjk @shuding @huozhi @vercel/turbopack
+/test/build-turbopack-dev-tests-manifest.js                          @timneutkens @ijjk @shuding @huozhi @vercel/turbopack
+/test/turbopack-dev-tests-manifest.json                              @timneutkens @ijjk @shuding @huozhi @vercel/turbopack

.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

.github/ISSUE_TEMPLATE/config.yml

@@ -6,3 +6,6 @@ contact_links:
   - name: Feature request
     url: https://github.com/vercel/next.js/discussions/new?category=ideas
     about: Feature requests should be opened as discussions
+  - name: Next.js Learn course
+    url: https://github.com/vercel/next-learn/issues/new
+    about: Next.js Lean course-related issues should be reported in their respective repository