Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Gutenberg to master #962

Merged
merged 10 commits into from
May 10, 2019
Merged

Update Gutenberg to master #962

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
18c4fe4
Update Gutenberg to master
koke May 7, 2019
16c1a79
Add fragment configuration to Babel
koke May 7, 2019
f8c10a7
Use babel preset directly from Gutenberg
koke May 7, 2019
d506b48
Add @babel/plugin-proposal-async-generator-functions dependency directly
koke May 8, 2019
1489081
Revert "Add @babel/plugin-proposal-async-generator-functions dependen…
koke May 8, 2019
b51c159
Revert "Use babel preset directly from Gutenberg"
koke May 10, 2019
c680a83
Use local babel plugins
koke May 10, 2019
6696615
Revert change to babel-preset import that wasn't needed
koke May 10, 2019
4976f0b
Merge branch 'develop' into update-master-20190507
koke May 10, 2019
a81707e
Update Gutenberg to latest master
koke May 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion babel.config.js
View file
Open in desktop
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
Open in desktop
Submodule gutenberg updated 254 files
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
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