Skip to content

Commit

Permalink
Merge pull request #1129 from ral-facilities/feature/react-17-upgrade…
Browse files Browse the repository at this point in the history
…-new-#830

React 17 and MUIv5 upgrade #830 #1096
  • Loading branch information
louise-davies authored Jul 8, 2022
2 parents a245664 + 854cbed commit eebfd67
Show file tree
Hide file tree
Showing 311 changed files with 29,298 additions and 47,811 deletions.
275 changes: 136 additions & 139 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,141 +1,138 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: daily
time: "00:00"
timezone: Europe/London
open-pull-requests-limit: 10
versioning-strategy: increase
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-patch"]
- dependency-name: "@date-io/date-fns"
versions:
- ">= 2.a, < 3"
- dependency-name: eslint-plugin-react
versions:
- "> 7.20.0, < 7.21"
- dependency-name: eslint-plugin-react-hooks
versions:
- "> 4.0.4, < 4.1"
- dependency-name: i18next
versions:
- ">= 19.7.a, < 19.8"
- dependency-name: i18next
versions:
- "> 19.9.0, < 19.10"
- dependency-name: i18next-browser-languagedetector
versions:
- "> 6.0.0, < 6.1"
- dependency-name: i18next-http-backend
versions:
- "> 1.0.15, < 1.1"
- dependency-name: jsrsasign
versions:
- "> 8.0.20, < 8.1"
- dependency-name: jsrsasign
versions:
- "> 9.0.0, < 9.1"
- dependency-name: react-i18next
versions:
- "> 11.7.0, < 11.8"
- dependency-name: react-redux
versions:
- "> 7.2.0, < 7.3"
- dependency-name: single-spa-react
versions:
- "> 3.0.0, < 3.1"
- dependency-name: typescript
versions:
- "> 3.9.6, < 3.10"
- dependency-name: typescript
versions:
- "> 4.2.2, < 4.3"
- dependency-name: "@types/jest"
versions:
- "> 26.0.4, < 26.1"
- dependency-name: "@types/jsrsasign"
versions:
- "> 8.0.3, < 8.1"
- dependency-name: "@types/node"
versions:
- "> 14.0.20, < 14.1"
- dependency-name: "@types/node"
versions:
- "> 14.14.31, < 14.15"
- dependency-name: "@types/react"
versions:
- "> 16.9.41, < 16.10"
- dependency-name: "@types/react-virtualized"
versions:
- "> 9.21.10, < 9.22"
- dependency-name: "@welldone-software/why-did-you-render"
versions:
- "> 4.2.5, < 4.3"
- dependency-name: i18next-http-backend
versions:
- 1.2.1
- dependency-name: eslint
versions:
- 7.21.0
- 7.22.0
- 7.23.0
- 7.24.0
- dependency-name: date-fns
versions:
- 2.16.1
- 2.18.0
- 2.19.0
- 2.20.2
- 2.21.0
- dependency-name: cypress
versions:
- 6.6.0
- 6.7.1
- 6.8.0
- 7.0.1
- 7.1.0
- dependency-name: "@typescript-eslint/parser"
versions:
- 4.17.0
- 4.18.0
- 4.19.0
- 4.20.0
- 4.21.0
- dependency-name: jsrsasign
versions:
- 10.1.13
- dependency-name: "@welldone-software/why-did-you-render"
versions:
- 6.0.5
- 6.1.0
- dependency-name: react
versions:
- 17.0.1
- dependency-name: typescript
versions:
- 4.1.3
- 4.1.5
- dependency-name: "@types/node"
versions:
- 14.14.22
- 14.14.25
- 14.14.26
- 14.14.28
- 14.14.29
- dependency-name: "@typescript-eslint/eslint-plugin"
versions:
- 4.14.0
- 4.14.2
- 4.15.0
- dependency-name: eslint-config-react-app
versions:
- 6.0.0
- dependency-name: lint-staged
versions:
- 10.5.3
- dependency-name: "@material-ui/core"
versions:
- 4.11.2
- package-ecosystem: npm
directory: '/'
schedule:
interval: daily
time: '00:00'
timezone: Europe/London
open-pull-requests-limit: 10
versioning-strategy: increase
ignore:
- dependency-name: '*'
update-types: ['version-update:semver-patch']
- dependency-name: '@date-io/date-fns'
versions:
- '>= 2.a, < 3'
- dependency-name: eslint-plugin-react
versions:
- '> 7.20.0, < 7.21'
- dependency-name: eslint-plugin-react-hooks
versions:
- '> 4.0.4, < 4.1'
- dependency-name: i18next
versions:
- '>= 19.7.a, < 19.8'
- dependency-name: i18next
versions:
- '> 19.9.0, < 19.10'
- dependency-name: i18next-browser-languagedetector
versions:
- '> 6.0.0, < 6.1'
- dependency-name: i18next-http-backend
versions:
- '> 1.0.15, < 1.1'
- dependency-name: jsrsasign
versions:
- '> 8.0.20, < 8.1'
- dependency-name: jsrsasign
versions:
- '> 9.0.0, < 9.1'
- dependency-name: react-i18next
versions:
- '> 11.7.0, < 11.8'
- dependency-name: react-redux
versions:
- '> 7.2.0, < 7.3'
- dependency-name: single-spa-react
versions:
- '> 3.0.0, < 3.1'
- dependency-name: typescript
versions:
- '> 3.9.6, < 3.10'
- dependency-name: typescript
versions:
- '> 4.2.2, < 4.3'
- dependency-name: '@types/jest'
versions:
- '> 26.0.4, < 26.1'
- dependency-name: '@types/jsrsasign'
versions:
- '> 8.0.3, < 8.1'
- dependency-name: '@types/node'
versions:
- '> 14.0.20, < 14.1'
- dependency-name: '@types/node'
versions:
- '> 14.14.31, < 14.15'
- dependency-name: '@types/react'
versions:
- '> 16.9.41, < 16.10'
- dependency-name: '@types/react-virtualized'
versions:
- '> 9.21.10, < 9.22'
- dependency-name: '@welldone-software/why-did-you-render'
versions:
- '> 4.2.5, < 4.3'
- dependency-name: i18next-http-backend
versions:
- 1.2.1
- dependency-name: eslint
versions:
- 7.21.0
- 7.22.0
- 7.23.0
- 7.24.0
- dependency-name: date-fns
versions:
- 2.16.1
- 2.18.0
- 2.19.0
- 2.20.2
- 2.21.0
- dependency-name: cypress
versions:
- 6.6.0
- 6.7.1
- 6.8.0
- 7.0.1
- 7.1.0
- dependency-name: '@typescript-eslint/parser'
versions:
- 4.17.0
- 4.18.0
- 4.19.0
- 4.20.0
- 4.21.0
- dependency-name: jsrsasign
versions:
- 10.1.13
- dependency-name: '@welldone-software/why-did-you-render'
versions:
- 6.0.5
- 6.1.0
- dependency-name: react
versions:
- 17.0.1
- dependency-name: typescript
versions:
- 4.1.3
- 4.1.5
- dependency-name: '@types/node'
versions:
- 14.14.22
- 14.14.25
- 14.14.26
- 14.14.28
- 14.14.29
- dependency-name: '@typescript-eslint/eslint-plugin'
versions:
- 4.14.0
- 4.14.2
- 4.15.0
- dependency-name: eslint-config-react-app
versions:
- 6.0.0
- dependency-name: lint-staged
versions:
- 10.5.3
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ node_modules/
/.pnp
.pnp.js

# yarn 2
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions

# testing
coverage/
screenshots/
Expand Down
785 changes: 785 additions & 0 deletions .yarn/releases/yarn-3.2.0.cjs

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
yarnPath: .yarn/releases/yarn-3.2.0.cjs
nodeLinker: node-modules
12 changes: 7 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
"workspaces": [
"packages/*"
],
"devDependencies": {
"dependencies": {
"husky": "^7.0.4",
"lerna": "^4.0.0",
"lerna": "^4.0.0"
},
"devDependencies": {
"lerna-update-wizard": "^1.1.0"
},
"scripts": {
"prepare": "lerna run prepare",
"build": "lerna run build --ignore datagateway-common",
"lint": "lerna run lint:js -- --max-warnings=0",
"tsc": "lerna run tsc",
"test": "yarn test:unit && yarn test:e2e",
Expand All @@ -23,5 +25,5 @@
"datagateway-search": "cd packages/datagateway-search && yarn start",
"postinstall": "husky install"
},
"dependencies": {}
}
"packageManager": "yarn@3.2.0"
}
Loading

0 comments on commit eebfd67

Please sign in to comment.