Framework: Update code to work with Babel 7 #7832

gziolo · 2018-07-09T16:01:19Z

This PR follows the migration docs for Babel 7 migration: https://new.babeljs.io/docs/en/next/v7-migration.html.

It is highly influenced by Calypso migration done a few weeks back on a much larger codebase with the help from Babel maintainers: Automattic/wp-calypso#23424.

The most useful hint:

Updated babel-core to the bridge which is necessary for anything having babel as a peer dependency -- aka jest.

Changes

jest and jest-enzyme were upgraded to the latest version to make them work with Babel 7.
This PR fixes the following Babel 6 issue we discovered when publishing packages to npm:

export * from './components';
export * from './api';

transpiles to commonjs with the unexpected:

import _Object$defineProperty from 'babel-runtime/core-js/object/define-property';
import _Object$keys from 'babel-runtime/core-js/object/keys';

See related comment from @nerrad:
#3955 (comment).

Testing

npm run dev
npm run buil
npm test
npm run test-e2e

All those commends should work, there should be no regressions when interacting with Gutenberg.

gziolo · 2018-07-09T16:03:15Z

Locally, one unit tests is failing:

packages/core-data/src/test/selectors.js
● Test suite failed to run

TypeError: Cannot read property 'loadAndPersist' of undefined

  29 |     return _persist.loadAndPersist;
  30 |   }
> 31 | });
     |              ^
  32 | Object.defineProperty(exports, "withRehydration", {
  33 |   enumerable: true,
  34 |   get: function get() {

  at Object.get [as loadAndPersist] (packages/data/build/index.js:31:21)
  at packages/core-data/src/test/selectors.js:23:452
      at Array.forEach (<anonymous>)
  at _objectSpread (packages/core-data/src/test/selectors.js:23:392)
  at Object.user:/Users/gziolo/PhpstormProjects/gutenberg/packages/data/build/index.js: (packages/core-data/src/test/selectors.js:4:10)
  at Object.<anonymous> (packages/data/build/store/index.js:12:9)
  at Object.<anonymous> (packages/data/build/index.js:84:37)
  at Object.user:/Users/gziolo/PhpstormProjects/gutenberg/packages/data/build/index.js: (packages/core-data/src/test/selectors.js:4:36)
  at Object.<anonymous> (packages/core-data/src/selectors.js:29:13)
  at Object.<anonymous> (packages/core-data/src/test/selectors.js:17:18)

I will further investigate tomorrow.

gziolo · 2018-07-10T07:07:34Z

package.json

@@ -178,7 +150,7 @@
 		"build:packages": "cross-env EXCLUDE_PACKAGES=babel-plugin-import-jsx-pragma node ./bin/packages/build.js",
 		"build": "npm run build:packages && cross-env NODE_ENV=production webpack",
 		"check-engines": "check-node-version --package",
-		"ci": "concurrently \"npm run lint && npm run build\" \"npm run test-unit:coverage-ci\"",
+		"ci": "concurrently \"npm run lint\" \"npm run test-unit:coverage-ci\"",


npm run build may accidentally regenerate jest-console build files which are used in framework setup script for each test suite. We run it on the node which runs e2e tests anyways.

I'm having a hard time tracking down why we had npm run build here in the first place. If I were to guess, seems as though it were to test to ensure that we'd have no errors during a build. Could still be useful, though I'm not entirely sure it's critical (at least weighted against the time cost / complications).

gziolo · 2018-07-10T07:08:22Z

packages/data/src/index.js

-export { loadAndPersist, withRehydration } from './persist';
+export {
+	loadAndPersist,
+	setPersistenceStorage,


setPersistenceStorage - it probably should be another PR. I added it because it wasn't exposed.

gziolo · 2018-07-10T07:08:47Z

packages/jest-preset-default/jest-preset.json

@@ -22,8 +22,7 @@
 	],
 	"timers": "fake",
 	"transform": {
-		"^.+\\.jsx?$": "babel-jest",
-		"\\.pegjs$": "<rootDir>/node_modules/@wordpress/jest-preset-default/scripts/pegjs-transform.js"


pegjs is not needed outside of Gutenberg.

gziolo · 2018-07-10T07:09:28Z

packages/jest-preset-default/scripts/pegjs-transform.js

@@ -1,16 +0,0 @@
-const pegjs = require( 'pegjs' );


The same applies - pegjs transform is duplicated here and we need it only for Gutenberg.

gziolo · 2018-07-10T07:09:51Z

packages/jest-preset-default/scripts/setup-globals.js

@@ -13,35 +13,6 @@ global.window.matchMedia = () => ( {
 	removeListener: () => {},
 } );

-global.window._wpDateSettings = {


We are now providing those defaults inside @wordpress/date package.

gziolo · 2018-07-10T07:10:18Z

packages/jest-preset-default/scripts/setup-globals.js

@@ -51,6 +22,3 @@ global.window.localStorage = {

 // UserSettings global
 global.window.userSettings = { uid: 1 };
-
-// Mock jQuery
-global.window.jQuery = { holdReady() {} };


We no longer use holdReady in the codebase, besides it isn't general enough to be here.

gziolo · 2018-07-10T07:11:08Z

test/unit/jest.config.json

 	},
 	"preset": "@wordpress/jest-preset-default",
 	"setupFiles": [
-		"core-js/fn/symbol/async-iterator",


It's included in Babel's preset.

gziolo · 2018-07-10T09:04:15Z

Travis is happy about the current shape of this PR, I am as well. It should be ready to be landed once it is tested and all review feedback gets addressed.

gziolo · 2018-07-10T09:16:06Z

Chunks stats for npm run build:

Before

Webpack stats:

          ./build/viewport/index.js   12.1 KiB      19  [emitted]         viewport
         ./build/shortcode/index.js   8.77 KiB       0  [emitted]         shortcode
          ./build/keycodes/index.js   12.7 KiB       2  [emitted]         keycodes
  ./build/is-shallow-equal/index.js   6.24 KiB       3  [emitted]         isShallowEqual
              ./build/i18n/index.js     24 KiB       4  [emitted]         i18n
             ./build/hooks/index.js   10.1 KiB       5  [emitted]         hooks
           ./build/element/index.js   31.4 KiB       6  [emitted]         element
         ./build/dom-ready/index.js  741 bytes       7  [emitted]         domReady
               ./build/dom/index.js     17 KiB       8  [emitted]         dom
        ./build/deprecated/index.js   6.66 KiB       9  [emitted]         deprecated
              ./build/date/index.js    187 KiB      10  [emitted]         date
              ./build/data/index.js   52.3 KiB      11  [emitted]         data
         ./build/core-data/index.js   45.1 KiB      12  [emitted]         coreData
              ./build/blob/index.js  909 bytes      13  [emitted]         blob
       ./build/api-request/index.js   8.45 KiB      14  [emitted]         apiRequest
              ./build/a11y/index.js    1.8 KiB      15  [emitted]         a11y
               ./build/nux/index.js   18.5 KiB      16  [emitted]         nux
       ./build/core-blocks/index.js    168 KiB      17  [emitted]         coreBlocks
         ./build/edit-post/index.js   80.6 KiB      18  [emitted]         editPost
           ./build/plugins/index.js     22 KiB       1  [emitted]         plugins
             ./build/utils/index.js   24.1 KiB      20  [emitted]         utils
            ./build/editor/index.js    322 KiB      21  [emitted]  [big]  editor
        ./build/components/index.js    484 KiB      22  [emitted]  [big]  components
            ./build/blocks/index.js    264 KiB      23  [emitted]  [big]  blocks

In the browser (JavaScript only):

After

Webpack stats:

                              Asset       Size  Chunks                    Chunk Names
          ./build/viewport/index.js   24.2 KiB      19  [emitted]         viewport
         ./build/shortcode/index.js   16.1 KiB       0  [emitted]         shortcode
          ./build/keycodes/index.js   17.7 KiB       2  [emitted]         keycodes
  ./build/is-shallow-equal/index.js   6.39 KiB       3  [emitted]         isShallowEqual
              ./build/i18n/index.js   27.4 KiB       4  [emitted]         i18n
             ./build/hooks/index.js   19.2 KiB       5  [emitted]         hooks
           ./build/element/index.js     42 KiB       6  [emitted]         element
         ./build/dom-ready/index.js  741 bytes       7  [emitted]         domReady
               ./build/dom/index.js   22.8 KiB       8  [emitted]         dom
        ./build/deprecated/index.js   4.89 KiB       9  [emitted]         deprecated
              ./build/date/index.js    192 KiB      10  [emitted]         date
              ./build/data/index.js   60.6 KiB      11  [emitted]         data
         ./build/core-data/index.js   54.5 KiB      12  [emitted]         coreData
              ./build/blob/index.js  909 bytes      13  [emitted]         blob
       ./build/api-request/index.js     21 KiB      14  [emitted]         apiRequest
              ./build/a11y/index.js   5.15 KiB      15  [emitted]         a11y
               ./build/nux/index.js   23.8 KiB      16  [emitted]         nux
       ./build/core-blocks/index.js    185 KiB      17  [emitted]         coreBlocks
         ./build/edit-post/index.js   91.7 KiB      18  [emitted]         editPost
           ./build/plugins/index.js   24.5 KiB       1  [emitted]         plugins
             ./build/utils/index.js   40.9 KiB      20  [emitted]         utils
            ./build/editor/index.js    352 KiB      21  [emitted]  [big]  editor
        ./build/components/index.js    502 KiB      22  [emitted]  [big]  components
            ./build/blocks/index.js    302 KiB      23  [emitted]  [big]  blocks

In the browser (JavaScript only):

Thoughts

There is a slight increase in the size of all bundles that use polyfills or Babel helpers. It's sort of expected given that we enable new useBuiltIns: 'usage' option. This should allow us to iterate later and move all those require statements to its own bundle and hopefully reduced the total size of JavaScript code sent to the browser.

hypest

👋 @gziolo , gave the PR (commit 1de19d6, and after merging from GB master) a try against this RN app branch ( and it seems that the RN app builds and runs just fine. In other words, upgrading GB to Babel 7 doesn't seem to affect the current state of the RN app in a negative way. So, fwiw, 👍 from me!

Shelob9 · 2018-07-11T11:39:24Z

@gziolo This is : 🔥

Is there any way to test the packages before the PR is merged? I was thinking build Gutenberg locally and then use npm link, but not sure if that works with this setup.

gziolo · 2018-07-11T11:59:10Z

Is there any way to test the packages before the PR is merged? I was thinking build Gutenberg locally and then use npm link, but not sure if that works with this setup.

It might be tricky because we started using local packages file:. We can always fix everything after next alpha is published to npm. I still don't know what it the proper way to inform consumers of packages that they should have @babel/runtime installed locally. Should we put this in the readme file or set as an explicit dependency in each package?

nerrad · 2018-07-11T12:26:02Z

I still don't know what it the proper way to inform consumers of packages that they should have @babel/runtime installed locally. Should we put this in the readme file or set as an explicit dependency in each package?

What about making @babel/runtime a peer dependency in each package?

aduth · 2018-07-11T12:33:06Z

codecov.yml

@@ -7,7 +7,3 @@ coverage:
    patch: off

 comment: false
-
-ignore:


Why is this being removed here?

Sorry, realized later it's now reflected in jest.config.json

aduth · 2018-07-11T12:36:18Z

package.json

@@ -178,7 +150,7 @@
 		"build:packages": "cross-env EXCLUDE_PACKAGES=babel-plugin-import-jsx-pragma node ./bin/packages/build.js",
 		"build": "npm run build:packages && cross-env NODE_ENV=production webpack",
 		"check-engines": "check-node-version --package",
-		"ci": "concurrently \"npm run lint && npm run build\" \"npm run test-unit:coverage-ci\"",
+		"ci": "concurrently \"npm run lint\" \"npm run test-unit:coverage-ci\"",


I'm having a hard time tracking down why we had npm run build here in the first place. If I were to guess, seems as though it were to test to ensure that we'd have no errors during a build. Could still be useful, though I'm not entirely sure it's critical (at least weighted against the time cost / complications).

aduth · 2018-07-11T12:36:44Z

packages/autop/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Unreleased (1.1.0)


I think formatting would be ## 1.1.0 (Unreleased) for consistency with other releases?

I can update all of them 👍

aduth · 2018-07-11T12:38:14Z

packages/babel-plugin-import-jsx-pragma/test/index.js

@@ -10,7 +10,7 @@ import plugin from '../src';

 describe( 'babel-plugin-import-jsx-pragma', () => {
 	function getTransformedCode( source, options = {} ) {
-		const { code } = transform( source, {
+		const { code } = transformSync( source, {
 			plugins: [
 				[ plugin, options ],
 				'syntax-jsx',


I think this needs to be updated to @babel/syntax-jsx ? I'm seeing some related failing tests.

aduth · 2018-07-11T12:39:27Z

packages/core-data/src/test/selectors.js

-} ) );
+jest.mock( '@wordpress/data', () => {
+	return {
+		select: jest.fn().mockReturnValue( {


Did we mean to drop the ...require.requireActual ?

I think I commented elsewhere, yes, it was failing when using requireActual because of some Babel + Enzyme internal things. requireActual isn't going through moduleNameMapper flow so it tried to load Babel build, but couldn't import it properly 🤷‍♂️

aduth · 2018-07-11T12:44:54Z

Observing these errors trying to run tests:

Configuration error:
    
    Could not locate module /Users/andrew/Documents/Code/vvv/www/editor/htdocs/wp-content/plugins/gutenberg/node_modules/@wordpress/babel-plugin-import-jsx-pragma/build/index.js mapped as:
    packages/babel-plugin-import-jsx-pragma/build/index.js/src.
    
    Please check your configuration for these entries:
    {
      "moduleNameMapper": {
        "/@wordpress\/(.*)$/": "packages/$1/src"
      },
      "resolver": null
    }

aduth · 2018-07-11T12:45:39Z

packages/babel-preset-default/index.js

+			} ],
+		].filter( Boolean ),
+		plugins: [
+			'@babel/plugin-proposal-object-rest-spread',


I think these can be shortened to e.g. @babel/proposal-object-rest-spread. Maybe less explicit. Haven't confirmed.

Yes, I think they now discourage it though 🤷‍♂️

aduth · 2018-07-11T12:54:16Z

Got closer to passing tests with this diff:

diff --git a/packages/babel-plugin-import-jsx-pragma/test/index.js b/packages/babel-plugin-import-jsx-pragma/test/index.js
index ede36f878..355a698f7 100644
--- a/packages/babel-plugin-import-jsx-pragma/test/index.js
+++ b/packages/babel-plugin-import-jsx-pragma/test/index.js
@@ -13,7 +13,7 @@ describe( 'babel-plugin-import-jsx-pragma', () => {
 		const { code } = transformSync( source, {
 			plugins: [
 				[ plugin, options ],
-				'syntax-jsx',
+				'@babel/syntax-jsx',
 			],
 		} );
 
diff --git a/test/unit/jest.config.json b/test/unit/jest.config.json
index 71c618443..5a4daa0fc 100644
--- a/test/unit/jest.config.json
+++ b/test/unit/jest.config.json
@@ -12,7 +12,7 @@
 	],
 	"moduleNameMapper": {
 		"@wordpress\\/(blocks|components|editor|utils|edit-post|viewport|core-blocks|nux)$": "$1",
-		"@wordpress\\/(.*)$": "packages/$1/src"
+		"@wordpress\\/(.*)$": "packages/$1"
 	},
 	"preset": "@wordpress/jest-preset-default",
 	"setupFiles": [

But still seeing failures as though it's doing much more transforms than expected in import-jsx-pragma tests:

    Expected: "import { createElement } from \"@wordpress/element\";
    let foo = <bar />;"
    Received: "\"use strict\";
    
    var _element = require(\"@wordpress/element\");
    
    var foo = (0, _element.createElement)(\"bar\", null);"

Also:

Guessing we don't want to target the built files in the test mapping (for debugging?)
Are we inheriting Babel configuration now in these tests? This was meant to be isolated . Tried some options to disable .babelrc from the transform with no luck.

gziolo · 2018-07-11T13:38:50Z

@aduth - I had all those bugs fixed, but overrode by accident commit when trying to merge package-lock.json with node-sass upgrade ... 😱

I recreated in 20c8db6

Guessing we don't want to target the built files in the test mapping (for debugging?)

Yes, we agreed about that in the past, that we want to test using source code whenever possible. It also helps us to avoid running npm run build:packages before each npm test run. Not mentioning watch mode where it gets even more tricky.

Are we inheriting Babel configuration now in these tests? This was meant to be isolated . Tried some options to disable .babelrc from the transform with no luck.

Now you need to explicitly disable searching for a config file:
https://github.com/WordPress/gutenberg/pull/7832/files#diff-356b7086329f67b5a3335e713d48ad9bR14

aduth

Looks great 👍

aduth · 2018-07-11T14:06:59Z

packages/babel-plugin-makepot/package.json

 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"dependencies": {
 		"gettext-parser": "^1.3.1",
-		"lodash": "4.17.10"
+		"lodash": "^4.17.10"


May have been mentioned already, but noting we're adding loose ranges for dependencies, which while not strictly within the scope of the effort is sensible given that these are libraries.

Yes, I had to regenerate lock file because of the amount of changes Babel introduced after they started using namespaced packages so I thought we can also include this change for everything that we consider libraries for consistency. We were mixing ranges and exact versions before.

gziolo added Framework Issues related to broader framework topics, especially as it relates to javascript [Status] In Progress Tracking issues with work in progress labels Jul 9, 2018

gziolo added this to the 3.3 milestone Jul 9, 2018

gziolo self-assigned this Jul 9, 2018

gziolo requested review from aduth, ntwb, nerrad and a team July 9, 2018 16:02

gziolo force-pushed the update/babel7-upgrade branch from 91dcc4f to 84f5ce2 Compare July 10, 2018 05:36

gziolo added [Type] Build Tooling Issues or PRs related to build tooling and removed [Status] In Progress Tracking issues with work in progress labels Jul 10, 2018

gziolo commented Jul 10, 2018

View reviewed changes

gziolo requested a review from hypest July 10, 2018 07:14

This was referenced Jul 10, 2018

Missing : npm install @wordpress/plugins --save #7460

Closed

Packages: Publish all modules as independent npm packages #3955

Closed

hypest approved these changes Jul 10, 2018

View reviewed changes

gziolo added 2 commits July 11, 2018 14:19

Framework: Update code to work with Babel 7

17e79ae

Testing: Fix failing test caused by Babel and Jest upgrade

a226495

gziolo added 4 commits July 11, 2018 14:19

Packages: Use consistent version of babel-core package

339f86b

Build: Execute npm run build only on one container on Travis

230a7c8

Packages: Minor tweaks to the configuration of packages

46e2c2d

Packages: Prepare changelogs for the upcoming release

76c16e9

gziolo force-pushed the update/babel7-upgrade branch from 1de19d6 to 76c16e9 Compare July 11, 2018 12:22

aduth reviewed Jul 11, 2018

View reviewed changes

gziolo added 2 commits July 11, 2018 15:11

Tests: Fix failing tests after Babel 7 migration

20c8db6

Packages: Follow sem for internal packages

5ee93bf

Packages: Update CHANGELOG files with heading tweaks

03f11a5

aduth approved these changes Jul 11, 2018

View reviewed changes

aduth mentioned this pull request Jul 11, 2018

Use a Babel polyfill script #746

Closed

aduth merged commit f3b6379 into master Jul 11, 2018

aduth deleted the update/babel7-upgrade branch July 11, 2018 14:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Framework: Update code to work with Babel 7 #7832

Framework: Update code to work with Babel 7 #7832

gziolo commented Jul 9, 2018 •

edited

Loading

gziolo commented Jul 9, 2018

gziolo Jul 10, 2018

aduth Jul 11, 2018

gziolo Jul 10, 2018

gziolo Jul 10, 2018

gziolo Jul 10, 2018

gziolo Jul 10, 2018

gziolo Jul 10, 2018

gziolo Jul 10, 2018

gziolo commented Jul 10, 2018

gziolo commented Jul 10, 2018 •

edited

Loading

hypest left a comment

Shelob9 commented Jul 11, 2018

gziolo commented Jul 11, 2018

nerrad commented Jul 11, 2018

aduth Jul 11, 2018

aduth Jul 11, 2018

aduth Jul 11, 2018

aduth Jul 11, 2018

gziolo Jul 11, 2018

aduth Jul 11, 2018

gziolo Jul 11, 2018

aduth Jul 11, 2018

gziolo Jul 11, 2018

aduth commented Jul 11, 2018

aduth Jul 11, 2018

gziolo Jul 11, 2018

aduth commented Jul 11, 2018

gziolo commented Jul 11, 2018 •

edited

Loading

aduth left a comment

aduth Jul 11, 2018

gziolo Jul 11, 2018

Framework: Update code to work with Babel 7 #7832

Framework: Update code to work with Babel 7 #7832

Conversation

gziolo commented Jul 9, 2018 • edited Loading

Changes

Testing

gziolo commented Jul 9, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gziolo commented Jul 10, 2018

gziolo commented Jul 10, 2018 • edited Loading

Before

After

Thoughts

hypest left a comment

Choose a reason for hiding this comment

Shelob9 commented Jul 11, 2018

gziolo commented Jul 11, 2018

nerrad commented Jul 11, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aduth commented Jul 11, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aduth commented Jul 11, 2018

gziolo commented Jul 11, 2018 • edited Loading

aduth left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gziolo commented Jul 9, 2018 •

edited

Loading

gziolo commented Jul 10, 2018 •

edited

Loading

gziolo commented Jul 11, 2018 •

edited

Loading