Updated dependencies, everuthing is broken.

Some minor fixes to the code to bring it up to speed.

Author: adrian-hintze

.editorconfig

@@ -0,0 +1,15 @@
+# EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = crlf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

.gitignore

@@ -1,5 +1,5 @@
-.vs/
+.vs/
 node_modules/
 build/
-Snapp.njsproj
+*.njsproj
 tsconfig.json

package-lock.json

@@ -1,128 +1,100 @@
 {
     "name": "snapp",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "description": "Snapp!",
-
     "author": {
         "name": "Adrian Hintze",
         "email": "hintze.adrian@gmail.com",
         "url": "https://github.com/Rydion/"
     },
-
     "private": true,
-
     "scripts": {
         "run": "node build/snapp/Snapp.js",
-
         "prebuild": "rimraf build/logs && rimraf build/upload",
         "build": "npm run build-server && npm run build-client && npm run copy-resources && npm run create-conf-file",
         "prebuild-server": "rimraf build/snapp",
         "build-server": "tsc -p server-tsconfig.json",
         "prebuild-client": "rimraf build/WebContent",
         "build-client": "webpack --progress --profile",
-
         "copy-resources": "npm run copy-snap && npm run copy-nw && npm run copy-icons && npm run copy-conf",
-
         "copy-snap": "npm run copy-snap-full && npm run copy-snap-reduced",
         "precopy-snap-full": "rimraf build/resources/snap/full",
         "copy-snap-full": "copyfiles -u 2 \"node_modules/snap-4-snapp-full/**/*\" \"build/resources/snap/full/files\" && copyfiles -u 2 \"node_modules/snap-4-snapp-full/gui.js\" \"build/resources/snap/full/gui\"",
         "postcopy-snap-full": "rimraf build/resources/snap/full/files/gui.js && rimraf build/resources/snap/full/files/package.json",
         "precopy-snap-reduced": "rimraf build/resources/snap/reduced",
         "copy-snap-reduced": "rimraf build/resources/snap/reduced && copyfiles -u 2 \"node_modules/snap-4-snapp-reduced/**/*\" \"build/resources/snap/reduced/files\" && copyfiles -u 2 \"node_modules/snap-4-snapp-reduced/gui.js\" \"build/resources/snap/reduced/gui\"",
         "postcopy-snap-reduced": "rimraf build/resources/snap/reduced/files/gui.js && rimraf build/resources/snap/reduced/files/package.json",
-
         "precopy-nw": "rimraf build/resources/nw",
         "copy-nw": "copyfiles -u 1 \"nw/**/*\" \"build/resources/nw\"",
-
         "precopy-icons": "rimraf build/resources/icons",
         "copy-icons": "copyfiles -u 1 \"icons/**/*\" \"build/resources/icons\"",
-
         "precopy-conf": "rimraf build/resources/conf",
         "copy-conf": "copyfiles -u 1 \"binary_conf/**/*\" \"build/resources/conf\"",
-
         "precreate-conf-file": "rimraf build/snapp_conf.json",
         "create-conf-file": "echo { \"port\": 80, \"uploadFileSizeLimit\": 100000000, \"compressStaticFiles\": true } >> build/snapp_conf.json"
     },
-
     "engines": {
-        "node": ">=7.9.0",
-        "npm": ">=4.5.0"
+        "node": ">=10.4.1",
+        "npm": ">=6.1.0"
     },
-
     "dependencies": {
-        "express": "4.15.2",
-        "body-parser": "1.17.1",
-        "multer": "1.3.0",
-        "compression": "1.6.2",
-
-        "sax": "1.2.2",
-
-        "archiver": "1.3.0",
-
-        "winston": "2.3.1",
-        "winston-daily-rotate-file": "1.4.6",
-
+        "archiver": "2.1.1",
+        "body-parser": "1.18.3",
+        "compression": "1.7.2",
+        "express": "4.16.3",
         "mkdirp": "0.5.1",
-
-        "stream-to-array": "2.3.0"
+        "multer": "1.3.0",
+        "sax": "1.2.4",
+        "stream-to-array": "2.3.0",
+        "winston": "3.0.0",
+        "winston-daily-rotate-file": "3.2.1"
     },
-
     "devDependencies": {
-        "typescript": "2.3.2",
-
-        "@types/body-parser": "1.16.3",
-        "@types/compression": "0.0.33",
-        "@types/express": "4.0.35",
-        "@types/file-saver": "0.0.1",
-        "@types/mime": "0.0.29",
-        "@types/mkdirp": "0.3.29",
-        "@types/multer": "0.0.33",
-        "@types/node": "7.0.16",
+        "@angular/animations": "6.0.5",
+        "@angular/common": "6.0.5",
+        "@angular/compiler": "6.0.5",
+        "@angular/core": "6.0.5",
+        "@angular/forms": "6.0.5",
+        "@angular/http": "6.0.5",
+        "@angular/platform-browser": "6.0.5",
+        "@angular/platform-browser-dynamic": "6.0.5",
+        "@angular/router": "6.0.5",
+        "@types/body-parser": "1.17.0",
+        "@types/compression": "0.0.36",
+        "@types/express": "4.16.0",
+        "@types/file-saver": "1.3.0",
+        "@types/mime": "2.0.0",
+        "@types/mkdirp": "0.5.2",
+        "@types/multer": "1.3.7",
+        "@types/node": "10.3.3",
         "@types/sax": "1.0.0",
-        "@types/stream-to-array": "0.0.28",
-
-        "concurrently": "3.4.0",
-        "rimraf": "2.6.1",
-        "copyfiles": "1.2.0",
-
-        "webpack": "2.5.0",
-        "webpack-merge": "4.1.0",
-
+        "@types/stream-to-array": "2.3.0",
+        "angular2-busy": "2.0.4",
         "angular2-template-loader": "0.6.2",
-        "awesome-typescript-loader": "3.1.3",
-        "css-loader": "0.28.1",
-        "file-loader": "0.11.1",
-        "html-loader": "0.4.5",
+        "awesome-typescript-loader": "5.1.0",
+        "bootstrap": "4.1.1",
+        "concurrently": "3.5.1",
+        "copyfiles": "2.0.0",
+        "core-js": "2.5.7",
+        "css-loader": "0.28.11",
+        "extract-text-webpack-plugin": "3.0.2",
+        "file-loader": "1.1.11",
+        "file-saver": "1.3.8",
+        "html-loader": "0.5.5",
+        "html-webpack-plugin": "3.2.0",
+        "ngx-modialog": "5.0.1",
         "null-loader": "0.1.1",
         "raw-loader": "0.5.1",
-        "style-loader": "0.17.0",
-        "to-string-loader": "1.1.5",
-
-        "extract-text-webpack-plugin": "2.1.0",
-        "html-webpack-plugin": "2.28.0",
-
-        "@angular/animations": "4.1.1",
-        "@angular/common": "4.1.1",
-        "@angular/compiler": "4.1.1",
-        "@angular/core": "4.1.1",
-        "@angular/forms": "4.1.1",
-        "@angular/http": "4.1.1",
-        "@angular/platform-browser": "4.1.1",
-        "@angular/platform-browser-dynamic": "4.1.1",
-        "@angular/router": "4.1.1",
-
-        "core-js": "2.4.1",
-        "rxjs": "5.3.1",
-        "zone.js": "0.8.10",
-
-        "angular2-busy": "2.0.4",
-        "angular2-modal": "2.0.3",
-
-        "file-saver": "1.3.3",
-
-        "bootstrap": "3.3.7",
-
+        "rimraf": "2.6.2",
+        "rxjs": "6.2.1",
         "snap-4-snapp-full": "git+https://git@github.com/Rydion/Snap-4-Snapp.git#full-v2.0.0",
-        "snap-4-snapp-reduced": "git+https://git@github.com/Rydion/Snap-4-Snapp.git#reduced-v2.0.0"
+        "snap-4-snapp-reduced": "git+https://git@github.com/Rydion/Snap-4-Snapp.git#reduced-v2.0.0",
+        "style-loader": "0.21.0",
+        "to-string-loader": "1.1.5",
+        "typescript": "2.9.2",
+        "webpack": "4.12.0",
+        "webpack-cli": "3.0.8",
+        "webpack-merge": "4.1.3",
+        "zone.js": "0.8.26"
     }
 }

package.json

@@ -1,16 +1,17 @@
 {
     "compilerOptions": {
-        "target": "es2016",
+        "target": "ES2016",
         "module": "commonjs",
         "moduleResolution": "node",
+
         "sourceMap": true,
         "outDir": "./build/snapp",
         "newLine": "LF",
-        "removeComments": false,
 
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
         "lib": [ "es2016", "dom" ],
+
         "strict": true,
         "suppressImplicitAnyIndexErrors": true,
         "noUnusedLocals": true,
@@ -31,4 +32,4 @@
     "exclude": [
         "./node_modules"
     ]
-}
+}

server-tsconfig.json

@@ -6,8 +6,6 @@
  *
  */
 
-'use strict';
-
 import * as path from 'path';
 
 import streamToArray = require('stream-to-array');
@@ -88,15 +86,15 @@ interface ExecGenerationRequestParams {
     useCompleteSnap: boolean;
 }
 
-function validateFilename(filename: string): Promise<undefined> {
+function validateFilename(filename: string): Promise<void> {
     if (validationUtils.validateString(filename, false)) {
         return Promise.reject({ message: 'validateFilename1' });
     }
 
     return Promise.resolve();
 }
 
-function validateFileContents(fileContents: string): Promise<undefined> {
+function validateFileContents(fileContents: string): Promise<void> {
     if (validationUtils.validateString(fileContents, false)) {
         return Promise.reject({ message: 'validateFileContents1' });
     }
@@ -136,7 +134,7 @@ function validateFileContents(fileContents: string): Promise<undefined> {
     return returnPromise;
 }
 
-function validateOs(os: string): Promise<undefined> {
+function validateOs(os: string): Promise<void> {
     const validOsValues: Array<string> = ['mac32', 'mac64', 'lin32', 'lin64', 'win32', 'win64'];
     if (validationUtils.validateString(os, false, validOsValues)) {
         return Promise.reject({ message: 'validateOs1' });
@@ -145,7 +143,7 @@ function validateOs(os: string): Promise<undefined> {
     return Promise.resolve();
 }
 
-function validateResolution(resolution: string): Promise<undefined> {
+function validateResolution(resolution: string): Promise<void> {
     if (validationUtils.validateString(resolution, false)) {
         return Promise.reject({ message: 'validateResolution1' });
     }
@@ -159,15 +157,15 @@ function validateResolution(resolution: string): Promise<undefined> {
     }
 }
 
-function validateUseCompleteSnap(useCompleteSnap: boolean): Promise<undefined> {
+function validateUseCompleteSnap(useCompleteSnap: boolean): Promise<void> {
     if (validationUtils.validateBoolean(useCompleteSnap)) {
         return Promise.reject({ message: 'validateUseCompleteSnap1' });
     }
 
     return Promise.resolve();
 }
 
-function validateParams({ filename, project, os, resolution, useCompleteSnap }: ExecGenerationRequestParams): Promise<undefined> {
+function validateParams({ filename, project, os, resolution, useCompleteSnap }: ExecGenerationRequestParams): Promise<void> {
     const validationPromises = [
         validateFilename(filename),
         validateFileContents(project),
@@ -211,7 +209,7 @@ function buildGui(gui: string, project: string, os: string, projectName: string)
     return result + `IDE_Morph.prototype.snapproject = '${project}';`
 }
 
-function buildProjectPackage(projectPackage: Zip, project: string, os: string, projectName: string, resolution: Resolution, useCompleteSnap: boolean): Promise<undefined> {
+function buildProjectPackage(projectPackage: Zip, project: string, os: string, projectName: string, resolution: Resolution, useCompleteSnap: boolean): Promise<void> {
     const version: string = useCompleteSnap ? 'full' : 'reduced';
 
     projectPackage.append(buildPackageJson(os, projectName, resolution), { name: 'package.json' });
@@ -227,7 +225,7 @@ function buildProjectPackage(projectPackage: Zip, project: string, os: string, p
     });
 }
 
-function buildFinalPackage(finalPackage: Zip, os: string, filename: string): Promise<undefined> {
+function buildFinalPackage(finalPackage: Zip, os: string, filename: string): Promise<void> {
     switch (os) {
         case 'mac64':
         case 'mac32': {
@@ -257,7 +255,7 @@ function buildFinalPackage(finalPackage: Zip, os: string, filename: string): Pro
             finalPackage.directory(path.join(resourcesDir, 'nw', os, 'lib'), rootDir);
             finalPackage.file(path.join(resourcesDir, 'icons', 'lambda.png'), { name: path.join(rootDir, 'lambda.png') });
 
-            const readFilesPromises: Array<Promise<undefined>> = [
+            const readFilesPromises: Array<Promise<void>> = [
                 fileSystemUtils.readTextFile(path.join(resourcesDir, 'conf', 'linux', 'launcher.sh'))
                 .then((launcherTemplate: string) => {
                     const launcher: string = launcherTemplate.replace('<filename>', filename);

src/server/GenerateExecutableHandler.ts

@@ -6,8 +6,6 @@
  *
  */
 
-'use strict';
-
 global.rootDir = __dirname;
 
 import * as path from 'path';
@@ -112,7 +110,7 @@ snapp
     generateExecutable(projectPath, body)
     .then((zip) => {
         const attachmentFilename = `${filename}.zip`;
-        const mimeType = mime.lookup(attachmentFilename);
+        const mimeType: string = <string>mime.getType(attachmentFilename);
 
         response.setHeader('Content-disposition', `attachment; filename=${attachmentFilename}`);
         response.setHeader('Content-type', mimeType);

src/server/Snapp.ts

@@ -6,8 +6,6 @@
  *
  */
 
-'use strict';
-
 import { parser as createSaxParser, SAXParser, Tag, QualifiedTag } from 'sax';
 
 export default class SaxParser {

src/server/Xml.ts

@@ -6,14 +6,12 @@
  *
  */
 
-'use strict';
-
 import { create as getNewArchiver, Archiver } from 'archiver';
 
 const defaultHighWaterMark = 100000000; // TODO -normal- Why does this value work and lower ones not?
 
 export default class Zip {
-    public constructor(onError: Function, onFinish: Function) {
+    public constructor(onError: (...args: any[]) => void, onFinish: (...args: any[]) => void) {
         this.zip = getNewArchiver('zip', { highWaterMark: defaultHighWaterMark });
         this.zip.on('error', onError);
         this.zip.on('finish', onFinish);
@@ -39,7 +37,7 @@ export default class Zip {
     }
 
     public getStream(): NodeJS.ReadableStream {
-        return this.zip;
+        return this.zip.;
     } 
 
     private zip: Archiver;

src/server/Zip.ts

@@ -8,8 +8,6 @@
 
 declare var winstonDailyRotator: any; // Ugly hack, make a d.ts file for winston-daily-rotate-file
 
-'use strict';
-
 import * as path from 'path';
 
 import * as winston from 'winston';

src/server/log/Log.ts

@@ -6,8 +6,6 @@
  *
  */
 
-'use strict';
-
 import * as fs from 'fs';
 
 import * as mkdirp from 'mkdirp';