Skip to content

Commit

Permalink
v7.7.0 — Updating modules and jest fix. (#110)
Browse files Browse the repository at this point in the history
  • Loading branch information
DamianMullins authored and ashleynolan committed Jan 30, 2018
1 parent 1ef61dc commit 991c712
Show file tree
Hide file tree
Showing 4 changed files with 150 additions and 71 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,22 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).


v7.7.0
------------------------------
*January 30, 2018*

### Added
- Run npm scripts concurrently.

### Changed
- Updated eslint module versions.
- Updated jest version.
- Using `Object.assign` in jest task as object spread is only supported in node v8.6.0 and up.

### Remove
- Removed eslint jest module as Jest is already specified within `eslint-config-fozzie`.


v7.6.0
------------------------------
*January 30, 2018*
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@justeat/gulp-build-fozzie",
"version": "7.6.0",
"version": "7.7.0",
"description": "Gulp build tasks for use across Fozzie modules",
"main": "index.js",
"author": "Damian Mullins <damian.mullins@just-eat.com> (http://www.damianmullins.com)",
Expand All @@ -17,7 +17,7 @@
},
"homepage": "https://github.com/justeat/gulp-build-fozzie#readme",
"scripts": {
"prepare": "yarn run lint && yarn test",
"prepare": "concurrently -n \"lint,test\" -c \"blue,green\" \"yarn lint\" \"yarn test\" --kill-others-on-fail",
"test": "jest",
"test:cover": "jest --coverage",
"test:cover:CI": "cat coverage/lcov.info | coveralls",
Expand All @@ -27,7 +27,7 @@
"release-major": "release-it major --non-interactive -p"
},
"dependencies": {
"@justeat/eslint-config-fozzie": "^1.3.0",
"@justeat/eslint-config-fozzie": "^1.4.0",
"@justeat/f-copy-assets": "^0.6.0",
"@justeat/stylelint-config-fozzie": "^2.0.1",
"assemble": "^0.24.3",
Expand All @@ -37,9 +37,8 @@
"browserify": "^15.2.0",
"cssnano": "^3.10.0",
"del": "^3.0.0",
"eslint": "^4.15.0",
"eslint": "^4.16.0",
"eslint-plugin-import": "^2.8.0",
"eslint-plugin-jest": "^21.6.2",
"event-stream": "^3.3.4",
"exorcist": "^1.0.0",
"eyeglass": "^1.3.0",
Expand Down Expand Up @@ -71,7 +70,7 @@
"handlebars-helpers": "^0.10.0",
"helper-markdown": "^1.0.0",
"helper-md": "^0.2.2",
"jest-cli": "^22.1.2",
"jest-cli": "^22.1.4",
"merge-stream": "^1.0.1",
"postcss-assets": "^5.0.0",
"postcss-reporter": "^5.0.0",
Expand All @@ -85,6 +84,7 @@
"vinyl-source-stream": "^2.0.0"
},
"devDependencies": {
"concurrently": "^3.5.1",
"coveralls": "^3.0.0",
"danger": "3.0.5",
"release-it": "^5.2.0"
Expand Down
2 changes: 1 addition & 1 deletion tasks/javascript.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ gulp.task('scripts:lint', () => gulp.src([`${pathBuilder.jsSrcDir}/**/*.js`, ...


const jestTestRun = (args = {}) => jest.runCLI(
{ ...{ bail: config.isProduction, passWithNoTests: true }, ...args },
Object.assign({ bail: config.isProduction, passWithNoTests: true }, args),
[path.resolve(process.cwd())]
);

Expand Down
Loading

0 comments on commit 991c712

Please sign in to comment.