Skip to content

Commit

Permalink
Merge pull request #579 from City-of-Helsinki/fix/yarn-lock
Browse files Browse the repository at this point in the history
Upgrade dependencies [Dependabot alerts]
  • Loading branch information
VilleMiekkoja authored Nov 29, 2021
2 parents 3f8e554 + d94b384 commit 4d9c696
Show file tree
Hide file tree
Showing 3 changed files with 5,590 additions and 7,394 deletions.
8 changes: 6 additions & 2 deletions packages/react/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,11 @@ module.exports = {
// globalTeardown: null,

// A set of global variables that need to be available in all test environments
// globals: {},
globals: {
'ts-jest': {
babelConfig: true,
}
},

// The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
// maxWorkers: "50%",
Expand Down Expand Up @@ -95,7 +99,7 @@ module.exports = {
// notifyMode: "failure-change",

// A preset that is used as a base for Jest's configuration
// preset: null,
preset: 'ts-jest/presets/js-with-babel',

// Run tests from one or more projects
// projects: null,
Expand Down
20 changes: 14 additions & 6 deletions packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,21 @@
"@testing-library/react": "10.0.4",
"@testing-library/user-event": "^12.8.1",
"@types/cleave.js": "1.4.4",
"@types/jest": "25.2.3",
"@types/jest-axe": "3.5.1",
"@types/jest": "^26.0.1",
"@types/jest-axe": "^3.5.3",
"@types/react": "16.9.50",
"@types/react-dom": "16.9.8",
"@types/yup": "^0.29.9",
"@typescript-eslint/eslint-plugin": "2.34.0",
"@typescript-eslint/parser": "2.34.0",
"@wessberg/rollup-plugin-ts": "1.3.5",
"babel-jest": "^26.0.1",
"babel-plugin-require-context-hook": "1.0.0",
"chalk": "4.0.0",
"eslint": "7.0.0",
"eslint-config-airbnb": "18.1.0",
"eslint-config-prettier": "6.11.0",
"eslint-plugin-import": "2.20.2",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jest": "23.13.1",
"eslint-plugin-jsx-a11y": "6.2.3",
"eslint-plugin-prettier": "3.1.3",
Expand All @@ -78,9 +79,9 @@
"formik": "^2.2.5",
"identity-obj-proxy": "3.0.0",
"inquirer": "7.1.0",
"jest": "26.0.1",
"jest-axe": "4.1.0",
"jest-environment-jsdom-sixteen": "^1.0.3",
"jest": "^26.0.1",
"jest-axe": "^5.0.1",
"jest-environment-jsdom-sixteen": "^2.0.0",
"loki": "0.26.0",
"node-sass": "4.14.1",
"path": "0.12.7",
Expand All @@ -94,6 +95,7 @@
"rollup-plugin-includepaths": "0.2.4",
"rollup-plugin-postcss": "3.1.8",
"rollup-plugin-terser": "7.0.2",
"ts-jest": "^26.0.1",
"typed-css-modules": "0.6.4",
"typescript": "3.9.3",
"yup": "^0.32.9"
Expand All @@ -116,6 +118,12 @@
"react-use-measure": "2.0.1",
"react-virtual": "2.2.7"
},
"resolutions": {
"@types/react": "16.9.50",
"babel-jest": "^26.0.1",
"jest": "^26.0.1",
"ts-jest": "^26.0.1"
},
"peerDependencies": {
"react": "^16.8.0",
"react-dom": "^16.8.0"
Expand Down
Loading

0 comments on commit 4d9c696

Please sign in to comment.