Bump swc to fix ESM helpers

packages/core/integration-tests/test/integration/swc-helpers-library/index.js

@@ -0,0 +1 @@
+class Test {}

packages/core/integration-tests/test/integration/swc-helpers-library/package.json

@@ -0,0 +1,8 @@
+{
+  "main": "dist/main.js",
+  "module": "dist/module.js",
+  "browserslist": "IE >= 11",
+  "dependencies": {
+    "@swc/helpers": "*"
+  }
+}

packages/core/integration-tests/test/transpilation.js

@@ -11,6 +11,7 @@ import {
   ncp,
 } from '@parcel/test-utils';
 import {symlinkSync} from 'fs';
+import nullthrows from 'nullthrows';
 
 const inputDir = path.join(__dirname, '/input');
 
@@ -355,6 +356,45 @@ describe('transpilation', function () {
     });
   });
 
+  it('should support commonjs and esm versions of @swc/helpers', async function () {
+    let b = await bundle(
+      path.join(__dirname, '/integration/swc-helpers-library/index.js'),
+    );
+
+    let file = await outputFS.readFile(
+      nullthrows(b.getBundles().find(b => b.env.outputFormat === 'commonjs'))
+        .filePath,
+      'utf8',
+    );
+    assert(file.includes('@swc/helpers/lib/_class_call_check.js'));
+
+    file = await outputFS.readFile(
+      nullthrows(b.getBundles().find(b => b.env.outputFormat === 'esmodule'))
+        .filePath,
+      'utf8',
+    );
+    assert(file.includes('@swc/helpers/src/_class_call_check.mjs'));
+  });
+
+  it('should support commonjs versions of @swc/helpers without scope hoisting', async function () {
+    let b = await bundle(
+      path.join(__dirname, '/integration/swc-helpers-library/index.js'),
+      {
+        targets: {
+          test: {
+            distDir,
+            isLibrary: true,
+            scopeHoist: false,
+          },
+        },
+      },
+    );
+
+    let file = await outputFS.readFile(b.getBundles()[0].filePath, 'utf8');
+    assert(file.includes('@swc/helpers/lib/_class_call_check.js'));
+    await run(b);
+  });
+
   it('should print errors from transpilation', async function () {
     let source = path.join(
       __dirname,

packages/transformers/js/core/Cargo.toml

@@ -8,9 +8,9 @@ edition = "2018"
 crate-type = ["rlib"]
 
 [dependencies]
-swc_ecmascript = { version = "0.161.0", features = ["parser", "transforms", "module", "optimization", "react", "typescript", "utils", "visit", "codegen", "utils", "preset_env"] }
-swc_common = { version = "0.18.8", features = ["tty-emitter", "sourcemap"] }
-swc_atoms = "0.2.11"
+swc_ecmascript = { version = "0.164.0", features = ["parser", "transforms", "module", "optimization", "react", "typescript", "utils", "visit", "codegen", "utils", "preset_env"] }
+swc_common = { version = "0.18.9", features = ["tty-emitter", "sourcemap"] }
+swc_atoms = "0.2.12"
 indoc = "1.0.3"
 serde = "1.0.123"
 serde_bytes = "0.11.5"

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

@@ -97,19 +97,36 @@ struct DependencyCollector<'a> {
 impl<'a> DependencyCollector<'a> {
   fn add_dependency(
     &mut self,
-    specifier: JsWord,
+    mut specifier: JsWord,
     span: swc_common::Span,
     kind: DependencyKind,
     attributes: Option<HashMap<swc_atoms::JsWord, bool>>,
     is_optional: bool,
     source_type: SourceType,
   ) -> Option<JsWord> {
+    // Rewrite SWC helpers from ESM to CJS for library output.
+    let mut is_specifier_rewritten = false;
+    if self.config.is_library && !self.config.is_esm_output {
+      if let Some(suffix) = specifier.strip_prefix("@swc/helpers/src/") {
+        if let Some(prefix) = suffix.strip_suffix(".mjs") {
+          specifier = format!("@swc/helpers/lib/{}.js", prefix).into();
+          is_specifier_rewritten = true;
+        }
+      }
+    }
+
     // For normal imports/requires, the specifier will remain unchanged.
     // For other types of dependencies, the specifier will be changed to a hash
     // that also contains the dependency kind. This way, multiple kinds of dependencies
     // to the same specifier can be used within the same file.
     let placeholder = match kind {
-      DependencyKind::Import | DependencyKind::Export | DependencyKind::Require => None,
+      DependencyKind::Import | DependencyKind::Export | DependencyKind::Require => {
+        if is_specifier_rewritten {
+          Some(specifier.as_ref().to_owned())
+        } else {
+          None
+        }
+      }
       _ => Some(format!(
         "{:x}",
         hash!(format!("{}:{}:{}", self.config.filename, specifier, kind))
@@ -256,12 +273,12 @@ impl<'a> Fold for DependencyCollector<'a> {
     node.fold_children_with(self)
   }
 
-  fn fold_import_decl(&mut self, node: ast::ImportDecl) -> ast::ImportDecl {
+  fn fold_import_decl(&mut self, mut node: ast::ImportDecl) -> ast::ImportDecl {
     if node.type_only {
       return node;
     }
 
-    self.add_dependency(
+    let rewritten = self.add_dependency(
       node.src.value.clone(),
       node.src.span,
       DependencyKind::Import,
@@ -270,30 +287,38 @@ impl<'a> Fold for DependencyCollector<'a> {
       self.config.source_type,
     );
 
+    if let Some(rewritten) = rewritten {
+      node.src.value = rewritten.into();
+    }
+
     node
   }
 
-  fn fold_named_export(&mut self, node: ast::NamedExport) -> ast::NamedExport {
-    if let Some(src) = &node.src {
+  fn fold_named_export(&mut self, mut node: ast::NamedExport) -> ast::NamedExport {
+    if let Some(src) = &mut node.src {
       if node.type_only {
         return node;
       }
 
-      self.add_dependency(
+      let rewritten = self.add_dependency(
         src.value.clone(),
         src.span,
         DependencyKind::Export,
         None,
         false,
         self.config.source_type,
       );
+
+      if let Some(rewritten) = rewritten {
+        src.value = rewritten.into();
+      }
     }
 
     node
   }
 
-  fn fold_export_all(&mut self, node: ast::ExportAll) -> ast::ExportAll {
-    self.add_dependency(
+  fn fold_export_all(&mut self, mut node: ast::ExportAll) -> ast::ExportAll {
+    let rewritten = self.add_dependency(
       node.src.value.clone(),
       node.src.span,
       DependencyKind::Export,
@@ -302,6 +327,10 @@ impl<'a> Fold for DependencyCollector<'a> {
       self.config.source_type,
     );
 
+    if let Some(rewritten) = rewritten {
+      node.src.value = rewritten.into();
+    }
+
     node
   }
 

packages/transformers/js/package.json

@@ -35,7 +35,7 @@
     "@parcel/source-map": "^2.0.0",
     "@parcel/utils": "2.6.0",
     "@parcel/workers": "2.6.0",
-    "@swc/helpers": "^0.3.15",
+    "@swc/helpers": "^0.4.2",
     "browserslist": "^4.6.6",
     "detect-libc": "^1.0.3",
     "nullthrows": "^1.1.1",

yarn.lock

@@ -2357,10 +2357,10 @@
     "@swc/core-win32-ia32-msvc" "^1.2.106"
     "@swc/core-win32-x64-msvc" "^1.2.106"
 
-"@swc/helpers@^0.3.15":
-  version "0.3.15"
-  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.3.15.tgz#02abb377c91c39e0a6034f1161870c18621b9129"
-  integrity sha512-rpZHDdzwhfe06gF98SUAi7TfI344zKb1Pd2D9gxUMTNnhMobDHrv2UiVVcbDXmkx84U5AaXJmBrmfT9g1TPasQ==
+"@swc/helpers@^0.4.2":
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.4.2.tgz#ed1f6997ffbc22396665d9ba74e2a5c0a2d782f8"
+  integrity sha512-556Az0VX7WR6UdoTn4htt/l3zPQ7bsQWK+HqdG4swV7beUCxo/BqmvbOpUkTIm/9ih86LIf1qsUnywNL3obGHw==
   dependencies:
     tslib "^2.4.0"