Skip to content

Commit

Permalink
Merge pull request #173 from mjeanroy/greenkeeper/eslint-config-googl…
Browse files Browse the repository at this point in the history
…e-0.10.0

Update eslint-config-google to the latest version 🚀
  • Loading branch information
mjeanroy authored Sep 10, 2018
2 parents 1e5317d + 9f6ead5 commit 849bb61
Show file tree
Hide file tree
Showing 4 changed files with 119 additions and 119 deletions.
24 changes: 12 additions & 12 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ gulp.task('lint', () => {
];

return gulp.src(src)
.pipe(eslint())
.pipe(eslint.format())
.pipe(eslint.failAfterError());
.pipe(eslint())
.pipe(eslint.format())
.pipe(eslint.failAfterError());
});

gulp.task('clean', () => {
Expand All @@ -66,20 +66,20 @@ gulp.task('clean', () => {

gulp.task('build', ['lint', 'clean'], () => {
return gulp.src(path.join(SRC, '*.js'))
.pipe(babel())
.pipe(gulp.dest(DIST));
.pipe(babel())
.pipe(gulp.dest(DIST));
});

gulp.task('pretag', () => {
return gulp.src([PKG_JSON, DIST])
.pipe(git.add({args: '-f'}))
.pipe(git.commit('release: release version'));
.pipe(git.add({args: '-f'}))
.pipe(git.commit('release: release version'));
});

gulp.task('posttag', () => {
return gulp.src(DIST)
.pipe(git.rm({args: '-r'}))
.pipe(git.commit('release: prepare next release'));
.pipe(git.rm({args: '-r'}))
.pipe(git.commit('release: prepare next release'));
});

gulp.task('tag', (done) => {
Expand All @@ -91,9 +91,9 @@ gulp.task('tag', (done) => {
['major', 'minor', 'patch'].forEach((level) => {
gulp.task(`bump:${level}`, () => {
return gulp.src(PKG_JSON)
.pipe(bump({type: level}))
.on('error', (e) => log.error(e))
.pipe(gulp.dest(ROOT));
.pipe(bump({type: level}))
.on('error', (e) => log.error(e))
.pipe(gulp.dest(ROOT));
});

gulp.task('release:' + level, ['build'], () => {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@babel/preset-env": "7.0.0",
"del": "3.0.0",
"eslint": "5.5.0",
"eslint-config-google": "0.9.1",
"eslint-config-google": "0.10.0",
"fancy-log": "1.3.2",
"gulp": "3.9.1",
"gulp-babel": "8.0.0",
Expand Down
52 changes: 26 additions & 26 deletions test/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ describe('rollup-plugin-prettier', () => {
expect(console.log).not.toHaveBeenCalled();
expect(result.map).not.toBeDefined();
expect(result.code).toBe(
'var foo = 0;\n' +
'var test = "hello world";\n'
'var foo = 0;\n' +
'var test = "hello world";\n'
);
});

Expand All @@ -68,17 +68,17 @@ describe('rollup-plugin-prettier', () => {
const result = instance.transformBundle(code);

expect(console.log).toHaveBeenCalledWith(
'[rollup-plugin-prettier] Sourcemap is enabled, computing diff is required'
'[rollup-plugin-prettier] Sourcemap is enabled, computing diff is required'
);

expect(console.log).toHaveBeenCalledWith(
'[rollup-plugin-prettier] This may take a moment (depends on the size of your bundle)'
'[rollup-plugin-prettier] This may take a moment (depends on the size of your bundle)'
);

expect(result.map).toBeDefined();
expect(result.code).toBe(
'var foo = 0;\n' +
'var test = "hello world";\n'
'var foo = 0;\n' +
'var test = "hello world";\n'
);
});

Expand All @@ -97,17 +97,17 @@ describe('rollup-plugin-prettier', () => {
const result = instance.transformBundle(code);

expect(console.log).toHaveBeenCalledWith(
'[rollup-plugin-prettier] Sourcemap is enabled, computing diff is required'
'[rollup-plugin-prettier] Sourcemap is enabled, computing diff is required'
);

expect(console.log).toHaveBeenCalledWith(
'[rollup-plugin-prettier] This may take a moment (depends on the size of your bundle)'
'[rollup-plugin-prettier] This may take a moment (depends on the size of your bundle)'
);

expect(result.map).toBeDefined();
expect(result.code).toBe(
'var foo = 0;\n' +
'var test = "hello world";\n'
'var foo = 0;\n' +
'var test = "hello world";\n'
);
});

Expand All @@ -127,17 +127,17 @@ describe('rollup-plugin-prettier', () => {
});

expect(console.log).toHaveBeenCalledWith(
'[rollup-plugin-prettier] Sourcemap is enabled, computing diff is required'
'[rollup-plugin-prettier] Sourcemap is enabled, computing diff is required'
);

expect(console.log).toHaveBeenCalledWith(
'[rollup-plugin-prettier] This may take a moment (depends on the size of your bundle)'
'[rollup-plugin-prettier] This may take a moment (depends on the size of your bundle)'
);

expect(result.map).toBeDefined();
expect(result.code).toBe(
'var foo = 0;\n' +
'var test = "hello world";\n'
'var foo = 0;\n' +
'var test = "hello world";\n'
);
});

Expand All @@ -157,17 +157,17 @@ describe('rollup-plugin-prettier', () => {
});

expect(console.log).toHaveBeenCalledWith(
'[rollup-plugin-prettier] Sourcemap is enabled, computing diff is required'
'[rollup-plugin-prettier] Sourcemap is enabled, computing diff is required'
);

expect(console.log).toHaveBeenCalledWith(
'[rollup-plugin-prettier] This may take a moment (depends on the size of your bundle)'
'[rollup-plugin-prettier] This may take a moment (depends on the size of your bundle)'
);

expect(result.map).toBeDefined();
expect(result.code).toBe(
'var foo = 0;\n' +
'var test = "hello world";\n'
'var foo = 0;\n' +
'var test = "hello world";\n'
);
});

Expand All @@ -189,8 +189,8 @@ describe('rollup-plugin-prettier', () => {
expect(console.log).not.toHaveBeenCalled();
expect(result.map).not.toBeDefined();
expect(result.code).toBe(
'var foo = 0;\n' +
'var test = "hello world";\n'
'var foo = 0;\n' +
'var test = "hello world";\n'
);
});

Expand All @@ -210,8 +210,8 @@ describe('rollup-plugin-prettier', () => {
const result = instance.transformBundle(code);

expect(result.code).toBe(
`var foo = 0;\n` +
`var test = 'hello world';\n`
`var foo = 0;\n` +
`var test = 'hello world';\n`
);
});

Expand All @@ -228,8 +228,8 @@ describe('rollup-plugin-prettier', () => {
const result = instance.transformBundle(code);

expect(result.code).toBe(
'var foo = 0;\n' +
'var test = "hello world";\n'
'var foo = 0;\n' +
'var test = "hello world";\n'
);
});

Expand All @@ -246,8 +246,8 @@ describe('rollup-plugin-prettier', () => {
const result = instance.transformBundle(code);

expect(result.code).toBe(
'var foo = 0;\n' +
'var test = "hello world";\n'
'var foo = 0;\n' +
'var test = "hello world";\n'
);
});

Expand Down
Loading

0 comments on commit 849bb61

Please sign in to comment.