Skip to content

Commit

Permalink
Merge pull request ampproject#7738 from ampproject/dependabot/npm_and…
Browse files Browse the repository at this point in the history
…_yarn/prettier-3.2.5

Bump prettier from 3.1.0 to 3.2.5
  • Loading branch information
westonruter authored Feb 7, 2024
2 parents ac68637 + e821ac5 commit 2690b34
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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}
/>
Expand Down Expand Up @@ -213,7 +213,7 @@ export default function AMPDocumentStatusNotification() {
'amp'
),
reviewedValidationErrorCount
)
)
: __('No AMP validation issues detected.', 'amp')
}
isSmall={true}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export function ErrorPanelTitle({ kept, title, error: { type } }) {
? __(
'This error has been kept, making this URL not AMP-compatible.',
'amp'
)
)
: ''
}
>
Expand Down
2 changes: 1 addition & 1 deletion assets/src/block-validation/components/sidebar/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export function Sidebar() {
? select(blockValidationStore).getValidationErrors()
: select(
blockValidationStore
).getUnreviewedValidationErrors(),
).getUnreviewedValidationErrors(),
hasReviewedValidationErrors:
select(blockValidationStore).getReviewedValidationErrors()
?.length > 0,
Expand Down
2 changes: 1 addition & 1 deletion assets/src/components/site-scan-context-provider/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ export function SiteScanContextProvider({
? Math.min(
scannableUrls.length,
...urlIndexesPendingScan
)
)
: 0) - 1,
stale,
startSiteScan,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export function PluginsWithAmpIncompatibility({
<a href={AMP_COMPATIBLE_PLUGINS_URL} />
),
}
)
)
: ''}
</p>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export function ThemesWithAmpIncompatibility({
<a href={AMP_COMPATIBLE_THEMES_URL} />
),
}
)
)
: ''}
</p>
)}
Expand Down
4 changes: 2 additions & 2 deletions assets/src/onboarding-wizard/components/nav/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
8 changes: 4 additions & 4 deletions assets/src/onboarding-wizard/pages/site-scan/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
)}
)}
</p>
}
>
Expand Down Expand Up @@ -175,7 +175,7 @@ export function SiteScan() {
isCompleted
? 100
: (scannedUrlsMaxIndex / scannableUrls.length) *
100
100
}
/>
<p className="site-scan__status">
Expand All @@ -190,7 +190,7 @@ export function SiteScan() {
scannedUrlsMaxIndex + 1,
scannableUrls.length,
scannableUrls[scannedUrlsMaxIndex]?.label
)}
)}
</p>
</>
}
Expand Down
2 changes: 1 addition & 1 deletion assets/src/settings-page/site-scan.js
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ function SiteScanInProgress() {
scannedUrlsMaxIndex + 1,
scannableUrls.length,
scannableUrls[scannedUrlsMaxIndex]?.label
)}
)}
</p>
</>
);
Expand Down
2 changes: 1 addition & 1 deletion assets/src/settings-page/supported-templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ export function SupportedTemplatesCheckboxes({ supportableTemplates }) {
supportableTemplate.id
)
);
});
});

return (
<ul>
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const preparePackagesSchema = (packages = []) => {
? 'i18n'
: camelCaseDash(
packageName.replace(WORDPRESS_NAMESPACE, '')
);
);

const handle = packageName.replace(WORDPRESS_NAMESPACE, 'wp-');

Expand All @@ -54,7 +54,7 @@ const preparePackagesSchema = (packages = []) => {
'polyfill' === camelCaseName
? require.resolve(
'@wordpress/babel-preset-default/build/polyfill'
)
)
: packageName,
handle,
packageName,
Expand Down

0 comments on commit 2690b34

Please sign in to comment.