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: deno_ast 0.30 #143

Merged
merged 2 commits into from
Oct 23, 2023
Merged

fix: deno_ast 0.30 #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35380ce
fix: deno_ast 0.30
dsherret Oct 23, 2023
0e4b1ee
Merge branch 'main' into fix_deno_ast_0_30
dsherret Oct 23, 2023
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
95 changes: 51 additions & 44 deletions Cargo.lock
View file
Open in desktop

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

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[workspace]
resolver = "2"
members = [
"rs-lib",
"wasm"
Expand Down
4 changes: 2 additions & 2 deletions rs-lib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ license = "MIT"
[dependencies]
anyhow = "1.0.44"
base64 = "0.13.0"
deno_ast = { version = "0.29.3", features = ["bundler", "codegen", "module_specifier", "proposal", "react", "sourcemap", "transforms", "typescript", "visit", "transpiling"] }
deno_graph = "0.57.0"
deno_ast = { version = "0.30.0", features = ["bundler", "codegen", "module_specifier", "proposal", "react", "sourcemap", "transforms", "typescript", "visit", "transpiling"] }
deno_graph = "0.58.0"
escape8259 = "0.5.2"
futures = "0.3.17"
import_map = "0.15.0"
Expand Down
13 changes: 7 additions & 6 deletions rs-lib/src/emit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,13 @@ pub fn bundle_graph(
let mut buf = Vec::new();
let mut srcmap = Vec::new();
{
let cfg = swc::codegen::Config {
minify: options.minify,
ascii_only: false,
target: deno_ast::ES_VERSION,
omit_last_semi: false,
};
// can't use struct expr because Config has #[non_exhaustive]
let mut cfg = swc::codegen::Config::default();
cfg.minify = options.minify;
cfg.ascii_only = false;
cfg.target = deno_ast::ES_VERSION;
cfg.omit_last_semi = false;
cfg.emit_assert_for_import_attributes = false;
let mut wr = Box::new(swc::codegen::text_writer::JsWriter::new(
cm.clone(),
"\n",
Expand Down