Skip to content

Commit

Permalink
Update dependency prettier (#29632)
Browse files Browse the repository at this point in the history
* Update dependency prettier
* Update all non-excluded files
* Update deprecated jsxBracketSameLine → bracketSameLine

Co-authored-by: Renovate Bot <bot@renovateapp.com>
  • Loading branch information
matticbot and renovate-bot committed Mar 22, 2023
1 parent 7e9da58 commit 260c45a
Show file tree
Hide file tree
Showing 138 changed files with 1,505 additions and 1,594 deletions.
2 changes: 1 addition & 1 deletion .prettierrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = {
trailingComma: 'es5',
bracketSpacing: true,
parenSpacing: true,
jsxBracketSameLine: false,
bracketSameLine: false,
semi: true,
arrowParens: 'avoid',
};
79 changes: 34 additions & 45 deletions pnpm-lock.yaml

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

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: Reformat JS for new version of prettier. Should be no functional changes.


Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ const debug = require( '../../utils/debug' );
* @param {GitHub} octokit - Initialized Octokit REST client.
*/
async function assignIssues( payload, octokit ) {
const regex = /(?:close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved):? +(?:#{1}|https?:\/\/github\.com\/automattic\/jetpack\/issues\/)(\d+)/gi;
const regex =
/(?:close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved):? +(?:#{1}|https?:\/\/github\.com\/automattic\/jetpack\/issues\/)(\d+)/gi;

let match;
while ( ( match = regex.exec( payload.pull_request.body ) ) ) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ function findPlatforms( body ) {
*/
function findPriority( body ) {
// Look for priority indicators in body.
const priorityRegex = /###\sImpact\n\n(?<impact>.*)\n\n###\sAvailable\sworkarounds\?\n\n(?<blocking>.*)\n/gm;
const priorityRegex =
/###\sImpact\n\n(?<impact>.*)\n\n###\sAvailable\sworkarounds\?\n\n(?<blocking>.*)\n/gm;
let match;
while ( ( match = priorityRegex.exec( body ) ) ) {
const [ , impact = '', blocking = '' ] = match;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: Reformat JS for new version of prettier. Should be no functional changes.


Original file line number Diff line number Diff line change
Expand Up @@ -87,20 +87,11 @@ Default.args = {
};

export const BreakpointMatch = () => {
const [
isSm,
isGtSm,
isMd,
isLtOrMd,
isLtMd,
isGtOrMd,
isGtMd,
isLessThanLg,
isLg,
] = useBreakpointMatch(
[ 'sm', 'sm', 'md', 'md', 'md', 'md', 'md', 'lg', 'lg' ],
[ null, '>', null, '<=', '<', '>=', '>', '<', null ]
);
const [ isSm, isGtSm, isMd, isLtOrMd, isLtMd, isGtOrMd, isGtMd, isLessThanLg, isLg ] =
useBreakpointMatch(
[ 'sm', 'sm', 'md', 'md', 'md', 'md', 'md', 'lg', 'lg' ],
[ null, '>', null, '<=', '<', '>=', '>', '<', null ]
);

return (
<Container>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import breakpointsValues from '../breakpoints.module.scss';

const BREAKPOINTS = [ 'sm', 'md', 'lg' ] as const;

type Breakpoints = typeof BREAKPOINTS[ number ];
type Breakpoints = ( typeof BREAKPOINTS )[ number ];

type Operators = '<' | '<=' | '>' | '>=';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ const Template: ComponentStory< typeof PricingCard > = args => <PricingCard { ..

const DefaultArgs = {
title: 'Jetpack Backup',
icon:
"data:image/svg+xml,%3Csvg width='32' height='32' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='m21.092 15.164.019-1.703v-.039c0-1.975-1.803-3.866-4.4-3.866-2.17 0-3.828 1.351-4.274 2.943l-.426 1.524-1.581-.065a2.92 2.92 0 0 0-.12-.002c-1.586 0-2.977 1.344-2.977 3.133 0 1.787 1.388 3.13 2.973 3.133H22.399c1.194 0 2.267-1.016 2.267-2.4 0-1.235-.865-2.19-1.897-2.368l-1.677-.29Zm-10.58-3.204a4.944 4.944 0 0 0-.201-.004c-2.75 0-4.978 2.298-4.978 5.133s2.229 5.133 4.978 5.133h12.088c2.357 0 4.267-1.97 4.267-4.4 0-2.18-1.538-3.99-3.556-4.339v-.06c0-3.24-2.865-5.867-6.4-5.867-2.983 0-5.49 1.871-6.199 4.404Z' fill='%23000'/%3E%3C/svg%3E",
icon: "data:image/svg+xml,%3Csvg width='32' height='32' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='m21.092 15.164.019-1.703v-.039c0-1.975-1.803-3.866-4.4-3.866-2.17 0-3.828 1.351-4.274 2.943l-.426 1.524-1.581-.065a2.92 2.92 0 0 0-.12-.002c-1.586 0-2.977 1.344-2.977 3.133 0 1.787 1.388 3.13 2.973 3.133H22.399c1.194 0 2.267-1.016 2.267-2.4 0-1.235-.865-2.19-1.897-2.368l-1.677-.29Zm-10.58-3.204a4.944 4.944 0 0 0-.201-.004c-2.75 0-4.978 2.298-4.978 5.133s2.229 5.133 4.978 5.133h12.088c2.357 0 4.267-1.97 4.267-4.4 0-2.18-1.538-3.99-3.556-4.339v-.06c0-3.24-2.865-5.867-6.4-5.867-2.983 0-5.49 1.871-6.199 4.404Z' fill='%23000'/%3E%3C/svg%3E",
priceBefore: 9,
priceAfter: 4.5,
ctaText: 'Get Jetpack Backup',
Expand Down
2 changes: 1 addition & 1 deletion projects/js-packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@automattic/jetpack-components",
"version": "0.30.1",
"version": "0.30.2-alpha",
"description": "Jetpack Components Package",
"author": "Automattic",
"license": "GPL-2.0-or-later",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: Reformat JS for new version of prettier. Should be no functional changes.


Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,8 @@ import useConnection from '../use-connection';
* @returns {React.Component} The RNA connection component.
*/
const ConnectButton = props => {
const {
apiRoot,
apiNonce,
connectLabel,
registrationNonce,
redirectUri,
from,
autoTrigger,
} = props;
const { apiRoot, apiNonce, connectLabel, registrationNonce, redirectUri, from, autoTrigger } =
props;

const {
handleRegisterSite,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,8 @@ import styles from './styles.module.scss';
* @returns {React.Component} The `ConnectionErrorNotice` component.
*/
const ConnectionErrorNotice = props => {
const {
message,
isRestoringConnection,
restoreConnectionCallback,
restoreConnectionError,
} = props;
const { message, isRestoringConnection, restoreConnectionCallback, restoreConnectionError } =
props;

const [ isBiggerThanMedium ] = useBreakpointMatch( [ 'md' ], [ '>' ] );
const wrapperClassName =
Expand Down
Loading

0 comments on commit 260c45a

Please sign in to comment.