Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(next-swc): Provide tokio context required for WASM plugins #62441

Merged
merged 6 commits into from
Feb 28, 2024
Merged

fix(next-swc): Provide tokio context required for WASM plugins #62441

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e32ab01
tokio for wasmer
kdy1 Feb 23, 2024
ae80cc6
extract
kdy1 Feb 26, 2024
9ae89f9
clippy
kdy1 Feb 26, 2024
c7d85e8
tokio
kdy1 Feb 27, 2024
8211ee5
Merge branch 'canary' into kdy1/wasmer-tokio
kdy1 Feb 27, 2024
c992f7b
use built in runtime all the time
ForsakenHarmony Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
171 changes: 90 additions & 81 deletions packages/next-swc/crates/napi/src/transform.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,90 +71,99 @@ impl Task for TransformTask {
type JsValue = Object;

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(
self.c.cm.clone(),
turbopack_binding::swc::core::base::HandlerOpts {
color: ColorConfig::Always,
skip_filename: skip_filename(),
},
|handler| {
self.c.run(|| {
let options: TransformOptions = serde_json::from_slice(&self.options)?;
let fm = match &self.input {
Input::Source { src } => {
let filename = if options.swc.filename.is_empty() {
FileName::Anon
} else {
FileName::Real(options.swc.filename.clone().into())
tokio::runtime::Runtime::new()
.unwrap()
.block_on(async move {
GLOBALS.set(&Default::default(), || {
let eliminated_packages: Rc<RefCell<fxhash::FxHashSet<String>>> =
Default::default();
let res = catch_unwind(AssertUnwindSafe(|| {
try_with_handler(
self.c.cm.clone(),
turbopack_binding::swc::core::base::HandlerOpts {
color: ColorConfig::Always,
skip_filename: skip_filename(),
},
|handler| {
self.c.run(|| {
let options: TransformOptions =
serde_json::from_slice(&self.options)?;
let fm = match &self.input {
Input::Source { src } => {
let filename = if options.swc.filename.is_empty() {
FileName::Anon
} else {
FileName::Real(options.swc.filename.clone().into())
};

self.c.cm.new_source_file(filename, src.to_string())
}
Input::FromFilename => {
let filename = &options.swc.filename;
if filename.is_empty() {
bail!("no filename is provided via options");
}

self.c.cm.new_source_file(
FileName::Real(filename.into()),
read_to_string(filename).with_context(|| {
format!(
"Failed to read source code from {}",
filename
)
})?,
)
}
};

self.c.cm.new_source_file(filename, src.to_string())
}
Input::FromFilename => {
let filename = &options.swc.filename;
if filename.is_empty() {
bail!("no filename is provided via options");
}

self.c.cm.new_source_file(
FileName::Real(filename.into()),
read_to_string(filename).with_context(|| {
format!("Failed to read source code from {}", filename)
})?,
)
}
};
let unresolved_mark = Mark::new();
let mut options = options.patch(&fm);
options.swc.unresolved_mark = Some(unresolved_mark);

let cm = self.c.cm.clone();
let file = fm.clone();

let comments = SingleThreadedComments::default();
self.c.process_js_with_custom_pass(
fm,
None,
handler,
&options.swc,
comments.clone(),
|_| {
custom_before_pass(
cm,
file,
&options,
let unresolved_mark = Mark::new();
let mut options = options.patch(&fm);
options.swc.unresolved_mark = Some(unresolved_mark);

let cm = self.c.cm.clone();
let file = fm.clone();

let comments = SingleThreadedComments::default();
self.c.process_js_with_custom_pass(
fm,
None,
handler,
&options.swc,
comments.clone(),
eliminated_packages.clone(),
unresolved_mark,
|_| {
custom_before_pass(
cm,
file,
&options,
comments.clone(),
eliminated_packages.clone(),
unresolved_mark,
)
},
|_| noop(),
)
},
|_| noop(),
)
})
},
)
}))
.map_err(|err| {
if let Some(s) = err.downcast_ref::<String>() {
anyhow!("failed to process {}", s)
} else {
anyhow!("failed to process")
}
});

match res {
Ok(res) => res
.map(|o| (o, eliminated_packages.replace(Default::default())))
.convert_err(),
Err(err) => Err(napi::Error::new(
Status::GenericFailure,
format!("{:?}", err),
)),
}
})
})
},
)
}))
.map_err(|err| {
if let Some(s) = err.downcast_ref::<String>() {
anyhow!("failed to process {}", s)
} else {
anyhow!("failed to process")
}
});

match res {
Ok(res) => res
.map(|o| (o, eliminated_packages.replace(Default::default())))
.convert_err(),
Err(err) => Err(napi::Error::new(
Status::GenericFailure,
format!("{:?}", err),
)),
}
})
})
}

fn resolve(
Expand Down
Loading