chore(deps) Update uglify-js. Tidy up gulp process output so it is now clean.

mchapman · mchapman · commit b3de538bf1f3 · 2017-11-16T15:48:33.000Z
diff --git a/dist/forms-angular.js b/dist/forms-angular.js
diff --git a/dist/forms-angular.min.js b/dist/forms-angular.min.js
diff --git a/gulpfile.js b/gulpfile.js
@@ -3,6 +3,8 @@ var runSequence = require('run-sequence');
 var del = require('del');
 var Server = require('karma').Server;
 var typeScriptCompiler = require('gulp-tsc');
+var uglify = require('gulp-uglify');
+var pump = require('pump');
 
 var browserSources = [
   'js/**/*.ts'
@@ -137,23 +139,30 @@ gulp.task('apiTest', function () {
 //});
 //
 
-gulp.task('uglify', function() {
-  var fs = require('fs');
-  var uglifyJs = require('uglify-js');
-
-  var code = fs.readFileSync('dist/forms-angular.js', 'utf8');
-
-  var parsed = uglifyJs.parse(code);
-  parsed.figure_out_scope();
-
-  var compressed = parsed.transform(uglifyJs.Compressor());
-  compressed.figure_out_scope();
-  compressed.compute_char_frequency();
-  compressed.mangle_names();
-
-  var finalCode = compressed.print_to_string();
-
-  fs.writeFileSync('dist/forms-angular.min.js', finalCode);
+gulp.task('uglify', function(cb) {
+  pump([
+      gulp.src('dist/forms-angular.js'),
+      uglify(),
+      gulp.dest('dist')
+    ],
+    cb
+  );
+  // var fs = require('fs');
+  // var uglifyJs = require('uglify-js');
+  //
+  // var code = fs.readFileSync('dist/forms-angular.js', 'utf8');
+  //
+  // var parsed = uglifyJs.parse(code);
+  // parsed.figure_out_scope();
+  //
+  // var compressed = parsed.transform(uglifyJs.Compressor());
+  // compressed.figure_out_scope();
+  // compressed.compute_char_frequency();
+  // compressed.mangle_names();
+  //
+  // var finalCode = compressed.print_to_string();
+  //
+  // fs.writeFileSync('dist/forms-angular.min.js', finalCode);
 });
 
 
diff --git a/js/services/form-generator.ts b/js/services/form-generator.ts
@@ -1,4 +1,3 @@
-/// <reference path="../../node_modules/@types/jquery/index.d.ts" />
 /// <reference path="../../node_modules/@types/angular/index.d.ts" />
 /// <reference path="../../node_modules/@types/lodash/index.d.ts" />
 /// <reference path="../fng-types.ts" />
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -42,8 +42,8 @@
   "devDependencies": {
     "@types/angular": "^1.6.3",
     "@types/lodash": "^4.14.85",
-    "@types/node": "^8.0.53",
     "@types/mongoose": "^4.7.27",
+    "@types/node": "^8.0.53",
     "body-parser": "1.18.2",
     "del": "3.0.0",
     "express": "4.16.2",
@@ -55,6 +55,7 @@
     "gulp-mocha": "4.3.1",
     "gulp-ng-annotate": "2.0.0",
     "gulp-tsc": "1.3.2",
+    "gulp-uglify": "^3.0.0",
     "gulp-umd": "0.2.1",
     "jasmine-core": "2.8.0",
     "karma": "1.7.1",
@@ -65,9 +66,9 @@
     "matchdep": "2.0.0",
     "mocha": "4.0.1",
     "mongoose": "^4.13.3",
+    "pump": "^1.0.2",
     "run-sequence": "1.2.2",
-    "typescript": "^2.6.1",
-    "uglify-js": "2.8.29"
+    "typescript": "^2.6.1"
   },
   "license": "MIT"
 }
diff --git a/test/api/CRUD-APISpec.js b/test/api/CRUD-APISpec.js
@@ -18,7 +18,7 @@ describe('API', function () {
 
     fng = new (formsAngular)(mongoose, app, {urlPrefix: '/api/'});
 
-    mongoose.connect('localhost', 'forms-ng_test');
+    mongoose.connect('mongodb://localhost/forms-ng_test', {useMongoClient: true});
     mongoose.connection.on('error', function () {
       console.error('connection error', arguments);
     });
diff --git a/test/api/ControlAPISpec.js b/test/api/ControlAPISpec.js
@@ -19,7 +19,7 @@ describe('original API', function () {
 
     fng = new (formsAngular)(mongoose, app, {urlPrefix: '/api/'});
 
-    mongoose.connect('localhost', 'forms-ng_test');
+    mongoose.connect('mongodb://localhost/forms-ng_test', {useMongoClient: true});
     mongoose.connection.on('error', function () {
       console.error('connection error', arguments);
     });
diff --git a/test/api/NewAddResourceAPISpec.js b/test/api/NewAddResourceAPISpec.js
@@ -17,7 +17,7 @@ describe('mongoose collection name API', function () {
 
     fng = new (formsAngular)(mongoose, app, {urlPrefix: '/api/'});
 
-    mongoose.connect('localhost', 'forms-ng_test');
+    mongoose.connect('mongodb://localhost/forms-ng_test', {useMongoClient: true});
     mongoose.connection.on('error', function () {
       console.error('connection error', arguments);
     });
diff --git a/test/api/listAPISpec.js b/test/api/listAPISpec.js
@@ -19,7 +19,7 @@ describe('List API', function () {
 
     fng = new (formsAngular)(mongoose, app, {urlPrefix: '/api/'});
 
-    mongoose.connect('localhost', 'forms-ng_test');
+    mongoose.connect('mongodb://localhost/forms-ng_test', {useMongoClient: true});
     mongoose.connection.on('error', function () {
       console.error('connection error', arguments);
     });
diff --git a/test/api/reportAPISpec.js b/test/api/reportAPISpec.js
@@ -18,8 +18,7 @@ describe('Report API', function () {
 
     fng = new (formsAngular)(mongoose, app, {urlPrefix: '/api/'});
 
-    mongoose.connect('localhost', 'forms-ng_test');
-//    mongoose.set('debug',true);
+    mongoose.connect('mongodb://localhost/forms-ng_test', {useMongoClient: true});
     mongoose.connection.on('error', function () {
       console.error('connection error', arguments);
     });

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-/// <reference path="../../node_modules/@types/jquery/index.d.ts" />`
`2`	`1`	`/// <reference path="../../node_modules/@types/angular/index.d.ts" />`
`3`	`2`	`/// <reference path="../../node_modules/@types/lodash/index.d.ts" />`
`4`	`3`	`/// <reference path="../fng-types.ts" />`