From a94276e35a6aa969380a984eaa7abfe40cc73814 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Fri, 11 Jun 2021 13:30:59 +0300 Subject: [PATCH 01/12] Release script: Update react-native-editor version to 1.55.0 --- packages/react-native-aztec/package.json | 2 +- packages/react-native-bridge/package.json | 2 +- packages/react-native-editor/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/react-native-aztec/package.json b/packages/react-native-aztec/package.json index 7c47e5964d5daa..ed72b6fd23b48d 100644 --- a/packages/react-native-aztec/package.json +++ b/packages/react-native-aztec/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/react-native-aztec", - "version": "1.54.0", + "version": "1.55.0", "description": "Aztec view for react-native.", "private": true, "author": "The WordPress Contributors", diff --git a/packages/react-native-bridge/package.json b/packages/react-native-bridge/package.json index fdd53933a72444..16a11e473eab55 100644 --- a/packages/react-native-bridge/package.json +++ b/packages/react-native-bridge/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/react-native-bridge", - "version": "1.54.0", + "version": "1.55.0", "description": "Native bridge library used to integrate the block editor into a native App.", "private": true, "author": "The WordPress Contributors", diff --git a/packages/react-native-editor/package.json b/packages/react-native-editor/package.json index a9c1b9042cd471..04278129959912 100644 --- a/packages/react-native-editor/package.json +++ b/packages/react-native-editor/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/react-native-editor", - "version": "1.54.0", + "version": "1.55.0", "description": "Mobile WordPress gutenberg editor.", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", From 02aa538a9fe401d251367d1670b77bba485b2bf9 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Fri, 11 Jun 2021 13:32:28 +0300 Subject: [PATCH 02/12] Release script: Update with changes from 'npm run core preios' --- packages/react-native-editor/ios/Podfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/react-native-editor/ios/Podfile.lock b/packages/react-native-editor/ios/Podfile.lock index c9e33cd1fc39a1..c75a570aace527 100644 --- a/packages/react-native-editor/ios/Podfile.lock +++ b/packages/react-native-editor/ios/Podfile.lock @@ -21,7 +21,7 @@ PODS: - DoubleConversion - glog - glog (0.3.5) - - Gutenberg (1.54.0): + - Gutenberg (1.55.0): - React-Core (= 0.61.5) - React-CoreModules (= 0.61.5) - React-RCTImage (= 0.61.5) @@ -253,7 +253,7 @@ PODS: - React-Core - RNSVG (9.13.6-gb): - React-Core - - RNTAztecView (1.54.0): + - RNTAztecView (1.55.0): - React-Core - WordPress-Aztec-iOS (~> 1.19.4) - WordPress-Aztec-iOS (1.19.4) @@ -402,7 +402,7 @@ SPEC CHECKSUMS: FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75 Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 glog: 1f3da668190260b06b429bb211bfbee5cd790c28 - Gutenberg: ad322d180eef826134153279d3bbde56a4b43d01 + Gutenberg: 6199021f2cf2b2cdab42cbc1249123ec4a189472 RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1 RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320 React: b6a59ef847b2b40bb6e0180a97d0ca716969ac78 @@ -435,7 +435,7 @@ SPEC CHECKSUMS: RNReanimated: f05baf4cd76b6eab2e4d7e2b244424960b968918 RNScreens: 953633729a42e23ad0c93574d676b361e3335e8b RNSVG: 46c4b680fe18237fa01eb7d7b311d77618fde31f - RNTAztecView: c5491bca29f7ff3da92f4a82cae82cc751d67aa7 + RNTAztecView: b36187f6d434a4f3b0ebdd423ca8651889d8c6cf WordPress-Aztec-iOS: 870c93297849072aadfc2223e284094e73023e82 Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b From 94ef35fdbf45e61313c540a1e139eb3ac672f763 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Thu, 17 Jun 2021 16:03:01 +0200 Subject: [PATCH 03/12] Release script: Update react-native-editor version to 1.55.1 --- packages/react-native-aztec/package.json | 2 +- packages/react-native-bridge/package.json | 2 +- packages/react-native-editor/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/react-native-aztec/package.json b/packages/react-native-aztec/package.json index ed72b6fd23b48d..f3d39f2505e16c 100644 --- a/packages/react-native-aztec/package.json +++ b/packages/react-native-aztec/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/react-native-aztec", - "version": "1.55.0", + "version": "1.55.1", "description": "Aztec view for react-native.", "private": true, "author": "The WordPress Contributors", diff --git a/packages/react-native-bridge/package.json b/packages/react-native-bridge/package.json index 16a11e473eab55..87ec8380b1a861 100644 --- a/packages/react-native-bridge/package.json +++ b/packages/react-native-bridge/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/react-native-bridge", - "version": "1.55.0", + "version": "1.55.1", "description": "Native bridge library used to integrate the block editor into a native App.", "private": true, "author": "The WordPress Contributors", diff --git a/packages/react-native-editor/package.json b/packages/react-native-editor/package.json index 04278129959912..5fe3b54a8f43bb 100644 --- a/packages/react-native-editor/package.json +++ b/packages/react-native-editor/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/react-native-editor", - "version": "1.55.0", + "version": "1.55.1", "description": "Mobile WordPress gutenberg editor.", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", From 0213960dfff111397307f4d394eef27e1ecd8673 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Thu, 17 Jun 2021 16:03:18 +0200 Subject: [PATCH 04/12] Release script: Update with changes from 'npm run core preios' --- packages/react-native-editor/ios/Podfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/react-native-editor/ios/Podfile.lock b/packages/react-native-editor/ios/Podfile.lock index c75a570aace527..3647249c8763b3 100644 --- a/packages/react-native-editor/ios/Podfile.lock +++ b/packages/react-native-editor/ios/Podfile.lock @@ -21,7 +21,7 @@ PODS: - DoubleConversion - glog - glog (0.3.5) - - Gutenberg (1.55.0): + - Gutenberg (1.55.1): - React-Core (= 0.61.5) - React-CoreModules (= 0.61.5) - React-RCTImage (= 0.61.5) @@ -253,7 +253,7 @@ PODS: - React-Core - RNSVG (9.13.6-gb): - React-Core - - RNTAztecView (1.55.0): + - RNTAztecView (1.55.1): - React-Core - WordPress-Aztec-iOS (~> 1.19.4) - WordPress-Aztec-iOS (1.19.4) @@ -402,7 +402,7 @@ SPEC CHECKSUMS: FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75 Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 glog: 1f3da668190260b06b429bb211bfbee5cd790c28 - Gutenberg: 6199021f2cf2b2cdab42cbc1249123ec4a189472 + Gutenberg: 3f2cc06c377a622ef87a025e5213a610919632db RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1 RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320 React: b6a59ef847b2b40bb6e0180a97d0ca716969ac78 @@ -435,7 +435,7 @@ SPEC CHECKSUMS: RNReanimated: f05baf4cd76b6eab2e4d7e2b244424960b968918 RNScreens: 953633729a42e23ad0c93574d676b361e3335e8b RNSVG: 46c4b680fe18237fa01eb7d7b311d77618fde31f - RNTAztecView: b36187f6d434a4f3b0ebdd423ca8651889d8c6cf + RNTAztecView: c841a326e7a994bbeeb1fa9e2e54db3f07915ca3 WordPress-Aztec-iOS: 870c93297849072aadfc2223e284094e73023e82 Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b From facf3936118749c66ed464cacc8c658631bacba0 Mon Sep 17 00:00:00 2001 From: Enej Bajgoric Date: Wed, 16 Jun 2021 10:54:33 -0700 Subject: [PATCH 05/12] Fix: RNMobile borderRadius value setting (#32717) --- .../block-library/src/button/edit.native.js | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/packages/block-library/src/button/edit.native.js b/packages/block-library/src/button/edit.native.js index 7818d3e37d197a..458e145682ed77 100644 --- a/packages/block-library/src/button/edit.native.js +++ b/packages/block-library/src/button/edit.native.js @@ -235,11 +235,18 @@ class ButtonEdit extends Component { setAttributes( { text: value } ); } - onChangeBorderRadius( value ) { - const { setAttributes } = this.props; - setAttributes( { - borderRadius: value, - } ); + onChangeBorderRadius( newRadius ) { + const { setAttributes, attributes } = this.props; + const { style } = attributes; + const newStyle = { + ...style, + border: { + ...style?.border, + radius: newRadius, + }, + }; + + setAttributes( { style: newStyle } ); } onShowLinkSettings() { @@ -373,7 +380,7 @@ class ButtonEdit extends Component { const { placeholder, text, - borderRadius, + style, url, align = 'center', width, @@ -385,6 +392,8 @@ class ButtonEdit extends Component { return null; } + const borderRadius = style?.border?.radius; + const borderRadiusValue = Number.isInteger( borderRadius ) ? borderRadius : styles.defaultButton.borderRadius; From d4b3deb85dabd4efaa6a005497a61df711b17658 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Thu, 17 Jun 2021 09:15:07 +0200 Subject: [PATCH 06/12] [RNMobile] Improve unsupported block message for reusable block (#32618) * Improve unsupported block message for reusable block The unsupported block message has been updated and the convert to regular blocks button has been also included. * Update unsupported block message of reusable block --- .../block-library/src/block/edit.native.js | 61 +++++++++++++++++-- .../src/block/editor.native.scss | 18 ++++++ 2 files changed, 73 insertions(+), 6 deletions(-) diff --git a/packages/block-library/src/block/edit.native.js b/packages/block-library/src/block/edit.native.js index 074dc9ee704c80..14e8cb5efbb485 100644 --- a/packages/block-library/src/block/edit.native.js +++ b/packages/block-library/src/block/edit.native.js @@ -12,23 +12,30 @@ import { /** * WordPress dependencies */ -import { useState } from '@wordpress/element'; +import { useState, useCallback } from '@wordpress/element'; import { useEntityBlockEditor, useEntityProp, store as coreStore, } from '@wordpress/core-data'; -import { BottomSheet, Icon, Disabled } from '@wordpress/components'; -import { useSelect } from '@wordpress/data'; -import { __ } from '@wordpress/i18n'; +import { + BottomSheet, + Icon, + Disabled, + TextControl, +} from '@wordpress/components'; +import { useSelect, useDispatch } from '@wordpress/data'; +import { __, sprintf } from '@wordpress/i18n'; import { __experimentalUseNoRecursiveRenders as useNoRecursiveRenders, InnerBlocks, Warning, + store as blockEditorStore, } from '@wordpress/block-editor'; import { usePreferredColorSchemeStyle } from '@wordpress/compose'; import { help } from '@wordpress/icons'; import { store as reusableBlocksStore } from '@wordpress/reusable-blocks'; +import { store as noticesStore } from '@wordpress/notices'; /** * Internal dependencies @@ -58,6 +65,14 @@ export default function ReusableBlockEdit( { styles.infoSheetIcon, styles.infoSheetIconDark ); + const infoDescriptionStyle = usePreferredColorSchemeStyle( + styles.infoDescription, + styles.infoDescriptionDark + ); + const actionButtonStyle = usePreferredColorSchemeStyle( + styles.actionButton, + styles.actionButtonDark + ); const spinnerStyle = usePreferredColorSchemeStyle( styles.spinner, styles.spinnerDark @@ -88,6 +103,12 @@ export default function ReusableBlockEdit( { [ ref, clientId ] ); + const { createSuccessNotice } = useDispatch( noticesStore ); + const { + __experimentalConvertBlockToStatic: convertBlockToStatic, + } = useDispatch( reusableBlocksStore ); + const { clearSelectedBlock } = useDispatch( blockEditorStore ); + const [ blocks, onInput, onChange ] = useEntityBlockEditor( 'postType', 'wp_block', @@ -104,13 +125,30 @@ export default function ReusableBlockEdit( { setShowHelp( false ); } + const onConvertToRegularBlocks = useCallback( () => { + createSuccessNotice( + sprintf( + /* translators: %s: name of the reusable block */ + __( '%s converted to regular blocks' ), + title + ) + ); + + clearSelectedBlock(); + // Convert action is executed at the end of the current JavaScript execution block + // to prevent issues related to undo/redo actions. + setImmediate( () => convertBlockToStatic( clientId ) ); + }, [ title, clientId ] ); + function renderSheet() { const infoTitle = Platform.OS === 'android' ? __( - "Reusable blocks aren't editable on WordPress for Android" + 'Editing reusable blocks is not yet supported on WordPress for Android' ) - : __( "Reusable blocks aren't editable on WordPress for iOS" ); + : __( + 'Editing reusable blocks is not yet supported on WordPress for iOS' + ); return ( { infoTitle } + + { __( + 'Alternatively, you can detach and edit these blocks separately by tapping "Convert to regular blocks".' + ) } + + ); diff --git a/packages/block-library/src/block/editor.native.scss b/packages/block-library/src/block/editor.native.scss index d69d9ee78162fa..3aa23e0ddd20ea 100644 --- a/packages/block-library/src/block/editor.native.scss +++ b/packages/block-library/src/block/editor.native.scss @@ -94,6 +94,24 @@ color: $white; } +.infoDescription { + padding-bottom: 24; + font-size: 16; + color: $gray-darken-20; +} + +.infoDescriptionDark { + color: $gray-20; +} + +.actionButton { + color: $blue-50; +} + +.actionButtonDark { + color: $blue-30; +} + .spinner { height: $grid-unit-60; border-width: $border-width; From 88d760138c266a373d3884f059e0ab4d78b79bde Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 18 Jun 2021 10:34:27 +0200 Subject: [PATCH 07/12] Update react-native-editor changelog --- packages/react-native-editor/CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md index ba64ae5fa2417e..83305b7c221271 100644 --- a/packages/react-native-editor/CHANGELOG.md +++ b/packages/react-native-editor/CHANGELOG.md @@ -10,6 +10,12 @@ For each user feature we should also add a importance categorization label to i --> ## Unreleased + +## 1.55.1 +- [*] Fix: RNMobile borderRadius value setting [#32717] +- [*] Improve unsupported block message for reusable block [#32618] + +## 1.55.0 - [*] Gallery block - Fix gallery images caption text formatting [#32351] - [*] Image block: "Set as featured" button within image block settings. (Android only) [#31705] - [***] Audio block now available on WP.com sites on the free plan. [#31966] From 0bcb8a8cedcd6164e0a6a26a8b7b3cd939078a1d Mon Sep 17 00:00:00 2001 From: David Calhoun <438664+dcalhoun@users.noreply.github.com> Date: Tue, 22 Jun 2021 09:19:16 -0500 Subject: [PATCH 08/12] Release script: Update react-native-editor version to 1.55.2 --- packages/react-native-aztec/package.json | 2 +- packages/react-native-bridge/package.json | 2 +- packages/react-native-editor/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/react-native-aztec/package.json b/packages/react-native-aztec/package.json index f3d39f2505e16c..94cd9b18ac9c9d 100644 --- a/packages/react-native-aztec/package.json +++ b/packages/react-native-aztec/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/react-native-aztec", - "version": "1.55.1", + "version": "1.55.2", "description": "Aztec view for react-native.", "private": true, "author": "The WordPress Contributors", diff --git a/packages/react-native-bridge/package.json b/packages/react-native-bridge/package.json index 87ec8380b1a861..fe2a4436570e8e 100644 --- a/packages/react-native-bridge/package.json +++ b/packages/react-native-bridge/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/react-native-bridge", - "version": "1.55.1", + "version": "1.55.2", "description": "Native bridge library used to integrate the block editor into a native App.", "private": true, "author": "The WordPress Contributors", diff --git a/packages/react-native-editor/package.json b/packages/react-native-editor/package.json index 5fe3b54a8f43bb..d2ddc2ddfa9158 100644 --- a/packages/react-native-editor/package.json +++ b/packages/react-native-editor/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/react-native-editor", - "version": "1.55.1", + "version": "1.55.2", "description": "Mobile WordPress gutenberg editor.", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", From d6401d5d6e77f2b20f281cdd2a85bab3a952edc5 Mon Sep 17 00:00:00 2001 From: David Calhoun <438664+dcalhoun@users.noreply.github.com> Date: Tue, 22 Jun 2021 09:20:28 -0500 Subject: [PATCH 09/12] Release script: Update with changes from 'npm run core preios' --- packages/react-native-editor/ios/Podfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/react-native-editor/ios/Podfile.lock b/packages/react-native-editor/ios/Podfile.lock index 3647249c8763b3..6aa7c81ba16b18 100644 --- a/packages/react-native-editor/ios/Podfile.lock +++ b/packages/react-native-editor/ios/Podfile.lock @@ -21,7 +21,7 @@ PODS: - DoubleConversion - glog - glog (0.3.5) - - Gutenberg (1.55.1): + - Gutenberg (1.55.2): - React-Core (= 0.61.5) - React-CoreModules (= 0.61.5) - React-RCTImage (= 0.61.5) @@ -253,7 +253,7 @@ PODS: - React-Core - RNSVG (9.13.6-gb): - React-Core - - RNTAztecView (1.55.1): + - RNTAztecView (1.55.2): - React-Core - WordPress-Aztec-iOS (~> 1.19.4) - WordPress-Aztec-iOS (1.19.4) @@ -402,7 +402,7 @@ SPEC CHECKSUMS: FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75 Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 glog: 1f3da668190260b06b429bb211bfbee5cd790c28 - Gutenberg: 3f2cc06c377a622ef87a025e5213a610919632db + Gutenberg: 25004d19897e3b8ad7439131ad3b8a92cb06f5a3 RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1 RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320 React: b6a59ef847b2b40bb6e0180a97d0ca716969ac78 @@ -435,7 +435,7 @@ SPEC CHECKSUMS: RNReanimated: f05baf4cd76b6eab2e4d7e2b244424960b968918 RNScreens: 953633729a42e23ad0c93574d676b361e3335e8b RNSVG: 46c4b680fe18237fa01eb7d7b311d77618fde31f - RNTAztecView: c841a326e7a994bbeeb1fa9e2e54db3f07915ca3 + RNTAztecView: 4a25067d531ba62f2e0595b513d34477a538988f WordPress-Aztec-iOS: 870c93297849072aadfc2223e284094e73023e82 Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b From 09119311a7e527c5d4be3ad3718bf27a030e472b Mon Sep 17 00:00:00 2001 From: David Calhoun <438664+dcalhoun@users.noreply.github.com> Date: Mon, 21 Jun 2021 11:21:41 -0500 Subject: [PATCH 10/12] Fix incorrect block insertion point after blurring post title (#32831) Selecting the title selection status within the same `useSelect` for reusable blocks caused the title selection status to become stale, due to the dependency array for the `useSelect` hook. The staleness caused the block insertion point to show up in the incorrect location after blurring the title text input. --- .../provider/use-block-editor-settings.native.js | 7 +++++-- packages/react-native-editor/CHANGELOG.md | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/editor/src/components/provider/use-block-editor-settings.native.js b/packages/editor/src/components/provider/use-block-editor-settings.native.js index 8baf2371442b2e..64522abd27e181 100644 --- a/packages/editor/src/components/provider/use-block-editor-settings.native.js +++ b/packages/editor/src/components/provider/use-block-editor-settings.native.js @@ -16,7 +16,7 @@ function useNativeBlockEditorSettings( settings, hasTemplate ) { const editorSettings = useBlockEditorSettings( settings, hasTemplate ); const supportReusableBlock = capabilities.reusableBlock === true; - const { isTitleSelected, reusableBlocks } = useSelect( + const { reusableBlocks } = useSelect( ( select ) => ( { reusableBlocks: supportReusableBlock ? select( coreStore ).getEntityRecords( @@ -27,11 +27,14 @@ function useNativeBlockEditorSettings( settings, hasTemplate ) { { per_page: 100 } ) : [], - isTitleSelected: select( editorStore ).isPostTitleSelected(), } ), [ supportReusableBlock ] ); + const { isTitleSelected } = useSelect( ( select ) => ( { + isTitleSelected: select( editorStore ).isPostTitleSelected(), + } ) ); + return useMemo( () => ( { ...editorSettings, diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md index 83305b7c221271..e4e4ae352ac9e5 100644 --- a/packages/react-native-editor/CHANGELOG.md +++ b/packages/react-native-editor/CHANGELOG.md @@ -10,6 +10,7 @@ For each user feature we should also add a importance categorization label to i --> ## Unreleased +- [**] Fix incorrect block insertion point after blurring the post title field. [#32831] ## 1.55.1 - [*] Fix: RNMobile borderRadius value setting [#32717] From 657f47104fc2a5f42d92b23748b3561cef0b5abb Mon Sep 17 00:00:00 2001 From: David Calhoun <438664+dcalhoun@users.noreply.github.com> Date: Tue, 22 Jun 2021 10:11:04 -0500 Subject: [PATCH 11/12] Update changelog --- packages/react-native-editor/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md index e4e4ae352ac9e5..ce0e44ea3bdae1 100644 --- a/packages/react-native-editor/CHANGELOG.md +++ b/packages/react-native-editor/CHANGELOG.md @@ -10,6 +10,8 @@ For each user feature we should also add a importance categorization label to i --> ## Unreleased + +## 1.55.2 - [**] Fix incorrect block insertion point after blurring the post title field. [#32831] ## 1.55.1 From 3356cc157f8f17c9c2bf7bbf1468642a490d24ee Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Mon, 21 Jun 2021 14:37:50 -0400 Subject: [PATCH 12/12] Properly handle 404 errors while publishing Android artifacts (#32860) --- packages/react-native-aztec/android/build.gradle | 4 ++-- .../android/react-native-bridge/build.gradle | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/react-native-aztec/android/build.gradle b/packages/react-native-aztec/android/build.gradle index f0137889fc9fc6..ccb3f91a6e4c71 100644 --- a/packages/react-native-aztec/android/build.gradle +++ b/packages/react-native-aztec/android/build.gradle @@ -170,8 +170,8 @@ tasks.register('checkIfVersionIsAlreadyPublished') { if (responseCode == 200) { throw new GradleException("'$publishReactNativeAztecVersion' is already published, please use a different version name. If this happened in CI for a PR, a new commit is necessary. If this happened for a tag, the existing version needs to be manually removed from S3.") - } else if (responseCode == 403) { - // S3 returns 403 status code if a file doesn't exist, which is what we want. Proceed to publish.. + } else if (responseCode == 403 || responseCode == 404) { + // If a file doesn't exist, which is what we want, S3 returns 403 if we don't have the List ACL or 404 if we do have the List ACL. Proceed to publish in those cases. } else { throw new GradleException("An unexpected status code ($responseCode) was received while checking if the version ($publishReactNativeAztecVersion) is already published to S3. If this issue persists, please contact Platform 9 team for help.") } diff --git a/packages/react-native-bridge/android/react-native-bridge/build.gradle b/packages/react-native-bridge/android/react-native-bridge/build.gradle index 9e4aeb42401928..4d9eda3548818c 100644 --- a/packages/react-native-bridge/android/react-native-bridge/build.gradle +++ b/packages/react-native-bridge/android/react-native-bridge/build.gradle @@ -182,8 +182,8 @@ tasks.register('checkIfVersionIsAlreadyPublished') { if (responseCode == 200) { throw new GradleException("'$publishReactNativeBridgeVersion' is already published, please use a different version name. If this happened in CI for a PR, a new commit is necessary. If this happened for a tag, the existing version needs to be manually removed from S3.") - } else if (responseCode == 403) { - // S3 returns 403 status code if a file doesn't exist, which is what we want. Proceed to publish.. + } else if (responseCode == 403 || responseCode == 404) { + // If a file doesn't exist, which is what we want, S3 returns 403 if we don't have the List ACL or 404 if we do have the List ACL. Proceed to publish in those cases. } else { throw new GradleException("An unexpected status code ($responseCode) was received while checking if the version ($publishReactNativeBridgeVersion) is already published to S3. If this issue persists, please contact Platform 9 team for help.") }