Skip to content

Commit

Permalink
remove --turbo, use --experimental-turbo as --turbo (#55063)
Browse files Browse the repository at this point in the history
### What?

Switch the default for `--turbo` to the new `--experimental-turbo`, remove the old code in next.js

### Why?

The new approach will be used in future


Closes WEB-1506
  • Loading branch information
sokra committed Sep 6, 2023
1 parent 16cbc82 commit 15980a6
Show file tree
Hide file tree
Showing 21 changed files with 1,939 additions and 2,308 deletions.
42 changes: 5 additions & 37 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,37 +124,13 @@ jobs:
afterBuild: turbo run rust-check
secrets: inherit

test-experimental-turbopack-dev:
name: test experimental turbopack dev
needs: ['build-native', 'build-next']
uses: ./.github/workflows/build_reusable.yml
with:
skipForDocsOnly: 'yes'
afterBuild: RUST_BACKTRACE=0 NEXT_EXTERNAL_TESTS_FILTERS="$(pwd)/test/turbopack-tests-manifest.js" EXPERIMENTAL_TURBOPACK=1 NEXT_E2E_TEST_TIMEOUT=240000 NEXT_TEST_MODE=dev node run-tests.js --test-pattern '^(test\/development)/.*\.test\.(js|jsx|ts|tsx)$' --timings -c ${TEST_CONCURRENCY}
secrets: inherit

test-turbopack-dev:
name: test turbopack dev
needs: ['build-native', 'build-next']
uses: ./.github/workflows/build_reusable.yml
with:
skipForDocsOnly: 'yes'
afterBuild: RUST_BACKTRACE=0 NEXT_EXTERNAL_TESTS_FILTERS="$(pwd)/packages/next-swc/crates/next-dev-tests/tests-manifest.js" TURBOPACK=1 __INTERNAL_CUSTOM_TURBOPACK_BINDINGS="$(pwd)/packages/next-swc/native/next-swc.linux-x64-gnu.node" NEXT_E2E_TEST_TIMEOUT=240000 NEXT_TEST_MODE=dev node run-tests.js --test-pattern '^(test\/development)/.*\.test\.(js|jsx|ts|tsx)$' --timings -c ${TEST_CONCURRENCY}
secrets: inherit

test-experimental-turbopack-integration:
name: test experimental turbopack integration
needs: ['build-native', 'build-next']
strategy:
fail-fast: false
matrix:
group: [1]

uses: ./.github/workflows/build_reusable.yml
with:
nodeVersion: 16
skipForDocsOnly: 'yes'
afterBuild: RUST_BACKTRACE=0 NEXT_EXTERNAL_TESTS_FILTERS="$(pwd)/test/turbopack-tests-manifest.js" EXPERIMENTAL_TURBOPACK=1 node run-tests.js --timings -g ${{ matrix.group }}/1 -c ${TEST_CONCURRENCY} --type integration
afterBuild: RUST_BACKTRACE=0 NEXT_EXTERNAL_TESTS_FILTERS="$(pwd)/test/turbopack-tests-manifest.js" TURBOPACK=1 NEXT_E2E_TEST_TIMEOUT=240000 NEXT_TEST_MODE=dev node run-tests.js --test-pattern '^(test\/development)/.*\.test\.(js|jsx|ts|tsx)$' --timings -c ${TEST_CONCURRENCY}
secrets: inherit

test-turbopack-integration:
Expand All @@ -163,14 +139,15 @@ jobs:
strategy:
fail-fast: false
matrix:
group: [1, 2, 3, 4, 5]
group: [1]

uses: ./.github/workflows/build_reusable.yml
with:
nodeVersion: 16
skipForDocsOnly: 'yes'
afterBuild: RUST_BACKTRACE=0 NEXT_EXTERNAL_TESTS_FILTERS="$(pwd)/packages/next-swc/crates/next-dev-tests/tests-manifest.js" TURBOPACK=1 __INTERNAL_CUSTOM_TURBOPACK_BINDINGS="$(pwd)/packages/next-swc/native/next-swc.linux-x64-gnu.node" node run-tests.js --timings -g ${{ matrix.group }}/5 -c ${TEST_CONCURRENCY} --type integration
afterBuild: RUST_BACKTRACE=0 NEXT_EXTERNAL_TESTS_FILTERS="$(pwd)/test/turbopack-tests-manifest.js" TURBOPACK=1 node run-tests.js --timings -g ${{ matrix.group }}/1 -c ${TEST_CONCURRENCY} --type integration
secrets: inherit

test-next-swc-wasm:
name: test next-swc wasm
needs: ['build-native', 'build-next']
Expand Down Expand Up @@ -235,14 +212,7 @@ jobs:
secrets: inherit

report-test-results:
needs:
[
'test-dev',
'test-prod',
'test-integration',
'test-turbopack-dev',
'test-turbopack-integration',
]
needs: ['test-dev', 'test-prod', 'test-integration']
uses: ./.github/workflows/build_reusable.yml
with:
skipForDocsOnly: 'yes'
Expand All @@ -266,9 +236,7 @@ jobs:
'rust-check',
'test-next-swc-wasm',
'test-turbopack-dev',
'test-experimental-turbopack-dev',
'test-turbopack-integration',
'test-experimental-turbopack-integration',
]

if: always()
Expand Down
7 changes: 3 additions & 4 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,9 @@ if (shouldEnableTestTrace) {
customJestConfig.reporters = ['default']
}

const outputDirectory =
process.env.TURBOPACK || process.env.EXPERIMENTAL_TURBOPACK
? '<rootDir>/turbopack-test-junit-report'
: '<rootDir>/test-junit-report'
const outputDirectory = process.env.TURBOPACK
? '<rootDir>/turbopack-test-junit-report'
: '<rootDir>/test-junit-report'

customJestConfig.reporters.push([
'jest-junit',
Expand Down
7 changes: 0 additions & 7 deletions packages/next-swc/crates/napi/src/turbopack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,9 @@ use next_build::{
build as turbo_next_build, build_options::BuildContext, BuildOptions as NextBuildOptions,
};
use next_core::next_config::{Rewrite, Rewrites, RouteHas};
use next_dev::{devserver_options::DevServerOptions, start_server};

use crate::util::MapErr;

#[napi]
pub async fn start_turbo_dev(options: Buffer) -> napi::Result<()> {
let options: DevServerOptions = serde_json::from_slice(&options)?;
start_server(&options).await.convert_err()
}

#[napi(object, object_to_js = false)]
#[derive(Debug)]
pub struct NextBuildContext {
Expand Down
30 changes: 0 additions & 30 deletions packages/next-swc/crates/next-dev-tests/print-enabled-tests.js

This file was deleted.

214 changes: 0 additions & 214 deletions packages/next-swc/crates/next-dev-tests/tests-manifest.js

This file was deleted.

0 comments on commit 15980a6

Please sign in to comment.