Skip to content

Commit

Permalink
Merge pull request #4751 from embarkokc/yarn-resolution
Browse files Browse the repository at this point in the history
Fix most yarn resolution warnings
  • Loading branch information
vesameskanen authored Feb 16, 2023
2 parents 816c44c + 716f012 commit 12225e1
Show file tree
Hide file tree
Showing 5 changed files with 882 additions and 351 deletions.
30 changes: 30 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,33 @@ plugins:
spec: "@yarnpkg/plugin-version"

yarnPath: .yarn/releases/yarn-berry.cjs

packageExtensions:
"@endemolshinegroup/cosmiconfig-typescript-loader@*":
peerDependencies:
typescript: "*"
"@octokit/rest@*":
peerDependencies:
"@octokit/core": "*"
polyfill-library@*:
peerDependencies:
"@types/node": "*"
"@lerna/github-client@*":
peerDependencies:
"@octokit/core": "*"
graphql-config@*:
peerDependencies:
typescript: "*"
eslint-plugin-graphql@*:
peerDependencies:
typescript: "*"
"@lerna/version@*":
peerDependencies:
"@octokit/core": "*"
"lerna@*":
peerDependencies:
"@octokit/core": "*"
"@lerna/publish@*":
peerDependencies:
"@octokit/core": "*"

20 changes: 20 additions & 0 deletions digitransit-component/packages/digitransit-component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,25 @@
"@digitransit-component/digitransit-component-icon": "^0.2.0",
"@digitransit-component/digitransit-component-suggestion-item": "^1.1.1",
"@digitransit-component/digitransit-component-with-breakpoint": "^0.0.5"
},
"peerDependencies": {
"@digitransit-component/digitransit-component-dialog-modal": "^0.3.4",
"@hsl-fi/container-spinner": "0.3.1",
"@hsl-fi/modal": "^0.3.1",
"@hsl-fi/sass": "^0.2.0",
"@hsl-fi/shimmer": "0.1.2",
"classnames": "2.2.6",
"hoist-non-react-statics": "2.5.4",
"i18next": "^19.3.3",
"lodash": "4.17.21",
"lodash-es": "4.17.21",
"prop-types": "^15.7.2",
"react": "^16.13.0",
"react-autosuggest": "10.0.0",
"react-autowhatever": "10.2.1",
"react-cookie": "^4.0.3",
"react-modal": "~3.11.2",
"react-sortablejs": "2.0.11",
"recompose": "0.30.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"license": "(AGPL-3.0 OR EUPL-1.2)",
"peerDependencies": {
"babel-plugin-relay": "14.1.0",
"graphql": "15.5.0",
"lodash": "4.17.21",
"moment": "2.29.1",
"react-relay": "14.1.0"
Expand Down
29 changes: 21 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
"prop-types": "15.7.2",
"raven": "2.6.4",
"raven-js": "3.27.0",
"react": "16.13.0",
"react": "^16.13.0",
"react-autosuggest": "10.0.3",
"react-autowhatever": "10.2.1",
"react-click-outside": "3.0.1",
Expand All @@ -220,6 +220,12 @@
"uuid": "8.3.0",
"zurb-foundation-5": "5.4.7"
},
"peerDependencies": {
"@octokit/core": ">=3",
"@types/node": "^17",
"sass": "^1.37.2",
"typescript": ">2.7"
},
"devDependencies": {
"@axe-core/react": "^4.2.0",
"@axe-core/webdriverjs": "^4.3.1",
Expand Down Expand Up @@ -263,20 +269,24 @@
"eslint-import-resolver-webpack": "0.12.2",
"eslint-plugin-compat": "3.8.0",
"eslint-plugin-graphql": "4.0.0",
"eslint-plugin-import": "2.22.0",
"eslint-plugin-import": "2.22.1",
"eslint-plugin-jsx-a11y": "6.3.1",
"eslint-plugin-prettier": "3.1.4",
"eslint-plugin-react": "7.20.6",
"eslint-plugin-react-hooks": "^4 || ^3 || ^2.3.0 || ^1.7.0",
"favicons-webpack-plugin": "0.0.9",
"fetch-mock": "9.10.7",
"file-loader": "5.0.2",
"git-precommit-checks": "3.0.0",
"graphql": "16.6.0",
"husky": "4.3.0",
"iso-morphic-style-loader": "2.0.1",
"jest": "27.0.3",
"jest-image-snapshot": "4.5.0",
"jest": "27.0.6",
"jest-circus": ">=26.6.3",
"jest-environment-node": ">=26.6.3",
"jest-image-snapshot": "^4.5.0",
"jest-playwright-preset": "1.7.0",
"jest-runner": ">=26.6.3",
"jsdom": "13.2.0",
"lerna": "3.20.2",
"lint-staged": "10.3.0",
Expand All @@ -291,7 +301,7 @@
"playwright": "1.16.2",
"postcss": "8.2.1",
"postcss-flexbugs-fixes": "4.2.1",
"postcss-loader": "4.0.1",
"postcss-loader": "^4",
"prettier": "2.1.1",
"relay-compiler": "14.1.0",
"rollup": "2.35.1",
Expand All @@ -309,10 +319,13 @@
"stylelint-scss": "3.18.0",
"terser-webpack-plugin": "4.1.0",
"url-loader": "3.0.0",
"webpack": "4.44.1",
"webpack": "^4",
"webpack-assets-manifest": "3.1.1",
"webpack-bundle-analyzer": "3.6.0",
"webpack-cli": "3.3.10",
"webpack-dev-server": "3.10.3"
"webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.11.3"
},
"resolutions": {
"html-webpack-plugin": "4.5.2"
}
}
Loading

0 comments on commit 12225e1

Please sign in to comment.