update swc and mdx-rs

Author: devongovett

Cargo.lock

@@ -9,9 +9,8 @@ napi = ["dep:napi", "dep:napi-derive", "dep:crossbeam-channel"]
 
 [dependencies]
 indexmap = "1.9.2"
-swc_core = { version = "9", features = [
+swc_core = { version = "21", features = [
   "common",
-  "common_ahash",
   "common_sourcemap",
   "ecma_ast",
   "ecma_parser",

crates/macros/Cargo.toml

@@ -12,7 +12,7 @@ use swc_core::{
   common::{sync::Lrc, util::take::Take, SourceMap, Span, DUMMY_SP},
   ecma::{
     ast::*,
-    atoms::{js_word, JsWord},
+    atoms::Atom as JsWord,
     parser::{error::Error, lexer::Lexer, Parser, StringInput},
     visit::{Fold, FoldWith},
   },
@@ -102,7 +102,7 @@ impl<'a> Macros<'a> {
             default.local.to_id(),
             MacroImport {
               src: import.src.value.clone(),
-              imported: Some(js_word!("default")),
+              imported: Some("default".into()),
               span: import.span,
             },
           );
@@ -707,7 +707,7 @@ impl<'a> Evaluator<'a> {
   pub fn value_to_expr(&self, value: JsValue) -> Result<Expr, MacroError> {
     Ok(match value {
       JsValue::Null => Expr::Lit(Lit::Null(Null::dummy())),
-      JsValue::Undefined => Expr::Ident(Ident::new_no_ctxt(js_word!("undefined"), DUMMY_SP)),
+      JsValue::Undefined => Expr::Ident(Ident::new_no_ctxt("undefined".into(), DUMMY_SP)),
       JsValue::Bool(b) => Expr::Lit(Lit::Bool(Bool {
         value: b,
         span: DUMMY_SP,

crates/macros/src/lib.rs

@@ -18,15 +18,14 @@ parking_lot = "0.12"
 percent-encoding = "2.2.0"
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.91"
-url = "2.3.1"
+url = "2.5.4"
 rustc-hash = "2.0.0"
 
 [dev-dependencies]
 assert_fs = "1.0"
 oxc_resolver = "2"
-node_resolver = "0.15.0"
+# node_resolver = "0.15.0"
 criterion = { version = "*", features = ["html_reports"] }
-url = "*"
 deno_package_json = "0.1.2"
 rspack_resolver = "*"
 

crates/parcel-resolver/Cargo.toml

@@ -201,7 +201,7 @@ describe('scope hoisting', function () {
         b.getBundles()[0].filePath,
         'utf8',
       );
-      assert(/let \S* = Symbol.toStringTag;/.test(contents));
+      assert(/Symbol.toStringTag/.test(contents));
 
       let output = await run(b);
       assert.deepEqual(output, ['1', '2']);

packages/core/integration-tests/test/scope-hoisting.js

@@ -8,9 +8,8 @@ edition = "2021"
 crate-type = ["rlib"]
 
 [dependencies]
-swc_core = { version = "9", features = [
+swc_core = { version = "21", features = [
   "common",
-  "common_ahash",
   "common_sourcemap",
   "ecma_ast",
   "ecma_codegen",
@@ -39,5 +38,6 @@ indexmap = "1.9.2"
 parcel-macros = { path = "../../../../crates/macros" }
 parking_lot = "0.12"
 bitflags = "1.3.2"
-mdxjs = { version = "0.2.4", git = "https://github.com/devongovett/mdxjs-rs", branch = "export_phases" }
-markdown = { version = "1.0.0-alpha.21", features = ["serde"] }
+mdxjs = "0.3.4"
+markdown = { version = "1.0.0-alpha.22", features = ["serde"] }
+rustc-hash = "2"

packages/transformers/js/core/Cargo.toml

@@ -5,7 +5,7 @@ use swc_core::{
   common::{sync::Lrc, Mark, Span, DUMMY_SP},
   ecma::{
     ast::*,
-    atoms::{js_word, JsWord},
+    atoms::Atom as JsWord,
     utils::stack_size::maybe_grow_default,
     visit::{noop_visit_type, Visit, VisitWith},
   },
@@ -350,7 +350,7 @@ impl Visit for Collect {
             id!(default.local),
             Import {
               source: node.src.value.clone(),
-              specifier: js_word!("default"),
+              specifier: "default".into(),
               kind: ImportKind::Import,
               loc: SourceLocation::from(&self.source_map, default.span),
             },
@@ -411,7 +411,7 @@ impl Visit for Collect {
         }
         ExportSpecifier::Default(default) => {
           self.exports.insert(
-            js_word!("default"),
+            "default".into(),
             Export {
               specifier: default.exported.sym.clone(),
               loc: SourceLocation::from(&self.source_map, default.exported.span),
@@ -423,7 +423,7 @@ impl Visit for Collect {
             self
               .exports_locals
               .entry(id!(default.exported))
-              .or_insert_with(|| js_word!("default"));
+              .or_insert_with(|| "default".into());
           }
         }
         ExportSpecifier::Namespace(namespace) => {
@@ -493,20 +493,20 @@ impl Visit for Collect {
       DefaultDecl::Class(class) => {
         if let Some(ident) = &class.ident {
           self.exports.insert(
-            js_word!("default"),
+            "default".into(),
             Export {
               specifier: ident.sym.clone(),
               loc: SourceLocation::from(&self.source_map, node.span),
               source: None,
               is_esm: true,
             },
           );
-          self.exports_locals.insert(id!(ident), js_word!("default"));
+          self.exports_locals.insert(id!(ident), "default".into());
         } else {
           self.exports.insert(
-            js_word!("default"),
+            "default".into(),
             Export {
-              specifier: js_word!("default"),
+              specifier: "default".into(),
               loc: SourceLocation::from(&self.source_map, node.span),
               source: None,
               is_esm: true,
@@ -517,20 +517,20 @@ impl Visit for Collect {
       DefaultDecl::Fn(func) => {
         if let Some(ident) = &func.ident {
           self.exports.insert(
-            js_word!("default"),
+            "default".into(),
             Export {
               specifier: ident.sym.clone(),
               loc: SourceLocation::from(&self.source_map, node.span),
               source: None,
               is_esm: true,
             },
           );
-          self.exports_locals.insert(id!(ident), js_word!("default"));
+          self.exports_locals.insert(id!(ident), "default".into());
         } else {
           self.exports.insert(
-            js_word!("default"),
+            "default".into(),
             Export {
-              specifier: js_word!("default"),
+              specifier: "default".into(),
               loc: SourceLocation::from(&self.source_map, node.span),
               source: None,
               is_esm: true,
@@ -548,9 +548,9 @@ impl Visit for Collect {
 
   fn visit_export_default_expr(&mut self, node: &ExportDefaultExpr) {
     self.exports.insert(
-      js_word!("default"),
+      "default".into(),
       Export {
-        specifier: js_word!("default"),
+        specifier: "default".into(),
         loc: SourceLocation::from(&self.source_map, node.span),
         source: None,
         is_esm: true,
@@ -679,7 +679,7 @@ impl Visit for Collect {
       Expr::Ident(ident) => {
         if &*ident.sym == "exports" && is_unresolved(&ident, self.unresolved_mark) {
           handle_export!();
-        } else if ident.sym == js_word!("module") && is_unresolved(&ident, self.unresolved_mark) {
+        } else if ident.sym == "module" && is_unresolved(&ident, self.unresolved_mark) {
           self.has_cjs_exports = true;
           self.static_cjs_exports = false;
           self.should_wrap = true;
@@ -718,7 +718,7 @@ impl Visit for Collect {
     if node.op == UnaryOp::TypeOf {
       match &*node.arg {
         Expr::Ident(ident)
-          if ident.sym == js_word!("module") && is_unresolved(&ident, self.unresolved_mark) =>
+          if ident.sym == "module" && is_unresolved(&ident, self.unresolved_mark) =>
         {
           // Do nothing to avoid the ident visitor from marking the module as non-static.
         }
@@ -754,7 +754,7 @@ impl Visit for Collect {
     match node {
       Expr::Ident(ident) => {
         // Bail if `module` or `exports` are accessed non-statically.
-        let is_module = ident.sym == js_word!("module");
+        let is_module = ident.sym == "module";
         let is_exports = &*ident.sym == "exports";
         if (is_module || is_exports) && is_unresolved(&ident, self.unresolved_mark) {
           self.has_cjs_exports = true;
@@ -913,7 +913,7 @@ impl Visit for Collect {
     if let Callee::Expr(expr) = &node.callee {
       match &**expr {
         Expr::Ident(ident) => {
-          if ident.sym == js_word!("eval") && is_unresolved(&ident, self.unresolved_mark) {
+          if ident.sym == "eval" && is_unresolved(&ident, self.unresolved_mark) {
             self.should_wrap = true;
             self.add_bailout(node.span, BailoutReason::Eval);
           }

packages/transformers/js/core/src/collect.rs

@@ -2,7 +2,7 @@ use std::collections::HashSet;
 
 use swc_core::ecma::{
   ast::{Decl, Expr, Lit, Module, ModuleDecl, ModuleItem, Stmt, VarDeclKind, VarDeclarator},
-  atoms::JsWord,
+  atoms::Atom as JsWord,
   visit::Visit,
 };
 

packages/transformers/js/core/src/constant_module.rs

@@ -13,7 +13,7 @@ use swc_core::{
   common::{sync::Lrc, Mark, SourceMap, Span, SyntaxContext, DUMMY_SP},
   ecma::{
     ast::{self, Callee, MemberProp, Module},
-    atoms::{js_word, JsWord},
+    atoms::Atom as JsWord,
     utils::{member_expr, stack_size::maybe_grow_default},
     visit::{Fold, FoldWith},
   },
@@ -140,7 +140,7 @@ pub struct DependencyDescriptor {
   pub kind: DependencyKind,
   pub loc: SourceLocation,
   /// The text specifier associated with the import/export statement.
-  pub specifier: swc_core::ecma::atoms::JsWord,
+  pub specifier: JsWord,
   pub attributes: Option<JsValue>,
   pub flags: DependencyFlags,
   pub source_type: Option<SourceType>,
@@ -896,7 +896,7 @@ impl<'a> Fold for DependencyCollector<'a> {
     } = &node
     {
       if let ast::Expr::Ident(ident) = &**arg {
-        if ident.sym == js_word!("require") && is_unresolved(&ident, self.unresolved_mark) {
+        if ident.sym == "require" && is_unresolved(&ident, self.unresolved_mark) {
           return node;
         }
       }
@@ -1043,7 +1043,7 @@ impl<'a> Fold for DependencyCollector<'a> {
       if !self.config.is_library && !self.config.standalone {
         return Expr::New(NewExpr {
           span: DUMMY_SP,
-          callee: Box::new(Expr::Ident(Ident::new_no_ctxt(js_word!("URL"), DUMMY_SP))),
+          callee: Box::new(Expr::Ident(Ident::new_no_ctxt("URL".into(), DUMMY_SP))),
           ctxt: SyntaxContext::empty(),
           args: Some(vec![ExprOrSpread {
             expr: Box::new(url),
@@ -1062,12 +1062,12 @@ impl<'a> Fold for DependencyCollector<'a> {
           return ast::Expr::Ident("import".into());
         }
         // Free `require` -> undefined
-        ident.sym == js_word!("require") && is_unresolved(&ident, self.unresolved_mark)
+        ident.sym == "require" && is_unresolved(&ident, self.unresolved_mark)
       }
       Expr::Member(MemberExpr { obj: expr, .. }) => {
         // e.g. `require.extensions` -> undefined
         if let Expr::Ident(ident) = &**expr {
-          ident.sym == js_word!("require") && is_unresolved(&ident, self.unresolved_mark)
+          ident.sym == "require" && is_unresolved(&ident, self.unresolved_mark)
         } else {
           false
         }
@@ -1266,7 +1266,7 @@ fn create_url_constructor(url: ast::Expr, use_import_meta: bool) -> ast::Expr {
         kind: MetaPropKind::ImportMeta,
         span: DUMMY_SP,
       })),
-      prop: MemberProp::Ident(IdentName::new(js_word!("url"), DUMMY_SP)),
+      prop: MemberProp::Ident(IdentName::new("url".into(), DUMMY_SP)),
     })
   } else {
     // CJS output: "file:" + __filename
@@ -1284,7 +1284,7 @@ fn create_url_constructor(url: ast::Expr, use_import_meta: bool) -> ast::Expr {
   Expr::New(NewExpr {
     span: DUMMY_SP,
     ctxt: SyntaxContext::empty(),
-    callee: Box::new(Expr::Ident(Ident::new_no_ctxt(js_word!("URL"), DUMMY_SP))),
+    callee: Box::new(Expr::Ident(Ident::new_no_ctxt("URL".into(), DUMMY_SP))),
     args: Some(vec![
       ExprOrSpread {
         expr: Box::new(url),
@@ -1356,7 +1356,7 @@ impl<'a> DependencyCollector<'a> {
 
     if let Expr::New(new) = expr {
       let is_url = match &*new.callee {
-        Expr::Ident(id) => id.sym == js_word!("URL") && is_unresolved(&id, self.unresolved_mark),
+        Expr::Ident(id) => id.sym == "URL" && is_unresolved(&id, self.unresolved_mark),
         _ => false,
       };
 
@@ -1426,7 +1426,7 @@ impl<'a> DependencyCollector<'a> {
         let name = match_property_name(member);
 
         if let Some((name, _)) = name {
-          name == js_word!("url")
+          name == "url"
         } else {
           false
         }
@@ -1641,21 +1641,15 @@ impl<'a> DependencyCollector<'a> {
           name: Pat::Ident(BindingIdent::from(ident.clone())),
           init: Some(Box::new(Expr::Call(CallExpr {
             callee: Callee::Expr(Box::new(Expr::Member(MemberExpr {
-              obj: Box::new(Expr::Ident(Ident::new_no_ctxt(
-                js_word!("Object"),
-                DUMMY_SP,
-              ))),
+              obj: Box::new(Expr::Ident(Ident::new_no_ctxt("Object".into(), DUMMY_SP))),
               prop: MemberProp::Ident(IdentName::new("assign".into(), DUMMY_SP)),
               span: DUMMY_SP,
             }))),
             args: vec![
               ExprOrSpread {
                 expr: Box::new(Expr::Call(CallExpr {
                   callee: Callee::Expr(Box::new(Expr::Member(MemberExpr {
-                    obj: (Box::new(Expr::Ident(Ident::new_no_ctxt(
-                      js_word!("Object"),
-                      DUMMY_SP,
-                    )))),
+                    obj: (Box::new(Expr::Ident(Ident::new_no_ctxt("Object".into(), DUMMY_SP)))),
                     prop: MemberProp::Ident(IdentName::new("create".into(), DUMMY_SP)),
                     span: DUMMY_SP,
                   }))),
@@ -1672,7 +1666,7 @@ impl<'a> DependencyCollector<'a> {
               ExprOrSpread {
                 expr: Box::new(Expr::Object(ObjectLit {
                   props: vec![PropOrSpread::Prop(Box::new(Prop::KeyValue(KeyValueProp {
-                    key: PropName::Ident(IdentName::new(js_word!("url"), DUMMY_SP)),
+                    key: PropName::Ident(IdentName::new("url".into(), DUMMY_SP)),
                     value: Box::new(self.get_import_meta_url()),
                   })))],
                   span: DUMMY_SP,

packages/transformers/js/core/src/dependency_collector.rs

@@ -8,7 +8,7 @@ use swc_core::{
   common::{sync::Lrc, Mark, DUMMY_SP},
   ecma::{
     ast,
-    atoms::JsWord,
+    atoms::Atom as JsWord,
     visit::{VisitMut, VisitMutWith},
   },
 };

packages/transformers/js/core/src/env_replacer.rs

@@ -5,7 +5,7 @@ use swc_core::{
   common::{Mark, Span, SyntaxContext, DUMMY_SP},
   ecma::{
     ast::*,
-    atoms::JsWord,
+    atoms::Atom as JsWord,
     utils::stack_size::maybe_grow_default,
     visit::{Fold, FoldWith, VisitWith},
   },