swc version bump

Author: andrieshiemstra

Cargo.toml

@@ -2,26 +2,26 @@
 name = "typescript_utils"
 version = "0.1.0"
 authors = ["HiRoFa <info@hirofa.com>"]
-edition = "2018"
+edition = "2021"
 description = "Typescript transpiler for GreenCopper"
 license = "MIT"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-swc = "0.186.0"
+swc = "0.226"
 #swc = {path="../swc"}
 #swc = {git="https://github.com/HiRoFa/swc"}
 #swc = {git="https://github.com/swc-project/swc"}
 #swc_ecma_parser = {version = "0.57.1"}
 #swc_ecma_parser = {path="../swc/ecmascript/parser"}
-swc_ecma_parser = "0.105.0"
+swc_ecma_parser = "0.119"
 #swc_ecma_parser = {git="https://github.com/swc-project/swc"}
 #swc_common = {version="0.10.20", features=["tty-emitter"]}
 #swc_common = {path="../swc/common", features=["tty-emitter"]}
 #swc_common = {git="https://github.com/swc-project/swc", features=["tty-emitter"]}
-swc_common = {version = "0.18.8", features = ["tty-emitter"]}
-swc_ecma_minifier = "0.118.0"
+swc_common = {version = "0.28", features = ["tty-emitter"]}
+swc_ecma_minifier = "0.154"
 #hirofa_utils = {git = "https://github.com/HiRoFa/utils"}
 hirofa_utils = "0.5"
 #hirofa_utils = {path = "../utils"}

src/lib.rs

@@ -2,7 +2,6 @@ use hirofa_utils::js_utils::{JsError, Script, ScriptPreProcessor};
 use std::sync::Arc;
 use swc::{Compiler};
 
-use swc::config::{ IsModule};
 use swc_common::errors::{ColorConfig, Handler};
 use swc_common::{FileName, SourceMap};
 
@@ -64,19 +63,19 @@ impl TypeScriptPreProcessor {
  .new_source_file(FileName::Custom(file_name.into()), code.into());
 
  let minify_options = if self.minify {
- r#"
- "minify": {
- "compress": {
- "unused": true
- },
+ format!(r#"
+ "minify": {{
+ "compress": {{
+ "unused": {}
+ }},
  "mangle": true
- },
- "#
+ }},
+ "#, is_module)
  } else {
- ""
+ "".to_string()
  };
 
- let module = r#"
+ let module = if is_module { r#"
  "module": {
  "type": "es6",
  "strict": true,
@@ -85,7 +84,10 @@ impl TypeScriptPreProcessor {
  "noInterop": false,
  "ignoreDynamic": true
  },
- "#;
+ "#
+ } else {
+ ""
+ };
 
  let cfg_json = format!(r#"
 
@@ -105,7 +107,7 @@ impl TypeScriptPreProcessor {
  "legacyDecorator": true,
  "decoratorMetadata": true,
  "react": {{
- "runtime": "automatic",
+ "runtime": "classic",
  "useBuiltins": true,
  "refresh": true
  }}
@@ -124,7 +126,6 @@ impl TypeScriptPreProcessor {
 
  let ops = swc::config::Options {
  config: cfg,
- is_module: IsModule::Bool(is_module),
  ..Default::default()
  };
 
@@ -194,7 +195,7 @@ pub mod tests {
  .js_script_pre_processor(TypeScriptPreProcessor::new(
  TargetVersion::Es2020,
  false,
- false,
+ true,
  ))
  .build();
 
@@ -215,19 +216,22 @@ pub mod tests {
 
  #[test]
  fn test_mts() {
- let pp = TypeScriptPreProcessor::new(TargetVersion::Es2020, true, false);
+
+ log_to_stderr(LevelFilter::Trace);
+
+ let pp = TypeScriptPreProcessor::new(TargetVersion::Es2020, true, true);
  let inputs = vec![
  Script::new(
  "export_class_test.ts",
  "function functWithLongName(abc) {return abc + 1;};export class /* hi */ MyClass {name: string; sum: number; constructor(name) {this.name = name; this.sum = functWithLongName(1);} getIt() {return (this.name + ' is gotten');}}",
  ),
  Script::new(
  "import_test.ts",
- "import {MyClass} from 'export_class_test.ts'; \n{let b: Number = MyClass.quibus;}\n export function q(val: Number) {let mc = new MyClass(); return mc.sum;};",
+ "import {MyClass} from 'export_class_test.ts'; \n{let b: Number = MyClass.quibus;}\n export function q(val: Number) {let mc = new MyClass(); return mc.sum + mc.getIt();};",
  ),
  Script::new(
  "not_a_module.ts",
- "async function test() {let m = await import('texport_class_test.ts'); let mc = new m.MyClass(); console.log(m.getIt());}",
+ "async function test() {let m = await import('export_class_test.ts'); let mc = new m.MyClass(); console.log(m.getIt());}",
  ),
 
  Script::new(
@@ -240,6 +244,9 @@ pub mod tests {
  render(): void {
  return <Button color="red" />;
  }
+ render2(): void {
+ return <div />;
+ }
  }
 
  export default DangerButton;