Merge branch 'canary' into visible-oomkill

.cargo/config.toml

@@ -1,5 +1,9 @@
 [env]
 CARGO_WORKSPACE_DIR = { value = "", relative = true }
+TURBO_PNPM_WORKSPACE_DIR = { value = "", relative = true }
+
+[alias]
+xtask = "run --package xtask --"
 
 [build]
 rustflags = [
@@ -21,11 +25,20 @@ rustflags = ["-C", "target-feature=+crt-static"]
 [target.aarch64-pc-windows-msvc]
 linker = "rust-lld"
 
-[target.aarch64-apple-darwin]
+[target.'cfg(target_os = "macos")']
 linker = "rust-lld"
 
-[target.aarch64-unknown-linux-gnu]
-linker = "aarch64-linux-gnu-gcc"
+[target.'cfg(all(target_os = "linux", target_env = "gnu"))']
+rustflags = [
+  "--cfg",
+  "tokio_unstable",
+  "-Zshare-generics=y",
+  "-Zthreads=8",
+  "-Zunstable-options",
+  "-Csymbol-mangling-version=v0",
+  "-Clinker-flavor=gnu-lld-cc",
+  "-Clink-self-contained=+linker",
+]
 
 [target.aarch64-unknown-linux-musl]
 linker = "aarch64-linux-musl-gcc"

.config/ast-grep/rule-tests/no-context-test.yml

@@ -0,0 +1,11 @@
+id: no-context
+valid:
+  - 'let chunking_context = ChunkingContext::new();'
+  - 'struct Foo { chunking_context: Context };'
+  - 'foo(|chunking_context| context)'
+  - 'fn foo(chunking_context: ChunkingContext) -> u32 { 5 };'
+invalid:
+  - 'let context = ChunkingContext::new();'
+  - 'struct Foo { context: Context };'
+  - 'foo(|context| context)'
+  - 'fn foo(context: ChunkingContext) -> u32 { 5 };'

.config/ast-grep/rules/no-context.yml

@@ -0,0 +1,22 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/ast-grep/ast-grep/main/schemas/rule.json
+
+id: no-context
+message: Don't name variables `context`.
+note: Use a more specific name, such as chunking_context, asset_context, etc.
+severity: error
+language: Rust
+rule:
+  regex: \bcontext\b
+  any:
+    - all:
+        - inside:
+            any:
+              - kind: closure_parameters
+              - kind: parameter
+              - kind: function_item
+              - kind: let_declaration
+        - kind: identifier
+    - all:
+        - kind: field_identifier
+        - inside:
+            kind: field_declaration

.config/nextest.toml

@@ -0,0 +1,17 @@
+[profile.tp-test-linux.junit]
+path = "junit.xml"
+report-name = "Turbopack tests (Linux)"
+store-success-output = true
+store-failure-output = true
+
+[profile.tp-test-mac.junit]
+path = "junit.xml"
+report-name = "Turbopack tests (Mac)"
+store-success-output = true
+store-failure-output = true
+
+[profile.tp-test-win.junit]
+path = "junit.xml"
+report-name = "Turbopack tests (Windows)"
+store-success-output = true
+store-failure-output = true

.eslintignore

@@ -34,7 +34,7 @@ test/production/emit-decorator-metadata/**/*.js
 !test/**/*.test.*
 test/e2e/app-dir/rsc-errors/app/swc/use-client/page.js
 test-timings.json
-packages/next-swc/crates/**
+crates/**
 bench/nested-deps/**
 bench/nested-deps-app-router/**
 bench/heavy-npm-deps/**
@@ -45,3 +45,7 @@ packages/next-swc/docs/assets/**/*
 test/lib/amp-validator-wasm.js
 test/production/pages-dir/production/fixture/amp-validator-wasm.js
 test/e2e/async-modules/amp-validator-wasm.js
+
+# turbopack crates
+turbopack/crates/*/tests/**
+turbopack/crates/*/js/src/compiled

.eslintrc.cli.json

@@ -0,0 +1,25 @@
+{
+  "$schema": "https://json.schemastore.org/eslintrc",
+  "extends": [".eslintrc.json"],
+  "overrides": [
+    {
+      // This override adds type-checked rules.
+      "files": ["**/*.ts", "**/*.tsx"],
+      // Linting with type-checked rules is very slow and needs a lot of memory,
+      // so we exclude non-essential files.
+      "excludedFiles": [
+        "examples/**/*",
+        "test/**/*",
+        "**/*.d.ts",
+        "turbopack/**/*"
+      ],
+      "parserOptions": {
+        "project": true
+      },
+      "rules": {
+        // TODO: enable in follow-up PR
+        "@typescript-eslint/no-floating-promises": "off"
+      }
+    }
+  ]
+}

.eslintrc.json

@@ -1,4 +1,9 @@
 {
+  // This is the default eslint config that is used by IDEs. It does not use
+  // computation-heavy type-checked rules to ensure maximum responsiveness while
+  // writing code. In addition, there is .eslintrc.cli.json that does use
+  // type-checked rules, and it is used when running `pnpm lint-eslint`.
+  "$schema": "https://json.schemastore.org/eslintrc",
   "root": true,
   "parser": "@babel/eslint-parser",
   "plugins": ["react", "react-hooks", "jest", "import", "jsdoc"],
@@ -7,7 +12,8 @@
     "commonjs": true,
     "es6": true,
     "node": true,
-    "jest": true
+    "jest": true,
+    "es2020": true
   },
   "parserOptions": {
     "requireConfigFile": false,
@@ -96,7 +102,11 @@
           "error",
           {
             "args": "none",
-            "ignoreRestSiblings": true
+            "ignoreRestSiblings": true,
+            "argsIgnorePattern": "^_",
+            "caughtErrorsIgnorePattern": "^_",
+            "destructuredArrayIgnorePattern": "^_",
+            "varsIgnorePattern": "^_"
           }
         ],
         "no-use-before-define": "off",

.gitattributes

@@ -3,3 +3,9 @@ packages/next/compiled/** -text linguist-vendored
 
 # Make next/src/build folder indexable for github search
 build/** linguist-generated=false
+
+turbopack/crates/turbo-tasks-macros-tests/tests/**/*.stderr linguist-generated=true
+turbopack/crates/turbopack-ecmascript/tests/tree-shaker/analyzer/**/output.md linguist-generated=true
+turbopack/crates/turbopack-tests/tests/snapshot/**/output/** linguist-generated=true
+
+.config/ast-grep/rule-tests/__snapshots__/** linguist-generated=true

.github/ISSUE_TEMPLATE/1.bug_report.yml

@@ -1,25 +1,30 @@
-name: Bug Report
-description: Create a bug report for Next.js.
+name: Report an issue
+description: Report a Next.js issue.
 labels: ['bug']
 body:
   - type: markdown
     attributes:
       value: |
-        This template is to report Next.js bugs. [Examples](https://github.com/vercel/next.js/tree/canary/examples) related issues should be reported using [this](https://github.com/vercel/next.js/issues/new?assignees=&labels=type%3A+example%2Ctemplate%3A+bug&template=2.example_bug_report.yml) issue template instead.
-        Feature requests should be opened as [discussions](https://github.com/vercel/next.js/discussions/new?category=ideas). [Read more](https://github.com/vercel/next.js/blob/canary/contributing/core/adding-features.md).
+        This template is used for reporting a Next.js issue. [Example](https://github.com/vercel/next.js/tree/canary/examples)-related issues should be reported using [this](https://github.com/vercel/next.js/issues/new?assignees=&labels=type%3A+example%2Ctemplate%3A+bug&template=2.example_bug_report.yml) issue template instead.
+
+        Feature requests should be opened in [discussions](https://github.com/vercel/next.js/discussions/new?category=ideas). For more information about opening a feature request, [read more](https://github.com/vercel/next.js/blob/canary/contributing/core/adding-features.md).
+
+        Documentation requests should also be opened in [discussions](https://github.com/vercel/next.js/discussions/new?category=ideas).
 
         Before opening a new issue, please do a [search](https://github.com/vercel/next.js/issues) of existing issues and :+1: upvote the existing issue instead. This will result in a quicker resolution.
 
         If you need help with your own project, you can:
-        - Start a discussion in the ["Help" section](https://github.com/vercel/next.js/discussions/categories/help)
-        - Ask a question on the [Next.js Discord](https://discord.com/invite/nextjs) server
+        - Start a discussion in the ["Help"](https://github.com/vercel/next.js/discussions/categories/help) section.
+        - Ask a question in [Vercel Community](https://vercel.community/tags/c/help/9/nextjs).
   - type: input
     attributes:
       label: Link to the code that reproduces this issue
       description: |
-        A link to a **public** [GitHub repository](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template) or a [CodeSandbox](https://codesandbox.io/p/sandbox/github/vercel/next.js/tree/canary/examples/reproduction-template) minimal reproduction. Minimal reproductions should be created from our [bug report template with `npx create-next-app -e reproduction-template`](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template) and should include only changes that contribute to the issue. To report a Pages Router related issue, you can use these templates: [`npx create-next-app -e reproduction-template-pages`](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template-pages) or [CodeSandbox](https://codesandbox.io/p/sandbox/github/vercel/next.js/tree/canary/examples/reproduction-template-pages)
+        A link to a **public** [GitHub repository](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template) or a [CodeSandbox](https://codesandbox.io/p/sandbox/github/vercel/next.js/tree/canary/examples/reproduction-template) minimal reproduction. Minimal reproductions should be created from our [bug report template with `npx create-next-app -e reproduction-template`](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template) and should include only changes that contribute to the issue. To report a Pages Router related issue, you can use these templates: [`npx create-next-app -e reproduction-template-pages`](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template-pages) or [CodeSandbox](https://codesandbox.io/p/sandbox/github/vercel/next.js/tree/canary/examples/reproduction-template-pages).
+
+        If you decide to create your own minimal reproduction, please make sure test on canary. It is highly likely that the issue you are experiencing is already fixed in the canary version.
 
-        **Skipping this/providing an invalid link will result in the issue being closed**
+        **Skipping this/providing an invalid link will result in the issue being closed.**
       placeholder: 'https://github.com/user/my-minimal-nextjs-issue-reproduction'
     validations:
       required: true
@@ -36,8 +41,11 @@ body:
   - type: textarea
     attributes:
       label: Current vs. Expected behavior
-      description: A clear and concise description of what the bug is, and what you expected to happen.
-      placeholder: 'Following the steps from the previous section, I expected A to happen, but I observed B instead'
+      description: |
+        A clear and concise description of what the bug is (e.g., screenshots, logs, etc.), and what you expected to happen.
+
+        **Skipping this/failure to provide complete information of the bug will result in the issue being closed.**
+      placeholder: 'Following the steps from the previous section, I expected A to happen, but I observed B instead.'
     validations:
       required: true
   - type: textarea
@@ -49,18 +57,18 @@ body:
         Operating System:
           Platform: darwin
           Arch: arm64
-          Version: Darwin Kernel Version 22.5.0
+          Version: Darwin Kernel Version 23.6.0
         Binaries:
-          Node: 18.17.1
-          npm: 9.5.1
-          Yarn: 1.22.19
-          pnpm: N/A
+          Node: 20.17.0
+          npm: 10.8.2
+          Yarn: 1.22.22
+          pnpm: 9.10.0
         Relevant Packages:
-          next: 13.4.20
-          eslint-config-next: 13.4.20
-          react: 18.2.0
-          react-dom: 18.2.0
-          typescript: 5.2.2
+          next: 15.0.0-canary.148 
+          eslint-config-next: 15.0.0-canary.148
+          react: 19.0.0-rc-3dfd5d9e-20240910
+          react-dom: 19.0.0-rc-3dfd5d9e-20240910
+          typescript: 5.6.2
         Next.js Config:
           output: N/A
     validations:
@@ -123,7 +131,7 @@ body:
       description: |
         Any extra information that might help us investigate. For example, where are you deploying your application (Vercel, Docker, other platform)? Is it only reproducible on that platform, or locally too? Is the issue only happening in a specific browser? etc.
       placeholder: |
-        I tested my reproduction against different canary releases, and the first one that introduced the bug was "13.4.20-canary.13", since reverting to "13.4.20-canary.12" works.
+        I tested my reproduction against different canary releases, and the first one that introduced the bug was "15.0.0-canary.148", since reverting to "15.0.0-canary.147" works.
 
         or
 

.github/ISSUE_TEMPLATE/2.example_bug_report.yml

@@ -1,11 +1,12 @@
-name: Bug Report for Examples
-description: Create a bug report for Next.js examples.
+name: Report an issue with an example
+description: Report an issue with one of our Next.js examples.
 labels: ['examples']
 body:
   - type: markdown
     attributes:
       value: |
-        *Note:* If you leave out sections, the issue might be moved to the ["Help" section](https://github.com/vercel/next.js/discussions/categories/help).
+        *Note:* If you leave out sections, the issue might be moved to the ["Help"](https://github.com/vercel/next.js/discussions/categories/help) section.
+
         Thanks for taking the time to file a bug report for [one of the examples](https://github.com/vercel/next.js/tree/canary/examples)! Please fill out this form as completely as possible.
   - type: checkboxes
     attributes:

.github/ISSUE_TEMPLATE/4.docs_report.yml

@@ -1,19 +1,22 @@
-name: 'Docs Report'
-description: Create a report for Next.js documentation.
+name: 'Report a documentation issue'
+description: Report an issue with the Next.js documentation.
 title: 'Docs: '
 labels:
   - 'Documentation'
 body:
   - type: markdown
     attributes:
-      value: Before opening a new docs issue, is this something you can help us with? Your contributions are welcomed and appreciated. See our [Docs Contribution Guide](https://nextjs.org/docs/community/contribution-guide) to learn how to edit the Next.js docs.
+      value: |
+        Before opening a new documentation issue, is this something you can help us with? Your contributions are welcomed and appreciated. See our [Docs Contribution Guide](https://nextjs.org/docs/community/contribution-guide) to learn how to edit the Next.js docs.
+
+        If you are reporting about an documentation request, please open it in our [discussions](https://github.com/vercel/next.js/discussions/new?category=ideas) instead.
   - type: markdown
     attributes:
       value: Thank you for helping us update our docs!
   - type: textarea
     attributes:
-      label: What is the update you wish to see?
-      description: 'Example: I would like to fix an example using the `<Link>` component. Or, the `<Link>` component docs are missing information.'
+      label: What is the documentation issue?
+      description: 'Example: There is incorrect or stale information about the `<Link>` component.'
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/config.yml

@@ -1,11 +1,11 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Ask a question
+  - name: Ask a question or discuss a topic
     url: https://github.com/vercel/next.js/discussions
-    about: Ask questions and discuss with other community members.
-  - name: Feature request
+    about: Ask questions or discuss with other Next.js users in discussions.
+  - name: Feature or documentation request
     url: https://github.com/vercel/next.js/discussions/new?category=ideas
-    about: Feature or docs requests should be opened as discussions.
+    about: Open a feature or documentation request in discussions.
   - name: Next.js Learn course
     url: https://github.com/vercel/next-learn/issues/new
-    about: Next.js Learn course-related issues should be reported in their respective repository.
+    about: Next.js Learn course-related issues should be reported in this repository instead.

.github/actions/next-integration-stat/package.json

@@ -21,7 +21,7 @@
     "strip-ansi": "^7.0.1"
   },
   "engines": {
-    "node": ">=18.17.0"
+    "node": ">=18.18.0"
   },
-  "packageManager": "pnpm@8.15.7"
+  "packageManager": "pnpm@9.6.0"
 }