Updated dependencies and resolved related issues.

Author: adrian-hintze

conf/webpack.prod.js

@@ -1,4 +1,4 @@
-const webpackMerge = require('webpack-merge');
+const { merge: webpackMerge } = require('webpack-merge');
 const TerserJSPlugin = require('terser-webpack-plugin');
 const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const commonConf = require('./webpack.common.js');

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "snapp",
-    "version": "5.0.0",
+    "version": "6.0.0",
     "description": "Snapp! transforms you Snap! projects into standalone executables.",
     "author": {
         "name": "Adrian Hintze",
@@ -53,72 +53,72 @@
         "postdownload-nw-mac64": "rimraf build/resources/nw/mac64/credits.html && rimraf build/resources/nw/mac64/Contents/Resources/app.icns && rimraf build/resources/nw/mac64/Contents/Resources/Info.plist && rimraf build/resources/nw/mac64/Contents/Resources/en.lproj/InfoPlist.strings"
     },
     "engines": {
-        "node": "13.10.1",
-        "npm": "6.13.7"
+        "node": "14.13.1",
+        "npm": "6.14.8"
     },
     "dependencies": {
-        "archiver": "3.1.1",
+        "archiver": "5.0.2",
         "body-parser": "1.19.0",
         "compression": "1.7.4",
         "download-cli": "1.1.1",
         "express": "4.17.1",
-        "mkdirp": "1.0.3",
-        "mime": "2.4.4",
+        "mkdirp": "1.0.4",
+        "mime": "2.4.6",
         "move-cli": "1.2.1",
         "multer": "1.4.2",
         "rimraf": "3.0.2",
         "sax": "1.2.4",
         "stream-to-array": "2.3.0",
-        "winston": "3.2.1",
-        "winston-daily-rotate-file": "4.4.2"
+        "winston": "3.3.3",
+        "winston-daily-rotate-file": "4.5.0"
     },
     "devDependencies": {
-        "@angular/animations": "9.0.5",
-        "@angular/common": "9.0.5",
-        "@angular/compiler": "9.0.5",
-        "@angular/core": "9.0.5",
-        "@angular/forms": "9.0.5",
-        "@angular/platform-browser": "9.0.5",
-        "@angular/platform-browser-dynamic": "9.0.5",
-        "@angular/router": "9.0.5",
-        "@types/archiver": "3.1.0",
+        "@angular/animations": "10.1.5",
+        "@angular/common": "10.1.5",
+        "@angular/compiler": "10.1.5",
+        "@angular/core": "10.1.5",
+        "@angular/forms": "10.1.5",
+        "@angular/platform-browser": "10.1.5",
+        "@angular/platform-browser-dynamic": "10.1.5",
+        "@angular/router": "10.1.5",
+        "@types/archiver": "3.1.1",
         "@types/compression": "1.7.0",
-        "@types/express": "4.17.3",
+        "@types/express": "4.17.8",
         "@types/file-saver": "2.0.1",
-        "@types/mime": "2.0.1",
-        "@types/mkdirp": "1.0.0",
-        "@types/multer": "1.4.2",
-        "@types/node": "13.9.0",
+        "@types/mime": "2.0.3",
+        "@types/mkdirp": "1.0.1",
+        "@types/multer": "1.4.4",
+        "@types/node": "13.13.25",
         "@types/sax": "1.2.1",
         "@types/stream-to-array": "2.3.0",
-        "@types/xmldoc": "1.1.4",
-        "angular2-busy": "2.0.4",
+        "@types/xmldoc": "1.1.5",
+        "qs-angular2-busy": "0.0.2",
         "angular2-template-loader": "0.6.2",
         "awesome-typescript-loader": "5.2.1",
-        "bootstrap": "4.4.1",
-        "concurrently": "5.1.0",
-        "copyfiles": "2.2.0",
-        "core-js": "3.6.4",
-        "css-loader": "3.4.2",
-        "file-loader": "5.1.0",
+        "bootstrap": "4.5.2",
+        "concurrently": "5.3.0",
+        "copyfiles": "2.4.0",
+        "core-js": "3.6.5",
+        "css-loader": "4.3.0",
+        "file-loader": "6.1.1",
         "file-saver": "2.0.2",
-        "html-loader": "0.5.5",
-        "html-webpack-plugin": "3.2.0",
-        "mini-css-extract-plugin": "0.9.0",
-        "ngx-modialog": "6.0.0",
-        "optimize-css-assets-webpack-plugin": "5.0.3",
-        "raw-loader": "4.0.0",
-        "rxjs": "6.5.4",
-        "rxjs-compat": "6.5.4",
-        "snap-4-snapp-full": "git+https://git@github.com/Rydion/Snap-4-Snapp.git#full-v4.0.0",
-        "snap-4-snapp-reduced": "git+https://git@github.com/Rydion/Snap-4-Snapp.git#reduced-v4.0.0",
-        "style-loader": "1.1.3",
+        "html-loader": "1.3.2",
+        "html-webpack-plugin": "4.5.0",
+        "mini-css-extract-plugin": "1.0.0",
+        "ngx-modialog-7": "9.0.2",
+        "optimize-css-assets-webpack-plugin": "5.0.4",
+        "raw-loader": "4.0.2",
+        "rxjs": "6.6.3",
+        "rxjs-compat": "6.6.3",
+        "snap-4-snapp-full": "git+https://git@github.com/Rydion/Snap-4-Snapp.git#6.0.0f",
+        "snap-4-snapp-reduced": "git+https://git@github.com/Rydion/Snap-4-Snapp.git#6.0.0r",
+        "style-loader": "2.0.0",
         "to-string-loader": "1.1.6",
-        "typescript": "3.8.3",
-        "webpack": "4.42.0",
-        "webpack-cli": "3.3.11",
+        "typescript": "4.0.3",
+        "webpack": "5.0.0",
+        "webpack-cli": "4.0.0",
         "webpack-log": "3.0.1",
-        "webpack-merge": "4.2.2",
-        "zone.js": "0.10.2"
+        "webpack-merge": "5.2.0",
+        "zone.js": "0.11.1"
     }
 }

package.json

@@ -8,7 +8,7 @@
 
 import { Component } from '@angular/core';
 
-import { Modal } from 'ngx-modialog/plugins/bootstrap';
+import { Modal } from 'ngx-modialog-7/plugins/bootstrap';
 
 @Component({
     selector: 'snapp-about',

src/client/components/about-component/about.component.ts

@@ -12,10 +12,10 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { FormsModule } from '@angular/forms';
 import { HttpClientModule } from '@angular/common/http';
 
-import { BusyModule } from 'angular2-busy';
+import { QsAngular2BusyModule } from 'qs-angular2-busy';
 
-import { ModalModule } from 'ngx-modialog';
-import { BootstrapModalModule } from 'ngx-modialog/plugins/bootstrap';
+import { ModalModule } from 'ngx-modialog-7';
+import { BootstrapModalModule } from 'ngx-modialog-7/plugins/bootstrap';
 
 import MainComponent from '../components/main-component/main.component';
 import SnapProjectSubmitFormComponent from '../components/snap-project-submit-form-component/snap-project-submit-form.component';
@@ -29,7 +29,7 @@ import { FileDownloadService } from '../services/file-download.service';
         BrowserAnimationsModule,
         FormsModule,
         HttpClientModule,
-        BusyModule,
+        QsAngular2BusyModule,
         ModalModule.forRoot(),
         BootstrapModalModule
     ],

src/client/modules/main.module.ts

@@ -15,3 +15,11 @@ import 'core-js/es/reflect';
 import 'core-js/proposals/reflect-metadata';
 
 import 'zone.js/dist/zone';
+
+// workaround for deprecated libraries (ngx-modialog-7)
+declare module "@angular/core" {
+    interface ModuleWithProviders<T = any> {
+        ngModule: Type<T>;
+        providers?: Provider[];
+    }
+}

src/client/polyfills.ts

@@ -10,10 +10,10 @@ import '@angular/router';
 import 'rxjs';
 
 // npm
-import 'angular2-busy';
-import 'ngx-modialog';
+import 'qs-angular2-busy';
+import 'ngx-modialog-7';
 import 'file-saver';
 
 // CSS
 import 'bootstrap/dist/css/bootstrap.css';
-import 'angular2-busy/build/style/busy.css';
+import 'qs-angular2-busy/styles/busy.css';

src/client/vendor.ts

@@ -61,7 +61,7 @@ const upload = multer({
 
 const snapProjectUpload = upload.single('project');
 const snapProjectUploadMiddleware = (request: express.Request, response: express.Response, next: express.NextFunction) => {
-    snapProjectUpload(request, response, (error) => {
+    snapProjectUpload(request, response, (error: any) => {
         if (error) {
             logger.error({ moduleName, message: 'Error ocurred while uploading project xml.', error });
             const { code } = error;

src/server/Snapp.ts

@@ -52,7 +52,7 @@ export class Logger {
         });
 
         const logger: winston.Logger = winston.createLogger({
-            level: isProduction ? 'info' : 'silly',
+            level: isProduction() ? 'info' : 'silly',
             format: winston.format.combine(
                 winston.format.timestamp(),
                 productionFormat