Merge pull request #20 from XElementDev/Updates_20210128

Updates 20210128

Author: IanStorm

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.10
+FROM alpine:3.13
 
 LABEL maintainer="https://github.com/IanStorm"
 
@@ -8,9 +8,9 @@ WORKDIR /opt/xelement/money-server
 COPY / ./
 
 #	↓	Install Node.js
-RUN apk add jq=1.6-r0 && \
-	XE_NODE_VERSION="$(cat ./package.json | jq -r '.engines.node')-r0" && \
-	apk add nodejs=$XE_NODE_VERSION npm=$XE_NODE_VERSION
+RUN apk add jq=~1.6 && \
+	XE_NODE_VERSION="$(cat ./package.json | jq -r '.engines.node')" && \
+	apk add nodejs=~$XE_NODE_VERSION npm=~$XE_NODE_VERSION
 
 #	↓	Compile money-server
 RUN npm install --unsafe-perm

README.md

@@ -1,15 +1,19 @@
 # Money Server
+
 [![Build Status](https://xelement.visualstudio.com/money-server/_apis/build/status/XElementDev.money-server?branchName=master)](https://xelement.visualstudio.com/money-server/_build/latest?definitionId=5&branchName=master)
 [![dependencies Status](https://david-dm.org/XElementDev/money-server/status.svg)](https://david-dm.org/XElementDev/money-server)
+[![devDependencies Status](https://david-dm.org/XElementDev/money-server/dev-status.svg)](https://david-dm.org/XElementDev/money-server?type=dev)
 [![Docker Pulls](https://img.shields.io/docker/pulls/xelement/money-server)](https://hub.docker.com/r/xelement/money-server)
 [![Docker Stars](https://img.shields.io/docker/stars/xelement/money-server)](https://hub.docker.com/r/xelement/money-server)
 
 
 ## End-user installation
+
 The software is currently in a state that does not yet allow an end-user installation.
 
 
 ## Development
+
 1. Install *Node.js*. (The required version can be found inside the `package.json` file.)
 2. Clone this repository.
 2. `cd` inside the cloned directory and run `npm install`.
@@ -19,6 +23,7 @@ The software is currently in a state that does not yet allow an end-user install
 
 
 ### ...via Docker and Visual Studio Code
+
 1. Clone this repository.
 2. Open the repository in vscode.
 2. Run the vscode task `install (Docker)`.

etc/gulp/GulpModel.ts

@@ -1,6 +1,6 @@
 import * as colors from "ansi-colors";
-import * as path from "path";
-import * as through from "through2";
+import path from "path";
+import through from "through2";
 
 
 export class GulpModel {

etc/gulp/build.ts

@@ -1,5 +1,5 @@
-import * as gulp from "gulp";
-import * as Undertaker from "undertaker";
+import gulp from "gulp";
+import Undertaker from "undertaker";
 import { typescriptTaskName } from "./ts";
 import { tslintTaskName } from "./tslint";
 import { tsoaTaskName } from "./tsoa";

etc/gulp/clean.ts

@@ -1,5 +1,5 @@
-import * as del from "del";
-import * as gulp from "gulp";
+import del from "del";
+import gulp from "gulp";
 import { GulpModel } from "./GulpModel";
 
 

etc/gulp/run-all-tests.ts

@@ -1,6 +1,6 @@
-import * as gulp from "gulp";
-import * as gulpMocha from "gulp-mocha";
-import * as path from "path";
+import gulp from "gulp";
+import gulpMocha from "gulp-mocha";
+import path from "path";
 import { SrcOptions } from "vinyl-fs";
 import { GulpModel } from "./GulpModel";
 
@@ -12,7 +12,7 @@ const runAllTestsTaskFunction: () => NodeJS.ReadWriteStream = () => {
 		read: false,
 		since: undefined // always re-run tests from all files
 	};
-	const mochaSetupOptions: MochaSetupOptions = {
+	const mochaSetupOptions: Mocha.MochaOptions = {
 		reporter: "spec"
 	};
 	const globs: Array<string> = [

etc/gulp/test.ts

@@ -1,5 +1,5 @@
-import * as gulp from "gulp";
-import * as Undertaker from "undertaker";
+import gulp from "gulp";
+import Undertaker from "undertaker";
 import { buildTaskName } from "./build";
 import { runAllTestsTaskName } from "./run-all-tests";
 

etc/gulp/ts.ts

@@ -1,7 +1,7 @@
-import * as gulp from "gulp";
-import * as gulpTs from "gulp-typescript";
-import * as path from "path";
-import * as ts from "typescript";
+import gulp from "gulp";
+import gulpTs from "gulp-typescript";
+import path from "path";
+import ts from "typescript";
 import { SrcOptions } from "vinyl-fs";
 import { GulpModel } from "./GulpModel";
 

etc/gulp/tslint.ts

@@ -1,12 +1,12 @@
-import * as gulp from "gulp";
+import gulp from "gulp";
 import {
 	default as gulpTslint,
 	PluginOptions,
 	ReportOptions
 	} from "gulp-tslint";
-import * as path from "path";
+import path from "path";
 import * as tslint from "tslint";
-import * as Undertaker from "undertaker";
+import Undertaker from "undertaker";
 import { SrcOptions } from "vinyl-fs";
 import { GulpModel } from "./GulpModel";
 

etc/gulp/tsoa.ts

@@ -1,8 +1,8 @@
-import * as cpp from "child-process-promise";
-import * as gulp from "gulp";
-import * as ListStream from "list-stream";
-import * as path from "path";
-import * as File from "vinyl";
+import cpp from "child-process-promise";
+import gulp from "gulp";
+import ListStream from "list-stream";
+import path from "path";
+import File from "vinyl";
 import { SrcOptions } from "vinyl-fs";
 import { GulpModel } from "./GulpModel";
 
@@ -38,7 +38,7 @@ const tsoaTaskFunction: () => Promise<void> = async () => {
 	console.log(`Going to run \`tsoa\` on ${folderPaths.length} folder(s).`);
 	const tsoaCmdPath = path.join(GulpModel.absoluteCommandFolderPath, "tsoa");
 	for (const folderPath of folderPaths) {
-		await exec(`${tsoaCmdPath} swagger`, { cwd: folderPath });
+		await exec(`${tsoaCmdPath} spec`, { cwd: folderPath });
 		await exec(`${tsoaCmdPath} routes`, { cwd: folderPath });
 	}
 	return;

etc/gulp/watch.ts

@@ -1,5 +1,5 @@
-import * as gulp from "gulp";
-import * as Undertaker from "undertaker";
+import gulp from "gulp";
+import Undertaker from "undertaker";
 import { GulpModel } from "./GulpModel";
 import { testTaskFunction } from "./test";
 

etc/ts/base/tsconfig.json

@@ -2,6 +2,7 @@
 	"compilerOptions": {
 		"alwaysStrict": true,
 		"baseUrl": "../../../",
+		"esModuleInterop": true,
 		"module": "commonjs",
 		"moduleResolution": "node",
 		"noEmitOnError": true,