diff --git a/config/dev.json b/config/dev.json index e939834..3af8a0a 100644 --- a/config/dev.json +++ b/config/dev.json @@ -6,7 +6,7 @@ "Database": { "host": "mongodb://localhost:27017/shimapan-dev" }, - "Uploads": { + "Upload": { "path": "uploads-dev" }, "Log": { diff --git a/gulpfile.js b/gulpfile.js index 4599f02..ca38416 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -3,7 +3,10 @@ const gulp = require('gulp'); const concat = require('gulp-concat'); const rename = require('gulp-rename'); -const uglify = require('gulp-uglify'); +//const uglify = require('gulp-uglify'); +const uglifyes = require('uglify-es'); +const composer = require('gulp-uglify/composer'); +const uglify = composer(uglifyes, console); const source = require('vinyl-source-stream'); const browserify = require('browserify'); const es = require('event-stream'); diff --git a/package-lock.json b/package-lock.json index adfd3df..66b8d37 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1445,16 +1445,6 @@ "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz", "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=" }, - "clipboard": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.1.tgz", - "integrity": "sha512-7yhQBmtN+uYZmfRjjVjKa0dZdWuabzpSKGtyQZN+9C8xlC788SSJjOHWh7tzurfwTqTD5UDYAhIv5fRJg3sHjQ==", - "requires": { - "good-listener": "^1.2.2", - "select": "^1.1.2", - "tiny-emitter": "^2.0.0" - } - }, "cliui": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", @@ -6714,11 +6704,28 @@ "integrity": "sha1-AYAPOHLlJvlTEPhHfpnk8S0NjRQ=" }, "ngclipboard": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ngclipboard/-/ngclipboard-2.0.0.tgz", - "integrity": "sha1-QG9sNNIdeME/qvp/ffKuSs1Q51o=", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/ngclipboard/-/ngclipboard-1.1.2.tgz", + "integrity": "sha1-RZ8B8+4eisQBWZquo3uXdQh9WW0=", "requires": { - "clipboard": "^2.0.0" + "clipboard": "~1.5.5" + }, + "dependencies": { + "clipboard": { + "version": "1.5.16", + "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-1.5.16.tgz", + "integrity": "sha1-kW1ec5sAZL5hsLSKU1cx7K7z02c=", + "requires": { + "good-listener": "^1.2.0", + "select": "^1.0.6", + "tiny-emitter": "^1.0.0" + } + }, + "tiny-emitter": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-1.2.0.tgz", + "integrity": "sha1-bchFBSywjr78GHRyO1jySmSMO28=" + } } }, "nocache": { @@ -14670,11 +14677,6 @@ "process": "~0.11.0" } }, - "tiny-emitter": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz", - "integrity": "sha512-2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow==" - }, "to-absolute-glob": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz", @@ -14800,6 +14802,30 @@ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", "dev": true }, + "uglify-es": { + "version": "3.3.9", + "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz", + "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", + "dev": true, + "requires": { + "commander": "~2.13.0", + "source-map": "~0.6.1" + }, + "dependencies": { + "commander": { + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", + "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "uglify-js": { "version": "3.4.5", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.5.tgz", diff --git a/package.json b/package.json index 60cb148..116ab59 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "mongoose": "^5.2.5", "morgan": "^1.9.0", "ng-file-upload": "^12.2.13", - "ngclipboard": "^2.0.0", + "ngclipboard": "^1.1.2", "passport": "^0.4.0", "passport-local": "^1.0.0", "passport-local-mongoose": "^5.0.1", @@ -45,7 +45,8 @@ "mocha": "^5.2.0", "nodemon": "^1.18.3", "npx": "^10.2.0", - "nyc": "^12.0.2" + "nyc": "^12.0.2", + "uglify-es": "^3.3.9" }, "author": "Jack Foltz", "license": "LICENSE", @@ -54,6 +55,7 @@ "build": "npx gulp", "start": "npx gulp start", "watch": "npx gulp watch" + }, "repository": { "type": "git",