Merge pull request #5574 from sebavan/master

Fix npm audit for Dev

Tools/Gulp/gulpfile.js

@@ -20,7 +20,7 @@ var replace = require("gulp-replace");
 var uncommentShader = require("./gulp-removeShaderComments");
 var expect = require("gulp-expect-file");
 var optimisejs = require("gulp-optimize-js");
-var webserver = require("gulp-webserver");
+var connect = require("gulp-connect");
 var path = require("path");
 const webpack = require('webpack');
 var webpackStream = require("webpack-stream");
@@ -847,16 +847,19 @@ gulp.task("deployLocalDev", function() {
  */
 gulp.task("webserver", function() {
     var options = {
+        root: "../../.",
         port: 1338,
         livereload: false,
-        middleware: [cors()]
+        middleware: function() {
+            return [cors()];
+        }
     };
 
     if (commandLineOptions.public) {
         options.host = "0.0.0.0";
     }
 
-    return gulp.src("../../.").pipe(webserver(options));
+    connect.server(options);
 });
 
 /**

Tools/Gulp/package.json

@@ -12,10 +12,14 @@
         "@types/node": "^8.10.22",
         "chai": "^4.1.2",
         "color-support": "^1.1.3",
+        "cors": "^2.8.4",
         "del": "3.0.0",
+        "dts-bundle": "^0.7.3",
         "gulp": "^4.0.0",
+        "gulp-clean": "^0.4.0",
         "gulp-clean-ts-extends": "~0.1.1",
         "gulp-concat": "~2.6.1",
+        "gulp-connect": "^5.6.1",
         "gulp-content-to-variable": "^0.1.0",
         "gulp-debug": "^4.0.0",
         "gulp-expect-file": "^1.0.0",
@@ -28,9 +32,7 @@
         "gulp-typedoc": "^2.2.1",
         "gulp-typescript": "4.0.2",
         "gulp-uglify": "^3.0.1",
-        "gulp-webserver": "^0.9.1",
-        "cors": "^2.8.4",
-        "karma": "^2.0.5",
+        "karma": "^3.1.1",
         "karma-browserstack-launcher": "^1.3.0",
         "karma-chai": "^0.1.0",
         "karma-chrome-launcher": "^2.2.0",
@@ -49,9 +51,7 @@
         "typedoc": "^0.12.0",
         "typescript": "~3.0.1",
         "webpack": "^4.16.3",
-        "webpack-stream": "5.0.0",
-        "dts-bundle": "^0.7.3",
-        "gulp-clean": "^0.4.0"
+        "webpack-stream": "5.0.0"
     },
     "scripts": {
         "install": "cd ../../gui && npm install && cd ../Tools/Gulp/ &&  cd ../../inspector && npm install && cd ../Tools/Gulp/ && npm --prefix ../../Playground/ install ../../Playground/ && npm --prefix ../../tests/unit/ install ../../tests/unit/ && npm --prefix ../../Viewer/tests/ install ../../Viewer/tests/ && cd ../../Viewer && npm install && cd ../Tools/Gulp/ && gulp deployLocalDev"