Upgrade swc ecamscript to 0.151.0

Author: ije

compiler/Cargo.lock

@@ -32,9 +32,9 @@ parcel_sourcemap = "2.0.2"
 # docs: https://swc.rs
 # crate: https://crates.io/search?q=swc_ecmascript
 swc_atoms = "0.2.11"
-swc_common = { version = "0.17.23", features = ["sourcemap"] }
-swc_ecma_transforms = { version = "0.145.0", features = ["proposal", "typescript", "react" ] }
-swc_ecmascript = { version = "0.147.0", features = ["codegen", "parser", "utils", "visit"] }
+swc_common = { version = "0.17.25", features = ["sourcemap"] }
+swc_ecma_transforms = { version = "0.148.0", features = ["proposal", "typescript", "react" ] }
+swc_ecmascript = { version = "0.151.0", features = ["codegen", "parser", "utils", "visit"] }
 
 # wasm-bindgen
 # docs: https://rustwasm.github.io/docs/wasm-bindgen

compiler/Cargo.toml

@@ -8,13 +8,15 @@ use std::{cell::RefCell, path::Path, rc::Rc};
 use swc_common::comments::SingleThreadedComments;
 use swc_common::errors::{Handler, HandlerFlags};
 use swc_common::{chain, FileName, Globals, Mark, SourceMap};
+use swc_ecma_transforms::pass::Optional;
 use swc_ecma_transforms::proposals::decorators;
-use swc_ecma_transforms::react;
 use swc_ecma_transforms::typescript::strip;
-use swc_ecma_transforms::{fixer, helpers, hygiene, pass::Optional, resolver_with_mark};
+use swc_ecma_transforms::{fixer, helpers, hygiene, react};
 use swc_ecmascript::ast::{EsVersion, Module, Program};
-use swc_ecmascript::codegen::{text_writer::JsWriter, Node};
-use swc_ecmascript::parser::{lexer::Lexer, EsConfig, StringInput, Syntax, TsConfig};
+use swc_ecmascript::codegen::text_writer::JsWriter;
+use swc_ecmascript::codegen::Node;
+use swc_ecmascript::parser::lexer::Lexer;
+use swc_ecmascript::parser::{EsConfig, StringInput, Syntax, TsConfig};
 use swc_ecmascript::visit::{Fold, FoldWith};
 
 /// Options for transpiling a module.
@@ -106,9 +108,12 @@ impl SWC {
     options: &EmitOptions,
   ) -> Result<(String, Option<String>), anyhow::Error> {
     swc_common::GLOBALS.set(&Globals::new(), || {
+      let unresolved_mark = Mark::new();
       let top_level_mark = Mark::fresh(Mark::root());
       let jsx_runtime = resolver.borrow().jsx_runtime.clone();
       let specifier_is_remote = resolver.borrow().specifier_is_remote;
+      let is_ts =
+        self.specifier.ends_with(".ts") || self.specifier.ends_with(".mts") || self.specifier.ends_with(".tsx");
       let is_jsx = self.specifier.ends_with(".tsx") || self.specifier.ends_with(".jsx");
       let is_dev = resolver.borrow().is_dev;
       let react_options = if let Some(jsx_import_source) = &options.jsx_import_source {
@@ -146,7 +151,7 @@ impl SWC {
         false
       };
       let passes = chain!(
-        resolver_with_mark(top_level_mark),
+        swc_ecma_transforms::resolver(unresolved_mark, top_level_mark, is_ts),
         Optional::new(react::jsx_src(is_dev, self.source_map.clone()), is_jsx),
         resolve_fold(resolver.clone(), options.strip_data_export, false),
         decorators::decorators(decorators::Config {
@@ -260,7 +265,7 @@ fn get_es_config(jsx: bool) -> EsConfig {
   EsConfig {
     fn_bind: true,
     export_default_from: true,
-    import_assertions: true, 
+    import_assertions: true,
     private_in_object: true,
     allow_super_outside_method: true,
     jsx,

compiler/src/swc.rs

@@ -21,7 +21,7 @@ fn transform(specifer: &str, source: &str, is_dev: bool, options: &EmitOptions)
     specifer,
     "https://deno.land/x/aleph",
     Some("react".into()),
-    Some("17.0.2".into()),
+    Some("18".into()),
     Some("64".into()),
     importmap,
     graph_versions,
@@ -89,8 +89,8 @@ fn import_resolving() {
       }, 1000)
     "#;
   let (code, _) = transform("./pages/blog/$id.tsx", source, false, &EmitOptions::default());
-  assert!(code.contains("\"/-/esm.sh/react@17.0.2\""));
-  assert!(code.contains("\"/-/cdn.esm.sh/v64/react-dom@17.0.2\""));
+  assert!(code.contains("\"/-/esm.sh/react@18\""));
+  assert!(code.contains("\"/-/cdn.esm.sh/v64/react-dom@18\""));
   assert!(code.contains("\"../../foo.ts?v=100\""));
   assert!(code.contains("\"./Layout.tsx\""));
   assert!(code.contains("\"/-/esm.sh/@fullcalendar/daygrid?css&dev&module\""));
@@ -115,17 +115,17 @@ fn jsx_automtic() {
     source,
     false,
     &EmitOptions {
-      jsx_import_source: Some("https://esm.sh/react@17.0.2".to_owned()),
+      jsx_import_source: Some("https://esm.sh/react@18".to_owned()),
       ..Default::default()
     },
   );
-  assert!(code.contains("import { jsx as _jsx, Fragment as _Fragment } from \"/-/esm.sh/react@17.0.2/jsx-runtime\""));
+  assert!(code.contains("import { jsx as _jsx, Fragment as _Fragment } from \"/-/esm.sh/react@18/jsx-runtime\""));
   assert!(code.contains("_jsx(_Fragment, {"));
   assert!(code.contains("_jsx(\"h1\", {"));
   assert!(code.contains("children: \"Hello world!\""));
   assert_eq!(
     resolver.borrow().deps.get(0).unwrap().specifier,
-    "https://esm.sh/react@17.0.2/jsx-runtime"
+    "https://esm.sh/react@18/jsx-runtime"
   );
 }