Skip to content

Commit 12225e1

Browse files
authored
Merge pull request #4751 from embarkokc/yarn-resolution
Fix most yarn resolution warnings
2 parents 816c44c + 716f012 commit 12225e1

File tree

5 files changed

+882
-351
lines changed

5 files changed

+882
-351
lines changed

.yarnrc.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,33 @@ plugins:
55
spec: "@yarnpkg/plugin-version"
66

77
yarnPath: .yarn/releases/yarn-berry.cjs
8+
9+
packageExtensions:
10+
"@endemolshinegroup/cosmiconfig-typescript-loader@*":
11+
peerDependencies:
12+
typescript: "*"
13+
"@octokit/rest@*":
14+
peerDependencies:
15+
"@octokit/core": "*"
16+
polyfill-library@*:
17+
peerDependencies:
18+
"@types/node": "*"
19+
"@lerna/github-client@*":
20+
peerDependencies:
21+
"@octokit/core": "*"
22+
graphql-config@*:
23+
peerDependencies:
24+
typescript: "*"
25+
eslint-plugin-graphql@*:
26+
peerDependencies:
27+
typescript: "*"
28+
"@lerna/version@*":
29+
peerDependencies:
30+
"@octokit/core": "*"
31+
"lerna@*":
32+
peerDependencies:
33+
"@octokit/core": "*"
34+
"@lerna/publish@*":
35+
peerDependencies:
36+
"@octokit/core": "*"
37+

digitransit-component/packages/digitransit-component/package.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,25 @@
2323
"@digitransit-component/digitransit-component-icon": "^0.2.0",
2424
"@digitransit-component/digitransit-component-suggestion-item": "^1.1.1",
2525
"@digitransit-component/digitransit-component-with-breakpoint": "^0.0.5"
26+
},
27+
"peerDependencies": {
28+
"@digitransit-component/digitransit-component-dialog-modal": "^0.3.4",
29+
"@hsl-fi/container-spinner": "0.3.1",
30+
"@hsl-fi/modal": "^0.3.1",
31+
"@hsl-fi/sass": "^0.2.0",
32+
"@hsl-fi/shimmer": "0.1.2",
33+
"classnames": "2.2.6",
34+
"hoist-non-react-statics": "2.5.4",
35+
"i18next": "^19.3.3",
36+
"lodash": "4.17.21",
37+
"lodash-es": "4.17.21",
38+
"prop-types": "^15.7.2",
39+
"react": "^16.13.0",
40+
"react-autosuggest": "10.0.0",
41+
"react-autowhatever": "10.2.1",
42+
"react-cookie": "^4.0.3",
43+
"react-modal": "~3.11.2",
44+
"react-sortablejs": "2.0.11",
45+
"recompose": "0.30.0"
2646
}
2747
}

digitransit-search-util/packages/digitransit-search-util-query-utils/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"license": "(AGPL-3.0 OR EUPL-1.2)",
3030
"peerDependencies": {
3131
"babel-plugin-relay": "14.1.0",
32+
"graphql": "15.5.0",
3233
"lodash": "4.17.21",
3334
"moment": "2.29.1",
3435
"react-relay": "14.1.0"

package.json

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
"prop-types": "15.7.2",
194194
"raven": "2.6.4",
195195
"raven-js": "3.27.0",
196-
"react": "16.13.0",
196+
"react": "^16.13.0",
197197
"react-autosuggest": "10.0.3",
198198
"react-autowhatever": "10.2.1",
199199
"react-click-outside": "3.0.1",
@@ -220,6 +220,12 @@
220220
"uuid": "8.3.0",
221221
"zurb-foundation-5": "5.4.7"
222222
},
223+
"peerDependencies": {
224+
"@octokit/core": ">=3",
225+
"@types/node": "^17",
226+
"sass": "^1.37.2",
227+
"typescript": ">2.7"
228+
},
223229
"devDependencies": {
224230
"@axe-core/react": "^4.2.0",
225231
"@axe-core/webdriverjs": "^4.3.1",
@@ -263,20 +269,24 @@
263269
"eslint-import-resolver-webpack": "0.12.2",
264270
"eslint-plugin-compat": "3.8.0",
265271
"eslint-plugin-graphql": "4.0.0",
266-
"eslint-plugin-import": "2.22.0",
272+
"eslint-plugin-import": "2.22.1",
267273
"eslint-plugin-jsx-a11y": "6.3.1",
268274
"eslint-plugin-prettier": "3.1.4",
269275
"eslint-plugin-react": "7.20.6",
276+
"eslint-plugin-react-hooks": "^4 || ^3 || ^2.3.0 || ^1.7.0",
270277
"favicons-webpack-plugin": "0.0.9",
271278
"fetch-mock": "9.10.7",
272279
"file-loader": "5.0.2",
273280
"git-precommit-checks": "3.0.0",
274281
"graphql": "16.6.0",
275282
"husky": "4.3.0",
276283
"iso-morphic-style-loader": "2.0.1",
277-
"jest": "27.0.3",
278-
"jest-image-snapshot": "4.5.0",
284+
"jest": "27.0.6",
285+
"jest-circus": ">=26.6.3",
286+
"jest-environment-node": ">=26.6.3",
287+
"jest-image-snapshot": "^4.5.0",
279288
"jest-playwright-preset": "1.7.0",
289+
"jest-runner": ">=26.6.3",
280290
"jsdom": "13.2.0",
281291
"lerna": "3.20.2",
282292
"lint-staged": "10.3.0",
@@ -291,7 +301,7 @@
291301
"playwright": "1.16.2",
292302
"postcss": "8.2.1",
293303
"postcss-flexbugs-fixes": "4.2.1",
294-
"postcss-loader": "4.0.1",
304+
"postcss-loader": "^4",
295305
"prettier": "2.1.1",
296306
"relay-compiler": "14.1.0",
297307
"rollup": "2.35.1",
@@ -309,10 +319,13 @@
309319
"stylelint-scss": "3.18.0",
310320
"terser-webpack-plugin": "4.1.0",
311321
"url-loader": "3.0.0",
312-
"webpack": "4.44.1",
322+
"webpack": "^4",
313323
"webpack-assets-manifest": "3.1.1",
314324
"webpack-bundle-analyzer": "3.6.0",
315-
"webpack-cli": "3.3.10",
316-
"webpack-dev-server": "3.10.3"
325+
"webpack-cli": "^3.3.12",
326+
"webpack-dev-server": "^3.11.3"
327+
},
328+
"resolutions": {
329+
"html-webpack-plugin": "4.5.2"
317330
}
318331
}

0 commit comments

Comments
 (0)