Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
kdy1 committed Sep 28, 2022
1 parent 40d2d0e commit e00158a
Showing 1 changed file with 48 additions and 46 deletions.
94 changes: 48 additions & 46 deletions crates/swc/tests/exec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -255,61 +255,63 @@ fn get_expected_stdout(input: &Path) -> Result<String, Error> {
let cm = Arc::new(SourceMap::default());
let c = Compiler::new(cm.clone());

try_with_handler(
cm.clone(),
HandlerOpts {
color: ColorConfig::Always,
skip_filename: true,
},
|handler| {
let fm = cm.load_file(input).context("failed to load file")?;
GLOBALS.set(&Default::default(), || {
try_with_handler(
cm.clone(),
HandlerOpts {
color: ColorConfig::Always,
skip_filename: true,
},
|handler| {
let fm = cm.load_file(input).context("failed to load file")?;

if let Ok(output) = stdout_of(&fm.src, NodeModuleType::Module) {
return Ok(output);
}
if let Ok(output) = stdout_of(&fm.src, NodeModuleType::CommonJs) {
return Ok(output);
}
if let Ok(output) = stdout_of(&fm.src, NodeModuleType::Module) {
return Ok(output);
}
if let Ok(output) = stdout_of(&fm.src, NodeModuleType::CommonJs) {
return Ok(output);
}

let res = c
.process_js_file(
fm,
handler,
&Options {
config: Config {
jsc: JscConfig {
target: Some(EsVersion::Es2021),
syntax: Some(Syntax::Typescript(TsConfig {
decorators: true,
let res = c
.process_js_file(
fm,
handler,
&Options {
config: Config {
jsc: JscConfig {
target: Some(EsVersion::Es2021),
syntax: Some(Syntax::Typescript(TsConfig {
decorators: true,
..Default::default()
})),
..Default::default()
})),
},
module: match input.extension() {
Some(ext) if ext == "ts" => {
Some(ModuleConfig::CommonJs(Default::default()))
}
Some(ext) if ext == "mjs" => None,
_ => None,
},
..Default::default()
},
module: match input.extension() {
Some(ext) if ext == "ts" => {
Some(ModuleConfig::CommonJs(Default::default()))
}
Some(ext) if ext == "mjs" => None,
_ => None,
},
..Default::default()
},
..Default::default()
},
)
.context("failed to process file")?;
)
.context("failed to process file")?;

let res = stdout_of(
&res.code,
match input.extension() {
Some(ext) if ext == "mjs" => NodeModuleType::Module,
_ => NodeModuleType::CommonJs,
},
)?;
let res = stdout_of(
&res.code,
match input.extension() {
Some(ext) if ext == "mjs" => NodeModuleType::Module,
_ => NodeModuleType::CommonJs,
},
)?;

Ok(res)
},
)
Ok(res)
},
)
})
}

/// Rename `foo/.bar/exec.js` => `foo/bar/exec.js`
Expand Down

0 comments on commit e00158a

Please sign in to comment.