Merge pull request #999 from 200ok-ch/feat/upgrade-cra-to-4

Feat: Upgrade Create-React-App to 4.0.3

.eslintrc.yml

@@ -32,6 +32,9 @@ rules:
   react/prop-types: off
   react-redux/prefer-separate-component-file: off
   jest/no-disabled-tests: off
+  no-redeclare:
+    - 'error'
+    - builtinGlobals: false
 settings:
   react:
     version: detect

package.json

@@ -5,6 +5,9 @@
   "engines": {
     "node": "^16.13.1"
   },
+  "resolutions": {
+    "@babel/core": "^7.16.0"
+  },
   "dependencies": {
     "@bity/oauth2-auth-code-pkce": "^2.13.0",
     "aos": "^2.3.4",
@@ -16,7 +19,7 @@
     "immutable": "^3.8.2",
     "lodash": "^4.17.21",
     "pegjs": "^0.10.0",
-    "react": "^16.8.3",
+    "react": "16.10.0",
     "react-beautiful-dnd": "^13.0.0",
     "react-collapse": "^4.0.3",
     "react-dom": "^16.7.0-alpha.0",
@@ -25,11 +28,11 @@
     "react-motion": "^0.5.2",
     "react-redux": "^7.2.1",
     "react-router-dom": "5.2.0",
-    "react-scripts": "3.4.3",
+    "react-scripts": "4.0.3",
     "redux": "^4.1.0",
     "redux-thunk": "^2.3.0",
     "redux-undo": "1.0.1",
-    "sass": "^1.80.6",
+    "sass": "1.44.0",
     "webdav": "^3.3.0"
   },
   "scripts": {
@@ -47,10 +50,12 @@
     "postinstall": "if [ \"$ON_HEROKU\" ]; then npm install -g serve; fi"
   },
   "devDependencies": {
+    "@babel/core": "^7.16.0",
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "12.0.0",
     "babel-eslint": "^10.1.0",
-    "eslint": "^6.6.0",
+    "eslint": "7.12.0",
     "eslint-nibble": "^6.1.0",
     "eslint-plugin-jest": "^23.20.0",
     "eslint-plugin-react": "^7.23.2",

src/components/OrgFile/OrgFile.integration.test.js

@@ -26,15 +26,6 @@ import { STATIC_FILE_PREFIX } from '../../lib/org_utils';
 afterEach(cleanup);
 
 describe('Render all views', () => {
-  jest.mock('react-hotkeys', () => {
-    const React = require('react');
-    const Fragment = React.Fragment;
-
-    return {
-      HotKeys: ({ children }) => <Fragment>{children}</Fragment>,
-    };
-  });
-
   const testOrgFile = readFixture('main_test_file');
 
   let store;

src/sync_backend_clients/gitlab_sync_backend_client.js

@@ -1,4 +1,5 @@
 /* global process */
+
 import { OAuth2AuthCodePKCE } from '@bity/oauth2-auth-code-pkce';
 import { orgFileExtensions } from '../lib/org_utils';
 import { getPersistedField } from '../util/settings_persister';