Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump react-scripts from 4.0.3 to 5.0.0 #882

Merged
merged 8 commits into from
Feb 8, 2022
Merged
24 changes: 7 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "scigateway",
"version": "0.1.0",
"private": true,
"proxy": "http://localhost:8000/",
"dependencies": {
"@material-ui/core": "^4.11.3",
"@material-ui/icons": "^4.11.2",
Expand All @@ -29,14 +28,13 @@
"react-redux-toastr": "^7.6.5",
"react-router": "^5.0.1",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.3",
"react-scripts": "5.0.0",
"redux": "^4.1.2",
"redux-logger": "^3.0.6",
"redux-thunk": "^2.3.0",
"single-spa": "^5.9.1",
"typeface-roboto": "1.1.13",
"typescript": "4.2.2",
"webpack": "4.44.2"
"typescript": "4.2.2"
},
"scripts": {
"lint:js": "eslint --max-warnings=0 --ext=tsx --ext=ts --ext=js --ext=jsx --fix ./src",
Expand Down Expand Up @@ -88,7 +86,6 @@
"not op_mini all"
],
"devDependencies": {
"@babel/core": "^7.13.1",
"@types/classnames": "^2.2.11",
"@types/enzyme": "^3.10.8",
"@types/history": "^4.7.2",
Expand All @@ -105,28 +102,21 @@
"@types/redux-logger": "^3.0.8",
"@types/redux-mock-store": "^1.0.2",
"@types/single-spa-react": "^3.0.1",
"@typescript-eslint/eslint-plugin": "^4.17.0",
"@typescript-eslint/parser": "^4.17.0",
"@typescript-eslint/eslint-plugin": "^5.5.0",
"@typescript-eslint/parser": "^5.5.0",
"axios-mock-adapter": "^1.19.0",
"babel-eslint": "10.1.0",
"babel-loader": "8.1.0",
"body-parser": "^1.19.0",
"concurrently": "^6.4.0",
"cross-env": "^7.0.3",
"cypress": "^6.6.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.6",
"enzyme-to-json": "^3.6.2",
"eslint": "^7.2.0",
"eslint": "^8.0.0",
"eslint-config-prettier": "^8.3.0",
"eslint-config-react-app": "^6.0.0",
"eslint-config-react-app": "^7.0.0",
"eslint-plugin-cypress": "^2.11.2",
"eslint-plugin-flowtype": "^5.10.0",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-prettier": "^3.4.1",
"eslint-plugin-react": "^7.28.0",
"eslint-plugin-react-hooks": "^4.0.0",
"husky": "^7.0.4",
"lint-staged": "^12.1.2",
"prettier": "^2.2.1",
Expand All @@ -135,4 +125,4 @@
"start-server-and-test": "^1.12.0",
"wait-on": "^5.2.1"
}
}
}
5 changes: 4 additions & 1 deletion src/App.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ describe('App', () => {

afterEach(() => {
mount.cleanUp();
jest.useRealTimers();
});

it('renders without crashing', () => {
Expand All @@ -28,7 +29,9 @@ describe('App', () => {
});

it('loadMaintenanceState dispatched when maintenance changes', async () => {
jest.useFakeTimers();
// this test only works with old jest fake timers
// when they remove legacy timers refactor this test to use real timers
jest.useFakeTimers('legacy');
(axios.get as jest.Mock).mockImplementation(() =>
Promise.resolve({
data: {
Expand Down
3 changes: 1 addition & 2 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ const middleware = [
autoLoginMiddleware,
];
if (process.env.NODE_ENV === `development`) {
/* eslint-disable-next-line @typescript-eslint/no-explicit-any */
const logger = (createLogger as any)({ collapsed: true });
const logger = createLogger({ collapsed: true });
middleware.push(logger);
// const {whyDidYouUpdate} = require('why-did-you-update');
// whyDidYouUpdate(React);
Expand Down
100 changes: 1 addition & 99 deletions src/images/decal1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
58 changes: 1 addition & 57 deletions src/images/decal2-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
58 changes: 1 addition & 57 deletions src/images/decal2-darkhc.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
56 changes: 1 addition & 55 deletions src/images/decal2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading