Skip to content

Commit

Permalink
Merge pull request #526 from entur/dependabot/npm_and_yarn/prettier-2…
Browse files Browse the repository at this point in the history
….4.1

Bump prettier from 2.3.2 to 2.4.1
  • Loading branch information
magnusrand authored Nov 19, 2021
2 parents 3b426ee + d970506 commit 51826ca
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 21 deletions.
36 changes: 26 additions & 10 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,12 +1,28 @@
{
"extends": [
"stylelint-config-standard",
"stylelint-config-prettier"
],
"rules": {
"at-rule-no-unknown": [ true, {
ignoreAtRules: ['extend', 'at-root', 'debug', 'warn', 'error', 'if', 'else', 'for', 'each', 'while', 'mixin', 'include', 'content', 'return', 'function']
}],
"no-descending-specificity": [true, { "severity": "warning" }]
}
"extends": ["stylelint-config-standard", "stylelint-config-prettier"],
"rules": {
"at-rule-no-unknown": [
true,
{
"ignoreAtRules": [
"extend",
"at-root",
"debug",
"warn",
"error",
"if",
"else",
"for",
"each",
"while",
"mixin",
"include",
"content",
"return",
"function"
]
}
],
"no-descending-specificity": [true, { "severity": "warning" }]
}
}
14 changes: 7 additions & 7 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 @@ -114,7 +114,7 @@
"postcss": "^8.3.6",
"postcss-loader": "^6.1.1",
"postcss-preset-env": "^6.7.0",
"prettier": "2.3.2",
"prettier": "2.4.1",
"sass-loader": "^12.1.0",
"speed-measure-webpack-plugin": "^1.5.0",
"style-loader": "^3.2.1",
Expand Down
6 changes: 3 additions & 3 deletions src/dashboards/Timeline/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ function walkMarkerPosition(walkTime: number): number {
return competitorPosition(roundedWalkTime) + offset
}

function groupDeparturesByMode(
departures: LineData[],
): { [mode in LegMode]?: LineData[] } {
function groupDeparturesByMode(departures: LineData[]): {
[mode in LegMode]?: LineData[]
} {
return departures.reduce(
(map, departure) => ({
...map,
Expand Down

0 comments on commit 51826ca

Please sign in to comment.