Skip to content

Commit afd3836

Browse files
andrieshiemstraandrieshiemstra
committed
update swc, fix serde to 1.0.219
1 parent 3b44aa0 commit afd3836

File tree

2 files changed

+32
-42
lines changed

2 files changed

+32
-42
lines changed

‎Cargo.toml‎

Lines changed: 30 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ console = []
1818
settimeout = []
1919
setinterval = []
2020
setimmediate = []
21-
typescript = ["swc", "swc_common", "swc_atoms", "swc_cached", "swc_macros_common", "swc_eq_ignore_macros", "swc_visit", "swc_visit_macros", "swc_config", "swc_config_macro", "swc_ecma_codegen", "swc_ecma_ast", "swc_ecma_codegen_macros", "swc_ecma_ext_transforms", "swc_ecma_utils", "swc_ecma_visit", "swc_ecma_lints", "swc_ecma_loader", "swc_ecma_minifier", "swc_ecma_parser", "swc_error_reporters", "swc_fast_graph", "swc_ecma_usage_analyzer", "swc_timer", "swc_ecma_preset_env", "swc_ecma_transforms", "swc_ecma_transforms_base", "swc_ecma_transforms_compat", "swc_ecma_transforms_classes", "swc_ecma_transforms_module", "swc_ecma_transforms_optimization", "swc_ecma_transforms_proposal", "swc_ecma_transforms_macros", "swc_ecma_transforms_react", "swc_ecma_transforms_typescript"]#, "swc_node_comments"]#, "swc_trace_macro"]
21+
typescript = ["swc", "swc_common", "swc_atoms", "swc_cached", "swc_macros_common", "swc_eq_ignore_macros", "swc_visit", "swc_visit_macros", "swc_config", "swc_config_macro", "swc_ecma_codegen", "swc_ecma_ast", "swc_ecma_codegen_macros", "swc_ecma_utils", "swc_ecma_visit", "swc_ecma_loader", "swc_ecma_transforms_base", "swc_ecma_transforms_compat", "swc_ecma_transforms_classes", "swc_ecma_transforms_optimization", "swc_ecma_transforms_proposal", "swc_ecma_transforms_macros", "swc_ecma_transforms_react", "swc_ecma_transforms_typescript", "swc_graph_analyzer", "swc_bundler", "swc_ecma_lexer", "swc_ecma_parser", "swc_sourcemap", "swc_trace_macro", "swc_node_comments"]
2222
bellard = ["libquickjs-sys/bellard"]
2323
quickjs-ng = ["libquickjs-sys/quickjs-ng"]
2424

@@ -40,7 +40,7 @@ thread-id = "5"
4040
futures = "0.3"
4141
tokio = { version = "1", features = ["rt", "rt-multi-thread"] }
4242
serde_json = "1.0"
43-
serde = { version = "1.0", features = ["derive"] }
43+
serde = { version = "=1.0.219", features = ["derive"] }
4444
string_cache = "0.8"
4545
flume = { version = "0.11", features = ["async"] }
4646
either = "1"
@@ -52,52 +52,41 @@ anyhow = "1"
5252
# published that break our build, so we pin all swc versions to prevent
5353
# pulling in new versions of swc crates"
5454
# see https://github.com/denoland/deno_ast/blob/main/Cargo.toml
55-
swc = { version = "=16.1.1", optional = true }
56-
swc_atoms = { version = "=5.0.0", optional = true }
55+
swc = { version = "=35.0.0", optional = true }
56+
swc_config = { version = "=3.1.1", optional = true }
57+
swc_config_macro = { version = "=1.0.1", optional = true }
58+
swc_ecma_ast = { version = "=15.0.0", features = ["serde-impl"] , optional=true}
59+
swc_atoms = { version = "=7.0.0", optional = true }
5760
swc_cached = { version = "=2.0.0", optional = true }
58-
swc_common = { version = "=8.0.1", optional = true, features = ["tty-emitter"] }
59-
swc_macros_common = { version = "=1.0.0", optional = true }
60-
swc_eq_ignore_macros = { version = "=1.0.0", optional = true }
61-
swc_visit = { version = "=2.0.0", optional = true }
61+
swc_eq_ignore_macros = { version = "=1.0.1", optional = true }
6262
swc_visit_macros = { version = "=0.5.13", optional = true }
63-
swc_config = { version = "=2.0.0", optional = true }
64-
swc_config_macro = { version = "=1.0.0", optional = true }
65-
swc_ecma_codegen = { version = "=8.0.2", optional = true }
66-
swc_ecma_ast = { version = "=8.1.0", optional = true }
67-
swc_ecma_codegen_macros = { version = "=1.0.1", optional = true }
68-
swc_ecma_ext_transforms = { version = "=11.0.0", optional = true }
69-
swc_ecma_utils = { version = "=11.0.0", optional = true }
70-
swc_ecma_visit = { version = "=8.0.0", optional = true }
71-
swc_ecma_lints = { version = "=11.0.1", optional = true }
72-
swc_ecma_loader = { version = "=8.0.0", optional = true }
73-
swc_ecma_minifier = { version = "=12.4.0", optional = true }
74-
swc_ecma_parser = { version = "=10.0.2", optional = true }
75-
swc_error_reporters = { version = "=9.1.1", optional = true }
76-
swc_fast_graph = { version = "=9.0.0", optional = true }
77-
swc_ecma_usage_analyzer = { version = "=12.0.2", optional = true }
78-
swc_timer = { version = "=1.0.0", optional = true }
79-
swc_ecma_preset_env = { version = "=14.0.0", optional = true }
80-
swc_ecma_transforms = { version = "=14.0.0", optional = true }
81-
swc_ecma_transforms_base = { version = "=11.2.0", optional = true }
82-
swc_ecma_transforms_compat = { version = "=12.0.0", optional = true }
83-
swc_ecma_transforms_classes = { version = "=11.0.0", optional = true }
84-
swc_ecma_transforms_module = { version = "=12.1.0", optional = true }
85-
swc_ecma_transforms_optimization = { version = "=11.1.0", optional = true }
86-
swc_ecma_transforms_proposal = { version = "=11.0.2", optional = true }
87-
swc_ecma_transforms_macros = { version = "=1.0.0", optional = true }
88-
swc_ecma_transforms_react = { version = "=12.0.1", optional = true }
89-
swc_ecma_transforms_typescript = { version = "=12.0.1", optional = true }
63+
swc_common = { version = "=14.0.3", optional = true, features = ["tty-emitter"] }
64+
swc_ecma_codegen = { version = "=17.0.0", optional = true }
65+
swc_ecma_codegen_macros = { version = "=2.0.2", optional = true }
66+
swc_ecma_loader = { version = "=14.0.0", optional = true }
67+
swc_ecma_lexer = { version="=23.0.1" , optional=true}
68+
swc_ecma_parser = {version="=23.0.0", optional=true}
69+
swc_ecma_transforms_base = { version = "=25.0.0", features = ["inline-helpers"], optional = true }
70+
swc_ecma_transforms_classes = { version = "=25.0.0", optional = true }
71+
swc_ecma_transforms_compat = { version = "=27.0.0", optional = true }
72+
swc_ecma_transforms_macros = { version = "=1.0.1", optional = true }
73+
swc_ecma_transforms_optimization = { version = "=26.0.0", optional = true }
74+
swc_ecma_transforms_proposal = { version = "=25.0.0", optional = true }
75+
swc_ecma_transforms_react = { version = "=28.0.0", optional = true }
76+
swc_ecma_transforms_typescript = { version = "=28.0.0", optional = true }
77+
swc_ecma_utils = { version = "=21.0.0", optional = true }
78+
swc_ecma_visit = { version = "=15.0.0", optional = true }
79+
swc_bundler = { version = "=29.0.0", optional = true }
80+
swc_graph_analyzer = { version = "=14.0.1", optional = true }
81+
swc_macros_common = { version = "=1.0.1", optional = true }
82+
swc_sourcemap = { version = "9.3.4", optional = true }
83+
swc_trace_macro = { version = "=2.0.2", optional = true }
84+
swc_visit = { version = "=2.0.1", optional = true }
9085
swc_node_comments = { version = "=8.0.0", optional = true }
91-
#swc_trace_macro = {version="=2.0.0", optional=true}
9286

9387

94-
#swc_ecma_parser = {version = "0.136.4", optional = true}
95-
#swc_common = {version = "0.31.13", features = ["tty-emitter"], optional = true}
96-
#swc_ecma_minifier = {version = "0.183.17", optional = true}
97-
9888
[dev-dependencies]
9989
#green_copper_runtime = { git = 'https://github.com/HiRoFa/GreenCopperRuntime', branch="main", features = ["console"]}
100-
serde = "1"
10190
serde_json = "1"
10291
tracing = "0.1"
10392
tracing-log = "0.1"

‎src/typescript/mod.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ impl TypeScriptTranspiler {
6666
is_module: bool,
6767
) -> Result<(String, Option<String>), JsError> {
6868
let globals = swc_common::Globals::new();
69+
let code = code.to_string();
6970
swc_common::GLOBALS.set(&globals, || {
7071
let handler = Handler::with_tty_emitter(
7172
ColorConfig::Auto,
@@ -76,7 +77,7 @@ impl TypeScriptTranspiler {
7677

7778
let fm = self
7879
.source_map
79-
.new_source_file(Arc::new(FileName::Custom(file_name.into())), code.into());
80+
.new_source_file(Arc::new(FileName::Custom(file_name.into())), code);
8081

8182
let mangle_config = if self.mangle {
8283
r#"

0 commit comments

Comments
 (0)