Unverified Commit 013ba068 authored by Donny/강동윤's avatar Donny/강동윤 Committed by GitHub

chore: Update `swc_core` to `v0.90.21` (#63031)

### What?

- Update `swc_core` to fix performance regression caused by the creation
of the `tokio` runtime.

This PR practically reverts
https://github.com/vercel/next.js/pull/62441.

 - Apply various minifier bug fixes.

   - https://github.com/swc-project/swc/pull/8730
   - https://github.com/swc-project/swc/pull/8733
   - https://github.com/swc-project/swc/pull/8725
   - https://github.com/swc-project/swc/pull/8726
   - https://github.com/swc-project/swc/pull/8727

- Apply https://github.com/swc-project/plugins/pull/271 (Closes
PACK-2714)


### Why?

Someone reported a performance regression. See
https://github.com/swc-project/swc/issues/8708

### How?

Closes PACK-2693

---------
Co-authored-by: 's avatarTobias Koppers <tobias.koppers@googlemail.com>
parent ed893fa0
This diff is collapsed.
......@@ -30,18 +30,18 @@ next-core = { path = "packages/next-swc/crates/next-core" }
next-custom-transforms = { path = "packages/next-swc/crates/next-custom-transforms" }
# SWC crates
swc_core = { version = "0.90.17", features = [
swc_core = { version = "0.90.21", features = [
"ecma_loader_lru",
"ecma_loader_parking_lot",
] }
testing = { version = "0.35.20" }
# Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240313.5" }
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240313.6" }
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240313.5" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240313.6" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240313.5" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240313.6" }
# General Deps
......
......@@ -58,7 +58,7 @@ pub enum Input {
pub struct TransformTask {
pub c: Arc<Compiler>,
pub input: Input,
pub options: Vec<u8>,
pub options: Buffer,
}
#[inline]
......@@ -66,19 +66,12 @@ fn skip_filename() -> bool {
cfg!(debug_assertions)
}
fn run_in_context<F, Ret>(op: F) -> Ret
where
F: FnOnce() -> Ret,
{
GLOBALS.set(&Default::default(), op)
}
impl Task for TransformTask {
type Output = (TransformOutput, FxHashSet<String>);
type JsValue = Object;
fn compute(&mut self) -> Result<Self::Output> {
run_in_context(|| {
fn compute(&mut self) -> napi::Result<Self::Output> {
GLOBALS.set(&Default::default(), || {
let eliminated_packages: Rc<RefCell<fxhash::FxHashSet<String>>> = Default::default();
let res = catch_unwind(AssertUnwindSafe(|| {
try_with_handler(
......@@ -168,18 +161,18 @@ impl Task for TransformTask {
&mut self,
env: Env,
(output, eliminated_packages): Self::Output,
) -> Result<Self::JsValue> {
) -> napi::Result<Self::JsValue> {
complete_output(&env, output, eliminated_packages)
}
}
#[napi]
pub fn transform(
env: Env,
src: Either3<String, Buffer, Undefined>,
_is_module: bool,
options: Buffer,
) -> Result<Object> {
signal: Option<AbortSignal>,
) -> napi::Result<AsyncTask<TransformTask>> {
let c = get_compiler();
let input = match src {
......@@ -190,14 +183,8 @@ pub fn transform(
Either3::C(_) => Input::FromFilename,
};
let options = options.to_vec();
let mut task = TransformTask { c, input, options };
env.execute_tokio_future(
async move { task.compute() },
|env, (output, eliminated_packages)| complete_output(env, output, eliminated_packages),
)
let task = TransformTask { c, input, options };
Ok(AsyncTask::with_optional_signal(task, signal))
}
#[napi]
......@@ -206,7 +193,7 @@ pub fn transform_sync(
src: Either3<String, Buffer, Undefined>,
_is_module: bool,
options: Buffer,
) -> Result<Object> {
) -> napi::Result<Object> {
let c = get_compiler();
let input = match src {
......@@ -217,12 +204,8 @@ pub fn transform_sync(
Either3::C(_) => Input::FromFilename,
};
let options = options.to_vec();
let mut task = TransformTask { c, input, options };
let output = block_on(async { task.compute() })?;
let output = task.compute()?;
task.resolve(env, output)
}
#[test]
......
......@@ -192,7 +192,7 @@
"@types/ws": "8.2.0",
"@vercel/ncc": "0.34.0",
"@vercel/nft": "0.26.4",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240313.5",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240313.6",
"acorn": "8.5.0",
"amphtml-validator": "1.0.35",
"anser": "1.4.9",
......
......@@ -1071,8 +1071,8 @@ importers:
specifier: 0.26.4
version: 0.26.4
'@vercel/turbopack-ecmascript-runtime':
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240313.5
version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240313.5'
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240313.6
version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240313.6'
acorn:
specifier: 8.5.0
version: 8.5.0
......@@ -25494,8 +25494,8 @@ packages:
/zwitch@2.0.4:
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240313.5':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240313.5}
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240313.6':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240313.6}
name: '@vercel/turbopack-ecmascript-runtime'
version: 0.0.0
dependencies:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment