From 70f1b39c656c537bc87e20266ca62fb064fe2ac2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 19:53:25 +0000 Subject: [PATCH 1/2] Bump prettier from 3.1.0 to 3.2.5 Bumps [prettier](https://github.com/prettier/prettier) from 3.1.0 to 3.2.5. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/3.1.0...3.2.5) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 20c53137c03..0721af54ea3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -77,7 +77,7 @@ "postcss-import": "15.1.0", "postcss-nested": "6.0.1", "postcss-preset-env": "9.3.0", - "prettier": "3.1.0", + "prettier": "3.2.5", "puppeteer": "21.7.0", "react-test-renderer": "18.2.0", "rtlcss-webpack-plugin": "4.0.7", @@ -24914,9 +24914,9 @@ } }, "node_modules/prettier": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz", - "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==", + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", + "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" diff --git a/package.json b/package.json index c148e8eb733..fa93b1242f8 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "postcss-import": "15.1.0", "postcss-nested": "6.0.1", "postcss-preset-env": "9.3.0", - "prettier": "3.1.0", + "prettier": "3.2.5", "puppeteer": "21.7.0", "react-test-renderer": "18.2.0", "rtlcss-webpack-plugin": "4.0.7", From e821ac557d2cbd8d7f898c4c976f490922bd9452 Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Wed, 7 Feb 2024 12:03:19 -0800 Subject: [PATCH 2/2] Fix prettier whitespace issues --- .../components/amp-document-status/index.js | 6 +++--- .../components/error/error-panel-title.js | 2 +- assets/src/block-validation/components/sidebar/index.js | 2 +- assets/src/components/site-scan-context-provider/index.js | 2 +- .../site-scan-results/plugins-with-amp-incompatibility.js | 2 +- .../site-scan-results/themes-with-amp-incompatibility.js | 2 +- assets/src/onboarding-wizard/components/nav/index.js | 4 ++-- assets/src/onboarding-wizard/pages/site-scan/index.js | 8 ++++---- assets/src/settings-page/site-scan.js | 2 +- assets/src/settings-page/supported-templates.js | 2 +- webpack.config.js | 4 ++-- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/assets/src/block-validation/components/amp-document-status/index.js b/assets/src/block-validation/components/amp-document-status/index.js index dd3f39c5a83..d38996a5534 100644 --- a/assets/src/block-validation/components/amp-document-status/index.js +++ b/assets/src/block-validation/components/amp-document-status/index.js @@ -94,11 +94,11 @@ export default function AMPDocumentStatusNotification() { ? __( 'Content may have changed. Trigger validation in the AMP Validation sidebar.', 'amp' - ) + ) : __( 'Content has changed. Trigger validation in the AMP Validation sidebar.', 'amp' - ) + ) } isSmall={true} /> @@ -213,7 +213,7 @@ export default function AMPDocumentStatusNotification() { 'amp' ), reviewedValidationErrorCount - ) + ) : __('No AMP validation issues detected.', 'amp') } isSmall={true} diff --git a/assets/src/block-validation/components/error/error-panel-title.js b/assets/src/block-validation/components/error/error-panel-title.js index dab6c026a39..01a41695498 100644 --- a/assets/src/block-validation/components/error/error-panel-title.js +++ b/assets/src/block-validation/components/error/error-panel-title.js @@ -31,7 +31,7 @@ export function ErrorPanelTitle({ kept, title, error: { type } }) { ? __( 'This error has been kept, making this URL not AMP-compatible.', 'amp' - ) + ) : '' } > diff --git a/assets/src/block-validation/components/sidebar/index.js b/assets/src/block-validation/components/sidebar/index.js index d3874b75799..46891494b94 100644 --- a/assets/src/block-validation/components/sidebar/index.js +++ b/assets/src/block-validation/components/sidebar/index.js @@ -30,7 +30,7 @@ export function Sidebar() { ? select(blockValidationStore).getValidationErrors() : select( blockValidationStore - ).getUnreviewedValidationErrors(), + ).getUnreviewedValidationErrors(), hasReviewedValidationErrors: select(blockValidationStore).getReviewedValidationErrors() ?.length > 0, diff --git a/assets/src/components/site-scan-context-provider/index.js b/assets/src/components/site-scan-context-provider/index.js index 4717665f8f4..c141a1768bd 100644 --- a/assets/src/components/site-scan-context-provider/index.js +++ b/assets/src/components/site-scan-context-provider/index.js @@ -610,7 +610,7 @@ export function SiteScanContextProvider({ ? Math.min( scannableUrls.length, ...urlIndexesPendingScan - ) + ) : 0) - 1, stale, startSiteScan, diff --git a/assets/src/components/site-scan-results/plugins-with-amp-incompatibility.js b/assets/src/components/site-scan-results/plugins-with-amp-incompatibility.js index 638ce538fce..8940f6ff2e7 100644 --- a/assets/src/components/site-scan-results/plugins-with-amp-incompatibility.js +++ b/assets/src/components/site-scan-results/plugins-with-amp-incompatibility.js @@ -86,7 +86,7 @@ export function PluginsWithAmpIncompatibility({ ), } - ) + ) : ''}

)} diff --git a/assets/src/components/site-scan-results/themes-with-amp-incompatibility.js b/assets/src/components/site-scan-results/themes-with-amp-incompatibility.js index c3814b58bbe..34126cfc138 100644 --- a/assets/src/components/site-scan-results/themes-with-amp-incompatibility.js +++ b/assets/src/components/site-scan-results/themes-with-amp-incompatibility.js @@ -99,7 +99,7 @@ export function ThemesWithAmpIncompatibility({ ), } - ) + ) : ''}

)} diff --git a/assets/src/onboarding-wizard/components/nav/index.js b/assets/src/onboarding-wizard/components/nav/index.js index 011b9e7392a..e6588eb1317 100644 --- a/assets/src/onboarding-wizard/components/nav/index.js +++ b/assets/src/onboarding-wizard/components/nav/index.js @@ -110,9 +110,9 @@ export function Nav({ closeLink, finishLink }) { ? { 'autofocus[panel]': 'amp_panel', url: previewPermalink, - } + } : { url: previewPermalink, [AMP_QUERY_VAR]: '1' } - ) + ) : undefined; } else if (isLastPage) { nextText = __('Finish', 'amp'); diff --git a/assets/src/onboarding-wizard/pages/site-scan/index.js b/assets/src/onboarding-wizard/pages/site-scan/index.js index 27744b97b16..180fbe050cd 100644 --- a/assets/src/onboarding-wizard/pages/site-scan/index.js +++ b/assets/src/onboarding-wizard/pages/site-scan/index.js @@ -117,11 +117,11 @@ export function SiteScan() { ? __( 'Site scan found issues on your site. Proceed to the next step to follow recommendations for choosing a template mode.', 'amp' - ) + ) : __( 'Site scan found no issues on your site. Proceed to the next step to follow recommendations for choosing a template mode.', 'amp' - )} + )}

} > @@ -175,7 +175,7 @@ export function SiteScan() { isCompleted ? 100 : (scannedUrlsMaxIndex / scannableUrls.length) * - 100 + 100 } />

@@ -190,7 +190,7 @@ export function SiteScan() { scannedUrlsMaxIndex + 1, scannableUrls.length, scannableUrls[scannedUrlsMaxIndex]?.label - )} + )}

} diff --git a/assets/src/settings-page/site-scan.js b/assets/src/settings-page/site-scan.js index 98eb774fd8f..0cd49e0185f 100644 --- a/assets/src/settings-page/site-scan.js +++ b/assets/src/settings-page/site-scan.js @@ -297,7 +297,7 @@ function SiteScanInProgress() { scannedUrlsMaxIndex + 1, scannableUrls.length, scannableUrls[scannedUrlsMaxIndex]?.label - )} + )}

); diff --git a/assets/src/settings-page/supported-templates.js b/assets/src/settings-page/supported-templates.js index a3967ae136a..74cfd3962c1 100644 --- a/assets/src/settings-page/supported-templates.js +++ b/assets/src/settings-page/supported-templates.js @@ -197,7 +197,7 @@ export function SupportedTemplatesCheckboxes({ supportableTemplates }) { supportableTemplate.id ) ); - }); + }); return (
    diff --git a/webpack.config.js b/webpack.config.js index 7df221e3c6d..cd53e55f576 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -44,7 +44,7 @@ const preparePackagesSchema = (packages = []) => { ? 'i18n' : camelCaseDash( packageName.replace(WORDPRESS_NAMESPACE, '') - ); + ); const handle = packageName.replace(WORDPRESS_NAMESPACE, 'wp-'); @@ -54,7 +54,7 @@ const preparePackagesSchema = (packages = []) => { 'polyfill' === camelCaseName ? require.resolve( '@wordpress/babel-preset-default/build/polyfill' - ) + ) : packageName, handle, packageName,