Syntax update and formatting tweaks

2 files changed, 35 insertions, 26 deletions

diff --git a/clientSource/package-lock.json b/clientSource/package-lock.json
index b08a515..85b9e00 100644
--- a/clientSource/package-lock.json
+++ b/clientSource/package-lock.json
@@ -5,9 +5,12 @@
   "requires": true,
   "dependencies": {
     "async": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz",
-      "integrity": "sha1-rDYTsdqb7RtHUQu0ZRuJMeRxRsc="
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "requires": {
+        "lodash": "^4.17.14"
+      }
     },
     "colors": {
       "version": "1.0.3",
@@ -28,14 +31,14 @@
       }
     },
     "ecstatic": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/ecstatic/-/ecstatic-1.4.1.tgz",
-      "integrity": "sha1-Mst7b6LikNWGaGdNEV6PDD1WfWo=",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/ecstatic/-/ecstatic-3.3.2.tgz",
+      "integrity": "sha512-fLf9l1hnwrHI2xn9mEDT7KIi22UDqA2jaCwyCbSUJh9a1V+LEUSL/JO/6TIz/QyuBURWUHrFL5Kg2TtO1bkkog==",
       "requires": {
-        "he": "^0.5.0",
-        "mime": "^1.2.11",
+        "he": "^1.1.1",
+        "mime": "^1.6.0",
         "minimist": "^1.1.0",
-        "url-join": "^1.0.0"
+        "url-join": "^2.0.5"
       }
     },
     "eventemitter3": {
@@ -52,9 +55,9 @@
       }
     },
     "he": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-0.5.0.tgz",
-      "integrity": "sha1-LAX/rvkLaOhg8/0rVO9YCYknfuI="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
     },
     "http-proxy": {
       "version": "1.18.0",
@@ -67,20 +70,25 @@
       }
     },
     "http-server": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/http-server/-/http-server-0.9.0.tgz",
-      "integrity": "sha1-jxsGvcczYY1NxCgxx7oa/04GABo=",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/http-server/-/http-server-0.11.1.tgz",
+      "integrity": "sha512-6JeGDGoujJLmhjiRGlt8yK8Z9Kl0vnl/dQoQZlc4oeqaUoAKQg94NILLfrY3oWzSyFaQCVNTcKE5PZ3cH8VP9w==",
       "requires": {
         "colors": "1.0.3",
         "corser": "~2.0.0",
-        "ecstatic": "^1.4.0",
+        "ecstatic": "^3.0.0",
         "http-proxy": "^1.8.1",
         "opener": "~1.4.0",
         "optimist": "0.6.x",
-        "portfinder": "0.4.x",
+        "portfinder": "^1.0.13",
         "union": "~0.4.3"
       }
     },
+    "lodash": {
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+    },
     "mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -133,12 +141,13 @@
       }
     },
     "portfinder": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-0.4.0.tgz",
-      "integrity": "sha1-o/+t/6/k+5jgYBqF7aJ8J86Eyh4=",
+      "version": "1.0.25",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz",
+      "integrity": "sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==",
       "requires": {
-        "async": "0.9.0",
-        "mkdirp": "0.5.x"
+        "async": "^2.6.2",
+        "debug": "^3.1.1",
+        "mkdirp": "^0.5.1"
       }
     },
     "qs": {
@@ -160,9 +169,9 @@
       }
     },
     "url-join": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/url-join/-/url-join-1.1.0.tgz",
-      "integrity": "sha1-dBxsL0WWxIMNZxhGCSDQySIC3Hg="
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/url-join/-/url-join-2.0.5.tgz",
+      "integrity": "sha1-WvIvGMBSoACkjXuCxenC4v7tpyg="
     },
     "wordwrap": {
       "version": "0.0.3",
diff --git a/clientSource/package.json b/clientSource/package.json
index 7abba43..63df0d3 100644
--- a/clientSource/package.json
+++ b/clientSource/package.json
@@ -17,6 +17,6 @@
   "author": "Marzavec",
   "license": "WTFPL",
   "dependencies": {
-    "http-server": "^0.9.0"
+    "http-server": "^0.11.1"
   }
 }