Merge pull request #4880 from Aircloak/sebastian/upgrade-base-images

Security updates
Aircloak · Jan 7, 2021 · 4cbfb44 · 4cbfb44
2 parents 8b4498b + d76de6d
commit 4cbfb44
Show file tree

Hide file tree

Showing 16 changed files with 4,371 additions and 3,527 deletions.
diff --git a/air/assets/package.json b/air/assets/package.json
@@ -33,6 +33,9 @@
     "vega-lite": "^4.12.2",
     "zxcvbn": "^4.4.2"
   },
+  "resolutions": {
+    "node-forge": "0.10.0"
+  },
   "devDependencies": {
     "@babel/core": "^7.9.0",
     "@babel/plugin-proposal-class-properties": "^7.8.3",

diff --git a/air/assets/yarn.lock b/air/assets/yarn.lock
diff --git a/central/Makefile b/central/Makefile
@@ -42,17 +42,10 @@ release:
 release-local:
 	NODE_ENV=production MIX_ENV=prod mix do compile, site_release --env=local --no-tar
 
-lint: eslint flow
+lint:
 	MIX_ENV=dev mix lint
 	MIX_ENV=test mix lint
 
-flow:
-	cd assets && node_modules/.bin/flow check
-
-eslint:
-	cd assets && node_modules/.bin/eslint --max-warnings 0 --rulesdir eslint_rules js
-	cd assets && node_modules/.bin/eslint --max-warnings 0 --rulesdir eslint_rules --config .eslintrc-test.js test
-
 mocha:
 	cd assets && npm test
 

diff --git a/central/assets/js/app.js b/central/assets/js/app.js
@@ -14,10 +14,3 @@
 // If you no longer want to use a dependency, remember
 // to also remove its path from "config.paths.watched".
 import "phoenix_html";
-
-const App = {
-};
-
-if (window.pageConfig !== undefined) {
-  window.pageConfig.onLoad.call(this, App);
-}
diff --git a/central/assets/js/plotly.js b/central/assets/js/plotly.js
diff --git a/central/assets/js/result_socket.js b/central/assets/js/result_socket.js
diff --git a/central/assets/package.json b/central/assets/package.json
@@ -7,29 +7,17 @@
     "clean-css-brunch": "~1.8.0",
     "css-brunch": "~1.7.0",
     "javascript-brunch": "~1.8.0",
-    "jquery": "^2.2.3",
+    "jquery": "^3.5.1",
     "lodash": "^4.11.1",
     "phoenix": "file:../deps/phoenix",
     "phoenix_html": "file:../deps/phoenix_html",
-    "plotly.js": "^1.17.2",
-    "react": "^15.0.1",
-    "react-dom": "^15.0.1",
     "uglify-js-brunch": "~1.7.0"
   },
   "optionalDependencies": {
     "fsevents": "*"
   },
   "devDependencies": {
-    "babel-eslint": "^7.0.0",
-    "babel-plugin-transform-flow-strip-types": "^6.14.0",
     "babel-register": "^6.14.0",
-    "eslint": "^2.9.0",
-    "eslint-config-airbnb": "^9.0.1",
-    "eslint-plugin-flowtype": "^2.19.0",
-    "eslint-plugin-import": "^1.8.0",
-    "eslint-plugin-jsx-a11y": "^1.2.0",
-    "eslint-plugin-react": "^5.1.1",
-    "flow-bin": "^0.33.0",
     "mocha": "^3.0.2"
   },
   "scripts": {