Skip to content

Commit e4fece6

Browse files
committed
- Updated jest-cli to avoid errors with Node >= 11.11.0 (see jestjs/jest#8050)
- Updated eslint rules - Removed `gulp-jest`
1 parent 27a0668 commit e4fece6

9 files changed

Lines changed: 869 additions & 408 deletions

File tree

.eslintrc.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,11 @@
220220
],
221221
"operator-linebreak": [
222222
"error",
223-
"after"
223+
"before", {
224+
"overrides": {
225+
"=": "after"
226+
}
227+
}
224228
],
225229
"padded-blocks": [
226230
"error",

.eslintrc.test.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
{
22
"env": {
3+
"es6": true,
34
"jest" : true,
45
"node": true
56
},
67
"extends": [
78
".eslintrc.json"
89
],
10+
"parserOptions": {
11+
"ecmaVersion": 9
12+
},
913
"rules": {
1014
"brace-style": [
1115
"error",

dist/lamb.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* @overview lamb - A lightweight, and docile, JavaScript library to help embracing functional programming.
33
* @author Andrea Scartabelli <andrea.scartabelli@gmail.com>
4-
* @version 0.58.0-alpha.1
4+
* @version 0.58.0-alpha.2
55
* @module lamb
66
* @license MIT
77
* @preserve
@@ -6374,9 +6374,9 @@
63746374
* @returns {Object}
63756375
*/
63766376
function updateIn (source, key, updater) {
6377-
return _isEnumerable(source, key) ?
6378-
_setIn(source, key, updater(source[key])) :
6379-
_merge(enumerables, source, {});
6377+
return _isEnumerable(source, key)
6378+
? _setIn(source, key, updater(source[key]))
6379+
: _merge(enumerables, source, {});
63806380
}
63816381

63826382
/**

dist/lamb.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/lamb.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gulpfile.js

Lines changed: 52 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
/* eslint-disable require-jsdoc */
22

3-
var gulp = require("gulp");
4-
var eslint = require("gulp-eslint");
5-
var jest = require("gulp-jest").default;
6-
var rename = require("gulp-rename");
7-
var rollup = require("rollup");
8-
var sourcemaps = require("gulp-sourcemaps");
9-
var uglify = require("gulp-uglify");
10-
11-
var jestBaseConfig = require("./jest.config");
12-
var pkg = require("./package.json");
13-
14-
var intro = [
3+
const gulp = require("gulp");
4+
const eslint = require("gulp-eslint");
5+
const jest = require("jest-cli");
6+
const rename = require("gulp-rename");
7+
const rollup = require("rollup");
8+
const sourcemaps = require("gulp-sourcemaps");
9+
const uglify = require("gulp-uglify");
10+
11+
const jestBaseConfig = require("./jest.config");
12+
const pkg = require("./package.json");
13+
14+
const intro = [
1515
"/**",
1616
"* @overview " + pkg.name + " - " + pkg.description,
1717
"* @author " + pkg.author.name + " <" + pkg.author.email + ">",
@@ -32,66 +32,64 @@ gulp.task("set-test-env", cb => {
3232

3333
/* build */
3434

35-
gulp.task("build", function () {
36-
return rollup.rollup({ input: "src/index.js" }).then(function (bundle) {
37-
return bundle.write({
38-
banner: intro,
39-
exports: "named",
40-
file: "dist/lamb.js",
41-
format: "umd",
42-
freeze: false,
43-
name: "lamb",
44-
sourcemap: false,
45-
strict: true
46-
});
47-
});
48-
});
49-
50-
gulp.task("minify", gulp.series(
51-
"build",
52-
function () {
53-
return gulp.src("dist/lamb.js")
54-
.pipe(sourcemaps.init())
55-
.pipe(uglify({ output: { comments: "some" } }))
56-
.pipe(rename({ extname: ".min.js" }))
57-
.pipe(sourcemaps.write("."))
58-
.pipe(gulp.dest("dist"));
59-
}
35+
gulp.task("build", () => rollup
36+
.rollup({ input: "src/index.js" })
37+
.then(bundle => bundle.write({
38+
banner: intro,
39+
exports: "named",
40+
file: "dist/lamb.js",
41+
format: "umd",
42+
freeze: false,
43+
name: "lamb",
44+
sourcemap: false,
45+
strict: true
46+
}))
47+
);
48+
49+
gulp.task("minify", gulp.series("build", () => gulp.src("dist/lamb.js")
50+
.pipe(sourcemaps.init())
51+
.pipe(uglify({ output: { comments: "some" } }))
52+
.pipe(rename({ extname: ".min.js" }))
53+
.pipe(sourcemaps.write("."))
54+
.pipe(gulp.dest("dist"))
6055
));
6156

6257
/* lint */
6358

64-
function lintWith (settings) {
65-
return function () {
66-
return gulp.src(settings.inputs)
67-
.pipe(eslint(settings.configPath))
68-
.pipe(eslint.format())
69-
.pipe(eslint.failAfterError());
70-
};
71-
}
59+
const lintWith = settings => () => gulp.src(settings.inputs)
60+
.pipe(eslint(settings.configPath))
61+
.pipe(eslint.format())
62+
.pipe(eslint.failAfterError());
7263

7364
gulp.task("lint:code", lintWith({
7465
configPath: ".eslintrc.json",
75-
inputs: ["./*.js", "./src/**/*.js", "!./src/**/__{tests,mocks}__/**"]
66+
inputs: ["./src/**/*.js", "!./src/**/__{tests,mocks}__/**"]
7667
}));
7768

7869
gulp.task("lint:tests", lintWith({
7970
configPath: ".eslintrc.test.json",
80-
inputs: "./src/**/__{tests,mocks}__/**/*.js"
71+
inputs: ["./*.js", "./src/**/__{tests,mocks}__/**/*.js"]
8172
}));
8273

8374
gulp.task("lint", gulp.series("lint:code", "lint:tests"));
8475

8576
/* test */
8677

87-
function testWith (extraSettings) {
88-
return gulp.series(
89-
"set-test-env",
90-
function () {
91-
return gulp.src("./src").pipe(jest(Object.assign({}, jestBaseConfig, extraSettings)));
78+
const testWith = extraSettings => gulp.series(
79+
"set-test-env",
80+
() => jest.runCLI(
81+
Object.assign({}, jestBaseConfig, extraSettings),
82+
[jestBaseConfig.rootDir]
83+
).then(({ results }) => { // eslint-disable-line consistent-return
84+
if (!results.success) {
85+
const message = results.numFailedTests || results.numFailedTestSuites
86+
? "Tests failed"
87+
: "Coverage threshold not met";
88+
89+
return Promise.reject(new Error(message));
9290
}
93-
);
94-
}
91+
})
92+
);
9593

9694
gulp.task("test", testWith({}));
9795

0 commit comments

Comments
 (0)