Skip to content

Commit

Permalink
Merge cb5d6b4 into d46face
Browse files Browse the repository at this point in the history
  • Loading branch information
kwonoj committed Nov 16, 2023
2 parents d46face + cb5d6b4 commit 1e571fa
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 20 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -905,18 +905,19 @@ jobs:
working-directory: examples/with-yarn
run: npm install

- name: Install nextest
uses: taiki-e/install-action@nextest

- name: Build nextest
timeout-minutes: 120
run: |
cargo tp-pre-test
cargo install cargo-nextest --locked
cargo check
cargo build
- name: Run nextest (Mac)
timeout-minutes: 120
if: matrix.os.name == 'macos'
run: |
cargo tp-pre-test
cargo tp-test --profile tp-test-mac
- name: Run nextest (Windows)
Expand Down
13 changes: 4 additions & 9 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ lto = "off"
[workspace.dependencies]
async-recursion = "1.0.2"
# Keep consistent with preset_env_base through swc_core
browserslist-rs = { version = "0.12.2" }
#browserslist-rs = { version = "0.13.0" }

mdxjs = "0.1.19"
modularize_imports = { version = "0.55.0" }
Expand Down
2 changes: 1 addition & 1 deletion crates/turbopack-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ anyhow = { workspace = true }
async-recursion = { workspace = true }
async-trait = { workspace = true }
auto-hash-map = { workspace = true }
browserslist-rs = { workspace = true }
# browserslist-rs = { workspace = true }
futures = { workspace = true }
indexmap = { workspace = true }
lazy_static = { workspace = true }
Expand Down
7 changes: 1 addition & 6 deletions crates/turbopack-core/src/environment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,7 @@ impl Environment {
Ok(match this.execution {
ExecutionEnvironment::NodeJsBuildTime(node_env, ..)
| ExecutionEnvironment::NodeJsLambda(node_env) => node_env.runtime_versions(),
ExecutionEnvironment::Browser(browser_env) => {
Vc::cell(Versions::parse_versions(browserslist::resolve(
browser_env.await?.browserslist_query.split(','),
&browserslist::Opts::new(),
)?)?)
}
ExecutionEnvironment::Browser(_browser_env) => todo!(),
ExecutionEnvironment::EdgeWorker(_) => todo!(),
ExecutionEnvironment::Custom(_) => todo!(),
})
Expand Down

0 comments on commit 1e571fa

Please sign in to comment.