Merge pull request #380 from ubccpsctech/feature/package-updates

Feature/package updates
ubccpsc · Jun 14, 2021 · 35cc5d8 · 35cc5d8
2 parents 0085223 + 2dee41f
commit 35cc5d8
Show file tree

Hide file tree

Showing 6 changed files with 2,370 additions and 6,000 deletions.
diff --git a/package.json b/package.json
@@ -36,12 +36,11 @@
         "@types/restify": "^8.4.1",
         "chai": "4.1.2",
         "jsonschema": "1.2.2",
-        "lerna": "^2.0.0-rc.5",
-        "mocha": "^7.1.0",
+        "mocha": "^9.0.0",
         "ts-node": "4.1.0",
         "tslint": "^5.11.0",
         "typescript": "^3.7.2",
-        "webpack": "^3.11.0"
+        "webpack": "^5.38.1"
     },
     "dependencies": {
         "@types/mongodb": "^3.0.5",

diff --git a/packages/autotest/package.json b/packages/autotest/package.json
@@ -25,11 +25,11 @@
     "dotenv": "4.0.0",
     "fs-extra": "5.0.0",
     "jszip": "^3.2.1",
-    "xunit-viewer": "^6.0.14",
-    "mocha": "^7.1.0",
+    "xunit-viewer": "^7.1.5",
+    "mocha": "^9.0.0",
     "mocha-junit-reporter": "^1.17.0",
     "mongodb": "^3.0.2",
-    "nyc": "^12.0.2",
+    "nyc": "^15.1.0",
     "restify": "^8.4.0",
     "ts-node": "^7.0.0",
     "typescript": "^3.7.2"

diff --git a/packages/portal/backend/package.json b/packages/portal/backend/package.json
@@ -27,7 +27,6 @@
         "@types/cookie": "^0.3.1",
         "@types/node": "^12.0.0",
         "@types/supertest": "^2.0.8",
-        "awesome-typescript-loader": "^5.2.1",
         "chai": "^4.1.2",
         "child-process-promise": "^2.2.1",
         "client-oauth2": "^4.2.1",
@@ -39,11 +38,11 @@
         "dotenv": "^5.0.1",
         "fs-extra": "^5.0.0",
         "markdown-table": "^1.1.2",
-        "mocha": "^7.1.0",
+        "mocha": "^9.0.0",
         "mocha-junit-reporter": "^1.17.0",
         "mongodb": "^3.0.3",
         "node-schedule": "^1.3.0",
-        "nyc": "^12.0.2",
+        "nyc": "^15.1.0",
         "restify": "^8.4.0",
         "source-map-loader": "^0.2.3",
         "supertest": "5.0.0-0",
@@ -53,6 +52,6 @@
         "tslint": "^5.11.0",
         "types": "^0.1.1",
         "typescript": "^3.7.2",
-        "xunit-viewer": "^6.0.14"
+        "xunit-viewer": "^7.1.5"
     }
 }
diff --git a/packages/portal/frontend/package.json b/packages/portal/frontend/package.json
@@ -37,8 +37,8 @@
         "tsconfig-paths-webpack-plugin": "^3.3.0",
         "tslint": "^5.11.0",
         "typescript": "^3.5.1",
-        "webpack": "^4.41.5",
-        "webpack-cli": "^3.3.10"
+        "webpack": "^5.38.1",
+        "webpack-cli": "^4.7.2"
     },
     "resolutions": {
         "**/event-stream": "^4.0.1"

diff --git a/packages/portal/frontend/webpack.config.js b/packages/portal/frontend/webpack.config.js
@@ -10,6 +10,7 @@ const CopyPlugin = require('copy-webpack-plugin');
 
 // handle @frontend and @common type import aliases from plugin
 const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
+const { webpack, DefinePlugin } = require('webpack');
 
 /**
  * Checks if plugin enabled in .env. Assume there _must_ be custom html as well.
@@ -35,6 +36,9 @@ module.exports = {
     mode: 'development',
 
     plugins: [
+        new DefinePlugin({
+            'process.env.LOG_LEVEL': JSON.stringify(process.env.LOG_LEVEL) || JSON.stringify('INFO')
+        }),
         new CopyPlugin({
             patterns: [
                 // copy plugin frontend files if plugin enabled or copy default Classy logic into place