Skip to content

Commit e9787d4

Browse files
greenkeeper[bot]SBoudrias
authored andcommitted
Update dependencies to enable Greenkeeper 🌴 (yeoman#77)
* chore(package): update dependencies https://greenkeeper.io/ * Update to latest yeoman-generator
1 parent 11ac9d2 commit e9787d4

File tree

7 files changed

+29
-48
lines changed

7 files changed

+29
-48
lines changed

‎.eslintrc

+6-26
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
22
"extends": "eslint:recommended",
3+
"parserOptions": {
4+
"ecmaVersion": 6
5+
},
36
"env": {
47
"node": true,
58
"mocha": true
@@ -43,25 +46,6 @@
4346
2,
4447
"single"
4548
],
46-
"space-before-blocks": [
47-
2,
48-
"always"
49-
],
50-
"space-after-keywords": [
51-
2,
52-
"always"
53-
],
54-
"space-before-function-paren": [
55-
2,
56-
{
57-
"anonymous": "always",
58-
"named": "never"
59-
}
60-
],
61-
"space-in-parens": [
62-
2,
63-
"never"
64-
],
6549
"strict": [
6650
2,
6751
"global"
@@ -71,6 +55,7 @@
7155
"all"
7256
],
7357
"eol-last": 2,
58+
"keyword-spacing": 2,
7459
"key-spacing": [
7560
2,
7661
{
@@ -93,8 +78,6 @@
9378
],
9479
"no-alert": 2,
9580
"no-caller": 2,
96-
"no-console": 0,
97-
"no-empty-label": 2,
9881
"no-extend-native": 2,
9982
"no-extra-bind": 2,
10083
"no-implied-eval": 2,
@@ -106,7 +89,6 @@
10689
"no-multi-spaces": 2,
10790
"no-multi-str": 2,
10891
"no-native-reassign": 2,
109-
"no-new": 2,
11092
"no-new-func": 2,
11193
"no-new-wrappers": 2,
11294
"no-octal-escape": 2,
@@ -116,15 +98,14 @@
11698
"no-sequences": 2,
11799
"no-unused-expressions": 2,
118100
"yoda": 2,
119-
"no-shadow": 2,
120-
"no-shadow-restricted-names": 2,
121101
"no-undef-init": 2,
122102
"camelcase": 2,
123103
"comma-spacing": 2,
124104
"new-cap": 2,
125105
"new-parens": 2,
126106
"no-array-constructor": 2,
127107
"no-extra-parens": 2,
108+
"no-console": 0,
128109
"no-new-object": 2,
129110
"no-spaced-func": 2,
130111
"no-trailing-spaces": 2,
@@ -135,7 +116,6 @@
135116
"before": false,
136117
"after": true
137118
}
138-
],
139-
"space-return-throw-case": 2
119+
]
140120
}
141121
}

‎package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,20 @@
4747
"coveralls": "^2.11.6",
4848
"gulp": "^3.6.0",
4949
"gulp-coveralls": "^0.1.0",
50-
"gulp-eslint": "^2.0.0",
50+
"gulp-eslint": "^3.0.1",
5151
"gulp-exclude-gitignore": "^1.0.0",
52-
"gulp-istanbul": "^0.10.3",
53-
"gulp-jscs": "^3.0.0",
54-
"gulp-mocha": "^2.0.0",
52+
"gulp-istanbul": "^1.1.1",
53+
"gulp-jscs": "^4.0.0",
54+
"gulp-mocha": "^3.0.1",
5555
"gulp-nsp": "^2.1.0",
5656
"gulp-plumber": "^1.0.0",
5757
"istanbul": "^0.4.1",
5858
"jsdoc": "^3.3.0-alpha9",
5959
"matcha": "^0.7.0",
60-
"mocha": "^2.3.4",
60+
"mocha": "^3.2.0",
6161
"shelljs": "^0.7.0",
6262
"sinon": "^1.9.1",
6363
"yeoman-assert": "^2.1.1",
64-
"yeoman-generator": "^0.22.1"
64+
"yeoman-generator": "^1.1.0"
6565
}
6666
}

‎test/environment.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var fs = require('fs');
66
var path = require('path');
77
var util = require('util');
88
var sinon = require('sinon');
9-
var generators = require('yeoman-generator');
9+
var Generator = require('yeoman-generator');
1010
var assert = require('yeoman-assert');
1111
var TerminalAdapter = require('../lib/adapter');
1212
var Environment = require('../lib/environment');
@@ -79,7 +79,7 @@ describe('Environment', function () {
7979

8080
describe('#create()', function () {
8181
beforeEach(function () {
82-
this.Generator = generators.Base.extend();
82+
this.Generator = Generator.extend();
8383
this.env.registerStub(this.Generator, 'stub');
8484
this.env.registerStub(this.Generator, 'stub:foo:bar');
8585
this.env.registerStub(this.Generator, '@scope/stub');
@@ -160,14 +160,14 @@ describe('Environment', function () {
160160
describe('#run()', function () {
161161
beforeEach(function () {
162162
var self = this;
163-
this.Stub = generators.Base.extend({
163+
this.Stub = Generator.extend({
164164
constructor: function () {
165165
self.args = arguments;
166-
generators.Base.apply(this, arguments);
166+
Generator.apply(this, arguments);
167167
},
168168
exec: function () {}
169169
});
170-
this.runMethod = sinon.spy(generators.Base.prototype, 'run');
170+
this.runMethod = sinon.spy(Generator.prototype, 'run');
171171
this.env.registerStub(this.Stub, 'stub:run');
172172
});
173173

@@ -239,7 +239,7 @@ describe('Environment', function () {
239239
});
240240

241241
it('returns the generator', function () {
242-
assert.ok(this.env.run('stub:run') instanceof generators.Base);
242+
assert.ok(this.env.run('stub:run') instanceof Generator);
243243
});
244244
});
245245

@@ -294,7 +294,7 @@ describe('Environment', function () {
294294
beforeEach(function () {
295295
this.simpleDummy = sinon.spy();
296296
this.completeDummy = function () {};
297-
util.inherits(this.completeDummy, generators.Base);
297+
util.inherits(this.completeDummy, Generator);
298298
this.env
299299
.registerStub(this.simpleDummy, 'dummy:simple')
300300
.registerStub(this.completeDummy, 'dummy:complete');
@@ -432,7 +432,7 @@ describe('Environment', function () {
432432
});
433433

434434
it('works with Windows\' absolute paths', sinon.test(function() {
435-
var absolutePath = 'C:\\foo\\bar';
435+
var absolutePath = 'C:\\foo\\bar';
436436

437437
var envMock = this.mock(this.env);
438438

Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
var generators = require('yeoman-generator');
2-
module.exports = generators.Base.extend();
1+
'use strict';
2+
var Generator = require('yeoman-generator');
3+
module.exports = Generator.extend();

‎test/fixtures/generator-mocha/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
var generators = require('yeoman-generator');
1+
var Generator = require('yeoman-generator');
22

3-
var Generator = module.exports = generators.Base.extend({
3+
var Generator = module.exports = Generator.extend({
44
default: function () {
55
console.log('Executing generator with', this.arguments, this.options);
66
}
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
var generators = require('yeoman-generator');
2-
module.exports = generators.Base.extend();
1+
var Generator = require('yeoman-generator');
2+
module.exports = Generator.extend();
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
indexvar generators = require('yeoman-generator');
2-
module.exports = generators.Base.extend();
1+
indexvar Generator = require('yeoman-generator');
2+
module.exports = Generator.extend();

0 commit comments

Comments
 (0)