From 0a341333ea9ddf39576ab7a0c60dc10553abae5c Mon Sep 17 00:00:00 2001 From: Jorge Bernal Date: Thu, 12 Dec 2019 17:45:59 +0100 Subject: [PATCH 01/17] Update Gutenberg --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index fdd69535ec..196c5bcfc0 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit fdd69535ecbec018bfabad783c890de3d72b7e07 +Subproject commit 196c5bcfc0a6466137c07a6043a5612274d7e39d From 05c245f087018c3711d3ed495074b2f18759b81b Mon Sep 17 00:00:00 2001 From: Jorge Bernal Date: Thu, 12 Dec 2019 17:46:07 +0100 Subject: [PATCH 02/17] Force SPT on demo project for testing. Revert before merge! --- src/index.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index 8e50dc2584..a2e4fade8d 100644 --- a/src/index.js +++ b/src/index.js @@ -65,14 +65,18 @@ export class RootComponent extends React.Component { let postType = this.props.postType; if ( initialData === undefined && __DEV__ ) { - initialData = initialHtml; + // initialData = initialHtml; } if ( initialTitle === undefined ) { - initialTitle = 'Welcome to Gutenberg!'; + // initialTitle = 'Welcome to Gutenberg!'; } if ( postType === undefined ) { postType = 'post'; } + postType = 'page'; + const settings = { + __experimentalEnablePageTemplates: !! __DEV__, + }; const Editor = require( '@wordpress/edit-post' ).Editor; return ( ); } From eee80b3e6e36447207e79a19e9200562dbbaa7ee Mon Sep 17 00:00:00 2001 From: Jorge Bernal Date: Fri, 13 Dec 2019 11:55:33 +0100 Subject: [PATCH 03/17] Update Gutenberg --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 196c5bcfc0..6c5579b2aa 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 196c5bcfc0a6466137c07a6043a5612274d7e39d +Subproject commit 6c5579b2aaeca9e296d5263fde8f0ebe2bef5061 From 0bb3fbed0216b6e62d2bba084eccff6004cb39e9 Mon Sep 17 00:00:00 2001 From: Jorge Bernal Date: Fri, 13 Dec 2019 15:28:29 +0100 Subject: [PATCH 04/17] Update Gutenberg --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 6c5579b2aa..b216ad50be 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 6c5579b2aaeca9e296d5263fde8f0ebe2bef5061 +Subproject commit b216ad50be4794324200fe20aa7843c7a8364a96 From 7bc9ddc15a4df0382a70955ae4fb1a7236c5695d Mon Sep 17 00:00:00 2001 From: Jorge Bernal Date: Wed, 18 Dec 2019 09:56:41 +0100 Subject: [PATCH 05/17] Update Gutenberg --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index b216ad50be..1c8531df9f 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit b216ad50be4794324200fe20aa7843c7a8364a96 +Subproject commit 1c8531df9fdd57df4e146049706ba0eaaefc991d From 3cd817166531694d244521a6cd5636a9fd075235 Mon Sep 17 00:00:00 2001 From: Jorge Bernal Date: Thu, 19 Dec 2019 08:29:09 +0100 Subject: [PATCH 06/17] Update Gutenberg and react-native-modal --- gutenberg | 2 +- package.json | 2 +- yarn.lock | 29 +++++++++++++++++------------ 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/gutenberg b/gutenberg index 1c8531df9f..93379d1ac7 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 1c8531df9fdd57df4e146049706ba0eaaefc991d +Subproject commit 93379d1ac76b3f2f3afd3bcd8303de28a64c80a4 diff --git a/package.json b/package.json index d03fee5fc1..7994842c2c 100644 --- a/package.json +++ b/package.json @@ -163,7 +163,7 @@ "react-native-dark-mode": "git+https://github.com/wordpress-mobile/react-native-dark-mode.git#f09bf1480e7b34536413ab3300f29e4375edb2c6", "react-native-hr": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3", "react-native-keyboard-aware-scroll-view": "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.7", - "react-native-modal": "^6.5.0", + "react-native-modal": "^11.5.3", "react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#eadaa2f62d2f488d4dc80f9148e52b62047297ab", "react-native-safe-area": "^0.5.0", "react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#f16e9adae71c6cf3158f2356cf95fff5c2075e0f", diff --git a/yarn.lock b/yarn.lock index 30ac2e3f4f..db7dac18b3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10916,22 +10916,27 @@ react-dom@16.8.6: prop-types "^15.6.2" scheduler "^0.13.6" -react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.3, react-is@^16.8.4, react-is@^16.8.6: +react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.3, react-is@^16.8.4, react-is@^16.8.6: version "16.8.6" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16" integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA== +react-is@^16.8.1: + version "16.12.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c" + integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q== + react-lifecycles-compat@^3.0.0: version "3.0.4" resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== -react-native-animatable@^1.2.4: - version "1.3.2" - resolved "https://registry.yarnpkg.com/react-native-animatable/-/react-native-animatable-1.3.2.tgz#4783ee1a73dc98815aef234ce6b819f80bfe7d80" - integrity sha512-rmah3KQ63ft8DxkzFUwJSuZeq+oSYwldoGF4DTOR5WM2WR5wiWLgBAtrAHlI3Di3by323uOR21s+MlqPcHz2Kw== +react-native-animatable@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/react-native-animatable/-/react-native-animatable-1.3.3.tgz#a13a4af8258e3bb14d0a9d839917e9bb9274ec8a" + integrity sha512-2ckIxZQAsvWn25Ho+DK3d1mXIgj7tITkrS4pYDvx96WyOttSvzzFeQnM2od0+FUMzILbdHDsDEqZvnz1DYNQ1w== dependencies: - prop-types "^15.5.10" + prop-types "^15.7.2" react-native-crypto@^2.0.1: version "2.1.2" @@ -10974,13 +10979,13 @@ react-native-iphone-x-helper@^1.0.3: prop-types "^15.6.2" react-native-iphone-x-helper "^1.0.3" -react-native-modal@^6.5.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/react-native-modal/-/react-native-modal-6.5.0.tgz#46220b2289a41597d344c1db17454611b426a758" - integrity sha512-ewchdETAGd32xLGLK93NETEGkRcePtN7ZwjmLSQnNW1Zd0SRUYE8NqftjamPyfKvK0i2DZjX4YAghGZTqaRUbA== +react-native-modal@^11.5.3: + version "11.5.3" + resolved "https://registry.yarnpkg.com/react-native-modal/-/react-native-modal-11.5.3.tgz#28b4c761680a165eaf1d2c0fb08e272c0191b39f" + integrity sha512-U6RghSkZUZ6c0LHMbwAnVscEwGoI58eXfBstVs18t50miV0GmLcJhIOu5OND+SDGVkBQFiGFRu/pTUJaA7wfGw== dependencies: - prop-types "^15.6.1" - react-native-animatable "^1.2.4" + prop-types "^15.6.2" + react-native-animatable "1.3.3" react-native-randombytes@^3.5.1: version "3.5.3" From 6123c3232c56a1cf8f084b4c2aa54342071832fd Mon Sep 17 00:00:00 2001 From: Jorge Bernal Date: Mon, 23 Dec 2019 17:54:42 +0100 Subject: [PATCH 07/17] Update Gutenberg --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 93379d1ac7..4f0ba05e61 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 93379d1ac76b3f2f3afd3bcd8303de28a64c80a4 +Subproject commit 4f0ba05e61438fba0d6ad78098a204b119f46ad4 From d7991764ad6ed2f22a97dbc9107f0ed767b01ec8 Mon Sep 17 00:00:00 2001 From: Jorge Bernal Date: Fri, 27 Dec 2019 10:59:53 +0100 Subject: [PATCH 08/17] Update Gutenberg --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 4f0ba05e61..02a1a13f67 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 4f0ba05e61438fba0d6ad78098a204b119f46ad4 +Subproject commit 02a1a13f677e025aef1732faef5566c4037436d6 From 6f4eb5edc2bf8cc209df7aff64bb35ae92c6a0b2 Mon Sep 17 00:00:00 2001 From: Jorge Bernal Date: Fri, 27 Dec 2019 11:35:13 +0100 Subject: [PATCH 09/17] Fix bad merge --- src/index.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/index.js b/src/index.js index 84b49684a5..9d44ad57b9 100644 --- a/src/index.js +++ b/src/index.js @@ -77,9 +77,6 @@ export class RootComponent extends React.Component { postType = 'post'; } postType = 'page'; - const settings = { - __experimentalEnablePageTemplates: !! __DEV__, - }; const Editor = require( '@wordpress/edit-post' ).Editor; return ( Date: Fri, 27 Dec 2019 12:12:48 +0100 Subject: [PATCH 10/17] Update Gutenberg --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 02a1a13f67..aad8e3f90b 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 02a1a13f677e025aef1732faef5566c4037436d6 +Subproject commit aad8e3f90b15dc204955ee130dc010195cf2487c From d96af1bf59cf4c7048ef1cd8ad804a0027ec184b Mon Sep 17 00:00:00 2001 From: Jorge Bernal Date: Fri, 27 Dec 2019 12:13:40 +0100 Subject: [PATCH 11/17] Revert testing changes to src/index.js --- src/index.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/index.js b/src/index.js index 9d44ad57b9..87719955ac 100644 --- a/src/index.js +++ b/src/index.js @@ -68,15 +68,14 @@ export class RootComponent extends React.Component { let postType = this.props.postType; if ( initialData === undefined && __DEV__ ) { - // initialData = initialHtml; + initialData = initialHtml; } if ( initialTitle === undefined ) { - // initialTitle = 'Welcome to Gutenberg!'; + initialTitle = 'Welcome to Gutenberg!'; } if ( postType === undefined ) { postType = 'post'; } - postType = 'page'; const Editor = require( '@wordpress/edit-post' ).Editor; return ( Date: Fri, 27 Dec 2019 12:43:34 +0100 Subject: [PATCH 12/17] Revert update to react-native-modal --- package.json | 2 +- yarn.lock | 29 ++++++++++++----------------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 8048b644e4..4ec8e349e1 100644 --- a/package.json +++ b/package.json @@ -163,7 +163,7 @@ "react-native-dark-mode": "git+https://github.com/wordpress-mobile/react-native-dark-mode.git#f09bf1480e7b34536413ab3300f29e4375edb2c6", "react-native-hr": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3", "react-native-keyboard-aware-scroll-view": "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.7", - "react-native-modal": "^11.5.3", + "react-native-modal": "^6.5.0", "react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#eadaa2f62d2f488d4dc80f9148e52b62047297ab", "react-native-safe-area": "^0.5.0", "react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#d466eb06a38e6f553f08666f0ca784d47fd6f724", diff --git a/yarn.lock b/yarn.lock index 25c25c553d..8d43b05493 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10916,27 +10916,22 @@ react-dom@16.8.6: prop-types "^15.6.2" scheduler "^0.13.6" -react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.3, react-is@^16.8.4, react-is@^16.8.6: +react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.3, react-is@^16.8.4, react-is@^16.8.6: version "16.8.6" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16" integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA== -react-is@^16.8.1: - version "16.12.0" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c" - integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q== - react-lifecycles-compat@^3.0.0: version "3.0.4" resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== -react-native-animatable@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/react-native-animatable/-/react-native-animatable-1.3.3.tgz#a13a4af8258e3bb14d0a9d839917e9bb9274ec8a" - integrity sha512-2ckIxZQAsvWn25Ho+DK3d1mXIgj7tITkrS4pYDvx96WyOttSvzzFeQnM2od0+FUMzILbdHDsDEqZvnz1DYNQ1w== +react-native-animatable@^1.2.4: + version "1.3.2" + resolved "https://registry.yarnpkg.com/react-native-animatable/-/react-native-animatable-1.3.2.tgz#4783ee1a73dc98815aef234ce6b819f80bfe7d80" + integrity sha512-rmah3KQ63ft8DxkzFUwJSuZeq+oSYwldoGF4DTOR5WM2WR5wiWLgBAtrAHlI3Di3by323uOR21s+MlqPcHz2Kw== dependencies: - prop-types "^15.7.2" + prop-types "^15.5.10" react-native-crypto@^2.0.1: version "2.1.2" @@ -10979,13 +10974,13 @@ react-native-iphone-x-helper@^1.0.3: prop-types "^15.6.2" react-native-iphone-x-helper "^1.0.3" -react-native-modal@^11.5.3: - version "11.5.3" - resolved "https://registry.yarnpkg.com/react-native-modal/-/react-native-modal-11.5.3.tgz#28b4c761680a165eaf1d2c0fb08e272c0191b39f" - integrity sha512-U6RghSkZUZ6c0LHMbwAnVscEwGoI58eXfBstVs18t50miV0GmLcJhIOu5OND+SDGVkBQFiGFRu/pTUJaA7wfGw== +react-native-modal@^6.5.0: + version "6.5.0" + resolved "https://registry.yarnpkg.com/react-native-modal/-/react-native-modal-6.5.0.tgz#46220b2289a41597d344c1db17454611b426a758" + integrity sha512-ewchdETAGd32xLGLK93NETEGkRcePtN7ZwjmLSQnNW1Zd0SRUYE8NqftjamPyfKvK0i2DZjX4YAghGZTqaRUbA== dependencies: - prop-types "^15.6.2" - react-native-animatable "1.3.3" + prop-types "^15.6.1" + react-native-animatable "^1.2.4" react-native-randombytes@^3.5.1: version "3.5.3" From be8f445db49508313b3ec2987864d8e34f41adbc Mon Sep 17 00:00:00 2001 From: Jorge Bernal Date: Fri, 27 Dec 2019 12:59:25 +0100 Subject: [PATCH 13/17] Update Gutenberg --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index aad8e3f90b..8663c04c97 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit aad8e3f90b15dc204955ee130dc010195cf2487c +Subproject commit 8663c04c97d8a409059d9f56ec02e2359d68fe94 From 447afb43fc79715a8c3e0012e1473f8c079488f7 Mon Sep 17 00:00:00 2001 From: Jorge Bernal Date: Fri, 27 Dec 2019 13:16:41 +0100 Subject: [PATCH 14/17] Update Gutenberg --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 8663c04c97..833b049105 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 8663c04c97d8a409059d9f56ec02e2359d68fe94 +Subproject commit 833b049105f2abfdc2c673d5aa697dec6f6e685e From 390f02070144c8f8697d3638e4e42d47d0c0940f Mon Sep 17 00:00:00 2001 From: Jorge Bernal Date: Fri, 27 Dec 2019 13:40:56 +0100 Subject: [PATCH 15/17] Update Gutenberg --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 833b049105..37b372f20b 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 833b049105f2abfdc2c673d5aa697dec6f6e685e +Subproject commit 37b372f20b6325bbf9b311bb9f7ae15c12c20fa8 From 445d6e376e1742f0f5c2880546ffec6084683ecb Mon Sep 17 00:00:00 2001 From: Jorge Bernal Date: Wed, 8 Jan 2020 11:39:29 +0100 Subject: [PATCH 16/17] Update Gutenberg --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 37b372f20b..f305785557 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 37b372f20b6325bbf9b311bb9f7ae15c12c20fa8 +Subproject commit f3057855578de984188cd25133d19ebc24ec9461 From af321392a459bce4f19293c84098247bd012634a Mon Sep 17 00:00:00 2001 From: Jorge Bernal Date: Wed, 15 Jan 2020 10:36:45 +0100 Subject: [PATCH 17/17] Update Gutenberg --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index f305785557..a7db562903 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit f3057855578de984188cd25133d19ebc24ec9461 +Subproject commit a7db56290392f5a3a2f41461640606c56d58bb42