From 44aafec7008034d37959296728a492fda12470b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Ne=C5=A1=C4=8Divera?= Date: Wed, 5 Jul 2017 12:15:43 +0200 Subject: [PATCH 1/2] enhancet gitignore and package-lock --- .gitignore | 1 + package-lock.json | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 47adaaf..fca38b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ node_modules \.vscode/ +npm-debug.log diff --git a/package-lock.json b/package-lock.json index fed7ff2..a7ec95b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53,11 +53,6 @@ "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", "dev": true }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" - }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -280,7 +275,7 @@ "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==" + "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=" }, "minimist": { "version": "0.0.8", From 70da40e58eab6ecef4d85ffda67173153816d016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Ne=C5=A1=C4=8Divera?= Date: Wed, 5 Jul 2017 20:07:57 +0200 Subject: [PATCH 2/2] updated dependencies --- package-lock.json | 149 +++++++++++++++++++++++++++------------------- package.json | 2 +- server/app.js | 2 +- 3 files changed, 91 insertions(+), 62 deletions(-) diff --git a/package-lock.json b/package-lock.json index a7ec95b..ab41629 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,11 +13,6 @@ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz", "integrity": "sha1-7nQAlBMALYTOxyGcasgRgS5yMWA=" }, - "backoff": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz", - "integrity": "sha1-9hbtqdPktmuMp/ynn2lXIsX44m8=" - }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", @@ -47,37 +42,32 @@ } } }, + "clone-regexp": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz", + "integrity": "sha1-6uCiQT9VwJQvgYwin+/OhF1/Oxw=" + }, "commander": { "version": "2.9.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", "dev": true }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, - "csv": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/csv/-/csv-0.4.6.tgz", - "integrity": "sha1-jbrn3f26rmLB6ph8Pg+Kmsc3tz0=" - }, - "csv-generate": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/csv-generate/-/csv-generate-0.0.6.tgz", - "integrity": "sha1-l+TmOuRrIZEs2UdbwxRp0m9a3mY=" - }, "csv-parse": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.0.tgz", "integrity": "sha1-BHtzhoq5qFdG6IX2N/ntD7ZFpCU=" }, - "csv-stringify": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-0.0.8.tgz", - "integrity": "sha1-Usw7PfwZd1jFWtMlqVvoUHH55Rs=" - }, "ctype": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz", @@ -101,9 +91,9 @@ "dev": true }, "dtrace-provider": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz", - "integrity": "sha1-CweNVReTfYcxAUUtkUZzdVe3XlE=", + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.3.tgz", + "integrity": "sha1-uhv8ZJMoXM/PxqtpzVxh10wqQ78=", "optional": true }, "escape-regexp-component": { @@ -187,6 +177,16 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, + "is-regexp": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", + "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=" + }, + "is-supported-regexp-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz", + "integrity": "sha1-i1IMhfrnolM4LUsCZS4EVXbhO7g=" + }, "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", @@ -198,10 +198,10 @@ "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=", "dev": true }, - "keep-alive-agent": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz", - "integrity": "sha1-RIR8o5TOjWtSGuhYFr1kUJlCs4U=" + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" }, "lodash._baseassign": { "version": "3.2.0", @@ -239,6 +239,11 @@ "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=", "dev": true }, + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=" + }, "lodash.isarguments": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", @@ -328,11 +333,6 @@ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=" }, - "node-uuid": { - "version": "1.4.8", - "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz", - "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=" - }, "obuf": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.1.tgz", @@ -348,11 +348,6 @@ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, - "precond": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz", - "integrity": "sha1-qpWRvKokkj8eD0hJ0kD0fvwQdaw=" - }, "process-nextick-args": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", @@ -381,9 +376,60 @@ } }, "restify": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/restify/-/restify-5.0.0.tgz", + "integrity": "sha1-KCsGiGFi0uYE5EGobc/cEj7dzX4=", + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + }, + "csv": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/csv/-/csv-1.1.1.tgz", + "integrity": "sha1-2ZUtWbH5ZKevvN2ATWgYpzGZpHc=" + }, + "csv-generate": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/csv-generate/-/csv-generate-1.0.0.tgz", + "integrity": "sha1-vVKIaFnQySXz5R9g86vtJi+hXK8=" + }, + "csv-stringify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-1.0.4.tgz", + "integrity": "sha1-vBi6ua1M7zGV/SV5gLWLR5xC0+U=" + }, + "semver": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=" + }, + "vasync": { + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/vasync/-/vasync-1.6.4.tgz", + "integrity": "sha1-3+k2Fq0OeugBszKp2Iv8XNyOHR8=", + "dependencies": { + "verror": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.6.0.tgz", + "integrity": "sha1-fROyex+swuLakEBetepuW90lLqU=" + } + } + } + } + }, + "restify-errors": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/restify/-/restify-4.3.0.tgz", - "integrity": "sha1-A7Z5YNHUKm2vzeO9gvuIIXOidng=" + "resolved": "https://registry.npmjs.org/restify-errors/-/restify-errors-4.3.0.tgz", + "integrity": "sha1-7JDzCTTX8xGRNRgd/DA+ML5gGr4=", + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + } + } }, "rimraf": { "version": "2.4.5", @@ -415,11 +461,6 @@ "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=" }, - "semver": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", - "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=" - }, "spdy": { "version": "3.4.7", "resolved": "https://registry.npmjs.org/spdy/-/spdy-3.4.7.tgz", @@ -483,27 +524,15 @@ "integrity": "sha1-Trw8d04WkUjLx2inNCUz8ILHpuU=", "dev": true }, - "tunnel-agent": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", - "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=" - }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, - "vasync": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/vasync/-/vasync-1.6.3.tgz", - "integrity": "sha1-SmnXBSpH9M6FUD12Qd8cv0BDKpQ=", - "dependencies": { - "verror": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.6.0.tgz", - "integrity": "sha1-fROyex+swuLakEBetepuW90lLqU=" - } - } + "uuid": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", + "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==" }, "verror": { "version": "1.10.0", diff --git a/package.json b/package.json index 5a3c6aa..db4a77c 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ }, "homepage": "https://eventer.azurewebsites.net", "dependencies": { - "restify": "^4.3.0" + "restify": "^5.0.0" }, "devDependencies": { "mocha": "^3.4.2", diff --git a/server/app.js b/server/app.js index 2dc7fb0..3e89199 100644 --- a/server/app.js +++ b/server/app.js @@ -8,7 +8,7 @@ server.get('/rest', function(req, res, next){ next(); }); -server.get(/\/?.*/, restify.serveStatic({ +server.get(/\/?.*/, restify.plugins.serveStatic({ directory: path.join(constants.applicationRoot, 'app'), default: 'index.html' }))