Merge pull request #13 from djbreen7/npm-updates

Fix Node Module Vulnerabilities

Author: AndreyBelym

.eslintrc

@@ -5,7 +5,6 @@
     "no-array-constructor": 2,
     "no-caller": 2,
     "no-catch-shadow": 2,
-    "no-empty-label": 2,
     "no-eval": 2,
     "no-extend-native": 2,
     "no-extra-bind": 2,
@@ -40,12 +39,12 @@
     "semi": 2,
     "semi-spacing": [2, {"before": false, "after": true}],
     "space-infix-ops": 2,
-    "space-return-throw-case": 2,
     "space-unary-ops": [2, { "words": true, "nonwords": false }],
     "yoda": [2, "never"],
     "brace-style": [2, "stroustrup", { "allowSingleLine": false }],
     "eol-last": 2,
     "indent": 2,
+    "keyword-spacing": [2, {"after": true}],
     "key-spacing": [2, { "align": "value" }],
     "max-nested-callbacks": [2, 3],
     "new-parens": 2,
@@ -58,7 +57,6 @@
     "object-curly-spacing": [2, "always"],
     "operator-assignment": [2, "always"],
     "quotes": [2, "single", "avoid-escape"],
-    "space-after-keywords": [2, "always"],
     "space-before-blocks": [2, "always"],
     "prefer-const": 2,
     "no-path-concat": 2,
@@ -82,6 +80,7 @@
     "handle-callback-err": 0
   },
   "env": {
-    "node": true
+    "node": true,
+    "es6":  true
   }
 }

.travis.yml

@@ -1,4 +1,4 @@
 language: node_js
 node_js:
   - stable
-  - v4
+  - 6

Gulpfile.js

@@ -1,27 +1,30 @@
 'use strict';
 
-var gulp   = require('gulp');
+var gulp = require('gulp');
 var eslint = require('gulp-eslint');
-var mocha  = require('gulp-mocha');
+var mocha = require('gulp-mocha');
 
-gulp.task('lint', function () {
+function lint () {
     return gulp
         .src([
             'generators/app/index.js',
-            'test.js',
+            'test/test.js',
             'Gulpfile.js'
         ])
         .pipe(eslint())
         .pipe(eslint.format())
         .pipe(eslint.failAfterError());
-});
+}
 
-gulp.task('test', ['lint'], function () {
+function test () {
     return gulp
         .src('test/test.js')
         .pipe(mocha({
             ui:       'bdd',
             reporter: 'spec',
             timeout:  typeof v8debug === 'undefined' ? 20000 : Infinity // NOTE: disable timeouts in debug
         }));
-});
+}
+
+exports.lint = lint;
+exports.test = gulp.series(lint, test);

generators/app/index.js

@@ -1,17 +1,14 @@
 'use strict';
-var yeoman       = require('yeoman-generator');
+var Generator    = require('yeoman-generator');
 var slugify      = require('underscore.string').slugify;
 var normalizeUrl = require('normalize-url');
 
 function filterProjectName (name) {
     return slugify(name.replace(/^testcafe(-|\s)reporter(-|\s)/i, ''));
 }
 
-module.exports = yeoman.generators.Base.extend({
-    prompting: function () {
-        var done = this.async();
-        var gen  = this;
-
+module.exports = class extends Generator {
+    prompting () {
         var prompts = [
             {
                 name:    'reporterName',
@@ -43,16 +40,14 @@ module.exports = yeoman.generators.Base.extend({
             }
         ];
 
-        this.prompt(prompts, function (props) {
-            gen.props = props;
-
-            done();
-        });
-    },
-
-    writing: function () {
-        var gen = this;
+        return this
+            .prompt(prompts)
+            .then(props => {
+                this.props = props;
+            });
+    }
 
+    writing () {
         var tmplProps = {
             author:         this.user.git.name(),
             email:          this.user.git.email(),
@@ -74,12 +69,12 @@ module.exports = yeoman.generators.Base.extend({
         this.fs.copyTpl(this.templatePath() + '/**/!(*.png)', this.destinationPath(), tmplProps);
         this.fs.copy(this.templatePath() + '/**/*.png', this.destinationPath());
 
-        Object.keys(unescaped).forEach(function (escaped) {
-            gen.fs.move(gen.destinationPath(escaped), gen.destinationPath(unescaped[escaped]));
+        Object.keys(unescaped).forEach(escaped => {
+            this.fs.move(this.destinationPath(escaped), this.destinationPath(unescaped[escaped]));
         });
-    },
+    }
 
-    install: function () {
+    install () {
         this.installDependencies({ bower: false });
     }
-});
+};

generators/app/templates/_.eslintrc

@@ -7,7 +7,6 @@
     "no-caller": 2,
     "no-catch-shadow": 2,
     "no-console": 0,
-    "no-empty-label": 2,
     "no-eval": 2,
     "no-extend-native": 2,
     "no-extra-bind": 2,
@@ -41,7 +40,7 @@
     "semi": 2,
     "semi-spacing": [2, {"before": false, "after": true}],
     "space-infix-ops": 2,
-    "space-return-throw-case": 2,
+    "keyword-spacing": [2, {"after": true}],
     "space-unary-ops": [2, { "words": true, "nonwords": false }],
     "yoda": [2, "never"],
     "brace-style": [2, "stroustrup", { "allowSingleLine": false }],
@@ -59,7 +58,6 @@
     "object-curly-spacing": [2, "always"],
     "operator-assignment": [2, "always"],
     "quotes": [2, "single", "avoid-escape"],
-    "space-after-keywords": [2, "always"],
     "space-before-blocks": [2, "always"],
     "prefer-const": 2,
     "no-path-concat": 2,

generators/app/templates/_package.json

@@ -24,17 +24,17 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "babel-eslint": "^4.0.10",
+    "@babel/core": "^7.3.4",
+    "babel-eslint": "^10.0.1",
     "callsite-record": "^3.2.0",
     "del": "^1.2.0",
-    "gulp": "^3.9.0",
-    "gulp-babel": "^5.2.1",
-    "gulp-eslint": "^1.1.1",
-    "gulp-mocha": "^2.2.0",
+    "gulp": "^4.0.0",
+    "gulp-babel": "^8.0.0",
+    "gulp-eslint": "^5.0.0",
+    "gulp-mocha": "^6.0.0",
     "normalize-newline": "^1.0.2",
-    "publish-please": "^1.0.1",
-    "publish-please": "^2.1.4",
+    "publish-please": "^5.4.3",
     "read-file-relative": "^1.2.0",
-    "testcafe": "^0.2.0-alpha"
+    "testcafe": "^1.0.1"
   }
 }