Commit 082e766e authored by Donny/강동윤's avatar Donny/강동윤

Fix

parent c3db1023
...@@ -13,7 +13,7 @@ use swc_core::{ ...@@ -13,7 +13,7 @@ use swc_core::{
common::{ common::{
collections::AHashMap, collections::AHashMap,
errors::{ColorConfig, Handler}, errors::{ColorConfig, Handler},
BytePos, FileName, SourceMap, Span, BytePos, FileName, Globals, SourceMap, Span, GLOBALS,
}, },
ecma::ast::*, ecma::ast::*,
ecma::atoms::JsWord, ecma::atoms::JsWord,
...@@ -69,10 +69,11 @@ impl Task for BundleTask { ...@@ -69,10 +69,11 @@ impl Task for BundleTask {
.map(JsWord::from) .map(JsWord::from)
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let globals = Globals::default();
let comments = self.c.comments().clone(); let comments = self.c.comments().clone();
// //
let mut bundler = Bundler::new( let mut bundler = Bundler::new(
self.c.globals(), &globals,
self.c.cm.clone(), self.c.cm.clone(),
CustomLoader { CustomLoader {
cm: self.c.cm.clone(), cm: self.c.cm.clone(),
...@@ -88,46 +89,46 @@ impl Task for BundleTask { ...@@ -88,46 +89,46 @@ impl Task for BundleTask {
}, },
Box::new(CustomHook), Box::new(CustomHook),
); );
GLOBALS.set(&globals, || {
let mut entries = HashMap::default(); let mut entries = HashMap::default();
let path: PathBuf = option.entry; let path: PathBuf = option.entry;
let path = path let path = path
.canonicalize() .canonicalize()
.context("failed to canonicalize entry file")?; .context("failed to canonicalize entry file")?;
entries.insert("main".to_string(), FileName::Real(path)); entries.insert("main".to_string(), FileName::Real(path));
let outputs = bundler.bundle(entries)?; let outputs = bundler.bundle(entries)?;
let output = outputs let output = outputs.into_iter().next().ok_or_else(|| {
.into_iter() anyhow!("swc_bundler::Bundle::bundle returned empty result")
.next() })?;
.ok_or_else(|| anyhow!("swc_bundler::Bundle::bundle returned empty result"))?;
let source_map_names = {
let source_map_names = { let mut v = SourceMapIdentCollector {
let mut v = SourceMapIdentCollector { names: Default::default(),
names: Default::default(), };
output.module.visit_with(&mut v);
v.names
}; };
output.module.visit_with(&mut v); let code = self.c.print(
&output.module,
v.names None,
}; None,
true,
let code = self.c.print( EsVersion::Es5,
&output.module, SourceMapsConfig::Bool(true),
None, &source_map_names,
None, None,
true, false,
EsVersion::Es5, Some(&comments),
SourceMapsConfig::Bool(true), true,
&source_map_names, false,
None, )?;
false,
Some(&comments), Ok(code)
true, })
false,
)?;
Ok(code)
}, },
) )
.convert_err() .convert_err()
......
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