Skip to content

Commit f68919e

Browse files
committed
Merge main.
2 parents 43d2aec + 3543736 commit f68919e

File tree

3,418 files changed

+60634
-414021
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,418 files changed

+60634
-414021
lines changed

.cargo/config.toml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,3 @@ rustflags = [
3131
"-Clink-arg=-fuse-ld=lld",
3232
]
3333

34-
[alias]
35-
xtask = "run --package xtask --"
36-
tr-build = "build -p turbo"
37-
tr-run = "run -p turbo"
38-
tr-test = "groups test turborepo"
39-
tr-check = "groups check turborepo"
40-
# Builds all test code to check for compiler errors before running
41-
tp-pre-test = "nextest run --no-run --workspace --release --exclude turbo --exclude turborepo-* --exclude turbopath --exclude wax --exclude globwalk --exclude globwatch --exclude pidlock"
42-
tp-test = "nextest run --workspace --release --no-fail-fast --exclude turbo --exclude turborepo-* --exclude turbopath --exclude wax --exclude globwalk --exclude globwatch --exclude pidlock"
43-
tp-bench-test = "test --benches --workspace --release --no-fail-fast --exclude turbopack-bench --exclude turbo --exclude turborepo-* --exclude turbopath --exclude wax --exclude globwalk --exclude globwatch --exclude pidlock"
44-
tp-check = "check --workspace --exclude turbo --exclude turborepo-* --exclude turbopath --exclude wax --exclude globwalk --exclude globwatch --exclude pidlock"
45-
tp-clippy = "clippy --workspace --exclude turbo --exclude turborepo-* --exclude turbopath --exclude wax --exclude globwalk --exclude globwatch --exclude pidlock"

.config/ast-grep/rule-tests/__snapshots__/no-context-snapshot.yml

Lines changed: 0 additions & 42 deletions
This file was deleted.

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

Lines changed: 0 additions & 11 deletions
This file was deleted.

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

Lines changed: 0 additions & 35 deletions
This file was deleted.

.config/nextest.toml

Lines changed: 0 additions & 17 deletions
This file was deleted.

.devcontainer/devcontainer.json

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,11 @@
1313
"NODE_VERSION": "lts/*"
1414
}
1515
},
16-
"runArgs": ["--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"],
17-
18-
// Set *default* container specific settings.json values on container create.
19-
"settings": {
20-
"go.toolsManagement.checkForUpdates": "local",
21-
"go.useLanguageServer": true,
22-
"go.gopath": "/go"
23-
},
24-
16+
"runArgs": [
17+
"--cap-add=SYS_PTRACE",
18+
"--security-opt",
19+
"seccomp=unconfined"
20+
],
2521
// Add the IDs of extensions you want installed when the container is created.
2622
"extensions": [
2723
"bradlc.vscode-tailwindcss",
@@ -39,12 +35,12 @@
3935
"windmilleng.vscode-go-autotest",
4036
"yzhang.markdown-all-in-one"
4137
],
42-
4338
// Use 'forwardPorts' to make a list of ports inside the container available locally.
4439
// "forwardPorts": [],
4540

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

4945
// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
5046
"remoteUser": "vscode",

.eslintignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@ dist/
88

99
packages/eslint-plugin-turbo/__fixtures__
1010
packages/create-turbo/templates
11-
packages/turbo-tracing-next-plugin/test/with-mongodb-mongoose
1211
crates/*/tests/**
1312
crates/*/js/src/compiled

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
.config/ast-grep/rule-tests/__snapshots__/** linguist-generated=true
2-
crates/turbopack-tests/tests/snapshot/**/output/** linguist-generated=true
2+
crates/turbo-tasks-macros-tests/tests/**/*.stderr linguist-generated=true
33
crates/turborepo-lockfiles/fixtures/*.lock text eol=lf

.github/.kodiak.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ notify_on_conflict = false
1717
# Without this, only branches that are passing CI will get updated.
1818
# The benefit of this config is that PRs that we want to automerge, but
1919
# have failed because the test suite is flaky will get stuck, unless someone
20-
# presses the Update Branch button manually, or re-triggers the Github workflow
20+
# presses the Update Branch button manually, or re-triggers the GitHub workflow
2121
# for tests again. This causes delays in getting easy PRs in.
2222
always = true
2323

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

3434
[merge.message]

.github/CODEOWNERS

Lines changed: 2 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,7 @@
11
# Learn how to add code owners here:
22
# https://help.github.com/en/articles/about-code-owners
33

4-
# Default to both teams
5-
* @vercel/turbo-oss @vercel/turbopack
4+
* @vercel/turbo-oss
65

76
# Shared docs (team specific overrides below)
8-
/docs @vercel/turbopack @vercel/turbo-oss @anthonyshew
9-
10-
# Turborepo-specific things
11-
12-
/cli @vercel/turbo-oss
13-
/benchmark @vercel/turbo-oss
14-
/buildcontainer @vercel/turbo-oss
15-
/examples @vercel/turbo-oss @anthonyshew
16-
/docs/pages/repo @vercel/turbo-oss @anthonyshew
17-
.github/workflows/bench-turborepo.yml @vercel/turbo-oss
18-
.github/workflows/pr-go-*.yml @vercel/turbo-oss
19-
.github/workflows/pr-js-tests-*.yml @vercel/turbo-oss
20-
/version.txt @vercel/turbo-oss
21-
.github/turborepo-release.yml @vercel/turbo-oss
22-
/turborepo-tests @vercel/turbo-oss
23-
24-
# Nobody owns these files, so nobody should get tagged on changes
25-
Cargo.lock
26-
pnpm-lock.yaml
27-
.gitignore
28-
29-
# Turbopack-specific things
30-
/.config/nextest.toml
31-
/docs/pages/pack @vercel/turbopack
32-
/xtask @vercel/turbopack
33-
.github/release.yml @vercel/turbopack
34-
.github/workflows/bench-turbopack.yml @vercel/turbopack
35-
.github/workflows/on-nextjs-release-publish.yml @vercel/turbopack
36-
.github/workflows/setup-nextjs-build.yml @vercel/turbopack
37-
.github/workflows/daily-nextjs-integration-test.yml @vercel/turbopack
38-
39-
# Nobody owns crates by default
40-
/crates
41-
42-
# overrides for crates that are owned by turbo-oss
43-
/crates/turborepo* @vercel/turbo-oss
44-
/crates/turborepo-telemetry/src/events @gsoltis @tknickman @padmaia
45-
46-
# overrides for crates that are owned by turbopack
47-
/crates/turbo-tasks* @vercel/turbopack
48-
/crates/turbopack* @vercel/turbopack
49-
/crates/node-file-trace @vercel/turbopack
50-
51-
# packages in alphabetical order, to match view github https://github.com/vercel/turbo/tree/main/packages
52-
# Separate section in this file, so we can add new entries more easily.
53-
# Note: Some packages may be omitted to indicate shared ownership.
54-
55-
/packages/create-turbo @vercel/turbo-oss
56-
/packages/eslint-config-turbo @vercel/turbo-oss
57-
/packages/eslint-plugin-turbo @vercel/turbo-oss
58-
/packages/node-module-trace @vercel/turbopack
59-
/packages/turbo @vercel/turbo-oss
60-
/packages/turbo-benchmark @vercel/turbo-oss
61-
/packages/turbo-codemod @vercel/turbo-oss
62-
/packages/turbo-gen @vercel/turbo-oss
63-
/packages/turbo-ignore @vercel/turbo-oss
64-
/packages/turbo-repository @vercel/turbo-oss
65-
/packages/turbo-tracing-next-plugin @vercel/turbopack
66-
/packages/turbo-types @vercel/turbo-oss
67-
/packages/turbo-telemetry @vercel/turbo-oss
68-
/packages/turbo-utils @vercel/turbo-oss
69-
/packages/turbo-workspaces @vercel/turbo-oss
70-
/packages/webpack-nmt @vercel/turbopack
71-
7+
/docs @vercel/turbo-oss @anthonyshew

0 commit comments

Comments
 (0)