From a646d8850683fe025445932f7776297050ea2027 Mon Sep 17 00:00:00 2001 From: Grzegorz Ziolkowski Date: Wed, 6 Jun 2018 18:30:31 +0200 Subject: [PATCH 1/5] Update packages to work with Babel 7 --- package.json | 10 ++--- packages/babel-plugin-makepot/package.json | 6 +-- packages/babel-plugin-makepot/test/index.js | 4 +- packages/babel-preset-default/README.md | 2 +- packages/babel-preset-default/index.js | 41 +++++++++++-------- packages/babel-preset-default/package.json | 12 +++--- packages/i18n/package.json | 2 +- packages/jest-console/package.json | 2 +- packages/jest-preset-default/jest-preset.json | 4 -- packages/jest-preset-default/package.json | 5 +-- .../scripts/pegjs-transform.js | 16 -------- .../scripts/setup-globals.js | 32 --------------- packages/scripts/config/babel-transform.js | 2 +- packages/scripts/config/jest.config.js | 4 +- packages/scripts/package.json | 3 +- packages/wordcount/package.json | 2 +- scripts/build.js | 6 +-- 17 files changed, 55 insertions(+), 98 deletions(-) delete mode 100644 packages/jest-preset-default/scripts/pegjs-transform.js diff --git a/package.json b/package.json index d6299f9..7513b34 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "npm": ">=5.0.0" }, "devDependencies": { - "babel-core": "^6.26.0", + "@babel/core": "^7.0.0-beta.49", "benchmark": "^2.1.4", "chalk": "^2.3.2", "check-node-version": "^3.1.1", @@ -19,14 +19,14 @@ "rimraf": "^2.6.1", "symlink-or-copy": "^1.2.0" }, - "babel": { - "presets": "@wordpress/default" - }, "jest": { "collectCoverageFrom": [ "packages/*/**/*.js" ], - "preset": "@wordpress/jest-preset-default" + "preset": "@wordpress/jest-preset-default", + "transform": { + "^.+\\.jsx?$": "/packages/scripts/config/babel-transform.js" + } }, "npmPackageJsonLintConfig": { "extends": "@wordpress/npm-package-json-lint-config", diff --git a/packages/babel-plugin-makepot/package.json b/packages/babel-plugin-makepot/package.json index 6ac19d4..80b84dd 100644 --- a/packages/babel-plugin-makepot/package.json +++ b/packages/babel-plugin-makepot/package.json @@ -21,11 +21,11 @@ "module": "build-module/index.js", "dependencies": { "gettext-parser": "^1.3.1", - "lodash": "^4.17.5" + "lodash": "^4.17.10" }, "devDependencies": { - "babel-core": "^6.26.0", - "babel-traverse": "^6.26.0" + "@babel/core": "^7.0.0-beta.49", + "@babel/traverse": "^7.0.0-beta.49" }, "publishConfig": { "access": "public" diff --git a/packages/babel-plugin-makepot/test/index.js b/packages/babel-plugin-makepot/test/index.js index 6d8b088..fd0334a 100644 --- a/packages/babel-plugin-makepot/test/index.js +++ b/packages/babel-plugin-makepot/test/index.js @@ -1,8 +1,8 @@ /** * External dependencies */ -import { transform } from 'babel-core'; -import traverse from 'babel-traverse'; +import { transform } from '@babel/core'; +import traverse from '@babel/traverse'; /** * Internal dependencies diff --git a/packages/babel-preset-default/README.md b/packages/babel-preset-default/README.md index f0eeef3..647a73a 100644 --- a/packages/babel-preset-default/README.md +++ b/packages/babel-preset-default/README.md @@ -29,7 +29,7 @@ babel script.js --presets @wordpress/default #### Via Node API ```js -require( 'babel-core' ).transform( 'code', { +require( '@babel/core' ).transform( 'code', { presets: [ '@wordpress/default' ] } ); ``` diff --git a/packages/babel-preset-default/index.js b/packages/babel-preset-default/index.js index 00f2495..747541a 100644 --- a/packages/babel-preset-default/index.js +++ b/packages/babel-preset-default/index.js @@ -1,22 +1,27 @@ const env = process.env.BABEL_ENV || process.env.NODE_ENV; const isTestEnv = env === 'test'; -module.exports = { - presets: [ - ! isTestEnv && [ require( 'babel-preset-env' ), { - modules: false, - targets: { - browsers: [ 'extends @wordpress/browserslist-config' ], - }, - } ], - isTestEnv && [ require( 'babel-preset-env' ) ], - ].filter( Boolean ), - plugins: [ - require( 'babel-plugin-transform-object-rest-spread' ), - [ require( 'babel-plugin-transform-react-jsx' ), { - pragma: 'wp.element.createElement', - } ], - require( 'babel-plugin-transform-async-generator-functions' ), - ! isTestEnv && require( 'babel-plugin-transform-runtime' ), - ].filter( Boolean ), +module.exports = function() { + return { + presets: [ + ! isTestEnv && [ '@babel/preset-env', { + modules: false, + targets: { + browsers: [ 'extends @wordpress/browserslist-config' ], + }, + useBuiltIns: 'usage', + } ], + isTestEnv && [ '@babel/preset-env', { + useBuiltIns: 'usage', + } ], + ].filter( Boolean ), + plugins: [ + '@babel/plugin-proposal-object-rest-spread', + [ '@babel/plugin-transform-react-jsx', { + pragma: 'wp.element.createElement', + } ], + '@babel/plugin-proposal-async-generator-functions', + ! isTestEnv && '@babel/plugin-transform-runtime', + ].filter( Boolean ), + }; }; diff --git a/packages/babel-preset-default/package.json b/packages/babel-preset-default/package.json index 2140715..26f2ad9 100644 --- a/packages/babel-preset-default/package.json +++ b/packages/babel-preset-default/package.json @@ -22,12 +22,14 @@ "node": ">=8" }, "dependencies": { + "@babel/plugin-proposal-async-generator-functions": "^7.0.0-beta.49", + "@babel/plugin-proposal-object-rest-spread": "^7.0.0-beta.49", + "@babel/plugin-transform-react-jsx": "^7.0.0-beta.49", + "@babel/plugin-transform-runtime": "^7.0.0-beta.49", + "@babel/preset-env": "^7.0.0-beta.49", + "@babel/runtime": "^7.0.0-beta.49", "@wordpress/browserslist-config": "^2.1.4", - "babel-plugin-transform-async-generator-functions": "^6.24.1", - "babel-plugin-transform-object-rest-spread": "^6.23.0", - "babel-plugin-transform-react-jsx": "^6.24.1", - "babel-plugin-transform-runtime": "^6.23.0", - "babel-preset-env": "^1.6.1" + "babel-core": "7.0.0-bridge.0" }, "publishConfig": { "access": "public" diff --git a/packages/i18n/package.json b/packages/i18n/package.json index e8bdbac..a65e7da 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -23,7 +23,7 @@ "dependencies": { "gettext-parser": "^1.3.1", "jed": "^1.1.1", - "lodash": "^4.17.5", + "lodash": "^4.17.10", "memize": "^1.0.5" }, "publishConfig": { diff --git a/packages/jest-console/package.json b/packages/jest-console/package.json index d455d4f..969b388 100644 --- a/packages/jest-console/package.json +++ b/packages/jest-console/package.json @@ -26,7 +26,7 @@ "module": "build-module/index.js", "dependencies": { "jest-matcher-utils": "^22.4.0", - "lodash": "^4.17.4" + "lodash": "^4.17.10" }, "peerDependencies": { "jest": ">=22" diff --git a/packages/jest-preset-default/jest-preset.json b/packages/jest-preset-default/jest-preset.json index af50744..bf57b53 100644 --- a/packages/jest-preset-default/jest-preset.json +++ b/packages/jest-preset-default/jest-preset.json @@ -21,9 +21,5 @@ "**/test/*.js" ], "timers": "fake", - "transform": { - "^.+\\.jsx?$": "babel-jest", - "\\.pegjs$": "/node_modules/@wordpress/jest-preset-default/scripts/pegjs-transform.js" - }, "verbose": true } diff --git a/packages/jest-preset-default/package.json b/packages/jest-preset-default/package.json index c7b1f31..261c4d7 100644 --- a/packages/jest-preset-default/package.json +++ b/packages/jest-preset-default/package.json @@ -27,11 +27,10 @@ "main": "index.js", "dependencies": { "@wordpress/jest-console": "^1.0.7", - "babel-jest": "^22.1.0", + "babel-jest": "^23.0.1", "enzyme": "^3.3.0", "enzyme-adapter-react-16": "^1.1.1", - "jest-enzyme": "^4.0.2", - "pegjs": "^0.10.0" + "jest-enzyme": "^6.0.1" }, "peerDependencies": { "jest": ">=22" diff --git a/packages/jest-preset-default/scripts/pegjs-transform.js b/packages/jest-preset-default/scripts/pegjs-transform.js deleted file mode 100644 index b5f84d2..0000000 --- a/packages/jest-preset-default/scripts/pegjs-transform.js +++ /dev/null @@ -1,16 +0,0 @@ -const pegjs = require( 'pegjs' ); - -module.exports = { - process( src ) { - // Description of PEG.js options: https://github.com/pegjs/pegjs#javascript-api - const pegOptions = { - output: 'source', - cache: false, - optimize: 'speed', - trace: false, - }; - const methodName = ( typeof pegjs.generate === 'function' ) ? 'generate' : 'buildParser'; - - return `module.exports = ${ pegjs[ methodName ]( src, pegOptions ) };`; - }, -}; diff --git a/packages/jest-preset-default/scripts/setup-globals.js b/packages/jest-preset-default/scripts/setup-globals.js index 188224b..e03f036 100644 --- a/packages/jest-preset-default/scripts/setup-globals.js +++ b/packages/jest-preset-default/scripts/setup-globals.js @@ -13,35 +13,6 @@ global.window.matchMedia = () => ( { removeListener: () => {}, } ); -global.window._wpDateSettings = { - formats: { - date: 'j F Y', - datetime: 'j F Y G \h i \m\i\n', - time: 'G \h i \m\i\n', - }, - l10n: { - locale: 'en', - meridiem: { - am: 'am', - AM: 'AM', - pm: 'pm', - PM: 'PM', - }, - months: [ 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December' ], - monthsShort: [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ], - weekdays: [ 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday' ], - weekdaysShort: [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ], - relative: { - future: '%s from now', - past: '%s ago', - }, - }, - timezone: { - offset: '-5', - string: 'America/New_York', - }, -}; - // Setup fake localStorage const storage = {}; global.window.localStorage = { @@ -51,6 +22,3 @@ global.window.localStorage = { // UserSettings global global.window.userSettings = { uid: 1 }; - -// Mock jQuery -global.window.jQuery = { holdReady() {} }; diff --git a/packages/scripts/config/babel-transform.js b/packages/scripts/config/babel-transform.js index cf27415..cf96515 100644 --- a/packages/scripts/config/babel-transform.js +++ b/packages/scripts/config/babel-transform.js @@ -4,5 +4,5 @@ const babelJest = require( 'babel-jest' ); module.exports = babelJest.createTransformer( { - presets: [ '@wordpress/default' ], + presets: [ '@wordpress/babel-preset-default' ], } ); diff --git a/packages/scripts/config/jest.config.js b/packages/scripts/config/jest.config.js index 41c8828..d58f9a7 100644 --- a/packages/scripts/config/jest.config.js +++ b/packages/scripts/config/jest.config.js @@ -16,11 +16,13 @@ const jestConfig = { }; const hasBabelConfig = hasProjectFile( '.babelrc' ) || + hasProjectFile( 'babelrc.json' ) || + hasProjectFile( 'babelrc.js' ) || hasPackageProp( 'babel' ); if ( ! hasBabelConfig ) { jestConfig.transform = { - '^.+\\.js$': path.join( __dirname, 'babel-transform' ), + '^.+\\.jsx?$': path.join( __dirname, 'babel-transform' ), }; } diff --git a/packages/scripts/package.json b/packages/scripts/package.json index fee0c0a..99a3fb9 100644 --- a/packages/scripts/package.json +++ b/packages/scripts/package.json @@ -34,8 +34,9 @@ "@wordpress/babel-preset-default": "^1.3.0", "@wordpress/jest-preset-default": "^1.0.6", "@wordpress/npm-package-json-lint-config": "^1.0.0", + "babel-jest": "^23.0.1", "cross-spawn": "^5.1.0", - "jest": "^22.4.0", + "jest": "^23.1.0", "npm-package-json-lint": "^3.0.1", "read-pkg-up": "^3.0.0", "resolve-bin": "^0.4.0" diff --git a/packages/wordcount/package.json b/packages/wordcount/package.json index 6411683..09aee20 100644 --- a/packages/wordcount/package.json +++ b/packages/wordcount/package.json @@ -19,7 +19,7 @@ "main": "build/index.js", "module": "build-module/index.js", "dependencies": { - "lodash": "^4.17.4" + "lodash": "^4.17.10" }, "publishConfig": { "access": "public" diff --git a/scripts/build.js b/scripts/build.js index be3b301..4538be3 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -11,7 +11,7 @@ const fs = require( 'fs' ); const path = require( 'path' ); const glob = require( 'glob' ); -const babel = require( 'babel-core' ); +const babel = require( '@babel/core' ); const chalk = require( 'chalk' ); const mkdirp = require( 'mkdirp' ); @@ -30,7 +30,7 @@ const ERROR = chalk.reset.inverse.bold.red( ' ERROR ' ); /** * Babel Configuration */ -const babelDefaultConfig = require( '../packages/babel-preset-default' ); +const babelDefaultConfig = require( '../packages/babel-preset-default' )(); babelDefaultConfig.babelrc = false; const presetEnvConfig = babelDefaultConfig.presets[ 0 ][ 1 ]; const babelConfigs = { @@ -38,7 +38,7 @@ const babelConfigs = { {}, babelDefaultConfig, { presets: [ - [ 'env', Object.assign( + [ '@babel/preset-env', Object.assign( {}, presetEnvConfig, { modules: 'commonjs' }, From b3ca12bf839381c33520895a7df357ac0fc8160d Mon Sep 17 00:00:00 2001 From: Grzegorz Ziolkowski Date: Wed, 13 Jun 2018 18:43:55 +0200 Subject: [PATCH 2/5] Scripts: Fix Babel transformation for test command --- babel.config.js | 7 +++++++ package.json | 10 ++++------ packages/babel-preset-default/index.js | 5 ++--- packages/scripts/package.json | 1 - 4 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 babel.config.js diff --git a/babel.config.js b/babel.config.js new file mode 100644 index 0000000..b56ad5b --- /dev/null +++ b/babel.config.js @@ -0,0 +1,7 @@ +module.exports = function( api ) { + api.cache( true ); + + return { + presets: [ '@wordpress/babel-preset-default' ], + }; +}; diff --git a/package.json b/package.json index 7513b34..d11b49e 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,7 @@ "collectCoverageFrom": [ "packages/*/**/*.js" ], - "preset": "@wordpress/jest-preset-default", - "transform": { - "^.+\\.jsx?$": "/packages/scripts/config/babel-transform.js" - } + "preset": "@wordpress/jest-preset-default" }, "npmPackageJsonLintConfig": { "extends": "@wordpress/npm-package-json-lint-config", @@ -50,13 +47,14 @@ }, "scripts": { "build-clean": "rimraf ./packages/*/build ./packages/*/build-module", - "prebuild": "npm-run-all check-engines build-clean", + "prebuild": "run-s check-engines build-clean", "build": "node ./scripts/build.js", "check-engines": "check-node-version --package", "create-symlinks": "node ./scripts/create-symlinks.js", "lerna-bootstrap": "lerna bootstrap --hoist", "lint:pkg-json": "wp-scripts lint-pkg-json ./packages", - "postinstall": "npm-run-all lerna-bootstrap create-symlinks build", + "preinstall": "npx rimraf ./node_modules/@wordpress/*", + "postinstall": "run-s lerna-bootstrap create-symlinks build", "pretest": "npm run lint:pkg-json", "test": "wp-scripts test-unit-js", "test:coverage": "npm run test -- --coverage", diff --git a/packages/babel-preset-default/index.js b/packages/babel-preset-default/index.js index 747541a..86f7c88 100644 --- a/packages/babel-preset-default/index.js +++ b/packages/babel-preset-default/index.js @@ -1,7 +1,6 @@ -const env = process.env.BABEL_ENV || process.env.NODE_ENV; -const isTestEnv = env === 'test'; +module.exports = function( api ) { + const isTestEnv = api.env() === 'test'; -module.exports = function() { return { presets: [ ! isTestEnv && [ '@babel/preset-env', { diff --git a/packages/scripts/package.json b/packages/scripts/package.json index 99a3fb9..51b810c 100644 --- a/packages/scripts/package.json +++ b/packages/scripts/package.json @@ -34,7 +34,6 @@ "@wordpress/babel-preset-default": "^1.3.0", "@wordpress/jest-preset-default": "^1.0.6", "@wordpress/npm-package-json-lint-config": "^1.0.0", - "babel-jest": "^23.0.1", "cross-spawn": "^5.1.0", "jest": "^23.1.0", "npm-package-json-lint": "^3.0.1", From 5c12ea8888c06cb8d444848c2dc09bc47fc99537 Mon Sep 17 00:00:00 2001 From: Grzegorz Ziolkowski Date: Thu, 14 Jun 2018 14:22:06 +0200 Subject: [PATCH 3/5] Build tools: Fix the build script by using Babel loader --- scripts/build.js | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/scripts/build.js b/scripts/build.js index 4538be3..48705f8 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -30,20 +30,23 @@ const ERROR = chalk.reset.inverse.bold.red( ' ERROR ' ); /** * Babel Configuration */ -const babelDefaultConfig = require( '../packages/babel-preset-default' )(); -babelDefaultConfig.babelrc = false; +const { options: babelDefaultConfig } = babel.loadPartialConfig( { + presets: [ '@wordpress/babel-preset-default' ], +} ); const presetEnvConfig = babelDefaultConfig.presets[ 0 ][ 1 ]; const babelConfigs = { main: Object.assign( {}, babelDefaultConfig, - { presets: [ - [ '@babel/preset-env', Object.assign( - {}, - presetEnvConfig, - { modules: 'commonjs' }, - ) ], - ] } + { + presets: [ + [ '@babel/preset-env', Object.assign( + {}, + presetEnvConfig, + { modules: 'commonjs' }, + ) ], + ] + } ), module: babelDefaultConfig, }; @@ -114,10 +117,10 @@ function buildFileFor( file, silent, environment ) { if ( ! silent ) { process.stdout.write( chalk.green( ' \u2022 ' ) + - path.relative( PACKAGES_DIR, file ) + - chalk.green( ' \u21D2 ' ) + - path.relative( PACKAGES_DIR, destPath ) + - '\n' + path.relative( PACKAGES_DIR, file ) + + chalk.green( ' \u21D2 ' ) + + path.relative( PACKAGES_DIR, destPath ) + + '\n' ); } } From 22f6cf900256c9cfb0dfc27ba781bfb22f6a16f9 Mon Sep 17 00:00:00 2001 From: Grzegorz Ziolkowski Date: Thu, 14 Jun 2018 16:56:21 +0200 Subject: [PATCH 4/5] Babel-plugin-makepot: Fix failing unit tests :) --- packages/babel-plugin-makepot/test/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/babel-plugin-makepot/test/index.js b/packages/babel-plugin-makepot/test/index.js index fd0334a..14137de 100644 --- a/packages/babel-plugin-makepot/test/index.js +++ b/packages/babel-plugin-makepot/test/index.js @@ -1,7 +1,7 @@ /** * External dependencies */ -import { transform } from '@babel/core'; +import { transformSync } from '@babel/core'; import traverse from '@babel/traverse'; /** @@ -46,7 +46,7 @@ describe( 'babel-plugin', () => { describe( '.getTranslatorComment()', () => { function getCommentFromString( string ) { let comment; - traverse( transform( string ).ast, { + traverse( transformSync( string, { ast: true } ).ast, { CallExpression( path ) { comment = getTranslatorComment( path ); }, @@ -95,7 +95,7 @@ describe( 'babel-plugin', () => { describe( '.getNodeAsString()', () => { function getNodeAsStringFromArgument( source ) { let string; - traverse( transform( source ).ast, { + traverse( transformSync( source, { ast: true } ).ast, { CallExpression( path ) { string = getNodeAsString( path.node.arguments[ 0 ] ); }, From 426a9dca1a1e372b446578b6efff7cb7246f8709 Mon Sep 17 00:00:00 2001 From: Grzegorz Ziolkowski Date: Thu, 14 Jun 2018 16:59:05 +0200 Subject: [PATCH 5/5] Scripts: Bring back removed whitespaces --- scripts/build.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/build.js b/scripts/build.js index 48705f8..ffc66cb 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -117,10 +117,10 @@ function buildFileFor( file, silent, environment ) { if ( ! silent ) { process.stdout.write( chalk.green( ' \u2022 ' ) + - path.relative( PACKAGES_DIR, file ) + - chalk.green( ' \u21D2 ' ) + - path.relative( PACKAGES_DIR, destPath ) + - '\n' + path.relative( PACKAGES_DIR, file ) + + chalk.green( ' \u21D2 ' ) + + path.relative( PACKAGES_DIR, destPath ) + + '\n' ); } }