Skip to content

Commit

Permalink
Merge branch 'main' into shew-f3f9b
Browse files Browse the repository at this point in the history
  • Loading branch information
anthonyshew authored Jan 2, 2025
2 parents 8c1eef9 + c8d4946 commit 5e970fd
Show file tree
Hide file tree
Showing 805 changed files with 39,877 additions and 21,548 deletions.
42 changes: 0 additions & 42 deletions .config/ast-grep/rule-tests/__snapshots__/no-context-snapshot.yml

This file was deleted.

11 changes: 0 additions & 11 deletions .config/ast-grep/rule-tests/no-context-test.yml

This file was deleted.

35 changes: 0 additions & 35 deletions .config/ast-grep/rules/no-context.yml

This file was deleted.

18 changes: 7 additions & 11 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,11 @@
"NODE_VERSION": "lts/*"
}
},
"runArgs": ["--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"],

// Set *default* container specific settings.json values on container create.
"settings": {
"go.toolsManagement.checkForUpdates": "local",
"go.useLanguageServer": true,
"go.gopath": "/go"
},

"runArgs": [
"--cap-add=SYS_PTRACE",
"--security-opt",
"seccomp=unconfined"
],
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"bradlc.vscode-tailwindcss",
Expand All @@ -39,12 +35,12 @@
"windmilleng.vscode-go-autotest",
"yzhang.markdown-all-in-one"
],

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "go version && cargo --version", // Invoking `cargo` will eagerly install the toolchain specified in rust-toolchain file
"postCreateCommand": "cargo --version",
// Invoking `cargo` will eagerly install the toolchain specified in rust-toolchain file

// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "vscode",
Expand Down
1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@ dist/

packages/eslint-plugin-turbo/__fixtures__
packages/create-turbo/templates
packages/turbo-tracing-next-plugin/test/with-mongodb-mongoose
crates/*/tests/**
crates/*/js/src/compiled
4 changes: 2 additions & 2 deletions .github/.kodiak.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ notify_on_conflict = false
# Without this, only branches that are passing CI will get updated.
# The benefit of this config is that PRs that we want to automerge, but
# have failed because the test suite is flaky will get stuck, unless someone
# presses the Update Branch button manually, or re-triggers the Github workflow
# presses the Update Branch button manually, or re-triggers the GitHub workflow
# for tests again. This causes delays in getting easy PRs in.
always = true

Expand All @@ -28,7 +28,7 @@ always = true
# (i.e. PRs with the "pr: automerge" label, which is configured above).
# This label allows PR authors to keep their PR branch up-to-date without
# opting into Kodiak's automerge feature. This is useful if you want to use
# Github's AutoMerge feature instead.
# GitHub's AutoMerge feature instead.
autoupdate_label = "pr: autoupdate"

[merge.message]
Expand Down
59 changes: 19 additions & 40 deletions .github/ISSUE_TEMPLATE/0-turborepo-bug-report.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
name: Turborepo Bug Report
description: Create a bug report for the Turborepo core team
name: Turborepo bug report
description: Create a bug report
labels: ["kind: bug", "needs: triage"]

body:
- type: markdown
attributes:
value: |
This template is to report Turborepo bugs. Before opening a new issue, please do a [search](https://github.com/vercel/turborepo/issues) of existing issues and :+1: upvote the existing issue instead. This will result in a quicker resolution.
This template is to report bugs. Before opening a new issue, please do a [search](https://github.com/vercel/turborepo/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/turborepo/discussions/categories/help).
Expand All @@ -23,34 +24,7 @@ body:
attributes:
label: Link to code that reproduces this issue
description: |
A link to a **public** GitHub repository with a minimal reproduction. Ideally, minimal reproductions should be created using [`npx create-turbo@canary -e with-shell-commands`](https://github.com/vercel/turborepo/tree/main/examples/with-shell-commands) and should include only changes that contribute to the issue. You may also use [`npx create-turbo@canary -e <example-name>`](https://github.com/vercel/turborepo/tree/main/examples) to create a reproduction that includes frameworks if you believe your bug requires a framework to reproduce.
validations:
required: true

- type: dropdown
id: packageManager
attributes:
multiple: true
label: What package manager are you using / does the bug impact?
description: |
You can quickly check different package managers in your reproduction using `npx turbo/workspaces convert`.
options:
- npm
- pnpm
- Yarn v1
- Yarn v2/v3/v4 (node_modules linker only)
validations:
required: true

- type: dropdown
id: os
attributes:
label: What operating system are you using?
options:
- Mac
- Windows
- Linux
- Other
A link to a **public** GitHub repository with a minimal reproduction. Ideally, minimal reproductions should be created using [`npx create-turbo@canary -e with-shell-commands`](https://github.com/vercel/turborepo/tree/main/examples/with-shell-commands) and should include only changes that contribute to the issue. You may also use [`npx create-turbo@canary -e <example-name>`](https://github.com/vercel/turborepo/tree/main/examples) to create a reproduction that includes frameworks if you believe your bug requires a specific framework to reproduce.
validations:
required: true

Expand All @@ -64,40 +38,45 @@ body:

- type: textarea
attributes:
label: Describe the Bug
label: Enviroment information
render: block
description: |
A clear and concise description of the bug.
Run the command `turbo info` and paste its output here. Please review it in case there is sensitive information you don't want to share.
- type: textarea
attributes:
label: Expected behavior
description: |
A clear and concise description of what you expected to happen.
validations:
required: true

- type: textarea
attributes:
label: Expected Behavior
label: Actual behavior
description: |
A clear and concise description of what you expected to happen.
A clear and concise description of the bug.
validations:
required: true

- type: textarea
attributes:
label: To Reproduce
description: |
Steps to reproduce the unexpected behavior. Please provide a clear code snippets that always reproduces the issue or a GitHub repository. Screenshots can be provided in the issue body below.
Steps to reproduce the unexpected behavior. Please provide clear code snippets that always reproduces the issue or a GitHub repository. Screenshots can be provided in "Additional context" below.
validations:
required: true

- type: markdown
attributes:
value: |
Another way you can help the maintainers is to pinpoint the `canary` version of `turbo` that introduced the issue. Check out our [releases](https://github.com/vercel/turborepo/releases), and try to find the first `canary` release that introduced the issue. This will help us narrow down the scope of the issue, and possibly point to the PR/code change that introduced it. You can install a specific version of `turbo` by running `npm install turbo@<version>`.
Another way you can help the maintainers is to pinpoint the `canary` version of `turbo` that introduced the issue. Check out our [releases](https://github.com/vercel/turborepo/releases), and try to find the first `canary` release that introduced the issue. While not required, this will help us narrow down the scope of the issue, and possibly point to the PR/code change that introduced it. You can install a specific version of `turbo` by running `npm install turbo@<version>`.
- type: textarea
attributes:
label: Additional context
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 "1.10.4-canary.2", since reverting to "1.10.4-canary.1" works.
I tested my reproduction against different canary releases, and the first one that introduced the bug was "2.2.4-canary.2", since reverting to "2.3.4-canary.1" works.
or
I am using GitHub Actions but running my tasks locally does not have the same issue.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/1-docs.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: "Documentation update or improvement"
description: A request to update or improve documentation
title: "Docs: "
title: "📚 Docs: "
labels:
- "template: documentation"
- "area: docs"
body:
- type: markdown
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/cargo-sweep/action.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: "cargo-sweep"
description: "Runs cargo-sweep to clean old build artifacts"
runs:
using: "node16"
using: "node20"
main: "dist/main/index.js"
post: "dist/post/index.js"
2 changes: 1 addition & 1 deletion .github/actions/setup-node/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ runs:
uses: pnpm/action-setup@v4

- name: Setup Node.js
uses: actions/setup-node@v3.6.0
uses: actions/setup-node@v4
with:
node-version: ${{ inputs.node-version }}
cache: pnpm
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/setup-rust/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ runs:
- name: Set Up Protoc
id: set-up-protoc
continue-on-error: true
uses: arduino/setup-protoc@v2.1.0
uses: arduino/setup-protoc@v3
with:
version: "26.x"
repo-token: ${{ inputs.github-token }}

- name: Set Up Protoc (second try)
if: steps.set-up-protoc.outcome == 'failure'
uses: arduino/setup-protoc@v2.1.0
uses: arduino/setup-protoc@v3
with:
version: "26.x"
repo-token: ${{ inputs.github-token }}
Expand Down
11 changes: 1 addition & 10 deletions .github/turbo-orchestrator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,7 @@

labeler:
labels:
# owned-by
- label: "owned-by: turborepo"
when:
isAnyFileOwnedByMatch: '@vercel\/turbo-oss'

- label: "created-by: turborepo"
when:
isPRAuthorMatch: "^(anthonyshew|dimitropoulos|tknickman|chris-olszewski|NicholasLYang)$"

# needs: triage when not any of the turbopack or turborepo team
# needs: triage when not any of the turborepo team
- label: "needs: triage"
when:
isNotPRAuthorMatch: "^(padmaia|anthonyshew|dimitropoulos|tknickman|chris-olszewski|NicholasLYang)$"
Expand Down
1 change: 0 additions & 1 deletion .github/turborepo-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
changelog:
exclude:
labels:
- "owned-by: turbopack"
- "area: ci"
- "release: turborepo"
categories:
Expand Down
Loading

0 comments on commit 5e970fd

Please sign in to comment.