From 73c9f84421d9cf2903d4fc5e3be045eba7bf71bf Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Thu, 3 Sep 2020 14:18:55 -0300 Subject: [PATCH 01/94] updated jetpack submodule commit hash --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index f6f313d268..f0c54b8942 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit f6f313d268c336491c8bca1afcf3e5d3663597ce +Subproject commit f0c54b8942f82f182890a1ac86c6f06bd796a85f From 82d121e14d06def923943399f51b990b28fee72a Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Thu, 3 Sep 2020 18:11:42 -0300 Subject: [PATCH 02/94] Revert "updated jetpack submodule commit hash" This reverts commit 73c9f84421d9cf2903d4fc5e3be045eba7bf71bf. --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index f0c54b8942..f6f313d268 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit f0c54b8942f82f182890a1ac86c6f06bd796a85f +Subproject commit f6f313d268c336491c8bca1afcf3e5d3663597ce From ddb9042b671549e3ca4b65f25390a059017d397e Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Fri, 4 Sep 2020 07:48:43 -0300 Subject: [PATCH 03/94] update jetpack to latest, containing the story block --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index f6f313d268..9e04c9be88 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit f6f313d268c336491c8bca1afcf3e5d3663597ce +Subproject commit 9e04c9be8837ee668e0b44466fe0f25bae57e1c0 From 71cd744962ef8fb8b20feedcbf5f7e02c66741bb Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Fri, 4 Sep 2020 09:01:42 -0300 Subject: [PATCH 04/94] declaring the jetpack/story block supported in mobile --- jetpack | 2 +- src/jetpack-editor-setup.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/jetpack b/jetpack index 9e04c9be88..fea60b0336 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 9e04c9be8837ee668e0b44466fe0f25bae57e1c0 +Subproject commit fea60b0336546c8cd8bcf97ea8f7ba5246b093e0 diff --git a/src/jetpack-editor-setup.js b/src/jetpack-editor-setup.js index 8ebf23aa54..74cf046070 100644 --- a/src/jetpack-editor-setup.js +++ b/src/jetpack-editor-setup.js @@ -7,6 +7,9 @@ const supportedJetpackBlocks = { 'contact-info': { available: true, }, + 'story': { + available: true, + }, }; const setJetpackData = ( { From c7cbc0315b384fed6478074bb467ff4561b0af1b Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Fri, 4 Sep 2020 12:13:49 -0300 Subject: [PATCH 05/94] added story block basic rendering, processing mediaFiles attribute --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index 7ee00ad4c5..d6f2950341 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 7ee00ad4c5dc64a2b971cebe1d6ee4789eff7157 +Subproject commit d6f2950341542d512d0e41d8c30a66f04fc80641 diff --git a/jetpack b/jetpack index fea60b0336..0ec53969c5 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit fea60b0336546c8cd8bcf97ea8f7ba5246b093e0 +Subproject commit 0ec53969c5cde27ac09d017466b5d792b4f9645b From c82e06df851fcd7172c57792566d00aa39c7c37a Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Wed, 9 Sep 2020 19:17:06 -0300 Subject: [PATCH 06/94] added StoryEditingButton for use in the story block in jetpack --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index 0ec53969c5..b6c4688229 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 0ec53969c5cde27ac09d017466b5d792b4f9645b +Subproject commit b6c46882292030cdd751db58a23e2313d4785951 From 13e3d83927a7849fee5d184ae988e74aec71a186 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Thu, 10 Sep 2020 10:46:24 -0300 Subject: [PATCH 07/94] updated gutenberg/jetpack commit hash for requestStoryCreatorLoad bridge implementation --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index d6f2950341..277bc2c189 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit d6f2950341542d512d0e41d8c30a66f04fc80641 +Subproject commit 277bc2c18904ee721b685ac578f9ede2fe365953 diff --git a/jetpack b/jetpack index b6c4688229..4c04834919 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit b6c46882292030cdd751db58a23e2313d4785951 +Subproject commit 4c04834919ecc5dfb8bad503be562a6d7b9922c9 From 60088f818f04a6a3eefca661da5220e7e2d0dbe0 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Thu, 10 Sep 2020 14:31:39 -0300 Subject: [PATCH 08/94] udpated gutenberg commit hash with new WPANdroid bridge interface OnStoryCreatorRequestListener --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 277bc2c189..fffdf0f470 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 277bc2c18904ee721b685ac578f9ede2fe365953 +Subproject commit fffdf0f4708b3b4ebfef78df93b09f58ffb4f5f7 From 4def44feb7302a36eda62f6a459e51d08449750c Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Fri, 11 Sep 2020 17:10:47 -0300 Subject: [PATCH 09/94] udpated commit hash for gutenberg and jetpack: making requestStoryCreatorLoad() method pass mediaFiles and clientId over the bridge --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index fffdf0f470..2c40df28d0 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit fffdf0f4708b3b4ebfef78df93b09f58ffb4f5f7 +Subproject commit 2c40df28d09e97eb7fde2db97d447951b1113fed diff --git a/jetpack b/jetpack index 4c04834919..312a26594c 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 4c04834919ecc5dfb8bad503be562a6d7b9922c9 +Subproject commit 312a26594c01ceb99e31aa5ac3e85e00d6c3a71c From 0dcfe93057eb868ced7edd5c4029ec95d2c05c8d Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Mon, 21 Sep 2020 17:39:31 -0300 Subject: [PATCH 10/94] updated jetpac and gutenberg libs hashes to point to new StoryUpdateProgress component --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index f2019a653c..12483fad3c 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit f2019a653c5f86e640e60f00bafa9269a185d780 +Subproject commit 12483fad3c7602600bbd431ed4cb79a0d3c13943 diff --git a/jetpack b/jetpack index 312a26594c..7022a2d940 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 312a26594c01ceb99e31aa5ac3e85e00d6c3a71c +Subproject commit 7022a2d9401a4fc8ddf86e38fe3f3180f9019313 From 1697f9f731f5f31822dac08e86c1f499f7306c34 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Thu, 24 Sep 2020 08:10:57 -0300 Subject: [PATCH 11/94] updated commit hash for gutenebrg and jetpack; updated save progress interfaces --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index 12483fad3c..78455a8ef8 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 12483fad3c7602600bbd431ed4cb79a0d3c13943 +Subproject commit 78455a8ef8ad3a33da1137fedfc1474e546b40db diff --git a/jetpack b/jetpack index 7022a2d940..af32096c1e 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 7022a2d9401a4fc8ddf86e38fe3f3180f9019313 +Subproject commit af32096c1e376b545594ac844631f6cd67594322 From 7e0dc26f505ba096cf8f3da27b3f806f18fb8827 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Fri, 25 Sep 2020 10:42:03 -0300 Subject: [PATCH 12/94] updated commit hashes for gutenberg and jetpack with stories block upload handling changes --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index 78455a8ef8..da1a900b99 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 78455a8ef8ad3a33da1137fedfc1474e546b40db +Subproject commit da1a900b9923a114ce332b8e6d775ff163c715ed diff --git a/jetpack b/jetpack index af32096c1e..eb6908f0c0 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit af32096c1e376b545594ac844631f6cd67594322 +Subproject commit eb6908f0c08936d4551d3291c4827af4af3df65f From 888d6c8dd0b387c5058a00e109d02973dfd9eeb1 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Fri, 25 Sep 2020 17:14:29 -0300 Subject: [PATCH 13/94] updated commit hash for gutenberg and jetpack to use new onStorySaveResult bridge method --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index da1a900b99..9613c56002 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit da1a900b9923a114ce332b8e6d775ff163c715ed +Subproject commit 9613c56002d0d5ff1d38fbc48f4315ce2cd67d10 diff --git a/jetpack b/jetpack index eb6908f0c0..f3b6316257 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit eb6908f0c08936d4551d3291c4827af4af3df65f +Subproject commit f3b6316257e093defb5e4e74ac8ea2e79d994756 From 4cae822a707c65bbcda7b5b517ca2a035e90dca0 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Mon, 28 Sep 2020 15:52:52 -0300 Subject: [PATCH 14/94] updated hash for gutenebrg and jetpack with stories block updates --- gutenberg | 2 +- jetpack | 2 +- package-lock.json | 67 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 68 insertions(+), 3 deletions(-) diff --git a/gutenberg b/gutenberg index 9613c56002..b305a9d847 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 9613c56002d0d5ff1d38fbc48f4315ce2cd67d10 +Subproject commit b305a9d8471aaff95b36911974d788bf1dfc69a8 diff --git a/jetpack b/jetpack index f3b6316257..d4d4f91b62 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit f3b6316257e093defb5e4e74ac8ea2e79d994756 +Subproject commit d4d4f91b62d9ea286f0fcc8c900cdbc7e4df04b8 diff --git a/package-lock.json b/package-lock.json index 9352d04b3a..f62a9f7975 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2791,6 +2791,37 @@ "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==", "dev": true }, + "@types/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", + "dev": true + }, + "@types/prop-types": { + "version": "15.7.3", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz", + "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==", + "dev": true + }, + "@types/react": { + "version": "16.9.49", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.49.tgz", + "integrity": "sha512-DtLFjSj0OYAdVLBbyjhuV9CdGVHCkHn2R+xr3XkBvK2rS1Y1tkc14XSGjYgm5Fjjr90AxH9tiSzc1pCFMGO06g==", + "dev": true, + "requires": { + "@types/prop-types": "*", + "csstype": "^3.0.2" + } + }, + "@types/react-dom": { + "version": "16.9.8", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.8.tgz", + "integrity": "sha512-ykkPQ+5nFknnlU6lDd947WbQ6TE3NNzbQAkInC2EKY1qeYdTKp7onFusmYZb+ityzx2YviqT6BXSu+LyWWJwcA==", + "dev": true, + "requires": { + "@types/react": "*" + } + }, "@types/stack-utils": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz", @@ -2884,6 +2915,8 @@ "dev": true, "requires": { "@babel/runtime": "^7.9.2", + "@types/react": "^16.9.0", + "@types/react-dom": "^16.9.0", "@wordpress/escape-html": "file:gutenberg/packages/escape-html", "lodash": "^4.17.19", "react": "^16.13.1", @@ -2911,6 +2944,7 @@ "requires": { "@wordpress/prettier-config": "file:gutenberg/packages/prettier-config", "babel-eslint": "^10.1.0", + "cosmiconfig": "^7.0.0", "eslint-config-prettier": "^6.10.1", "eslint-plugin-jest": "^23.8.2", "eslint-plugin-jsdoc": "^30.2.2", @@ -2980,7 +3014,7 @@ "dev": true }, "prettier": { - "version": "npm:prettier@2.0.5", + "version": "npm:wp-prettier@2.0.5", "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.0.5.tgz", "integrity": "sha512-5GCgdeevIXwR3cW4Qj5XWC5MO1iSCz8+IPn0mMw6awAt/PBiey8yyO7MhePRsaMqghJAhg6Q3QLYWSnUHWkG6A==", "dev": true @@ -10935,6 +10969,19 @@ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true }, + "cosmiconfig": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz", + "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==", + "dev": true, + "requires": { + "@types/parse-json": "^4.0.0", + "import-fresh": "^3.2.1", + "parse-json": "^5.0.0", + "path-type": "^4.0.0", + "yaml": "^1.10.0" + } + }, "crc": { "version": "3.8.0", "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz", @@ -11058,6 +11105,12 @@ "cssom": "0.3.x" } }, + "csstype": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.3.tgz", + "integrity": "sha512-jPl+wbWPOWJ7SXsWyqGRk3lGecbar0Cb0OvZF/r/ZU011R4YqiRehgkQ9p4eQfo9DSDLqLL3wHwfxeJiuIsNag==", + "dev": true + }, "damerau-levenshtein": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz", @@ -16986,6 +17039,12 @@ "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", "dev": true }, + "path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true + }, "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", @@ -19418,6 +19477,12 @@ "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", "dev": true }, + "yaml": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz", + "integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==", + "dev": true + }, "zip-stream": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-2.1.3.tgz", From 85bf8acadf8343fde0e1e79b922ab2df5cab5e65 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Mon, 28 Sep 2020 19:52:48 -0300 Subject: [PATCH 15/94] updated gutenberg and jetpack commit hashes with mediaModelCreated bridge call --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index b305a9d847..407b2d118c 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit b305a9d8471aaff95b36911974d788bf1dfc69a8 +Subproject commit 407b2d118c29c5ebf053aa0a8b1bf19ae5f2b0fe diff --git a/jetpack b/jetpack index d4d4f91b62..cd93dd862b 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit d4d4f91b62d9ea286f0fcc8c900cdbc7e4df04b8 +Subproject commit cd93dd862b224463313b5f23199389ff5cf8513a From a7bc72c32822f852f7030600d7f9388b7d7de01f Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Mon, 28 Sep 2020 21:18:54 -0300 Subject: [PATCH 16/94] updated commit hash for gutenebrg and jetpack libs, updating mediaID and remoteurl on a Story frame once it finished uploading --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index 407b2d118c..269cc917dd 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 407b2d118c29c5ebf053aa0a8b1bf19ae5f2b0fe +Subproject commit 269cc917dd552f34464ee704aec214f34172c55e diff --git a/jetpack b/jetpack index cd93dd862b..6b0addce3b 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit cd93dd862b224463313b5f23199389ff5cf8513a +Subproject commit 6b0addce3b1e181eed58e429c0704aa574264b08 From 21b823b4f33313fc5b134e7d37d5ef0a4d4bd943 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Tue, 29 Sep 2020 12:19:06 -0300 Subject: [PATCH 17/94] updated commit hash for gutenebrg and jetpack, just removed commented lines --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index 269cc917dd..5ce5e5c9c7 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 269cc917dd552f34464ee704aec214f34172c55e +Subproject commit 5ce5e5c9c71affac73eb55e2e4f51e41a7e97a12 diff --git a/jetpack b/jetpack index 6b0addce3b..92d04e1bd8 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 6b0addce3b1e181eed58e429c0704aa574264b08 +Subproject commit 92d04e1bd839680a4af8080fc58430d185e8c44e From 7f9313f1704e9d8d69994df8a33bcb4ae7909e38 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Wed, 30 Sep 2020 16:33:11 -0300 Subject: [PATCH 18/94] updated gutenberg commit hash --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 5ce5e5c9c7..e83c8c8ce4 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 5ce5e5c9c71affac73eb55e2e4f51e41a7e97a12 +Subproject commit e83c8c8ce4574c0481f642a2ae21d53e159b5b34 From 430fd3c7e0b3284734e80b52cda7b1749807e917 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Wed, 30 Sep 2020 16:42:34 -0300 Subject: [PATCH 19/94] updated jetpack commit hash --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index 92d04e1bd8..a0d35ffd32 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 92d04e1bd839680a4af8080fc58430d185e8c44e +Subproject commit a0d35ffd328753c548427e3601e63adbfb340183 From fd317778b43bf5229a4a033dfe76ae8e1c750b1d Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Thu, 1 Oct 2020 00:34:16 -0300 Subject: [PATCH 20/94] updated commit hash for gutenberg with fix for mobile demo app --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index e83c8c8ce4..42288a565b 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit e83c8c8ce4574c0481f642a2ae21d53e159b5b34 +Subproject commit 42288a565b6b9efb85c4a0e180bcb2b601fe9d6d From e39c4ea51d09d5a4ae7d444df9a88f1b27fe63c0 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Thu, 1 Oct 2020 10:23:38 -0300 Subject: [PATCH 21/94] updated jetpack commit hash: --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index a0d35ffd32..3f9c63823f 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit a0d35ffd328753c548427e3601e63adbfb340183 +Subproject commit 3f9c63823f9360d798e9ae86f9d7d58ac8389c60 From d7f11402859f18fb00bb587c9cf804f101250fcc Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Thu, 1 Oct 2020 15:46:38 -0300 Subject: [PATCH 22/94] fixed lint prettier warning --- src/jetpack-editor-setup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jetpack-editor-setup.js b/src/jetpack-editor-setup.js index 74cf046070..fb06abebad 100644 --- a/src/jetpack-editor-setup.js +++ b/src/jetpack-editor-setup.js @@ -7,7 +7,7 @@ const supportedJetpackBlocks = { 'contact-info': { available: true, }, - 'story': { + story: { available: true, }, }; From a3b108ede4903f97ce9ad1911513afcff951926a Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Thu, 1 Oct 2020 15:46:47 -0300 Subject: [PATCH 23/94] updated jetpack branch --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index 312a26594c..34349b1897 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 312a26594c01ceb99e31aa5ac3e85e00d6c3a71c +Subproject commit 34349b18976191249fe6d38efc9a1f8796a7485b From 22c192d9c9f6a5557e07a41e2b75d91b3077ae69 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Thu, 1 Oct 2020 15:55:08 -0300 Subject: [PATCH 24/94] updated jetpack commit hash --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index 34349b1897..3699cc5be1 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 34349b18976191249fe6d38efc9a1f8796a7485b +Subproject commit 3699cc5be1b2258beb6e887ccab089de3b21a114 From b2685445fa4fda8b03799a5a71606adb348bd12b Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Thu, 1 Oct 2020 16:32:21 -0300 Subject: [PATCH 25/94] updated commit hash for gutenberg --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index f2019a653c..696fe160ba 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit f2019a653c5f86e640e60f00bafa9269a185d780 +Subproject commit 696fe160ba9fab668f4b83ec1171133ab923788d From 33f2addaab7f5338f791d968680cb6f1e97b4ffa Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Thu, 1 Oct 2020 17:24:34 -0300 Subject: [PATCH 26/94] updated gutenberg and jetpack commit hashes --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index 696fe160ba..5a7c8d9c05 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 696fe160ba9fab668f4b83ec1171133ab923788d +Subproject commit 5a7c8d9c0501eeae6d2935431e3a7932661d85ea diff --git a/jetpack b/jetpack index 3699cc5be1..d8c065808d 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 3699cc5be1b2258beb6e887ccab089de3b21a114 +Subproject commit d8c065808df80612d1fbec19c35156de4fb00d95 From b1de4df250b2dc0c27f15aa94db8d1f1c0a6a65e Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Thu, 1 Oct 2020 18:53:44 -0300 Subject: [PATCH 27/94] updated commit hash --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 0213a1f5c3..5d385b5842 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 0213a1f5c3676af1f6ac67254ed19505d94cfd15 +Subproject commit 5d385b58421e77c652fe4b2d5bc1414e1805cd32 From 0f8916f5a4dccd263cfbecfb88e1a6df61cf09f2 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Fri, 9 Oct 2020 13:22:18 -0300 Subject: [PATCH 28/94] moved jetpack/story block examples to initial-html for demo loader --- src/initial-html.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/initial-html.js b/src/initial-html.js index 5392f60169..edc7127836 100644 --- a/src/initial-html.js +++ b/src/initial-html.js @@ -12,4 +12,16 @@ export default `
Random Street
+ + +
+ + + +
+ + + +
+ `; From 7c7430cf026148db0bfea6392cf938f27c43e237 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Fri, 9 Oct 2020 15:35:14 -0300 Subject: [PATCH 29/94] fix getCategories mock --- src/test/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/index.js b/src/test/index.js index bc33b11eb1..51397c6494 100644 --- a/src/test/index.js +++ b/src/test/index.js @@ -3,7 +3,7 @@ describe( 'Test Jetpack blocks', () => { const mockRegisterBlockCollection = jest.fn(); jest.mock( '@wordpress/blocks', () => { return { - getCategories: () => [], + getCategories: () => [ { slug: 'media'} ], setCategories: jest.fn(), registerBlockCollection: mockRegisterBlockCollection, }; From 6360f4c43299fcac464a775196a8e7627d47fa81 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Fri, 9 Oct 2020 15:56:20 -0300 Subject: [PATCH 30/94] fixed prettier error --- src/test/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/index.js b/src/test/index.js index 51397c6494..f3c37ec086 100644 --- a/src/test/index.js +++ b/src/test/index.js @@ -3,7 +3,7 @@ describe( 'Test Jetpack blocks', () => { const mockRegisterBlockCollection = jest.fn(); jest.mock( '@wordpress/blocks', () => { return { - getCategories: () => [ { slug: 'media'} ], + getCategories: () => [ { slug: 'media' } ], setCategories: jest.fn(), registerBlockCollection: mockRegisterBlockCollection, }; From e4031f441d20839f2ac8a12b339b9f52948fbfa6 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Sat, 10 Oct 2020 11:17:35 -0300 Subject: [PATCH 31/94] only set initialData with demo initialHtml example if initialData not set --- src/index.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index 246739d5bd..c7051c9c86 100644 --- a/src/index.js +++ b/src/index.js @@ -24,16 +24,20 @@ addAction( 'native.pre-render', 'gutenberg-mobile', ( props ) => { addFilter( 'native.block_editor_props', 'gutenberg-mobile', ( editorProps ) => { if ( __DEV__ ) { - let { initialTitle } = editorProps; + let { initialTitle, initialData } = editorProps; if ( initialTitle === undefined ) { initialTitle = 'Welcome to gutenberg for WP Apps!'; } + if ( initialData === undefined ) { + initialData = initialHtml + initialHtmlGutenberg; + } + return { ...editorProps, initialTitle, - initialData: initialHtml + initialHtmlGutenberg, + initialData, }; } return editorProps; From aa1b58b4d8cae446cf8a84542709b0fde1a40fc2 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Sat, 10 Oct 2020 11:17:35 -0300 Subject: [PATCH 32/94] only set initialData with demo initialHtml example if initialData not set --- src/index.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index 246739d5bd..c7051c9c86 100644 --- a/src/index.js +++ b/src/index.js @@ -24,16 +24,20 @@ addAction( 'native.pre-render', 'gutenberg-mobile', ( props ) => { addFilter( 'native.block_editor_props', 'gutenberg-mobile', ( editorProps ) => { if ( __DEV__ ) { - let { initialTitle } = editorProps; + let { initialTitle, initialData } = editorProps; if ( initialTitle === undefined ) { initialTitle = 'Welcome to gutenberg for WP Apps!'; } + if ( initialData === undefined ) { + initialData = initialHtml + initialHtmlGutenberg; + } + return { ...editorProps, initialTitle, - initialData: initialHtml + initialHtmlGutenberg, + initialData, }; } return editorProps; From 5e873998f92dd361dedc538fd5c0f5a9031c2166 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Sat, 10 Oct 2020 13:27:40 -0300 Subject: [PATCH 33/94] updated commit hashes for guetnberg and jetpack --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index 1934b2d977..61877c2560 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 1934b2d9770b2ab7329962b934dbc5783230d317 +Subproject commit 61877c25600979fd6967f754931c26b62906d52c diff --git a/jetpack b/jetpack index 5e255c4997..e9e675737a 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 5e255c49970552b1d852c8f106ae8d048a3f7580 +Subproject commit e9e675737a4b63e03f6378a8d503a7b758585c01 From c6319697105b55fae3581fa802ef7c277684aa98 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Sat, 10 Oct 2020 13:33:14 -0300 Subject: [PATCH 34/94] upated gutenberg commit hash --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 61877c2560..1ab42cf73e 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 61877c25600979fd6967f754931c26b62906d52c +Subproject commit 1ab42cf73ee06db03381802cce38eca800b392d0 From e8aea4af51d58d1a5d4941414d550dd411161394 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Sat, 10 Oct 2020 20:06:22 -0300 Subject: [PATCH 35/94] updated jetpack and gutenberg commit hashes with new method renames --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index 1ab42cf73e..4182bddc07 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 1ab42cf73ee06db03381802cce38eca800b392d0 +Subproject commit 4182bddc07a2f139a78f94837c5efc488592f295 diff --git a/jetpack b/jetpack index e9e675737a..b30589f7ee 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit e9e675737a4b63e03f6378a8d503a7b758585c01 +Subproject commit b30589f7ee25a0722b54f199bbf020e247960f1a From be942f006ceffb9850044ba6ad04f299a63e275d Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Sun, 11 Oct 2020 07:56:32 -0300 Subject: [PATCH 36/94] updated gutenberg commit hash, fixed prettier error --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 4182bddc07..4fbc17d101 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 4182bddc07a2f139a78f94837c5efc488592f295 +Subproject commit 4fbc17d10191e8d1be304d44b3d98141ea05591c From e4b907c3e9a971c8e0021e310ba4b86dcdb92076 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Sun, 11 Oct 2020 08:04:11 -0300 Subject: [PATCH 37/94] updated gutenberg commit hash --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 4fbc17d101..3592ff044a 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 4fbc17d10191e8d1be304d44b3d98141ea05591c +Subproject commit 3592ff044adc69b54777b1ed40e6dbd6e46e6e8a From 90f84ac9da86e576232508e83c8efed8cbeb07b9 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Sun, 11 Oct 2020 11:00:02 -0300 Subject: [PATCH 38/94] updated gutenberg and jetpack commit hash for story error handling logic WIP --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index 3592ff044a..f1e4782788 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 3592ff044adc69b54777b1ed40e6dbd6e46e6e8a +Subproject commit f1e4782788573af7e5245e46abf974a095411aac diff --git a/jetpack b/jetpack index b30589f7ee..766ce49c05 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit b30589f7ee25a0722b54f199bbf020e247960f1a +Subproject commit 766ce49c053e1fedfb4bf39eccd7b72d73b80c2b From 246d3a706ccdbba266710ba5175dd461d39c18c7 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Mon, 12 Oct 2020 10:15:00 -0300 Subject: [PATCH 39/94] added bridge methods for cancel and retry uploads on mediaFiles collection based blocks --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index f1e4782788..ee45b0723c 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit f1e4782788573af7e5245e46abf974a095411aac +Subproject commit ee45b0723c30bf527909e13c2b1139dc5a3eab91 diff --git a/jetpack b/jetpack index 766ce49c05..5b613c05eb 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 766ce49c053e1fedfb4bf39eccd7b72d73b80c2b +Subproject commit 5b613c05ebc6cf3b835950b23b87fde406303291 From 4a09adc333c25d34edebfc9a059d9249df5ac492 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Mon, 12 Oct 2020 10:58:10 -0300 Subject: [PATCH 40/94] deep copy of mediaFiles when assigning new mediaUrl or mediaId --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index 5b613c05eb..333b06f12b 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 5b613c05ebc6cf3b835950b23b87fde406303291 +Subproject commit 333b06f12b4dcc72715aac54619a499a91061768 From 8f30bdf272b8cfdd67531690ab3222762a688ef3 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Mon, 12 Oct 2020 12:17:05 -0300 Subject: [PATCH 41/94] updated commit hash; implemented requestMediaFilesSaveCancelDialog bridge method --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index ee45b0723c..053a16899a 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit ee45b0723c30bf527909e13c2b1139dc5a3eab91 +Subproject commit 053a16899abb48bbabbe0397eb5d859e0a036d9a diff --git a/jetpack b/jetpack index 333b06f12b..15fe14e715 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 333b06f12b4dcc72715aac54619a499a91061768 +Subproject commit 15fe14e715b80a88baece9ef31778cdd5d58c121 From 433e2cb33c22cefcb8aadfcc390d2cd720e61188 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Tue, 13 Oct 2020 09:04:45 -0300 Subject: [PATCH 42/94] updated gutenberg and jetpack commit hashes for bridge method rename mediaModelCreatedForFile to mediaIdChanged --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index 053a16899a..7a18e56aa1 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 053a16899abb48bbabbe0397eb5d859e0a036d9a +Subproject commit 7a18e56aa186c22350e976c6284ce0f87696176c diff --git a/jetpack b/jetpack index 15fe14e715..f30449ce62 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 15fe14e715b80a88baece9ef31778cdd5d58c121 +Subproject commit f30449ce62e6cb7b1e64db3db2ed2ecebec4c2ac From 875112c46153b0a2169d2ddc7a6144b537728a5f Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Wed, 14 Oct 2020 06:38:53 -0300 Subject: [PATCH 43/94] updated jetpack commit hash - just removed commented out code --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index f30449ce62..51134e44f8 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit f30449ce62e6cb7b1e64db3db2ed2ecebec4c2ac +Subproject commit 51134e44f81b7d6476568f17d043ef3d02ac5185 From a76e41781e4e8a4791c8006804aaf9eb06edbd04 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Wed, 14 Oct 2020 11:49:25 -0300 Subject: [PATCH 44/94] updated gutenberg commit hash --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 3592ff044a..a9ce5104b3 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 3592ff044adc69b54777b1ed40e6dbd6e46e6e8a +Subproject commit a9ce5104b3a5f2b32ea252b1e5f86ffcb6e5203e From 3130e2449ca3c390474a579654076f90ee58555c Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Wed, 14 Oct 2020 11:59:08 -0300 Subject: [PATCH 45/94] updated gutenberg and jetpack commit hashes --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index a9ce5104b3..e2889308a4 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit a9ce5104b3a5f2b32ea252b1e5f86ffcb6e5203e +Subproject commit e2889308a4f279c48f4f2fe451b9c0696e31147d diff --git a/jetpack b/jetpack index b30589f7ee..5467990230 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit b30589f7ee25a0722b54f199bbf020e247960f1a +Subproject commit 5467990230e870a258dd316bd1e782cd998fed0b From 19dc04b00d741327b026d941d30985404a45de64 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Wed, 14 Oct 2020 13:47:02 -0300 Subject: [PATCH 46/94] updated commit hash for merged PRs in gutenberg and jetapck submodules --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index 71e5d6d063..66c15e3e01 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 71e5d6d063cb0f98f79b53ee1323f715a9fb1ff5 +Subproject commit 66c15e3e01866148475fdce2bce5fd8d863a934f diff --git a/jetpack b/jetpack index 8184fb7b04..7411e9af9e 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 8184fb7b04a3de25ec87860483659335e0eec1a8 +Subproject commit 7411e9af9e016f0a4e280f3eb3a4972a4806b724 From afedc7e30ca7c7dc5e86a00c8a9be7f9a276cd2a Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Thu, 15 Oct 2020 21:07:45 -0300 Subject: [PATCH 47/94] updated commit hash for gutenberg and jetpack --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index 6445611993..0283500858 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 6445611993113ef46aa9e993c7ceb3b5c6652e4a +Subproject commit 028350085897d3a20226089e8cb985069ac4fdaf diff --git a/jetpack b/jetpack index 12068dee6c..e22b73b5d7 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 12068dee6c7253929ed8404a77f199cfa4b414e2 +Subproject commit e22b73b5d7ef839c0607b607843f89f3a30279b2 From c238c6d38614d2ffbf9237fd6ea3c8114fae9116 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Fri, 16 Oct 2020 17:47:33 -0300 Subject: [PATCH 48/94] unmade change to package-lock.json --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 0289befe75..5d2ddae2f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4043,7 +4043,7 @@ "dev": true }, "prettier": { - "version": "npm:wp-prettier@2.0.5", + "version": "npm:prettier@2.0.5", "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.0.5.tgz", "integrity": "sha512-5GCgdeevIXwR3cW4Qj5XWC5MO1iSCz8+IPn0mMw6awAt/PBiey8yyO7MhePRsaMqghJAhg6Q3QLYWSnUHWkG6A==", "dev": true From 85113124528fc71cf6e5a0871a706c1605438b41 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Fri, 16 Oct 2020 17:49:27 -0300 Subject: [PATCH 49/94] mocked the story web editor impl for gutenberg-mobile tests --- src/test/index.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/index.js b/src/test/index.js index f3c37ec086..4360325884 100644 --- a/src/test/index.js +++ b/src/test/index.js @@ -12,6 +12,10 @@ describe( 'Test Jetpack blocks', () => { '../../jetpack/extensions/blocks/contact-info/editor.js', () => jest.fn() ); + jest.mock( + '../../jetpack/extensions/blocks/story/editor.js', + () => jest.fn() + ); const setupJetpackEditor = require( '../jetpack-editor-setup' ).default; setupJetpackEditor( { blogId: 1, isJetpackActive: true } ); From 1ca2893bd59c24a47d56e2fce2829ca7bfb5ecf5 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Fri, 16 Oct 2020 19:06:27 -0300 Subject: [PATCH 50/94] Revert "mocked the story web editor impl for gutenberg-mobile tests" This reverts commit 85113124528fc71cf6e5a0871a706c1605438b41. --- src/test/index.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/test/index.js b/src/test/index.js index 4360325884..f3c37ec086 100644 --- a/src/test/index.js +++ b/src/test/index.js @@ -12,10 +12,6 @@ describe( 'Test Jetpack blocks', () => { '../../jetpack/extensions/blocks/contact-info/editor.js', () => jest.fn() ); - jest.mock( - '../../jetpack/extensions/blocks/story/editor.js', - () => jest.fn() - ); const setupJetpackEditor = require( '../jetpack-editor-setup' ).default; setupJetpackEditor( { blogId: 1, isJetpackActive: true } ); From ddb2681c2d9117d94bf07ec7a3c654ced8fab2d7 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Thu, 15 Oct 2020 09:30:03 -0300 Subject: [PATCH 51/94] mocked the story web editor impl for gutenberg-mobile tests --- src/test/index.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/index.js b/src/test/index.js index f3c37ec086..4360325884 100644 --- a/src/test/index.js +++ b/src/test/index.js @@ -12,6 +12,10 @@ describe( 'Test Jetpack blocks', () => { '../../jetpack/extensions/blocks/contact-info/editor.js', () => jest.fn() ); + jest.mock( + '../../jetpack/extensions/blocks/story/editor.js', + () => jest.fn() + ); const setupJetpackEditor = require( '../jetpack-editor-setup' ).default; setupJetpackEditor( { blogId: 1, isJetpackActive: true } ); From b7d8c8c17df08e1068ede0f9faef879b9d9850bd Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Fri, 16 Oct 2020 19:15:54 -0300 Subject: [PATCH 52/94] ran prettier on file --- src/test/index.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/test/index.js b/src/test/index.js index 4360325884..098aeb66e9 100644 --- a/src/test/index.js +++ b/src/test/index.js @@ -12,9 +12,8 @@ describe( 'Test Jetpack blocks', () => { '../../jetpack/extensions/blocks/contact-info/editor.js', () => jest.fn() ); - jest.mock( - '../../jetpack/extensions/blocks/story/editor.js', - () => jest.fn() + jest.mock( '../../jetpack/extensions/blocks/story/editor.js', () => + jest.fn() ); const setupJetpackEditor = require( '../jetpack-editor-setup' ).default; From e7aa037bde5daf8968f13dcafa08349692f09632 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Fri, 16 Oct 2020 19:30:23 -0300 Subject: [PATCH 53/94] bump ci --- package-lock.json | 2 +- src/test/index.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 5d2ddae2f5..0289befe75 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4043,7 +4043,7 @@ "dev": true }, "prettier": { - "version": "npm:prettier@2.0.5", + "version": "npm:wp-prettier@2.0.5", "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.0.5.tgz", "integrity": "sha512-5GCgdeevIXwR3cW4Qj5XWC5MO1iSCz8+IPn0mMw6awAt/PBiey8yyO7MhePRsaMqghJAhg6Q3QLYWSnUHWkG6A==", "dev": true diff --git a/src/test/index.js b/src/test/index.js index 098aeb66e9..541215c8e8 100644 --- a/src/test/index.js +++ b/src/test/index.js @@ -12,6 +12,7 @@ describe( 'Test Jetpack blocks', () => { '../../jetpack/extensions/blocks/contact-info/editor.js', () => jest.fn() ); + jest.mock( '../../jetpack/extensions/blocks/story/editor.js', () => jest.fn() ); From 1e637673eeb98d93981ff7a0b2c4c0921e197108 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Fri, 16 Oct 2020 19:31:02 -0300 Subject: [PATCH 54/94] Revert "bump ci" This reverts commit e7aa037bde5daf8968f13dcafa08349692f09632. --- package-lock.json | 2 +- src/test/index.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0289befe75..5d2ddae2f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4043,7 +4043,7 @@ "dev": true }, "prettier": { - "version": "npm:wp-prettier@2.0.5", + "version": "npm:prettier@2.0.5", "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.0.5.tgz", "integrity": "sha512-5GCgdeevIXwR3cW4Qj5XWC5MO1iSCz8+IPn0mMw6awAt/PBiey8yyO7MhePRsaMqghJAhg6Q3QLYWSnUHWkG6A==", "dev": true diff --git a/src/test/index.js b/src/test/index.js index 541215c8e8..098aeb66e9 100644 --- a/src/test/index.js +++ b/src/test/index.js @@ -12,7 +12,6 @@ describe( 'Test Jetpack blocks', () => { '../../jetpack/extensions/blocks/contact-info/editor.js', () => jest.fn() ); - jest.mock( '../../jetpack/extensions/blocks/story/editor.js', () => jest.fn() ); From 080a970f72b6c7e64884d58cafe6345efc7855c2 Mon Sep 17 00:00:00 2001 From: eToledo Date: Tue, 20 Oct 2020 12:16:00 +0200 Subject: [PATCH 55/94] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index d72efb8e05..1ac5a800c8 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit d72efb8e05578a8207450238e2e8235eb6586b5b +Subproject commit 1ac5a800c8c537d4e4de9ebd0e49410e26c11e8e From ed36dfc682ec2203fe8f7b9995ca0dc94b90065d Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Tue, 20 Oct 2020 12:06:05 -0300 Subject: [PATCH 56/94] updated jetpack commit hash --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index caea14fdd8..b885029e99 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit caea14fdd8378477b0316e0c682415786002d527 +Subproject commit b885029e99ce32bc6e0cb55d34435fcda26bd4e8 From ba4df52f44826817d29f3a3c255963b062b2fde8 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Wed, 21 Oct 2020 16:53:02 -0300 Subject: [PATCH 57/94] updated gutenberg commit hash --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 1ac5a800c8..0e00c7ad00 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 1ac5a800c8c537d4e4de9ebd0e49410e26c11e8e +Subproject commit 0e00c7ad0064373e9ad051b467f69d5a894840c9 From 21e92296af210039214c0afb46e9300dba91cf86 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Thu, 22 Oct 2020 20:50:23 -0300 Subject: [PATCH 58/94] updated gutenberg and jetpack commit hashes with latest squashed commits after merge --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index 0e00c7ad00..d10e5d0e3f 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 0e00c7ad0064373e9ad051b467f69d5a894840c9 +Subproject commit d10e5d0e3f053f3a7b326d431c24d15a203a5ab7 diff --git a/jetpack b/jetpack index b885029e99..6b7df13efc 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit b885029e99ce32bc6e0cb55d34435fcda26bd4e8 +Subproject commit 6b7df13efcb76e619ce62e86645e719be6f36a15 From 4259361ab5ecd2792d0e9a494cb630826df85b17 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Tue, 27 Oct 2020 07:27:31 -0300 Subject: [PATCH 59/94] updated gutenberg and jetpack commit hashes --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index d10e5d0e3f..26165d160a 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit d10e5d0e3f053f3a7b326d431c24d15a203a5ab7 +Subproject commit 26165d160aaafe17486181d4eb284f2a61aa2928 diff --git a/jetpack b/jetpack index 6b7df13efc..5d409e4604 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 6b7df13efcb76e619ce62e86645e719be6f36a15 +Subproject commit 5d409e4604550b48235bed07432e6cfca6f89118 From 945e7aa742a88bf864498e7b3162e6f97100ae4f Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Tue, 27 Oct 2020 15:15:51 -0300 Subject: [PATCH 60/94] updated gutenberg commit hash --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 26165d160a..0e734b4e4b 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 26165d160aaafe17486181d4eb284f2a61aa2928 +Subproject commit 0e734b4e4b311919d59c48538ab2fe3a1e0de0d4 From f94126be5c46e8d888b0142f1b4c52d3ac0cb754 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Wed, 28 Oct 2020 14:03:40 -0300 Subject: [PATCH 61/94] updated commit hash with props rename for mediaFilesCollectionBlock props --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 0e734b4e4b..cc0cc54a62 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 0e734b4e4b311919d59c48538ab2fe3a1e0de0d4 +Subproject commit cc0cc54a620a721da3b3c670c2f77d40aa7f2102 From 0c8e155cca8c80d3a336d37770df5b0eb35167a1 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Wed, 28 Oct 2020 14:06:56 -0300 Subject: [PATCH 62/94] updated gutetnberg commit hash --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index cc0cc54a62..54e3b5755a 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit cc0cc54a620a721da3b3c670c2f77d40aa7f2102 +Subproject commit 54e3b5755a2f41f0e680caea14e3b03594b5eaa1 From a361b1d6328ce0e044d11da32f80acd923947bdf Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Wed, 28 Oct 2020 18:40:01 -0300 Subject: [PATCH 63/94] moved mediaFilesCollectionBlock feature/capability flag code from gutenberg to gutenberg-mobile --- gutenberg | 2 +- src/jetpack-editor-setup.js | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 54e3b5755a..520d6491d0 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 54e3b5755a2f41f0e680caea14e3b03594b5eaa1 +Subproject commit 520d6491d032d30dbc6dff874758bf770060e254 diff --git a/src/jetpack-editor-setup.js b/src/jetpack-editor-setup.js index 9d80a73c94..2e2d011539 100644 --- a/src/jetpack-editor-setup.js +++ b/src/jetpack-editor-setup.js @@ -2,6 +2,10 @@ * Internal dependencies */ import { JETPACK_DATA_PATH } from '../jetpack/extensions/shared/get-jetpack-data'; +/** + * WordPress dependencies + */ +import { useDispatch, useSelect } from '@wordpress/data'; // When adding new blocks to this list please also consider updating ./block-support/supported-blocks.json const supportedJetpackBlocks = { @@ -40,6 +44,17 @@ export default ( jetpackState ) => { const jetpackData = setJetpackData( jetpackState ); + const mediaFilesCollectionBlock = useSelect( ( select ) => { + return select( 'core/block-editor' ).getSettings( 'capabilities' ).mediaFilesCollectionBlock; + }, [] ); + + + if ( mediaFilesCollectionBlock !== true ) { + useDispatch( 'core/edit-post' ).hideBlockTypes( [ 'jetpack/story' ] ); + } else { + useDispatch( 'core/edit-post' ).showBlockTypes( [ 'jetpack/story' ] ); + } + if ( __DEV__ ) { require( '../jetpack/extensions/editor' ); } From 1ad0cff9430c4db7bc6ebbeabe0bac76ad3541ad Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Fri, 30 Oct 2020 11:55:56 -0300 Subject: [PATCH 64/94] move the setupJetpackEditor() call fr om to action --- src/index.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/index.js b/src/index.js index c7051c9c86..ae8211544d 100644 --- a/src/index.js +++ b/src/index.js @@ -17,6 +17,9 @@ import initialHtml from './initial-html'; addAction( 'native.pre-render', 'gutenberg-mobile', ( props ) => { require( './strings-overrides' ); correctTextFontWeight(); +} ); + +addAction( 'native.render', 'gutenberg-mobile', ( props ) => { setupJetpackEditor( props.jetpackState || { blogId: 1, isJetpackActive: true } ); From 67d6fc3687595ec353a7e0ff3af5b249f34b9aa5 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Fri, 30 Oct 2020 12:24:25 -0300 Subject: [PATCH 65/94] updated gutenberg commit hash --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 520d6491d0..5ea6a7e33e 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 520d6491d032d30dbc6dff874758bf770060e254 +Subproject commit 5ea6a7e33e13b1ea507bd7b47e49e94295b11420 From 54535040467a9bf727009baab6aedf1e9f1e821a Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Fri, 30 Oct 2020 15:44:21 -0300 Subject: [PATCH 66/94] updated gutenberg commit hash --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 520d6491d0..5ea6a7e33e 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 520d6491d032d30dbc6dff874758bf770060e254 +Subproject commit 5ea6a7e33e13b1ea507bd7b47e49e94295b11420 From 835a286851a258b48456b731d0afe683838e114d Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Fri, 30 Oct 2020 18:51:51 -0300 Subject: [PATCH 67/94] mocked useSelect, useDispatch in test --- src/test/index.js | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/test/index.js b/src/test/index.js index 098aeb66e9..46c479d8b9 100644 --- a/src/test/index.js +++ b/src/test/index.js @@ -1,5 +1,37 @@ +/** + * WordPress dependencies + */ +import { useDispatch, useSelect } from '@wordpress/data'; +// import { JetpackLogo } from '../../jetpack/extensions/shared/icons'; +// import { JetpackLogo } from '../../jetpack/extensions/shared/icons'; + +// import { NoticeList } from '../../gutenberg/packages/components/src/notice/list'; + + +jest.mock( '@wordpress/data/build/components/use-select' ); +jest.mock( '@wordpress/data/build/components/use-dispatch' ); +// jest.mock('../../jetpack/extensions/shared/icons'); + +// jest.mock('../../gutenberg/packages/components/src/notice/list'); + describe( 'Test Jetpack blocks', () => { it( 'should setup the editor for jetpack without failing', () => { + useSelect.mockImplementation( () => { + return { + mediaFilesCollectionBlock: true, + }; + } ); + + useDispatch.mockImplementation( () => { + return { + hideBlockTypes: jest.fn(), + showBlockTypes: jest.fn(), + } + } ); + + // JetpackLogo.mockImplementation( () => { return 'JetpackLogo' } ); + // NoticeList.mockImplementation( () => { return 'NoticeList' } ); + const mockRegisterBlockCollection = jest.fn(); jest.mock( '@wordpress/blocks', () => { return { From 2305176b46881a13f76e072b3b4e5354a7404630 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Mon, 2 Nov 2020 08:50:45 -0300 Subject: [PATCH 68/94] updated jetpack commit hash, updated jetpack stories branch with latest jetpack master --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index 5d409e4604..2fea666cb6 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 5d409e4604550b48235bed07432e6cfca6f89118 +Subproject commit 2fea666cb67f921259daada4aa5c24c89627f4d5 From 0d988a2cb3471903550934825742747872007c4b Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Mon, 2 Nov 2020 12:52:54 -0300 Subject: [PATCH 69/94] prettified --- src/jetpack-editor-setup.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jetpack-editor-setup.js b/src/jetpack-editor-setup.js index 2e2d011539..6f2504a876 100644 --- a/src/jetpack-editor-setup.js +++ b/src/jetpack-editor-setup.js @@ -45,10 +45,10 @@ export default ( jetpackState ) => { const jetpackData = setJetpackData( jetpackState ); const mediaFilesCollectionBlock = useSelect( ( select ) => { - return select( 'core/block-editor' ).getSettings( 'capabilities' ).mediaFilesCollectionBlock; + return select( 'core/block-editor' ).getSettings( 'capabilities' ) + .mediaFilesCollectionBlock; }, [] ); - if ( mediaFilesCollectionBlock !== true ) { useDispatch( 'core/edit-post' ).hideBlockTypes( [ 'jetpack/story' ] ); } else { From f312735e5c503dcf7c99d15c403f12e885b8c7ab Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Mon, 2 Nov 2020 18:34:36 -0300 Subject: [PATCH 70/94] moved select/dispatch call logic within setTimeout to ensure its run when editor settings has already been loading --- src/jetpack-editor-setup.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/jetpack-editor-setup.js b/src/jetpack-editor-setup.js index 6f2504a876..9f4e59c31f 100644 --- a/src/jetpack-editor-setup.js +++ b/src/jetpack-editor-setup.js @@ -5,7 +5,7 @@ import { JETPACK_DATA_PATH } from '../jetpack/extensions/shared/get-jetpack-data /** * WordPress dependencies */ -import { useDispatch, useSelect } from '@wordpress/data'; +import { dispatch, select } from '@wordpress/data'; // When adding new blocks to this list please also consider updating ./block-support/supported-blocks.json const supportedJetpackBlocks = { @@ -44,17 +44,17 @@ export default ( jetpackState ) => { const jetpackData = setJetpackData( jetpackState ); - const mediaFilesCollectionBlock = useSelect( ( select ) => { - return select( 'core/block-editor' ).getSettings( 'capabilities' ) - .mediaFilesCollectionBlock; - }, [] ); - - if ( mediaFilesCollectionBlock !== true ) { - useDispatch( 'core/edit-post' ).hideBlockTypes( [ 'jetpack/story' ] ); - } else { - useDispatch( 'core/edit-post' ).showBlockTypes( [ 'jetpack/story' ] ); - } - + // eslint-disable-next-line @wordpress/react-no-unsafe-timeout + setTimeout( () => { + const mediaFilesCollectionBlock = select( 'core/block-editor' ).getSettings( 'capabilities' ).mediaFilesCollectionBlock; + + if ( mediaFilesCollectionBlock !== true ) { + dispatch( 'core/edit-post' ).hideBlockTypes( [ 'jetpack/story' ] ); + } else { + dispatch( 'core/edit-post' ).showBlockTypes( [ 'jetpack/story' ] ); + } + } ); + if ( __DEV__ ) { require( '../jetpack/extensions/editor' ); } From e5f8084aa5a381f7f7350998228335b2be2b66ab Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Mon, 2 Nov 2020 18:35:00 -0300 Subject: [PATCH 71/94] removed commented test code --- src/test/index.js | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/src/test/index.js b/src/test/index.js index 46c479d8b9..fa2ee6c721 100644 --- a/src/test/index.js +++ b/src/test/index.js @@ -1,37 +1,8 @@ /** * WordPress dependencies */ -import { useDispatch, useSelect } from '@wordpress/data'; -// import { JetpackLogo } from '../../jetpack/extensions/shared/icons'; -// import { JetpackLogo } from '../../jetpack/extensions/shared/icons'; - -// import { NoticeList } from '../../gutenberg/packages/components/src/notice/list'; - - -jest.mock( '@wordpress/data/build/components/use-select' ); -jest.mock( '@wordpress/data/build/components/use-dispatch' ); -// jest.mock('../../jetpack/extensions/shared/icons'); - -// jest.mock('../../gutenberg/packages/components/src/notice/list'); - describe( 'Test Jetpack blocks', () => { it( 'should setup the editor for jetpack without failing', () => { - useSelect.mockImplementation( () => { - return { - mediaFilesCollectionBlock: true, - }; - } ); - - useDispatch.mockImplementation( () => { - return { - hideBlockTypes: jest.fn(), - showBlockTypes: jest.fn(), - } - } ); - - // JetpackLogo.mockImplementation( () => { return 'JetpackLogo' } ); - // NoticeList.mockImplementation( () => { return 'NoticeList' } ); - const mockRegisterBlockCollection = jest.fn(); jest.mock( '@wordpress/blocks', () => { return { From 9bf27e019a6733a2ccbe4c8958807effdeb77fa7 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Mon, 2 Nov 2020 18:36:50 -0300 Subject: [PATCH 72/94] removed non-applicable comment heading --- src/test/index.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/test/index.js b/src/test/index.js index fa2ee6c721..098aeb66e9 100644 --- a/src/test/index.js +++ b/src/test/index.js @@ -1,6 +1,3 @@ -/** - * WordPress dependencies - */ describe( 'Test Jetpack blocks', () => { it( 'should setup the editor for jetpack without failing', () => { const mockRegisterBlockCollection = jest.fn(); From 25d82e7b7f18d45881b790a5e0b13e213dd1e93b Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Mon, 2 Nov 2020 18:45:20 -0300 Subject: [PATCH 73/94] prettified --- src/jetpack-editor-setup.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/jetpack-editor-setup.js b/src/jetpack-editor-setup.js index 9f4e59c31f..fa9b45fecf 100644 --- a/src/jetpack-editor-setup.js +++ b/src/jetpack-editor-setup.js @@ -46,7 +46,9 @@ export default ( jetpackState ) => { // eslint-disable-next-line @wordpress/react-no-unsafe-timeout setTimeout( () => { - const mediaFilesCollectionBlock = select( 'core/block-editor' ).getSettings( 'capabilities' ).mediaFilesCollectionBlock; + const mediaFilesCollectionBlock = select( + 'core/block-editor' + ).getSettings( 'capabilities' ).mediaFilesCollectionBlock; if ( mediaFilesCollectionBlock !== true ) { dispatch( 'core/edit-post' ).hideBlockTypes( [ 'jetpack/story' ] ); @@ -54,7 +56,7 @@ export default ( jetpackState ) => { dispatch( 'core/edit-post' ).showBlockTypes( [ 'jetpack/story' ] ); } } ); - + if ( __DEV__ ) { require( '../jetpack/extensions/editor' ); } From 6eb17d5dcb95af04f49c04722d882beeb9b63d31 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Tue, 3 Nov 2020 15:46:33 -0300 Subject: [PATCH 74/94] added comment describing the value of having a setTimeout() call here --- src/jetpack-editor-setup.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/jetpack-editor-setup.js b/src/jetpack-editor-setup.js index fa9b45fecf..e56a3e7dc6 100644 --- a/src/jetpack-editor-setup.js +++ b/src/jetpack-editor-setup.js @@ -44,6 +44,13 @@ export default ( jetpackState ) => { const jetpackData = setJetpackData( jetpackState ); + // Note on the use of setTimeout() here: + // We observed the settings may not be ready exactly when the native.render hooks get run but rather + // right after that execution cycle (because state hasn't changed yet). Hence, we're only checking for + // the actual settings to be loaded by using setTimeout without a delay parameter. This ensures the + // settings are loaded onto the store and we can use the core/block-editor selector by the time we do + // the actual check. + // eslint-disable-next-line @wordpress/react-no-unsafe-timeout setTimeout( () => { const mediaFilesCollectionBlock = select( From f1fcac29156cd0f0a43ea748a7bf19050e90d977 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Tue, 3 Nov 2020 15:59:42 -0300 Subject: [PATCH 75/94] ran prettier --- src/jetpack-editor-setup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jetpack-editor-setup.js b/src/jetpack-editor-setup.js index e56a3e7dc6..898d2ec9f6 100644 --- a/src/jetpack-editor-setup.js +++ b/src/jetpack-editor-setup.js @@ -50,7 +50,7 @@ export default ( jetpackState ) => { // the actual settings to be loaded by using setTimeout without a delay parameter. This ensures the // settings are loaded onto the store and we can use the core/block-editor selector by the time we do // the actual check. - + // eslint-disable-next-line @wordpress/react-no-unsafe-timeout setTimeout( () => { const mediaFilesCollectionBlock = select( From 4d378dcbab283f30c19211c299dfa8d873a54cf6 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Tue, 3 Nov 2020 17:51:04 -0300 Subject: [PATCH 76/94] removed unused param --- src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index ae8211544d..082bcea445 100644 --- a/src/index.js +++ b/src/index.js @@ -14,7 +14,7 @@ import correctTextFontWeight from './text-font-weight-correct'; import setupJetpackEditor from './jetpack-editor-setup'; import initialHtml from './initial-html'; -addAction( 'native.pre-render', 'gutenberg-mobile', ( props ) => { +addAction( 'native.pre-render', 'gutenberg-mobile', () => { require( './strings-overrides' ); correctTextFontWeight(); } ); From 63845b12522e3b5bf19f7fa42e58ad60fccdf3f4 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Wed, 4 Nov 2020 09:17:52 -0300 Subject: [PATCH 77/94] updated gutenberg commit hash --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 8c6975676f..08e77ba07e 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 8c6975676f77b883333a48138418cbb096fcf16f +Subproject commit 08e77ba07e5487915bc8946f03baa1085cc0f306 From d87f7cbefa81ab0e32fcaafe7a9f86c56c4166b4 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Wed, 4 Nov 2020 09:25:06 -0300 Subject: [PATCH 78/94] updated jetpack with master branch, updated jetpack commit hash --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index 2fea666cb6..4dedeb8b58 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 2fea666cb67f921259daada4aa5c24c89627f4d5 +Subproject commit 4dedeb8b585469eae2401221e3bf461c812bd34d From 43013f169fcefd07e3da622d7c5bd82da06e29bc Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Wed, 4 Nov 2020 11:30:25 -0300 Subject: [PATCH 79/94] updated gutenberg --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 094cf0b7b5..6b651f2e49 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 094cf0b7b53331c51fc0f6f629768e890f015dcb +Subproject commit 6b651f2e498f401e9d27370e23f018305974e8ed From 3bf13556c441c6ec774aa9823aba57ac0f36fa7e Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Thu, 5 Nov 2020 10:11:57 -0300 Subject: [PATCH 80/94] updated with latest jetpack commit hash --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index 4dedeb8b58..e39af70a1c 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 4dedeb8b585469eae2401221e3bf461c812bd34d +Subproject commit e39af70a1cc52d72ba602de99ac957f335370b7d From 08757d23b510913536c1b177f6667258f833ad6c Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Thu, 5 Nov 2020 15:18:43 -0300 Subject: [PATCH 81/94] updated gutenberg and jetpack commit hashes --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index 6b651f2e49..7b14d3a9ee 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 6b651f2e498f401e9d27370e23f018305974e8ed +Subproject commit 7b14d3a9eef59e3a785ac784c3ddb71896b2a23e diff --git a/jetpack b/jetpack index e39af70a1c..74d2fd6fad 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit e39af70a1cc52d72ba602de99ac957f335370b7d +Subproject commit 74d2fd6fadb56f4b0f64ab51d6755965c30768bf From 680dc5ed0098da989a384258526ecf3eaab66d9c Mon Sep 17 00:00:00 2001 From: eToledo Date: Fri, 6 Nov 2020 17:20:33 +0100 Subject: [PATCH 82/94] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 7b14d3a9ee..04ff0d1592 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 7b14d3a9eef59e3a785ac784c3ddb71896b2a23e +Subproject commit 04ff0d1592ef76900b2026c941d4b300a9838874 From 4725701212c162b831c606dfe6d2acf4d583e363 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Fri, 6 Nov 2020 15:51:08 -0300 Subject: [PATCH 83/94] updated gutenberg commit hash to latest, merged with master --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 04ff0d1592..6caae6e9d7 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 04ff0d1592ef76900b2026c941d4b300a9838874 +Subproject commit 6caae6e9d724087317ad8b8a251c4f195abcb590 From 82ac1700d0b71e3d7e4113a96bceb60573f69a2a Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Fri, 6 Nov 2020 17:54:36 -0300 Subject: [PATCH 84/94] updated gutenberg commit hash --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 6caae6e9d7..c1c614ec5b 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 6caae6e9d724087317ad8b8a251c4f195abcb590 +Subproject commit c1c614ec5be57aa5742495aea2a875fee6ad7fc7 From 65817bd3d7a3397007326bd3c7005ca96b73968c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Nov 2020 07:42:37 +0000 Subject: [PATCH 85/94] Bump gutenberg from `f06dcd9` to `c531129` Bumps [gutenberg](https://github.com/WordPress/gutenberg) from `f06dcd9` to `c531129`. - [Release notes](https://github.com/WordPress/gutenberg/releases) - [Commits](https://github.com/WordPress/gutenberg/compare/f06dcd92b067ddb0954d27e382a3625f4744f25c...c5311290d940fecbd75502722e9e411974531036) Signed-off-by: dependabot[bot] --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index f06dcd92b0..c5311290d9 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit f06dcd92b067ddb0954d27e382a3625f4744f25c +Subproject commit c5311290d940fecbd75502722e9e411974531036 From ba05bdd0658f3bd4600df7ff213882ddc0f615b4 Mon Sep 17 00:00:00 2001 From: Ceyhun Ozugur Date: Mon, 9 Nov 2020 12:27:25 +0100 Subject: [PATCH 86/94] Run full e2e test suite on dependabot submodule update prs and post failures to slack --- .circleci/config.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8f8941b4b3..403926ab63 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -274,6 +274,18 @@ workflows: requires: [ "Optional UI Tests" ] - android-native-unit-tests: name: Android Native Unit Tests + - ios-device-checks: + name: Test iOS on Device - Submodule Update + post-to-slack: true + filters: + branches: + only: /^dependabot/submodules/.*/ + - android-device-checks: + name: Test Android on Device - Submodule Update + post-to-slack: true + filters: + branches: + only: /^dependabot/submodules/.*/ ui-tests-full-scheduled: jobs: From a6233e79e1b984de78d7ac9fd6439afc10c47d02 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Nov 2020 12:01:33 +0000 Subject: [PATCH 87/94] Bump jetpack from `664f027` to `b7ccbb1` Bumps [jetpack](https://github.com/Automattic/jetpack) from `664f027` to `b7ccbb1`. - [Release notes](https://github.com/Automattic/jetpack/releases) - [Commits](https://github.com/Automattic/jetpack/compare/664f02770c117ec2a22250b3639afdc9533be41a...b7ccbb1d60d8d0a1463711836a810d1d5f012728) Signed-off-by: dependabot[bot] --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index 664f02770c..b7ccbb1d60 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 664f02770c117ec2a22250b3639afdc9533be41a +Subproject commit b7ccbb1d60d8d0a1463711836a810d1d5f012728 From 3d70f50bcfd460c9be2113f4b265cb65548ae967 Mon Sep 17 00:00:00 2001 From: Ceyhun Ozugur Date: Mon, 9 Nov 2020 14:52:54 +0100 Subject: [PATCH 88/94] Update config to auto-merge gutenberg and jetpack --- .github/dependabot.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3e149c95b3..e9553ec2e5 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,3 +9,8 @@ updates: directory: "/" # Location of package manifests schedule: interval: "daily" + automerged_updates: + - match: + dependency_name: "gutenberg" + - match: + dependency_name: "jetpack" From 6feececdc895de22299221d5e52eba45328a09a3 Mon Sep 17 00:00:00 2001 From: Ceyhun Ozugur Date: Mon, 9 Nov 2020 14:58:50 +0100 Subject: [PATCH 89/94] Revert "Update config to auto-merge gutenberg and jetpack" This reverts commit 3d70f50bcfd460c9be2113f4b265cb65548ae967. --- .github/dependabot.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e9553ec2e5..3e149c95b3 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,8 +9,3 @@ updates: directory: "/" # Location of package manifests schedule: interval: "daily" - automerged_updates: - - match: - dependency_name: "gutenberg" - - match: - dependency_name: "jetpack" From 18a9c7593f74ecd0823dded3e411d249fe31ba2f Mon Sep 17 00:00:00 2001 From: Ceyhun Ozugur Date: Mon, 9 Nov 2020 15:55:38 +0100 Subject: [PATCH 90/94] Ignore 'Optional UI Tests' on dependabot submodule branches --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 403926ab63..d4d8d45dda 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -266,6 +266,7 @@ workflows: branches: ignore: - develop + - /^dependabot/submodules/.*/ - ios-device-checks: name: Test iOS on Device - Full requires: [ "Optional UI Tests" ] From 25d6ae13096dd2d6a430ddd53d0bf1d2251eca63 Mon Sep 17 00:00:00 2001 From: Ceyhun Ozugur Date: Mon, 9 Nov 2020 15:56:41 +0100 Subject: [PATCH 91/94] Rename job --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d4d8d45dda..a5a266125c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -276,13 +276,13 @@ workflows: - android-native-unit-tests: name: Android Native Unit Tests - ios-device-checks: - name: Test iOS on Device - Submodule Update + name: Test iOS on Device - Full post-to-slack: true filters: branches: only: /^dependabot/submodules/.*/ - android-device-checks: - name: Test Android on Device - Submodule Update + name: Test Android on Device - Full post-to-slack: true filters: branches: From d650829a0ee494c026f650dfe154e45cd754040f Mon Sep 17 00:00:00 2001 From: Ceyhun Ozugur Date: Mon, 9 Nov 2020 15:58:17 +0100 Subject: [PATCH 92/94] Rename job --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a5a266125c..47c3e28861 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -276,13 +276,13 @@ workflows: - android-native-unit-tests: name: Android Native Unit Tests - ios-device-checks: - name: Test iOS on Device - Full + name: Test iOS on Device - Full (Submodule Update) post-to-slack: true filters: branches: only: /^dependabot/submodules/.*/ - android-device-checks: - name: Test Android on Device - Full + name: Test Android on Device - Full (Submodule Update) post-to-slack: true filters: branches: From 92598b5f509e9e5b10747b612e1ceb4d9fab98c3 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Tue, 10 Nov 2020 23:38:37 -0300 Subject: [PATCH 93/94] moved __DEV__ flag to contact-info block availability decl only --- src/jetpack-editor-setup.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/jetpack-editor-setup.js b/src/jetpack-editor-setup.js index 898d2ec9f6..dcc1e65c57 100644 --- a/src/jetpack-editor-setup.js +++ b/src/jetpack-editor-setup.js @@ -10,7 +10,7 @@ import { dispatch, select } from '@wordpress/data'; // When adding new blocks to this list please also consider updating ./block-support/supported-blocks.json const supportedJetpackBlocks = { 'contact-info': { - available: true, + available: __DEV__, }, story: { available: true, @@ -64,9 +64,7 @@ export default ( jetpackState ) => { } } ); - if ( __DEV__ ) { - require( '../jetpack/extensions/editor' ); - } + require( '../jetpack/extensions/editor' ); return jetpackData; }; From e80e0b9265280433f1485f42d0c342cde3b8ac0f Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Sat, 14 Nov 2020 02:22:09 -0300 Subject: [PATCH 94/94] updated jetpack and gutenberg commit hashes with revert-revert, bringing Stories back in --- gutenberg | 2 +- jetpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index bc3dc55392..85eecf58b1 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit bc3dc553925436054a04c261d2e189fba53e1d82 +Subproject commit 85eecf58b1f723fa575229b33bd60446b48edd83 diff --git a/jetpack b/jetpack index f940f854dc..81ec9fc23f 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit f940f854dc9b8a26c826f11f13ecd9565303522c +Subproject commit 81ec9fc23f8508c59b84599a7e6aac701588d371