fix: revert #684 and #674 to fix @swc/helpers bundle error (#687)

Author: XGHeaven

.changeset/angry-llamas-punch.md

@@ -21,12 +21,5 @@
     "@ice/remark-react-docgen-docusaurus": "1.0.1",
     "icepkg-site": "0.0.0"
   },
-  "changesets": [
-    "angry-llamas-punch",
-    "cold-camels-rest",
-    "dry-pots-buy",
-    "long-experts-design",
-    "quick-wasps-shake",
-    "violet-pots-brush"
-  ]
+  "changesets": ["cold-camels-rest", "dry-pots-buy", "long-experts-design", "quick-wasps-shake", "violet-pots-brush"]
 }

.changeset/calm-bikes-punch.md

@@ -48,15 +48,16 @@ export function getRollupOptions(context: Context, taskRunnerContext: TaskRunner
     );
   }
 
-  const swcPluginInstance = swcPlugin(
-    taskConfig.jsxRuntime,
-    rootDir,
-    taskConfig.swcCompileOptions,
-    taskConfig.type === 'bundle' && taskConfig.compileDependencies,
+  plugins.push(
+    swcPlugin(
+      taskConfig.jsxRuntime,
+      rootDir,
+      taskConfig.swcCompileOptions,
+      taskConfig.type === 'bundle' && taskConfig.compileDependencies,
+    ),
   );
 
   if (taskConfig.type === 'transform') {
-    plugins.push(swcPluginInstance);
     plugins.push(transformAliasPlugin(rootDir, taskConfig.alias));
   } else if (taskConfig.type === 'bundle') {
     const [external, globals] = getExternalsAndGlobals(taskConfig, pkg as PkgJson);
@@ -130,7 +131,6 @@ export function getRollupOptions(context: Context, taskRunnerContext: TaskRunner
       ),
       image(),
       json(),
-      swcPluginInstance,
       bundleAliasPlugin({
         entries: alias,
       }),

.changeset/pre.json

@@ -7,6 +7,8 @@ import {
   formatCnpmDepFilepath,
   getIncludeNodeModuleScripts,
 } from '../utils.js';
+import { init, parse } from 'es-module-lexer';
+import MagicString from 'magic-string';
 import type { Options as SwcCompileOptions, Config, TsParserConfig, EsParserConfig } from '@swc/core';
 import type { TaskConfig, OutputFile, BundleTaskConfig } from '../types.js';
 import type { Plugin } from 'rollup';
@@ -69,6 +71,59 @@ const normalizeSwcConfig = (
   });
 };
 
+// Transform @swc/helpers to cjs path if in commonjs module.
+async function transformImport(source: string, sourceFilename: string) {
+  await init;
+  const [imports, exports] = await parse(source);
+  let s: MagicString | undefined;
+  const str = () => {
+    if (!s) {
+      s = new MagicString(source);
+    }
+    return s;
+  };
+  const isESM =
+    exports.length > 0 ||
+    imports.some((targetImport) => {
+      const importString = targetImport.n;
+      // `targetImport.n` get undefined when code has `import.meta.*`.
+      return importString && !importString.includes('core-js') && !importString.includes('@swc/helpers');
+    });
+
+  imports.forEach((targetImport) => {
+    if (!targetImport.n) {
+      // If visiting `import.meta.*`, `targetImport.n` will be undefined, that should be ignored.
+      return;
+    }
+    if (targetImport.n.startsWith('@swc/helpers')) {
+      if (!isESM) {
+        // Replace @swc/helpers with cjs path.
+        const importStr = source.substring(targetImport.ss, targetImport.se);
+        // Import rule: import { _ as _type_of } from "@swc/helpers/_/_type_of";
+        const matchImport = importStr.match(/import\s+{\s+([\w*\s{},]*)\s+}\s+from\s+['"](.*)['"]/);
+        if (matchImport) {
+          const [, identifier] = matchImport;
+          const replaceModule = `var ${identifier.split(' as ')[1].trim()} = require('${targetImport.n}')._`;
+          str().overwrite(targetImport.ss, targetImport.se, replaceModule);
+        }
+      }
+    }
+  });
+
+  return s
+    ? {
+        code: s.toString(),
+        map: s.generateMap({
+          source: sourceFilename,
+          file: `${sourceFilename}.map`,
+          includeContent: true,
+        }),
+      }
+    : {
+        code: source,
+      };
+}
+
 /**
  * plugin-swc works as substitute of plugin-typescript, babel, babel-preset-env and plugin-minify.
  */
@@ -108,9 +163,11 @@ const swcPlugin = (
         }),
       );
 
+      const transformedCode = await transformImport(code, sourceFileName);
+
       return {
-        code,
-        map,
+        code: transformedCode.code,
+        map: transformedCode.map ?? map,
         meta: {
           filename: destFilename,
         },

packages/pkg/src/engine/rollup/options.ts

@@ -26,6 +26,9 @@ exports[`Run config swc-helpers > dist structure 1`] = `
     {
       "name": "entry-mts.esm.es5.production.js",
     },
+    {
+      "name": "entry-mts.umd.es5.production.js",
+    },
   ],
   "name": "dist",
 }
@@ -66,9 +69,9 @@ module.exports.extend = function(a, b) {
 `;
 
 exports[`Run config swc-helpers > file content cjs/entry-mts.d.ts 1`] = `
-"import { join, extend } from './cjs';
-export { join, extend };
-export declare const foo: any;
+"import { add, extend } from './cjs';
+export { add, extend };
+export declare const foo: Record<string, any>;
 "
 `;
 
@@ -84,14 +87,14 @@ function _export(target, all) {
     });
 }
 _export(exports, {
+    add: function() {
+        return _cjs.add;
+    },
     extend: function() {
         return _cjs.extend;
     },
     foo: function() {
         return foo;
-    },
-    join: function() {
-        return _cjs.join;
     }
 });
 var _object_spread = require(\\"@swc/helpers/_/_object_spread\\");
@@ -105,17 +108,22 @@ var foo = _object_spread._({}, (0, _cjs.extend)({
 `;
 
 exports[`Run config swc-helpers > file content dist/entry-mts.cjs.es5.production.js 1`] = `
-"\\"use strict\\";var e,t=require(\\"@swc/helpers/_/_object_spread\\"),r={},n=(e||(e=1,r.add=function(e,t){return e+t},r.extend=function(e,r){return t._({},e,r)}),r),o=t._({},n.extend({a:1},{b:2}));exports.extend=n.extend,exports.foo=o,exports.join=n.join;
+"\\"use strict\\";var e,r=require(\\"@swc/helpers/_/_object_spread\\"),t={},n=function(){if(e)return t;e=1;var n=r._;return t.add=function(e,r){return e+r},t.extend=function(e,r){return n({},e,r)},t}(),d=r._({},n.extend({a:1},{b:2}));exports.add=n.add,exports.extend=n.extend,exports.foo=d;
 "
 `;
 
 exports[`Run config swc-helpers > file content dist/entry-mts.esm.es5.production.js 1`] = `
-"import{_ as e}from\\"@swc/helpers/_/_object_spread\\";var n,t={},o=(n||(n=1,t.add=function(e,n){return e+n},t.extend=function(n,t){return e({},n,t)}),t),r=e({},o.extend({a:1},{b:2})),d=o.extend,i=o.join;export{d as extend,r as foo,i as join};
+"import e,{_ as r}from\\"@swc/helpers/_/_object_spread\\";var n,t={},d=function(){if(n)return t;n=1;var r=e._;return t.add=function(e,r){return e+r},t.extend=function(e,n){return r({},e,n)},t}(),o=r({},d.extend({a:1},{b:2})),a=d.add,u=d.extend;export{a as add,u as extend,o as foo};
+"
+`;
+
+exports[`Run config swc-helpers > file content dist/entry-mts.umd.es5.production.js 1`] = `
+"var e,t;e=this,t=function(e,t){\\"use strict\\";var n,r={},d=function(){if(n)return r;n=1;var e=t._;return r.add=function(e,t){return e+t},r.extend=function(t,n){return e({},t,n)},r}(),o=t._({},d.extend({a:1},{b:2}));e.add=d.add,e.extend=d.extend,e.foo=o},\\"object\\"==typeof exports&&\\"undefined\\"!=typeof module?t(exports,require(\\"@swc/helpers/_/_object_spread\\")):\\"function\\"==typeof define&&define.amd?define([\\"exports\\",\\"@swc/helpers/_/_object_spread\\"],t):t((e=\\"undefined\\"!=typeof globalThis?globalThis:e||self)[\\"@ice/pkg-tests-mix-cjs-mjs\\"]={},e.require$$0);
 "
 `;
 
 exports[`Run config swc-helpers > file content esm/cjs.js 1`] = `
-"import { _ as _object_spread } from \\"@swc/helpers/_/_object_spread\\";
+"var _object_spread = require('@swc/helpers/_/_object_spread')._;
 module.exports.add = function(a, b) {
     return a + b;
 };
@@ -126,16 +134,16 @@ module.exports.extend = function(a, b) {
 `;
 
 exports[`Run config swc-helpers > file content esm/entry-mts.d.ts 1`] = `
-"import { join, extend } from './cjs';
-export { join, extend };
-export declare const foo: any;
+"import { add, extend } from './cjs';
+export { add, extend };
+export declare const foo: Record<string, any>;
 "
 `;
 
 exports[`Run config swc-helpers > file content esm/entry-mts.js 1`] = `
 "import { _ as _object_spread } from \\"@swc/helpers/_/_object_spread\\";
-import { join, extend } from './cjs';
-export { join, extend };
+import { add, extend } from './cjs';
+export { add, extend };
 export var foo = _object_spread({}, extend({
     a: 1
 }, {

packages/pkg/src/rollupPlugins/swc.ts

@@ -6,7 +6,7 @@ export default defineConfig({
     formats: ['cjs', 'esm']
   },
   bundle: {
-    formats: ['cjs', 'esm'],
+    formats: ['cjs', 'esm', 'umd'],
     externals: [/@swc\/helpers/]
   },
 })

tests/integration/mix-cjs-mjs/__snapshots__/index.test.ts.snap

@@ -1,7 +1,7 @@
-import { join, extend } from './cjs';
+import { add, extend } from './cjs';
 
-export { join, extend };
+export { add, extend };
 
-export const foo = {
+export const foo: Record<string, any> = {
   ...extend({ a: 1 }, { b: 2 }),
 };