fixed support for JSX fragments

turns out 5467bc6 was insufficient
faucet-pipeline · Jan 8, 2020 · 3e9a3cd · 3e9a3cd
1 parent b76dbfe
commit 3e9a3cd
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 11 deletions.
diff --git a/lib/bundle/babel.js b/lib/bundle/babel.js
@@ -31,9 +31,9 @@ module.exports = function generateTranspiler({ esnext, jsx, exclude }, { browser
 
 	if(jsx) {
 		extensions.push(".jsx");
-		let { pragma } = jsx;
-		let options = pragma ? { pragma } : {};
-		plugins.push(["@babel/plugin-transform-react-jsx", options]);
+		let { pragma, pragmaFrag } = jsx;
+		plugins.push(["@babel/plugin-transform-react-jsx",
+			{ pragma, pragmaFrag }]);
 	}
 
 	if(plugins.length) {

diff --git a/test/cli/test_jsx/expected.js b/test/cli/test_jsx/expected.js
@@ -13,6 +13,6 @@ var MyComponent = function MyComponent() {
 
 var el = createElement(MyComponent, {
   type: "dummy"
-}, createElement("my-element", null, "lorem ipsum", createElement("mark", null, "666"), "dolor sit amet"));
+}, createElement("my-element", null, "lorem ipsum", createElement(Fragment, null, createElement("mark", null, "666"), "dolor sit amet")));
 
 }());
diff --git a/test/cli/test_jsx/faucet.config.js b/test/cli/test_jsx/faucet.config.js
@@ -7,7 +7,10 @@ module.exports = {
 		source: "./src/index.jsx",
 		target: "./dist/bundle.js",
 		esnext: true,
-		jsx: { pragma: "createElement" }
+		jsx: {
+			pragma: "createElement",
+			fragment: "Fragment"
+		}
 	}],
 	plugins: {
 		js: {

diff --git a/test/cli/test_jsx/src/index.jsx b/test/cli/test_jsx/src/index.jsx
@@ -3,7 +3,9 @@ import MyComponent from "./component"
 let el = <MyComponent type="dummy">
 	<my-element>
 		lorem ipsum
-		<mark>666</mark>
-		dolor sit amet
+		<>
+			<mark>666</mark>
+			dolor sit amet
+		</>
 	</my-element>
 </MyComponent>
diff --git a/test/unit/expected/virtual_bundle_jsx.js b/test/unit/expected/virtual_bundle_jsx.js
@@ -22,7 +22,7 @@ function List(_, ...children) {
 
 console.log(createElement(List, null, createElement(Button, {
   label: UTIL
-}), createElement(Button, {
+}), createElement(Fragment, null, createElement(Button, {
   type: "reset",
   label: MYLIB
-})));
+}))));
diff --git a/test/unit/test_virtual.js b/test/unit/test_virtual.js
@@ -38,7 +38,10 @@ console.log(UTIL + MYLIB);
 	it("should support JSX", async () => {
 		let bundle = new VirtualBundle(FIXTURES_DIR, {
 			format: "CommonJS",
-			jsx: { pragma: "createElement" }
+			jsx: {
+				pragma: "createElement",
+				fragment: "Fragment"
+			}
 		}, DEFAULT_OPTIONS);
 
 		let { code, error } = await bundle.compile(`
@@ -49,7 +52,9 @@ import createElement from "my-lib/elements";
 
 console.log(<List>
 	<Button label={UTIL} />
-	<Button type="reset" label={MYLIB} />
+	<>
+		<Button type="reset" label={MYLIB} />
+	</>
 </List>);
 		`);
 		assertSame(error, undefined);