Skip to content

Commit

Permalink
Merge main.
Browse files Browse the repository at this point in the history
  • Loading branch information
anthonyshew committed Mar 4, 2024
2 parents 48e4e42 + f07566d commit c2e52b6
Show file tree
Hide file tree
Showing 807 changed files with 35,033 additions and 17,990 deletions.
3 changes: 0 additions & 3 deletions .editorconfig
Expand Up @@ -18,9 +18,6 @@ indent_style = tab
[{go.mod,go.sum,*.go}]
indent_style = tab

[nginx.conf]
indent_size = 8

[*.rs]
# Keep in sync with rustfmt
max_line_length = 100
Expand Down
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Expand Up @@ -41,6 +41,7 @@ pnpm-lock.yaml

# overrides for crates that are owned by turbo-oss
/crates/turborepo* @vercel/turbo-oss
/crates/turborepo-telemetry/src/events @gsoltis @tknickman @padmaia

# overrides for crates that are owned by turbopack
/crates/turbo-tasks* @vercel/turbopack
Expand Down
20 changes: 20 additions & 0 deletions .github/DISCUSSION_TEMPLATE/help.yml
@@ -0,0 +1,20 @@
body:
- type: textarea
attributes:
label: Summary
description: What do you need help with?
validations:
required: true
- type: textarea
attributes:
label: Additional information
description: Any code snippets, error messages, or dependency details that may be related?
render: js
validations:
required: false
- type: input
attributes:
label: Example
description: A link to a minimal reproduction is helpful for collaborative debugging!
validations:
required: false
33 changes: 33 additions & 0 deletions .github/DISCUSSION_TEMPLATE/ideas.yml
@@ -0,0 +1,33 @@
body:
- type: textarea
attributes:
label: Goals
description: Short list of the problems that the feature request aims to address.
value: |
1.
2.
3.
validations:
required: true
- type: textarea
attributes:
label: Non-goals
description: Short list of what the feature request _does not_ aim to address.
value: |
1.
2.
3.
validations:
required: false
- type: textarea
attributes:
label: Background
description: Discuss prior art and provide context around your idea. Why do you think this feature is needed? Are there current alternatives?
validations:
required: true
- type: textarea
attributes:
label: Proposal
description: How should this feature be implemented? Are you interested in contributing?
validations:
required: true
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/0-turborepo-bug-report.yml
Expand Up @@ -38,7 +38,7 @@ body:
- npm
- pnpm
- Yarn v1
- Yarn v2/v3 (node_modules linker only)
- Yarn v2/v3/v4 (node_modules linker only)
validations:
required: true

Expand Down
30 changes: 30 additions & 0 deletions .github/ISSUE_TEMPLATE/1-docs.yml
@@ -0,0 +1,30 @@
name: "Documentation update or improvement"
description: A request to update or improve documentation
title: "Docs: "
labels:
- "template: documentation"
body:
- type: markdown
attributes:
value: Before opening this issue to request a docs improvement, is this something you can help us with? Your contributions are welcomed and appreciated.
- type: markdown
attributes:
value: Thank you for helping us improve the docs!
- type: textarea
attributes:
label: What is the improvement or update you wish to see?
description: "Example: I would like to see more examples of how to use `turbo run`. Or, the `turbo run` docs are missing information."
validations:
required: true
- type: textarea
attributes:
label: Is there any context that might help us understand?
description: A clear description of any added context that might help us understand.
validations:
required: true
- type: input
attributes:
label: Does the docs page already exist? Please link to it.
description: "Example: https://turbo.build/repo/docs/reference/command-line-reference/run"
validations:
required: false
38 changes: 0 additions & 38 deletions .github/ISSUE_TEMPLATE/1-feature-request.yml

This file was deleted.

9 changes: 6 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Expand Up @@ -3,6 +3,9 @@ contact_links:
- name: Turbopack in Next.js Bug Report
url: https://github.com/vercel/next.js/issues/new?assignees=&labels=template%3A+bug&projects=&template=1.bug_report.yml
about: Create a Next.js bug report for the Turbopack team
- name: Ask a question
url: https://github.com/vercel/turbo/discussions
about: Ask questions and discuss ideas with other community members
- name: Ask for help
url: https://github.com/vercel/turbo/discussions/new?category=help
about: Need to ask a question? Get help from the community.
- name: Submit an idea
url: https://github.com/vercel/turbo/discussions/new?category=ideas
about: Make feature requests and suggest improvements.
9 changes: 9 additions & 0 deletions .github/turbo-orchestrator.yml
Expand Up @@ -79,6 +79,15 @@ labeler:
- label: "pkg: turbo-workspaces"
when:
isAnyFilePathMatch: '^packages\/turbo-workspaces\/.*$'
- label: "pkg: turbo-repository"
when:
isAnyFilePathMatch: '^packages\/turbo-repository\/.*$'

# release
- label: "release: turborepo"
when:
isAnyFilePathMatch: '^version\.txt$'
isPRTitleMatch: '^release\(turborepo\):.*$'
events:
onPublish:
turbo:
Expand Down
4 changes: 4 additions & 0 deletions .github/turborepo-release.yml
Expand Up @@ -5,6 +5,7 @@ changelog:
labels:
- "owned-by: turbopack"
- "area: ci"
- "release: turborepo"
categories:
- title: Docs
labels:
Expand All @@ -22,6 +23,9 @@ changelog:
- title: "eslint"
labels:
- "pkg: turbo-eslint"
- title: "@turbo/repository"
labels:
- "pkg: turbo-repository"
- title: Examples
labels:
- "area: examples"
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/bench-turbopack-scheduled.yml
Expand Up @@ -40,6 +40,13 @@ jobs:
TURBOPACK_BENCH_COUNTS: 100,500,1000
TURBOPACK_BENCH_BUNDLERS: all

# This measures Next.js 14
- name: next 14
title: Next.js 14
run_args: '"(Turbopack SSR/1000|Next.js 14)"'
TURBOPACK_BENCH_COUNTS: 100,500,1000
TURBOPACK_BENCH_BUNDLERS: all

# This measures Next.js 13
- name: next 13
title: Next.js 13
Expand All @@ -54,13 +61,6 @@ jobs:
TURBOPACK_BENCH_COUNTS: 100,500,1000
TURBOPACK_BENCH_BUNDLERS: all

# This measures Next.js 11
- name: next 11
title: Next.js 11
run_args: '"(Turbopack SSR/1000|Next.js 11)"'
TURBOPACK_BENCH_COUNTS: 100,500,1000
TURBOPACK_BENCH_BUNDLERS: all

# This measures Vite
- name: vite
title: Vite
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/bench-turborepo.yml
Expand Up @@ -140,7 +140,9 @@ jobs:
send-to-slack:
name: Send to Slack
needs: [time-to-first-task]
# Wait for send-to-tinybird so we can get aggregate data points
# before sending to slack.
needs: [send-to-tinybird]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -165,6 +167,9 @@ jobs:
# TODO: compare results to previous data and only post regressions
- name: Create Slack payload
shell: bash
env:
BLOB_READ_WRITE_TOKEN: ${{ secrets.BLOB_READ_WRITE_TOKEN }}
TINYBIRD_TOKEN: ${{ secrets.TINYBIRD_TOKEN }}
run: |
cd packages/turbo-benchmark
node -r esbuild-register ./src/ttft/slack.ts ${{github.run_id}}
Expand Down
36 changes: 21 additions & 15 deletions .github/workflows/test.yml
Expand Up @@ -223,8 +223,13 @@ jobs:
with:
windows: ${{ matrix.os.name == 'windows' }}
github-token: "${{ secrets.GITHUB_TOKEN }}"

- run: turbo run build --filter=cli --color --env-mode=strict --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }}
# We explicitly unset RUSTC_WRAPPER if it is an empty string as causes build issues
- run: |
if [ -z "${RUSTC_WRAPPER}" ]; then
unset RUSTC_WRAPPER
fi
turbo run build --filter=cli --color --env-mode=strict --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }}
shell: bash
env:
SCCACHE_BUCKET: turborepo-sccache
SCCACHE_REGION: us-east-2
Expand All @@ -233,7 +238,6 @@ jobs:
CARGO_INCREMENTAL: 0
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
EXPERIMENTAL_RUST_CODEPATH: true
- name: Run sccache stat for check
shell: bash
Expand All @@ -245,6 +249,7 @@ jobs:
needs: [determine_jobs, build_turborepo]
if: needs.determine_jobs.outputs.turborepo_integration == 'true'
runs-on: ${{ matrix.os.runner }}
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -284,9 +289,7 @@ jobs:
key: prysk-venv-${{ matrix.os.runner }}

- name: Integration Tests
run: turbo run test --filter=turborepo-tests-integration-rust --color --env-mode=strict --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }}
env:
EXPERIMENTAL_RUST_CODEPATH: true
run: turbo run test --filter=turborepo-tests-integration --color --env-mode=strict --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }}

turborepo_examples:
name: Turborepo Examples
Expand Down Expand Up @@ -368,10 +371,12 @@ jobs:
github-token: "${{ secrets.GITHUB_TOKEN }}"

- name: Run tests
# We manually set TURBO_API to an empty string to override Hetzner env
# We filter out turborepo-repository because it's a native package and needs
# to run when turbo core changes. This job (`js_packages`) does not run on turborpeo core
# changes, and we don't want to enable that beahvior for _all_ our JS packages.
run: |
turbo run check-types test --filter=docs --filter={./packages/*}...[${{ github.event.pull_request.base.sha || 'HEAD^1' }}] --color --env-mode=strict
env:
EXPERIMENTAL_RUST_CODEPATH: true
TURBO_API= turbo run check-types test --filter=docs --filter="!turborepo-repository" --filter={./packages/*}...[${{ github.event.pull_request.base.sha || 'HEAD^1' }}] --color --env-mode=strict
turbopack_typescript:
name: Turbopack TypeScript files
Expand Down Expand Up @@ -428,7 +433,7 @@ jobs:
cargo fmt --check
- name: Check Cargo.toml formatting (taplo)
run: npx @taplo/cli format --check
run: npx @taplo/cli@0.5.2 format --check

- name: Check licenses
uses: EmbarkStudios/cargo-deny-action@v1
Expand Down Expand Up @@ -509,12 +514,16 @@ jobs:
uses: ./.github/actions/setup-rust
with:
components: clippy
targets: wasm32-unknown-unknown
targets: wasm32-unknown-unknown,wasm32-wasi-preview1-threads

- name: Run cargo check release
run: |
RUSTFLAGS="-D warnings -A deprecated" cargo groups check turbopack --features rustls-tls --release
- name: Run cargo check for the wasi targets
run: |
RUSTFLAGS="-D warnings -A deprecated" cargo groups check turbopack-wasi --release
turbopack_rust_clippy:
needs: [turbopack_rust_check]
name: Turbopack rust clippy
Expand Down Expand Up @@ -846,11 +855,8 @@ jobs:

- name: Lint
# Filters some workspaces out:
# - `cli` because it runs golangci-lint and this Job doesn't have all the dependencies for that.
# - Other `@vercel/*` packages because ??
run: turbo run lint --filter=!cli --filter=!@vercel/devlow-bench --filter=!@vercel/experimental-nft-next-plugin --filter=!@vercel/experimental-nft-next-plugin --filter=!turbopack-bump-action --filter=!next-integration-stat --env-mode=strict
env:
EXPERIMENTAL_RUST_CODEPATH: true
run: turbo run lint --filter=!@vercel/devlow-bench --filter=!@vercel/experimental-nft-next-plugin --filter=!@vercel/experimental-nft-next-plugin --filter=!turbopack-bump-action --filter=!next-integration-stat --env-mode=strict

final:
name: Ok
Expand Down

0 comments on commit c2e52b6

Please sign in to comment.