Skip to content

Commit

Permalink
Update Gutenberg to master (#962)
Browse files Browse the repository at this point in the history
* Update Gutenberg to master

* Add fragment configuration to Babel

* Use babel preset directly from Gutenberg

* Add @babel/plugin-proposal-async-generator-functions dependency directly

* Revert "Add @babel/plugin-proposal-async-generator-functions dependency directly"

This reverts commit d506b48.

* Revert "Use babel preset directly from Gutenberg"

This reverts commit f8c10a7.

* Use local babel plugins

* Revert change to babel-preset import that wasn't needed

* Update Gutenberg to latest master
  • Loading branch information
koke authored May 10, 2019
1 parent ce74c70 commit 9637fa9
Show file tree
Hide file tree
Showing 4 changed files with 384 additions and 98 deletions.
4 changes: 3 additions & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ module.exports = function( api ) {
'@babel/plugin-transform-react-jsx',
{
pragma: 'createElement',
pragmaFrag: 'Fragment',
},
],
],
Expand All @@ -33,9 +34,10 @@ module.exports = function( api ) {
{ // Auto-add `import { createElement } from '@wordpress/element';` when JSX is found
plugins: [
[
'@wordpress/babel-plugin-import-jsx-pragma',
'./gutenberg/packages/babel-plugin-import-jsx-pragma',
{
scopeVariable: 'createElement',
scopeVariableFrag: 'Fragment',
source: '@wordpress/element',
isDefault: false,
},
Expand Down
2 changes: 1 addition & 1 deletion gutenberg
Submodule gutenberg updated 286 files
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"@wordpress/eslint-plugin": "^2.0.0",
"@wordpress/jest-preset-default": "^4.0.0",
"appium": "^1.12.1",
"jest-junit": "^6.3.0",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^8.2.2",
"babel-jest": "^24.1.0",
Expand All @@ -36,6 +35,7 @@
"flow-bin": "0.92.0",
"identity-obj-proxy": "^3.0.0",
"jest": "^24.1.0",
"jest-junit": "^6.3.0",
"metro-react-native-babel-preset": "^0.52.0",
"node-fetch": "^2.3.0",
"prettier": "git+https://github.com/Automattic/calypso-prettier.git#calypso-1.9",
Expand Down Expand Up @@ -159,4 +159,4 @@
"resolutions": {
"@react-native-community/cli": "^1.5.2"
}
}
}
Loading

0 comments on commit 9637fa9

Please sign in to comment.