From fd3ce6faef253a6b66df12bf997624ee437ea1ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20=28Greg=29=20Zi=C3=B3=C5=82kowski?=
 <grzegorz@gziolo.pl>
Date: Mon, 25 Feb 2019 10:50:41 +0100
Subject: [PATCH] Improve default Babel preset to include JSX pragma (#13540)

* Include custome JSX pragma support in Babel preset

* Stop using Babel tranpiliation for two packages
babel-plugin-import-jsx-pragma and postcss-themes

* Add engines field to node based packages
---
 babel.config.js                               | 10 -----
 bin/packages/get-babel-config.js              | 13 ++-----
 bin/packages/get-packages.js                  | 38 +------------------
 package-lock.json                             |  7 +---
 package.json                                  |  4 +-
 .../CHANGELOG.md                              |  1 +
 .../{src => }/index.js                        |  9 ++---
 .../package.json                              | 12 +++---
 .../test/index.js                             |  2 +-
 packages/babel-plugin-makepot/package.json    |  3 ++
 packages/babel-preset-default/CHANGELOG.md    |  1 +
 packages/babel-preset-default/index.js        |  8 ++++
 packages/babel-preset-default/package.json    |  4 ++
 .../package.json                              |  3 ++
 packages/e2e-test-utils/package.json          |  3 ++
 packages/e2e-tests/package.json               |  3 ++
 packages/jest-console/package.json            |  3 ++
 packages/jest-preset-default/package.json     |  3 ++
 packages/jest-puppeteer-axe/package.json      |  3 ++
 .../package.json                              |  3 ++
 .../npm-package-json-lint-config/package.json |  3 ++
 packages/postcss-themes/CHANGELOG.md          |  5 +++
 packages/postcss-themes/{src => }/index.js    |  3 ++
 packages/postcss-themes/package.json          |  9 +++--
 packages/postcss-themes/test/index.js         |  2 +-
 25 files changed, 73 insertions(+), 82 deletions(-)
 rename packages/babel-plugin-import-jsx-pragma/{src => }/index.js (96%)
 create mode 100644 packages/postcss-themes/CHANGELOG.md
 rename packages/postcss-themes/{src => }/index.js (98%)

diff --git a/babel.config.js b/babel.config.js
index 6a903eff6c1d9..4dc16df8337b2 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -3,16 +3,6 @@ module.exports = function( api ) {
 
 	return {
 		presets: [ '@wordpress/babel-preset-default' ],
-		plugins: [
-			[
-				'@wordpress/babel-plugin-import-jsx-pragma',
-				{
-					scopeVariable: 'createElement',
-					source: '@wordpress/element',
-					isDefault: false,
-				},
-			],
-		],
 		env: {
 			production: {
 				plugins: [
diff --git a/bin/packages/get-babel-config.js b/bin/packages/get-babel-config.js
index e79bc306d07c4..b2646da46955c 100644
--- a/bin/packages/get-babel-config.js
+++ b/bin/packages/get-babel-config.js
@@ -10,14 +10,7 @@ const babel = require( '@babel/core' );
 const { options: babelDefaultConfig } = babel.loadPartialConfig( {
 	configFile: '@wordpress/babel-preset-default',
 } );
-const plugins = babelDefaultConfig.plugins;
-if ( ! process.env.SKIP_JSX_PRAGMA_TRANSFORM ) {
-	plugins.push( [ '@wordpress/babel-plugin-import-jsx-pragma', {
-		scopeVariable: 'createElement',
-		source: '@wordpress/element',
-		isDefault: false,
-	} ] );
-}
+const { plugins, presets } = babelDefaultConfig;
 
 const overrideOptions = ( target, targetName, options ) => {
 	if ( get( target, [ 'file', 'request' ] ) === targetName ) {
@@ -37,7 +30,7 @@ const babelConfigs = {
 		{
 			plugins,
 			presets: map(
-				babelDefaultConfig.presets,
+				presets,
 				( preset ) => overrideOptions( preset, '@babel/preset-env', {
 					modules: 'commonjs',
 				} )
@@ -55,7 +48,7 @@ const babelConfigs = {
 				} )
 			),
 			presets: map(
-				babelDefaultConfig.presets,
+				presets,
 				( preset ) => overrideOptions( preset, '@babel/preset-env', {
 					modules: false,
 				} )
diff --git a/bin/packages/get-packages.js b/bin/packages/get-packages.js
index 30093a22abba6..ed271db0434f2 100644
--- a/bin/packages/get-packages.js
+++ b/bin/packages/get-packages.js
@@ -3,7 +3,7 @@
  */
 const fs = require( 'fs' );
 const path = require( 'path' );
-const { overEvery, compact, includes, negate } = require( 'lodash' );
+const { overEvery } = require( 'lodash' );
 
 /**
  * Absolute path to packages directory.
@@ -12,36 +12,6 @@ const { overEvery, compact, includes, negate } = require( 'lodash' );
  */
 const PACKAGES_DIR = path.resolve( __dirname, '../../packages' );
 
-const {
-	/**
-	 * Comma-separated string of packages to include in build.
-	 *
-	 * @type {string}
-	 */
-	INCLUDE_PACKAGES,
-
-	/**
-	 * Comma-separated string of packages to exclude from build.
-	 *
-	 * @type {string}
-	 */
-	EXCLUDE_PACKAGES,
-} = process.env;
-
-/**
- * Given a comma-separated string, returns a filter function which returns true
- * if the item is contained within as a comma-separated entry.
- *
- * @param {Function} filterFn Filter function to call with item to test.
- * @param {string}   list     Comma-separated list of items.
- *
- * @return {Function} Filter function.
- */
-const createCommaSeparatedFilter = ( filterFn, list ) => {
-	const listItems = list.split( ',' );
-	return ( item ) => filterFn( listItems, item );
-};
-
 /**
  * Returns true if the given base file name for a file within the packages
  * directory is itself a directory.
@@ -62,11 +32,7 @@ function isDirectory( file ) {
  *
  * @return {boolean} Whether to include file in build.
  */
-const filterPackages = overEvery( compact( [
-	isDirectory,
-	INCLUDE_PACKAGES && createCommaSeparatedFilter( includes, INCLUDE_PACKAGES ),
-	EXCLUDE_PACKAGES && createCommaSeparatedFilter( negate( includes ), EXCLUDE_PACKAGES ),
-] ) );
+const filterPackages = overEvery( isDirectory );
 
 /**
  * Returns the absolute path of all WordPress packages
diff --git a/package-lock.json b/package-lock.json
index 4c9b3ccb412e8..064963872225f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2496,10 +2496,7 @@
 		},
 		"@wordpress/babel-plugin-import-jsx-pragma": {
 			"version": "file:packages/babel-plugin-import-jsx-pragma",
-			"dev": true,
-			"requires": {
-				"@babel/runtime": "^7.3.1"
-			}
+			"dev": true
 		},
 		"@wordpress/babel-plugin-makepot": {
 			"version": "file:packages/babel-plugin-makepot",
@@ -2521,6 +2518,7 @@
 				"@babel/plugin-transform-runtime": "^7.2.0",
 				"@babel/preset-env": "^7.3.1",
 				"@babel/runtime": "^7.3.1",
+				"@wordpress/babel-plugin-import-jsx-pragma": "file:packages/babel-plugin-import-jsx-pragma",
 				"@wordpress/browserslist-config": "file:packages/browserslist-config"
 			}
 		},
@@ -2975,7 +2973,6 @@
 			"version": "file:packages/postcss-themes",
 			"dev": true,
 			"requires": {
-				"@babel/runtime": "^7.3.1",
 				"autoprefixer": "^9.4.5",
 				"postcss": "^7.0.13",
 				"postcss-color-function": "^4.0.1"
diff --git a/package.json b/package.json
index 63f478e6c6fa3..eb1b308d87f2a 100644
--- a/package.json
+++ b/package.json
@@ -150,8 +150,8 @@
 	"scripts": {
 		"prebuild": "npm run check-engines",
 		"clean:packages": "rimraf ./packages/*/build ./packages/*/build-module ./packages/*/build-style",
-		"prebuild:packages": "npm run clean:packages && lerna run build && cross-env INCLUDE_PACKAGES=babel-plugin-import-jsx-pragma,postcss-themes,jest-console SKIP_JSX_PRAGMA_TRANSFORM=1 node ./bin/packages/build.js",
-		"build:packages": "cross-env EXCLUDE_PACKAGES=babel-plugin-import-jsx-pragma,jest-console,postcss-themes node ./bin/packages/build.js",
+		"prebuild:packages": "npm run clean:packages && lerna run build",
+		"build:packages": "node ./bin/packages/build.js",
 		"build": "npm run build:packages && wp-scripts build",
 		"check-engines": "wp-scripts check-engines",
 		"check-licenses": "concurrently \"wp-scripts check-licenses --prod --gpl2\" \"wp-scripts check-licenses --dev\"",
diff --git a/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md b/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md
index ffa68f4404f0d..32ad201bf1884 100644
--- a/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md
+++ b/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Breaking Change
 
 - Plugin skips now adding import JSX pragma when the scope variable is defined for all JSX elements ([#13809](https://github.com/WordPress/gutenberg/pull/13809)). 
+- Stop using Babel transpilation internally and set node 8 as a minimal version required ([#13540](https://github.com/WordPress/gutenberg/pull/13540)).
 
 ## 1.1.0 (2018-09-05)
 
diff --git a/packages/babel-plugin-import-jsx-pragma/src/index.js b/packages/babel-plugin-import-jsx-pragma/index.js
similarity index 96%
rename from packages/babel-plugin-import-jsx-pragma/src/index.js
rename to packages/babel-plugin-import-jsx-pragma/index.js
index 68e94e1ffc37d..d431b6823aea3 100644
--- a/packages/babel-plugin-import-jsx-pragma/src/index.js
+++ b/packages/babel-plugin-import-jsx-pragma/index.js
@@ -26,15 +26,12 @@ const DEFAULT_OPTIONS = {
  *
  * @return {Object} Babel transform plugin.
  */
-export default function( babel ) {
+module.exports = function( babel ) {
 	const { types: t } = babel;
 
 	function getOptions( state ) {
 		if ( ! state._options ) {
-			state._options = {
-				...DEFAULT_OPTIONS,
-				...state.opts,
-			};
+			state._options = Object.assign( {}, DEFAULT_OPTIONS, state.opts );
 		}
 
 		return state._options;
@@ -106,4 +103,4 @@ export default function( babel ) {
 			},
 		},
 	};
-}
+};
diff --git a/packages/babel-plugin-import-jsx-pragma/package.json b/packages/babel-plugin-import-jsx-pragma/package.json
index 3f9efdc87ffa1..c06f76a26f3bb 100644
--- a/packages/babel-plugin-import-jsx-pragma/package.json
+++ b/packages/babel-plugin-import-jsx-pragma/package.json
@@ -20,15 +20,13 @@
 	"bugs": {
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
+	"engines": {
+		"node": ">=8"
+	},
 	"files": [
-		"build",
-		"build-module"
+		"index.js"
 	],
-	"main": "build/index.js",
-	"module": "build-module/index.js",
-	"dependencies": {
-		"@babel/runtime": "^7.3.1"
-	},
+	"main": "index.js",
 	"peerDependencies": {
 		"@babel/core": "^7.0.0"
 	},
diff --git a/packages/babel-plugin-import-jsx-pragma/test/index.js b/packages/babel-plugin-import-jsx-pragma/test/index.js
index d70cf2313c540..a10207a5d5563 100644
--- a/packages/babel-plugin-import-jsx-pragma/test/index.js
+++ b/packages/babel-plugin-import-jsx-pragma/test/index.js
@@ -6,7 +6,7 @@ import { transformSync } from '@babel/core';
 /**
  * Internal dependencies
  */
-import plugin from '../src';
+import plugin from '../';
 
 describe( 'babel-plugin-import-jsx-pragma', () => {
 	function getTransformedCode( source, options = {} ) {
diff --git a/packages/babel-plugin-makepot/package.json b/packages/babel-plugin-makepot/package.json
index fae36a7f7ac3d..10b4d4eb90d02 100644
--- a/packages/babel-plugin-makepot/package.json
+++ b/packages/babel-plugin-makepot/package.json
@@ -19,6 +19,9 @@
 	"bugs": {
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
+	"engines": {
+		"node": ">=8"
+	},
 	"files": [
 		"build",
 		"build-module"
diff --git a/packages/babel-preset-default/CHANGELOG.md b/packages/babel-preset-default/CHANGELOG.md
index 40e47005778e4..3fe7a9f29b100 100644
--- a/packages/babel-preset-default/CHANGELOG.md
+++ b/packages/babel-preset-default/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Breaking Change
 
 - Removed `babel-core` dependency acting as Babel 7 bridge ([#13922](https://github.com/WordPress/gutenberg/pull/13922). Ensure all references to `babel-core` are replaced with `@babel/core` .
+- Preset updated to include `@wordpress/babel-plugin-import-jsx-pragma` plugin integration ([#13540](https://github.com/WordPress/gutenberg/pull/13540)).
 
 ## 3.0.0 (2018-09-30)
 
diff --git a/packages/babel-preset-default/index.js b/packages/babel-preset-default/index.js
index a2bfedebe1b37..44a0392cd82cb 100644
--- a/packages/babel-preset-default/index.js
+++ b/packages/babel-preset-default/index.js
@@ -15,6 +15,14 @@ module.exports = function( api ) {
 		].filter( Boolean ),
 		plugins: [
 			'@babel/plugin-proposal-object-rest-spread',
+			[
+				'@wordpress/babel-plugin-import-jsx-pragma',
+				{
+					scopeVariable: 'createElement',
+					source: '@wordpress/element',
+					isDefault: false,
+				},
+			],
 			[ '@babel/plugin-transform-react-jsx', {
 				pragma: 'createElement',
 			} ],
diff --git a/packages/babel-preset-default/package.json b/packages/babel-preset-default/package.json
index a1f2f02e0ac88..1bf66c0c54e6c 100644
--- a/packages/babel-preset-default/package.json
+++ b/packages/babel-preset-default/package.json
@@ -22,6 +22,9 @@
 	"engines": {
 		"node": ">=8"
 	},
+	"files": [
+		"index.js"
+	],
 	"main": "index.js",
 	"dependencies": {
 		"@babel/core": "^7.2.2",
@@ -31,6 +34,7 @@
 		"@babel/plugin-transform-runtime": "^7.2.0",
 		"@babel/preset-env": "^7.3.1",
 		"@babel/runtime": "^7.3.1",
+		"@wordpress/babel-plugin-import-jsx-pragma": "file:../babel-plugin-import-jsx-pragma",
 		"@wordpress/browserslist-config": "file:../browserslist-config"
 	},
 	"peerDependencies": {
diff --git a/packages/custom-templated-path-webpack-plugin/package.json b/packages/custom-templated-path-webpack-plugin/package.json
index 49ca17003c257..02cd1d4c4d7c9 100644
--- a/packages/custom-templated-path-webpack-plugin/package.json
+++ b/packages/custom-templated-path-webpack-plugin/package.json
@@ -18,6 +18,9 @@
 	"bugs": {
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
+	"engines": {
+		"node": ">=8"
+	},
 	"files": [
 		"build",
 		"build-module"
diff --git a/packages/e2e-test-utils/package.json b/packages/e2e-test-utils/package.json
index 071541ed4449c..f31d67677475e 100644
--- a/packages/e2e-test-utils/package.json
+++ b/packages/e2e-test-utils/package.json
@@ -18,6 +18,9 @@
 	"bugs": {
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
+	"engines": {
+		"node": ">=8"
+	},
 	"files": [
 		"build",
 		"build-module"
diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
index 881a497511505..c7e096b781d76 100644
--- a/packages/e2e-tests/package.json
+++ b/packages/e2e-tests/package.json
@@ -18,6 +18,9 @@
 	"bugs": {
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
+	"engines": {
+		"node": ">=8"
+	},
 	"dependencies": {
 		"@wordpress/e2e-test-utils": "file:../e2e-test-utils",
 		"@wordpress/jest-console": "file:../jest-console",
diff --git a/packages/jest-console/package.json b/packages/jest-console/package.json
index d39dbe4b23026..2b54b68bb8ff8 100644
--- a/packages/jest-console/package.json
+++ b/packages/jest-console/package.json
@@ -19,6 +19,9 @@
 	"bugs": {
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
+	"engines": {
+		"node": ">=8"
+	},
 	"files": [
 		"build",
 		"build-module"
diff --git a/packages/jest-preset-default/package.json b/packages/jest-preset-default/package.json
index 42110a066fe89..bc73370bb4706 100644
--- a/packages/jest-preset-default/package.json
+++ b/packages/jest-preset-default/package.json
@@ -21,6 +21,9 @@
 	"bugs": {
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
+	"engines": {
+		"node": ">=8"
+	},
 	"files": [
 		"scripts",
 		"jest-preset.json"
diff --git a/packages/jest-puppeteer-axe/package.json b/packages/jest-puppeteer-axe/package.json
index 6c5e7ba6bc88d..c8a534ec613d4 100644
--- a/packages/jest-puppeteer-axe/package.json
+++ b/packages/jest-puppeteer-axe/package.json
@@ -20,6 +20,9 @@
 	"bugs": {
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
+	"engines": {
+		"node": ">=8"
+	},
 	"files": [
 		"build",
 		"build-module"
diff --git a/packages/library-export-default-webpack-plugin/package.json b/packages/library-export-default-webpack-plugin/package.json
index e2a2881f72902..c64a2f3bee854 100644
--- a/packages/library-export-default-webpack-plugin/package.json
+++ b/packages/library-export-default-webpack-plugin/package.json
@@ -18,6 +18,9 @@
 	"bugs": {
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
+	"engines": {
+		"node": ">=8"
+	},
 	"files": [
 		"build",
 		"build-module"
diff --git a/packages/npm-package-json-lint-config/package.json b/packages/npm-package-json-lint-config/package.json
index f2dabfdf29af2..f61270594fd16 100644
--- a/packages/npm-package-json-lint-config/package.json
+++ b/packages/npm-package-json-lint-config/package.json
@@ -18,6 +18,9 @@
 	"bugs": {
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
+	"engines": {
+		"node": ">=8"
+	},
 	"main": "index.js",
 	"peerDependencies": {
 		"npm-package-json-lint": ">=3.3.1"
diff --git a/packages/postcss-themes/CHANGELOG.md b/packages/postcss-themes/CHANGELOG.md
new file mode 100644
index 0000000000000..23a814422fd86
--- /dev/null
+++ b/packages/postcss-themes/CHANGELOG.md
@@ -0,0 +1,5 @@
+## 2.0.0 (Unreleased)
+
+### Breaking change
+
+- Stop using Babel transpilation internally and set node 8 as a minimal version required ([#13540](https://github.com/WordPress/gutenberg/pull/13540)).
diff --git a/packages/postcss-themes/src/index.js b/packages/postcss-themes/index.js
similarity index 98%
rename from packages/postcss-themes/src/index.js
rename to packages/postcss-themes/index.js
index 5018a0dd39a4e..9c7dd80c64501 100644
--- a/packages/postcss-themes/src/index.js
+++ b/packages/postcss-themes/index.js
@@ -1,3 +1,6 @@
+/**
+ * External dependencies
+ */
 const postcss = require( 'postcss' );
 
 module.exports = postcss.plugin( 'postcss-themes', function( options ) {
diff --git a/packages/postcss-themes/package.json b/packages/postcss-themes/package.json
index cafbbdf93e6b4..8a089ee2c8ccf 100644
--- a/packages/postcss-themes/package.json
+++ b/packages/postcss-themes/package.json
@@ -21,13 +21,14 @@
 	"bugs": {
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
+	"engines": {
+		"node": ">=8"
+	},
 	"files": [
-		"build",
-		"build-module"
+		"index.js"
 	],
-	"main": "build/index.js",
+	"main": "index.js",
 	"dependencies": {
-		"@babel/runtime": "^7.3.1",
 		"autoprefixer": "^9.4.5",
 		"postcss": "^7.0.13",
 		"postcss-color-function": "^4.0.1"
diff --git a/packages/postcss-themes/test/index.js b/packages/postcss-themes/test/index.js
index 9a670ba55a588..45a058d6e2a31 100644
--- a/packages/postcss-themes/test/index.js
+++ b/packages/postcss-themes/test/index.js
@@ -6,7 +6,7 @@ import postcss from 'postcss';
 /**
  * Internal dependencies
  */
-import plugin from '../src';
+import plugin from '../';
 
 /**
  * Module constants