Chore/update dependencies (#13)

Update dependencies
aics-int · Jan 18, 2022 · 5535e09 · 5535e09
1 parent fac640b
commit 5535e09
Show file tree

Hide file tree

Showing 119 changed files with 7,485 additions and 8,733 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -10,30 +10,21 @@ module.exports = {
     tsconfigRootDir: __dirname,
     project: ["./tsconfig.json"],
   },
-  plugins: ["@typescript-eslint", "import", "no-only-tests"],
-  extends: [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:@typescript-eslint/recommended-requiring-type-checking",
-    "plugin:react/recommended",
-    "plugin:react-hooks/recommended",
-    "prettier/@typescript-eslint",
-    "prettier/react",
-    "plugin:prettier/recommended",
-    "plugin:@fintechstudios/chai-as-promised/recommended"
-  ],
+  plugins: ["@typescript-eslint", "import", "no-only-tests", "react-hooks"],
+  extends: ["plugin:@typescript-eslint/recommended", "plugin:react/recommended", "prettier"],
   settings: {
     react: {
       version: "detect",
     },
   },
   rules: {
-    "@typescript-eslint/no-var-requires": "off",
-    "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/explicit-function-return-type": "off",
-    "react/prop-types": "off",
-    "@typescript-eslint/no-unused-vars": "error",
+    "@typescript-eslint/explicit-member-accessibility": "off",
+    "@typescript-eslint/explicit-module-boundary-types": "off",
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/no-unused-vars": ["error"],
+    "@typescript-eslint/no-var-requires": "off",
+    "eqeqeq": ["error", "always"],
     "import/order": ["error", {
       "alphabetize": {
         order: "asc",
@@ -42,8 +33,9 @@ module.exports = {
       "newlines-between": "always",
       "groups": ["builtin", "external", "parent", "sibling", "index"],
     }],
-    "eqeqeq": ["error", "always"],
-    "react-hooks/exhaustive-deps": "error",
     "no-only-tests/no-only-tests": "error",
-  },
+    "react/prop-types": "off",
+    "react-hooks/rules-of-hooks": "error",
+    "react-hooks/exhaustive-deps": "warn",
+},
 };
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ jobs:
       - name: Initialize
         uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 16
       - name: Install Dependencies
         run: yarn
       - name: Lint

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,13 +20,13 @@ jobs:
       - name: Install Node.js, NPM, and Yarn
         uses: actions/setup-node@main
         with:
-          node-version: 12
+          node-version: 16
 
       - name: Install deps and compile app
         env:
           ELECTRON_WEBPACK_APP_AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }}
         run: |
-          yarn --link-duplicates
+          yarn --link-duplicates --production=false
           yarn compile-prod
 
       - name: Build artifact and release

diff --git a/.huskyrc b/.huskyrc
@@ -0,0 +1,3 @@
+"hooks": {
+    "pre-commit": "lint-staged"
+}
diff --git a/.mocharc.js b/.mocharc.js
@@ -3,7 +3,7 @@ module.exports = {
     "ts-node/register",
     "jsdom-global/register",
     "./scripts/mock-css-modules.js",
-    "./scripts/adapt-enzyme-to-react-16.js",
+    "./scripts/adapt-enzyme-to-react-17.js",
     "./scripts/chai-setup.js",
   ],
 };
diff --git a/electron-webpack.json b/electron-webpack.json
@@ -2,5 +2,5 @@
   "renderer": {
     "webpackConfig": "webpack/webpack.renderer.additions.js"
   },
-  "whiteListedModules": ["react-table", "react-beautiful-dnd"]
+  "whiteListedModules": ["@ant-design/icons", "react-table", "react-beautiful-dnd"]
 }
diff --git a/package.json b/package.json
@@ -1,5 +1,9 @@
 {
   "name": "file-upload-app",
+  "engines": {
+    "node": "16.x",
+    "npm": "8.x"
+  },
   "version": "2.7.0",
   "build": {
     "appId": "org.aics.alleninstitute.fileupload",
@@ -27,10 +31,11 @@
     "compile-prod": "cross-env ELECTRON_WEBPACK_APP_LIMS_HOST=\"aics.corp.alleninstitute.org\" ELECTRON_WEBPACK_APP_LIMS_PORT=80 NODE_ENV=production yarn compile",
     "build-executable": "yarn compile && yarn electron-builder",
     "dist": "electron-builder -p always",
-    "test": "cross-env TS_NODE_PROJECT=tsconfig.commonjs.json TS_NODE_FILES=true NODE_ENV=production mocha src/**/test/*.{ts,tsx}",
+    "test": "cross-env TS_NODE_PROJECT=tsconfig.commonjs.json TS_NODE_FILES=true NODE_ENV=production mocha --exit src/**/test/*.{ts,tsx}",
     "postinstall": "electron-builder install-app-deps",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
-    "madge": "madge --warning --circular --ts-config tsconfig.base.json --webpack-config webpack/webpack.render.additions.js --extensions js,jsx,ts,tsx  src/"
+    "madge": "madge --warning --circular --ts-config tsconfig.base.json --webpack-config webpack/webpack.render.additions.js --extensions js,jsx,ts,tsx  src/",
+    "prepare": "husky install"
   },
   "repository": {
     "type": "git",
@@ -41,115 +46,99 @@
     "react",
     "aics"
   ],
-  "resolutions": {
-    "@types/react": "16.9.2"
-  },
   "author": "Lisa Harrylock",
   "license": "ISC",
   "dependencies": {
-    "@aics/aics-react-labkey": "^4.6.3",
-    "@aics/frontend-insights": "0.2.3",
-    "@aics/frontend-insights-plugin-amplitude-node": "0.2.3",
-    "@ant-design/icons": "~1.1.0",
-    "@types/react-beautiful-dnd": "13.1.1",
-    "@types/react-virtualized-auto-sizer": "^1.0.0",
-    "@types/react-window": "^1.8.3",
-    "antd": "3.26.0",
-    "axios": "0.24.0",
-    "axios-retry": "^3.2.4",
-    "chai-as-promised": "7.1.1",
-    "core-js": "2.6.5",
-    "electron-devtools-installer": "^3.1.1",
-    "electron-store": "5.2.0",
-    "electron-updater": "4.2.2",
-    "humps": "2.0.1",
-    "js-logger": "1.6.0",
-    "jsdom": "14.0.0",
-    "jsdom-global": "3.0.2",
-    "lodash": "4.17.20",
-    "moment": "2.24.0",
-    "object-hash": "2.0.3",
-    "react": "16.9.0",
-    "react-beautiful-dnd": "13.1.0",
-    "react-dom": "16.9.0",
-    "react-table": "^7.6.3",
-    "react-virtualized-auto-sizer": "^1.0.5",
-    "react-window": "^1.8.6",
-    "redux-undo": "1.0.0-beta9-9-7",
-    "reselect": "4.0.0",
-    "rimraf": "^3.0.2",
-    "rxjs": "6.5.4",
-    "source-map-support": "0.5.11",
-    "ts-import-plugin": "1.5.5",
-    "ts-node": "9.0.0",
-    "uuid": "^8.3.0"
+    "@aics/aics-react-labkey": "~4.6.3",
+    "@aics/frontend-insights": "~0.2.3",
+    "@aics/frontend-insights-plugin-amplitude-node": "~0.2.3",
+    "@ant-design/icons": "~4.7.0",
+    "@types/react-beautiful-dnd": "~13.1.2",
+    "@types/react-virtualized-auto-sizer": "~1.0.0",
+    "@types/react-window": "~1.8.3",
+    "antd": "~4.18.3",
+    "axios": "~0.24.0",
+    "axios-retry": "~3.2.4",
+    "chai-as-promised": "~7.1.1",
+    "electron-devtools-installer": "~3.2.0",
+    "electron-store": "~8.0.1",
+    "electron-updater": "~4.6.1",
+    "humps": "~2.0.1",
+    "jsdom": "~19.0.0",
+    "jsdom-global": "~3.0.2",
+    "lodash": "~4.17.21",
+    "moment": "~2.29.1",
+    "object-hash": "~2.2.0",
+    "react": "~17.0.2",
+    "react-beautiful-dnd": "~13.1.0",
+    "react-dom": "~17.0.2",
+    "react-table": "~7.7.0",
+    "react-virtualized-auto-sizer": "~1.0.5",
+    "react-window": "~1.8.6",
+    "redux-undo": "~1.0.1",
+    "reselect": "~4.1.5",
+    "rimraf": "~3.0.2",
+    "source-map-support": "~0.5.21",
+    "ts-import-plugin": "~2.0.0",
+    "ts-node": "~10.4.0",
+    "uuid": "~8.3.0"
   },
   "devDependencies": {
-    "@fintechstudios/eslint-plugin-chai-as-promised": "^3.1.0",
-    "@types/chai": "4.1.7",
-    "@types/chai-as-promised": "7.1.2",
-    "@types/classnames": "2.2.7",
-    "@types/electron-devtools-installer": "2.2.0",
-    "@types/electron-json-storage": "4.0.0",
-    "@types/enzyme": "3.9.0",
-    "@types/humps": "1.1.2",
-    "@types/jsdom": "12.2.3",
-    "@types/lodash": "4.14.123",
-    "@types/mocha": "8.0.4",
-    "@types/node": "12.12.47",
-    "@types/object-hash": "1.3.3",
-    "@types/react": "16.9.2",
-    "@types/react-dom": "16.9.0",
-    "@types/react-redux": "7.1.18",
-    "@types/react-table": "^7.0.29",
-    "@types/rimraf": "^3.0.0",
-    "@types/semver": "6.0.0",
-    "@types/sinon": "^9.0.5",
-    "@types/sinon-chai": "^3.2.4",
-    "@types/uuid": "^8.3.0",
-    "@typescript-eslint/eslint-plugin": "2.32.0",
-    "@typescript-eslint/parser": "2.32.0",
-    "chai": "4.2.0",
-    "classnames": "2.2.6",
-    "cross-env": "5.2.0",
-    "css-loader": "2.1.1",
-    "electron": "10.1.5",
-    "electron-builder": "22.9.1",
-    "electron-webpack": "2.6.2",
-    "electron-webpack-ts": "3.1.1",
-    "enzyme": "3.9.0",
-    "enzyme-adapter-react-16": "1.11.2",
-    "eslint": "7.6.0",
-    "eslint-config-prettier": "6.11.0",
-    "eslint-plugin-import": "2.20.2",
-    "eslint-plugin-no-only-tests": "2.4.0",
-    "eslint-plugin-prettier": "3.1.3",
-    "eslint-plugin-react": "7.19.0",
-    "eslint-plugin-react-hooks": "4.0.0",
-    "husky": ">=4",
-    "less": "3.9.0",
-    "less-loader": "4.1.0",
-    "lint-staged": ">=10",
-    "madge": "^3.9.2",
-    "mocha": "8.2.1",
-    "mock-css-modules": "2.0.0",
-    "postcss-import": "12.0.1",
-    "postcss-loader": "3.0.0",
-    "postcss-preset-env": "6.6.0",
-    "prettier": "2.0.5",
-    "react-redux": "7.2.4",
-    "redux": "4.1.0",
-    "redux-logic": "2.1.1",
-    "sinon": "^9.0.3",
-    "sinon-chai": "^3.5.0",
-    "style-loader": "0.23.1",
-    "typescript": "3.7.2",
-    "webpack": "4.28.4"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
+    "@types/chai": "~4.3.0",
+    "@types/chai-as-promised": "~7.1.4",
+    "@types/enzyme": "~3.10.11",
+    "@types/humps": "~2.0.1",
+    "@types/jsdom": "~16.2.14",
+    "@types/lodash": "~4.14.178",
+    "@types/mocha": "~9.0.0",
+    "@types/node": "~17.0.8",
+    "@types/object-hash": "~2.2.1",
+    "@types/react": "~17.0.38",
+    "@types/react-dom": "~17.0.11",
+    "@types/react-redux": "~7.1.21",
+    "@types/react-table": "~7.7.9",
+    "@types/rimraf": "~3.0.0",
+    "@types/semver": "~7.3.9",
+    "@types/sinon": "~10.0.6",
+    "@types/sinon-chai": "~3.2.8",
+    "@types/uuid": "~8.3.0",
+    "@typescript-eslint/eslint-plugin": "~5.9.0",
+    "@typescript-eslint/parser": "~5.9.0",
+    "@wojtekmaj/enzyme-adapter-react-17": "~0.6.6",
+    "chai": "~4.3.4",
+    "classnames": "~2.3.1",
+    "cross-env": "~7.0.3",
+    "css-loader": "~5.2.7",
+    "electron": "~16.0.6",
+    "electron-builder": "~22.14.5",
+    "electron-webpack": "~2.8.2",
+    "electron-webpack-ts": "~4.0.1",
+    "enzyme": "~3.11.0",
+    "eslint": "~8.6.0",
+    "eslint-config-prettier": "~8.3.0",
+    "eslint-plugin-import": "~2.25.4",
+    "eslint-plugin-no-only-tests": "~2.6.0",
+    "eslint-plugin-prettier": "~4.0.0",
+    "eslint-plugin-react": "~7.28.0",
+    "eslint-plugin-react-hooks": "~4.3.0",
+    "husky": "~7.0.4",
+    "less": "~4.1.2",
+    "less-loader": "~7.3.0",
+    "lint-staged": "~12.1.7",
+    "madge": "~5.0.1",
+    "mocha": "~9.1.3",
+    "mock-css-modules": "~2.0.0",
+    "postcss-import": "~14.0.2",
+    "postcss-loader": "~4.2.0",
+    "postcss-preset-env": "~7.2.0",
+    "prettier": "~2.5.1",
+    "react-redux": "~7.2.6",
+    "redux": "~4.1.2",
+    "redux-logic": "~3.0.3",
+    "sinon": "~12.0.1",
+    "sinon-chai": "~3.7.0",
+    "typescript": "~4.5.4",
+    "webpack": "~4.46.0"
   },
   "lint-staged": {
     "*.{ts,tsx,js,jsx}": "eslint --cache --fix"

diff --git a/scripts/adapt-enzyme-to-react-16.js → scripts/adapt-enzyme-to-react-17.js b/scripts/adapt-enzyme-to-react-16.js → scripts/adapt-enzyme-to-react-17.js
@@ -1,5 +1,5 @@
 /* This is intended to be `required` by mocha in order to test React components */
+const Adapter = require("@wojtekmaj/enzyme-adapter-react-17");
 const enzyme = require("enzyme");
-const Adapter = require("enzyme-adapter-react-16");
 
 enzyme.configure({ adapter: new Adapter() });