Use swc instead of Babel

moonglum · moonglum · commit 1928d6687f68 · 2022-04-22T15:23:14.000+02:00
diff --git a/lib/bundle/babel.js b/lib/bundle/babel.js
diff --git a/lib/bundle/config.js b/lib/bundle/config.js
@@ -1,7 +1,6 @@
 /* eslint-disable object-curly-newline */
 "use strict";
 
-let generateTranspiler = require("./babel");
 let { generateSWCConfig } = require("./swc");
 let { loadExtension, abort, repr } = require("faucet-pipeline-core/lib/util");
 let commonjs = require("@rollup/plugin-commonjs");
@@ -53,7 +52,7 @@ function generateConfig({ externals, format, exports, // eslint-disable-next-lin
 	let plugins = [];
 	let extensions = [".js"];
 
-	if(typescript || jsx) {
+	if(esnext || typescript || jsx) {
 		// TODO: Improve error message (correct extension name)
 		let { default: swc } = loadExtension("rollup-plugin-swc",
 				"failed to activate SWC");
@@ -64,24 +63,16 @@ function generateConfig({ externals, format, exports, // eslint-disable-next-lin
 		if(typescript) {
 			extensions.push(".ts");
 		}
-		let swcConfig = generateSWCConfig({ typescript, jsx, sourcemaps });
+		let swcConfig = generateSWCConfig({
+			esnext,
+			typescript,
+			jsx,
+			sourcemaps,
+			browsers
+		});
 		plugins.push(swc(swcConfig));
 	}
 
-	if(esnext) {
-		let transpiler = Object.assign({}, esnext);
-		transpiler.esnext = true;
-
-		let { browserslist } = transpiler;
-		browsers = browserslist === false ? null : browsers[browserslist || "defaults"];
-		if(browsers && browsers.length) {
-			console.error("transpiling JavaScript for", browsers.join(", "));
-		}
-
-		let { plugin } = generateTranspiler(transpiler, { browsers });
-		plugins.push(plugin);
-	}
-
 	plugins = plugins.concat([
 		nodeResolve({ extensions }),
 		commonjs({ include: "node_modules/**" })
diff --git a/lib/bundle/swc.js b/lib/bundle/swc.js
@@ -1,10 +1,11 @@
-exports.generateSWCConfig = function({ typescript, jsx, sourcemaps }) {
+exports.generateSWCConfig = function({ esnext, typescript, jsx, sourcemaps, browsers }) {
+	let env;
+	let rollup = {};
 	let jsc = {
 		parser: {
 			syntax: typescript ? "typescript" : "ecmascript"
 		},
-		// Disable es3 / es5 / es2015 transforms
-		target: "es2016"
+		target: esnext ? "es5" : "es2016"
 	};
 
 	if(jsx) {
@@ -30,7 +31,28 @@ exports.generateSWCConfig = function({ typescript, jsx, sourcemaps }) {
 		jsc.sourcemaps = "inline";
 	}
 
+	let exclude = esnext?.exclude ?? [];
+	let browserslist = esnext?.browserslist;
+
+	let targets = browserslist === false ? null : browsers[browserslist || "defaults"];
+	if(targets && targets.length) {
+		console.error("transpiling JavaScript for", targets.join(", "));
+		delete jsc.target;
+		env = { targets };
+	}
+
+	rollup.exclude = exclude.map(pkg => {
+		// distinguish paths from package identifiers - as per Node's
+		// resolution algorithm <https://nodejs.org/api/modules.html>, a
+		// string is a path if it begins with `/`, `./` or `../`
+		// FIXME: duplicates faucet-core's `resolvePath`, resulting in
+		//        inconsistency WRT working directory
+		return /^\.{0,2}\//.test(pkg) ? pkg : `node_modules/${pkg}/**`;
+	});
+
 	return {
+		rollup,
+		env,
 		jsc
 	};
 };
diff --git a/pkg/faucet-pipeline-esnext/package.json b/pkg/faucet-pipeline-esnext/package.json
@@ -13,9 +13,7 @@
 		"url": "https://github.com/faucet-pipeline/faucet-pipeline-js/issues"
 	},
 	"dependencies": {
-		"@babel/core": "~7.17.5",
-		"@babel/preset-env": "~7.16.11",
-		"@rollup/plugin-babel": "~5.3.1",
-		"faucet-pipeline-js": "2.1.8"
+		"@swc/core": "^1.2.145",
+		"rollup-plugin-swc": "^0.2.1"
 	}
 }
diff --git a/test/cli/test_browserslist/expected.js b/test/cli/test_browserslist/expected.js
@@ -1,5 +1,5 @@
-class Util {}
-const FOO = "lorem ipsum";
+class Util {
+}const FOO = "lorem ipsum";
 const BAR = "dolor sit amet";
 
 console.log(`~~ ${Util} ~~ ${FOO} ~~ ${BAR} ~~`);
diff --git a/test/cli/test_browserslist/expected_legacy.js b/test/cli/test_browserslist/expected_legacy.js
@@ -1,31 +1,11 @@
 function _classCallCheck(instance, Constructor) {
-  if (!(instance instanceof Constructor)) {
-    throw new TypeError("Cannot call a class as a function");
-  }
+    if (!(instance instanceof Constructor)) {
+        throw new TypeError("Cannot call a class as a function");
+    }
 }
-
-function _defineProperties(target, props) {
-  for (var i = 0; i < props.length; i++) {
-    var descriptor = props[i];
-    descriptor.enumerable = descriptor.enumerable || false;
-    descriptor.configurable = true;
-    if ("value" in descriptor) descriptor.writable = true;
-    Object.defineProperty(target, descriptor.key, descriptor);
-  }
-}
-
-function _createClass(Constructor, protoProps, staticProps) {
-  if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-  if (staticProps) _defineProperties(Constructor, staticProps);
-  Object.defineProperty(Constructor, "prototype", {
-    writable: false
-  });
-  return Constructor;
-}
-
-var Util = /*#__PURE__*/_createClass(function Util() {
-  _classCallCheck(this, Util);
-});
+var Util = function Util() {
+    _classCallCheck(this, Util);
+};
 var FOO = "lorem ipsum";
 var BAR = "dolor sit amet";
 
diff --git a/test/cli/test_jsx/expected.js b/test/cli/test_jsx/expected.js
@@ -1,33 +1,13 @@
 function _classCallCheck(instance, Constructor) {
-  if (!(instance instanceof Constructor)) {
-    throw new TypeError("Cannot call a class as a function");
-  }
+    if (!(instance instanceof Constructor)) {
+        throw new TypeError("Cannot call a class as a function");
+    }
 }
+var MyComponent = function MyComponent() {
+    _classCallCheck(this, MyComponent);
+};
 
-function _defineProperties(target, props) {
-  for (var i = 0; i < props.length; i++) {
-    var descriptor = props[i];
-    descriptor.enumerable = descriptor.enumerable || false;
-    descriptor.configurable = true;
-    if ("value" in descriptor) descriptor.writable = true;
-    Object.defineProperty(target, descriptor.key, descriptor);
-  }
-}
-
-function _createClass(Constructor, protoProps, staticProps) {
-  if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-  if (staticProps) _defineProperties(Constructor, staticProps);
-  Object.defineProperty(Constructor, "prototype", {
-    writable: false
-  });
-  return Constructor;
-}
-
-var MyComponent = /*#__PURE__*/_createClass(function MyComponent() {
-  _classCallCheck(this, MyComponent);
-});
-
-var el = /*#__PURE__*/createElement(MyComponent, {
-  type: "dummy"
-}, /*#__PURE__*/createElement("my-element", null, "lorem ipsum", /*#__PURE__*/createElement(Fragment, null, /*#__PURE__*/createElement("mark", null, "666"), "dolor sit amet")));
+var el = /*#__PURE__*/ createElement(MyComponent, {
+    type: "dummy"
+}, /*#__PURE__*/ createElement("my-element", null, "lorem ipsum", /*#__PURE__*/ createElement(Fragment, null, /*#__PURE__*/ createElement("mark", null, "666"), "dolor sit amet")));
 console.log(el);
diff --git a/test/cli/test_transpilation/expected.js b/test/cli/test_transpilation/expected.js
@@ -1,31 +1,11 @@
 function _classCallCheck(instance, Constructor) {
-  if (!(instance instanceof Constructor)) {
-    throw new TypeError("Cannot call a class as a function");
-  }
+    if (!(instance instanceof Constructor)) {
+        throw new TypeError("Cannot call a class as a function");
+    }
 }
-
-function _defineProperties(target, props) {
-  for (var i = 0; i < props.length; i++) {
-    var descriptor = props[i];
-    descriptor.enumerable = descriptor.enumerable || false;
-    descriptor.configurable = true;
-    if ("value" in descriptor) descriptor.writable = true;
-    Object.defineProperty(target, descriptor.key, descriptor);
-  }
-}
-
-function _createClass(Constructor, protoProps, staticProps) {
-  if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-  if (staticProps) _defineProperties(Constructor, staticProps);
-  Object.defineProperty(Constructor, "prototype", {
-    writable: false
-  });
-  return Constructor;
-}
-
-var Util = /*#__PURE__*/_createClass(function Util() {
-  _classCallCheck(this, Util);
-});
+var Util = function Util() {
+    _classCallCheck(this, Util);
+};
 var FOO = "lorem ipsum";
 var BAR = "dolor sit amet";
 

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,7 @@`
`13`	`13`	`"url": "https://github.com/faucet-pipeline/faucet-pipeline-js/issues"`
`14`	`14`	`},`
`15`	`15`	`"dependencies": {`
`16`		`- "@babel/core": "~7.17.5",`
`17`		`- "@babel/preset-env": "~7.16.11",`
`18`		`- "@rollup/plugin-babel": "~5.3.1",`
`19`		`- "faucet-pipeline-js": "2.1.8"`
	`16`	`+ "@swc/core": "^1.2.145",`
	`17`	`+ "rollup-plugin-swc": "^0.2.1"`
`20`	`18`	`}`
`21`	`19`	`}`