Skip to content

Commit

Permalink
build(deps-dev): bump the prettier group with 1 update (#998)
Browse files Browse the repository at this point in the history
* build(deps-dev): bump the prettier group with 1 update

Bumps the prettier group with 1 update: [prettier](https://github.com/prettier/prettier).

- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@3.0.3...3.1.1)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: prettier
...

Signed-off-by: dependabot[bot] <[email protected]>

* updated peer dependency

* prettier fix

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: oliverabrahams <[email protected]>
  • Loading branch information
dependabot[bot] and oliverabrahams authored Dec 18, 2023
1 parent cd48e2b commit 7cdfec3
Show file tree
Hide file tree
Showing 14 changed files with 64 additions and 151 deletions.
5 changes: 5 additions & 0 deletions .changeset/itchy-crabs-float.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@guardian/prettier': major
---

Updated peer dependency `prettier` from 3.0.0 to 3.1.1
Original file line number Diff line number Diff line change
Expand Up @@ -257,11 +257,7 @@ const relevantImportSource = (importSource: string, pkg: Package): boolean => {
return true;
}

if (pkg === 'all' && importSource.startsWith("'@guardian/src-")) {
return true;
}

return false;
return pkg === 'all' && importSource.startsWith("'@guardian/src-");
};

const createReport = (context: Rule.RuleContext, node: Node, pkg: Package) => {
Expand Down Expand Up @@ -309,7 +305,7 @@ const createReport = (context: Rule.RuleContext, node: Node, pkg: Package) => {
: [
...getRenameImportFixers(node, removedExports, fixer, nodeSource),
fixer.replaceTextRange(node.source?.range ?? [0, 0], newPackage),
];
];
},
});
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -257,11 +257,7 @@ const relevantImportSource = (importSource: string, pkg: Package): boolean => {
return true;
}

if (pkg === 'all' && importSource.startsWith("'@guardian/src-")) {
return true;
}

return false;
return pkg === 'all' && importSource.startsWith("'@guardian/src-");
};

const createReport = (context: Rule.RuleContext, node: Node, pkg: Package) => {
Expand Down Expand Up @@ -309,7 +305,7 @@ const createReport = (context: Rule.RuleContext, node: Node, pkg: Package) => {
: [
...getRenameImportFixers(node, removedExports, fixer, nodeSource),
fixer.replaceTextRange(node.source?.range ?? [0, 0], newPackage),
];
];
},
});
};
Expand Down
2 changes: 1 addition & 1 deletion libs/@guardian/libs/src/performance/getMeasures.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const getMeasures = (
entryType,
startTime,
toJson: () => JSON.stringify(this),
}
}
: [];
})
: [];
2 changes: 1 addition & 1 deletion libs/@guardian/libs/src/switches/getSwitches.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const fetchSwitches = () =>
? (switches as Switches)
: Promise.reject(
new Error('Error getting remote switches – config is malformed'),
),
),
);

// cache to store any retrieved switches
Expand Down
4 changes: 2 additions & 2 deletions libs/@guardian/prettier/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"description": "Prettier config for Guardian JavaScript & TypeScript projects",
"main": "index.js",
"devDependencies": {
"prettier": "3.0.3",
"prettier": "3.1.1",
"tslib": "2.5.3"
},
"peerDependencies": {
"prettier": "^3.0.0",
"prettier": "^3.1.1",
"tslib": "^2.5.3"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ export const darkModeCss =
})
.join('')}
}
`
`
: css``;
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ const decideSpace = (
return displayText
? css`
margin-top: -${space[1]}px;
`
`
: css`
margin-top: ${space[6]}px;
`;
`;
case 'loose':
return displayText
? css`
margin-top: ${space[9]}px;
`
`
: css`
margin-top: ${space[12]}px;
`;
`;
}
};

Expand Down
2 changes: 1 addition & 1 deletion libs/@guardian/source-react-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@types/react": "18.2.11",
"dotenv": "16.3.1",
"mkdirp": "1.0.4",
"prettier": "3.0.3",
"prettier": "3.1.1",
"react": "18.2.0",
"ts-node": "10.9.1",
"tslib": "2.5.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export const CheckboxGroup = ({
? {
error: true,
'aria-describedby': descriptionId(groupId),
}
}
: {},
{
name,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,9 @@ export const ChoiceCardGroup = ({
...props
}: ChoiceCardGroupProps): EmotionJSX.Element => {
const groupId = id ?? generateSourceId();
const showLabel = !!(label && !hideLabel);
const topMargin =
(label && !hideLabel) || supporting || error ? containerTopMargin : '';
(showLabel || supporting) ?? error ? containerTopMargin : '';

return (
<fieldset css={[fieldset, cssOverrides]} id={groupId} {...props}>
Expand Down Expand Up @@ -104,7 +105,7 @@ export const ChoiceCardGroup = ({
? {
error: true,
'aria-describedby': descriptionId(groupId),
}
}
: {},
{
name,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export const RadioGroup = ({
error
? {
'aria-describedby': descriptionId(groupId),
}
}
: {},
{
name,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"lint-staged": "15.2.0",
"nx": "17.2.5",
"nx-cloud": "latest",
"prettier": "3.0.3",
"prettier": "3.1.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"require-from-string": "2.0.2",
Expand Down
Loading

0 comments on commit 7cdfec3

Please sign in to comment.