diff --git a/package-lock.json b/package-lock.json index 900d4b5..b59a4a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2234,11 +2234,6 @@ "is-symbol": "1.0.1" } }, - "es6-promise": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz", - "integrity": "sha1-7FYjOGgDKQkgcXDDlEjiREndH8Q=" - }, "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -3866,11 +3861,6 @@ "os-tmpdir": "1.0.2" } }, - "hooks-fixed": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hooks-fixed/-/hooks-fixed-2.0.2.tgz", - "integrity": "sha512-YurCM4gQSetcrhwEtpQHhQ4M7Zo7poNGqY4kQGeBS6eZtOcT3tnNs01ThFa0jYBByAiYt1MjMjP/YApG0EnAvQ==" - }, "htmlescape": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz", @@ -4517,9 +4507,9 @@ "integrity": "sha1-eeoBiRth3mto4T5nwLS1vak3spQ=" }, "kareem": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/kareem/-/kareem-1.5.0.tgz", - "integrity": "sha1-4+QQHZ3P3imXadr0tNtk2JXRdEg=" + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.0.6.tgz", + "integrity": "sha512-/C+l8gABdHsAIfNpykJNWmYodpTnDRyn+JhORkP2VgEf1GgdAc+oTHjVADwISwCJKta031EOIwY6+Hki5z8SpQ==" }, "kind-of": { "version": "3.2.2", @@ -4880,58 +4870,54 @@ "integrity": "sha512-1muXCh8jb1N/gHRbn9VDUBr0GYb8A/aVcHlII9QSB68a50spqEVLIGN6KVmCOnSvJrUhC0edGgKU5ofnGXdYdg==" }, "mongodb": { - "version": "2.2.34", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.34.tgz", - "integrity": "sha1-o09Zu+thdUrsQy3nLD/iFSakTBo=", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.0.4.tgz", + "integrity": "sha512-90YIIs7A4ko4kCGafxxXj3foexCAlJBC0YLwwIKgSLoE7Vni2IqUMz6HSsZ3zbXOfR1KWtxfnc0RyAMAY/ViLg==", "requires": { - "es6-promise": "3.2.1", - "mongodb-core": "2.1.18", - "readable-stream": "2.2.7" + "mongodb-core": "3.0.4" } }, "mongodb-core": { - "version": "2.1.18", - "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.18.tgz", - "integrity": "sha1-TEYTm986HwMt7ZHbSfOO7AFlkFA=", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-3.0.4.tgz", + "integrity": "sha512-OTH267FjfwBdEufSnrgd+u8HuLWRuQ6p8DR0XirPl2BdlLEMh4XwjJf1RTlruILp5p2m1w8dDC8rCxibC3W8qQ==", "requires": { "bson": "1.0.6", "require_optional": "1.0.1" } }, "mongoose": { - "version": "4.13.12", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-4.13.12.tgz", - "integrity": "sha512-pH8NK5AYGbnPeEFFGs5ACk18vzzcy4DFT48U9kKvkfg6SI3nJZkzGfN7o1NDWjy+kP26hWyU/AMhYTfe5hSVnA==", + "version": "5.0.13", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.0.13.tgz", + "integrity": "sha512-VCiutgdxwhTuNHIuUgMRWVYvv0GFw6FUi4j14B7um/Wcy1uhuwF552a6XVKUCth/AY8C+PjVU9fVGJ5K0JmrmQ==", "requires": { "async": "2.1.4", "bson": "1.0.6", - "hooks-fixed": "2.0.2", - "kareem": "1.5.0", + "kareem": "2.0.6", "lodash.get": "4.4.2", - "mongodb": "2.2.34", + "mongodb": "3.0.4", + "mongoose-legacy-pluralize": "1.0.2", "mpath": "0.3.0", - "mpromise": "0.5.5", - "mquery": "2.3.3", + "mquery": "3.0.0", "ms": "2.0.0", - "muri": "1.3.0", "regexp-clone": "0.0.1", "sliced": "1.0.1" } }, + "mongoose-legacy-pluralize": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz", + "integrity": "sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ==" + }, "mpath": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.3.0.tgz", "integrity": "sha1-elj3iem1/TyUUgY0FXlg8mvV70Q=" }, - "mpromise": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mpromise/-/mpromise-0.5.5.tgz", - "integrity": "sha1-9bJCWddjrMIlewoMjG2Gb9UXMuY=" - }, "mquery": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/mquery/-/mquery-2.3.3.tgz", - "integrity": "sha512-NC8L14kn+qxJbbJ1gbcEMDxF0sC3sv+1cbRReXXwVvowcwY1y9KoVZFq0ebwARibsadu8lx8nWGvm3V0Pf0ZWQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/mquery/-/mquery-3.0.0.tgz", + "integrity": "sha512-WL1Lk8v4l8VFSSwN3yCzY9TXw+fKVYKn6f+w86TRzOLSE8k1yTgGaLBPUByJQi8VcLbOdnUneFV/y3Kv874pnQ==", "requires": { "bluebird": "3.5.0", "debug": "2.6.9", @@ -4951,11 +4937,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, - "muri": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/muri/-/muri-1.3.0.tgz", - "integrity": "sha512-FiaFwKl864onHFFUV/a2szAl7X0fxVlSKNdhTf+BM8i8goEgYut8u5P9MqQqIYwvaMxjzVESsoEm/2kfkFH1rg==" - }, "mute-stream": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", @@ -6091,15 +6072,6 @@ } } }, - "pico-flux": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/pico-flux/-/pico-flux-3.0.1.tgz", - "integrity": "sha512-GKz0DI1UimZbMvOwNVWwFZOmLwe86HsDWkLKBQKQqsI0+/vibK/y3Oh2RpsGoroOrP81oToEkaKmUfdQUGcm2A==", - "requires": { - "create-react-class": "15.6.3", - "react": "16.3.1" - } - }, "pico-router": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/pico-router/-/pico-router-2.1.0.tgz", diff --git a/package.json b/package.json index ade10b7..4343e92 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "lodash": "^4.11.2", "marked": "^0.3.5", "moment": "^2.11.0", - "mongoose": "^4.13.12", + "mongoose": "^5.0.13", "nconf": "^0.10.0", "pico-router": "^2.1.0", "react": "^16.3.1", diff --git a/scripts/project.json b/scripts/project.json index fab7063..7523deb 100644 --- a/scripts/project.json +++ b/scripts/project.json @@ -14,7 +14,6 @@ "moment", "superagent", "marked", - "pico-router", - "pico-flux" + "pico-router" ] } \ No newline at end of file diff --git a/server.js b/server.js index d401ef0..d70ac50 100644 --- a/server.js +++ b/server.js @@ -14,12 +14,13 @@ const config = require('nconf') .file('defaults', { file: 'config/default.json' }); //DB -require('mongoose') - .connect(process.env.MONGODB_URI || process.env.MONGOLAB_URI || 'mongodb://localhost/naturalcrit') - .connection.on('error', ()=>{ - console.log('Error : Could not connect to a Mongo Database.'); - console.log(' If you are running locally, make sure mongodb.exe is running.'); - }); +const mongoose = require('mongoose'); +mongoose.connect(process.env.MONGODB_URI || process.env.MONGOLAB_URI || 'mongodb://localhost/naturalcrit'); +mongoose.connection.on('error', ()=>{ + console.log('Error : Could not connect to a Mongo Database.'); + console.log(' If you are running locally, make sure mongodb.exe is running.'); + throw 'Can not connect to Mongo'; +}); //Account MIddleware