Skip to content

Commit

Permalink
Merge branch 'canary' into 08-01-test_add_dynamic_import
Browse files Browse the repository at this point in the history
  • Loading branch information
devjiwonchoi authored Sep 13, 2024
2 parents d8edc47 + e40574b commit a2e740e
Show file tree
Hide file tree
Showing 4,507 changed files with 500,674 additions and 72,255 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
19 changes: 16 additions & 3 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -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 = [
Expand All @@ -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"
Expand Down
42 changes: 42 additions & 0 deletions .config/ast-grep/rule-tests/__snapshots__/no-context-snapshot.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .config/ast-grep/rule-tests/no-context-test.yml
Original file line number Diff line number Diff line change
@@ -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 };'
Empty file.
22 changes: 22 additions & 0 deletions .config/ast-grep/rules/no-context.yml
Original file line number Diff line number Diff line change
@@ -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
17 changes: 17 additions & 0 deletions .config/nextest.toml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 6 additions & 1 deletion .eslintrc.cli.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@
"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"],
"excludedFiles": [
"examples/**/*",
"test/**/*",
"**/*.d.ts",
"turbopack/**/*"
],
"parserOptions": {
"project": true
},
Expand Down
9 changes: 7 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"commonjs": true,
"es6": true,
"node": true,
"jest": true
"jest": true,
"es2020": true
},
"parserOptions": {
"requireConfigFile": false,
Expand Down Expand Up @@ -101,7 +102,11 @@
"error",
{
"args": "none",
"ignoreRestSiblings": true
"ignoreRestSiblings": true,
"argsIgnorePattern": "^_",
"caughtErrorsIgnorePattern": "^_",
"destructuredArrayIgnorePattern": "^_",
"varsIgnorePattern": "^_"
}
],
"no-use-before-define": "off",
Expand Down
6 changes: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion .github/.react-version

This file was deleted.

50 changes: 29 additions & 21 deletions .github/ISSUE_TEMPLATE/1.bug_report.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions .github/ISSUE_TEMPLATE/2.example_bug_report.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
13 changes: 8 additions & 5 deletions .github/ISSUE_TEMPLATE/4.docs_report.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -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.
8 changes: 4 additions & 4 deletions .github/actions/next-repo-actions/dist/bankrupt/index.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Loading

0 comments on commit a2e740e

Please sign in to comment.