Merge pull request #741 from developit/x

preact x support 👀
preactjs · Feb 23, 2019 · 11ac54b · 11ac54b
2 parents 33bab78 + 080df94
commit 11ac54b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/packages/cli/lib/lib/babel-config.js b/packages/cli/lib/lib/babel-config.js
@@ -24,7 +24,10 @@ module.exports = function(env, options = {}) {
 			require.resolve('@babel/plugin-transform-react-constant-elements'),
 			isProd &&
 				require.resolve('babel-plugin-transform-react-remove-prop-types'),
-			[require.resolve('@babel/plugin-transform-react-jsx'), { pragma: 'h' }],
+			[
+				require.resolve('@babel/plugin-transform-react-jsx'),
+				{ pragma: 'h', pragmaFrag: 'Fragment' },
+			],
 			[require.resolve('fast-async'), { spec: true }],
 			require.resolve('babel-plugin-macros'),
 			!isProd && isRHLEnabled && require.resolve('react-hot-loader/babel'),

diff --git a/packages/cli/lib/lib/webpack/webpack-base-config.js b/packages/cli/lib/lib/webpack/webpack-base-config.js
@@ -66,6 +66,7 @@ module.exports = function(env) {
 		resolve: {
 			modules: ['node_modules', ...nodeModules],
 			extensions: [
+				'.mjs',
 				'.js',
 				'.jsx',
 				'.ts',
@@ -107,7 +108,8 @@ module.exports = function(env) {
 				{
 					// ES2015
 					enforce: 'pre',
-					test: /\.jsx?$/,
+					test: /\.m?jsx?$/,
+					type: 'javascript/auto',
 					loader: 'babel-loader',
 					options: Object.assign(
 						{ babelrc: false },
@@ -236,6 +238,7 @@ module.exports = function(env) {
 			}),
 			new webpack.ProvidePlugin({
 				h: ['preact', 'h'],
+				Fragment: ['preact', 'Fragment'],
 			}),
 			// Extract CSS
 			new MiniCssExtractPlugin({