Skip to content

Commit

Permalink
Merge branch 'dev' into npm
Browse files Browse the repository at this point in the history
  • Loading branch information
electric-el committed Feb 24, 2023
2 parents a808883 + c98a90a commit 091c2ff
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/linux-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- npm
- v3-lts
# After releasing, bump to next anticpated version.
- v3-lts@3.9.17
- v3-lts@3.9.18
pull_request:
branches:
- '*'
Expand All @@ -18,10 +18,10 @@ jobs:
strategy:
matrix:
node-version:
- 12.x
- 14.x
- 16.x
- 17.x
- 18.x
- 19.x
steps:
- uses: actions/checkout@v2

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/mac-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- npm
- v3-lts
# After releasing, bump to next anticpated version.
- v3-lts@3.9.17
- v3-lts@3.9.19
pull_request:
branches:
- '*'
Expand All @@ -18,10 +18,10 @@ jobs:
strategy:
matrix:
node-version:
- 12.x
- 14.x
- 16.x
- 17.x
- 18.x
- 19.x
steps:
- uses: actions/checkout@v2

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- npm
- v3-lts
# After releasing, bump to next anticpated version.
- v3-lts@3.9.17
- v3-lts@3.9.19
pull_request:
branches:
- '*'
Expand All @@ -18,10 +18,10 @@ jobs:
strategy:
matrix:
node-version:
- 12.x
- 14.x
- 16.x
- 17.x
- 18.x
- 19.x
steps:
- uses: actions/checkout@v2

Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# gulp changelog

### 3.9.19
* Bumped fined and plugin-error dependencies in order to update is-plain-object

### 3.9.18
* Bumped dependencies
* Updated dev environments
* Updated documentation

### 3.9.17
* Updated dependency tree to no longer contain glob-parent and its regex dos vulnerability

Expand Down
2 changes: 1 addition & 1 deletion bin/liftoff/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var EE = require('events').EventEmitter;
var extend = require('extend');
var resolve = require('resolve');
var flaggedRespawn = require('flagged-respawn');
var isPlainObject = require('is-plain-object');
var isPlainObject = require('is-plain-object').isPlainObject;
var mapValues = require('object.map');
var fined = require('fined');

Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@electric-eloquence/gulp",
"description": "The streaming build system (v3 with long-term support)",
"version": "3.9.18",
"version": "3.9.19",
"homepage": "https://github.com/electric-eloquence/gulp",
"repository": {
"type": "git",
Expand Down Expand Up @@ -36,18 +36,18 @@
},
"dependencies": {
"@electric-eloquence/chokidar": "^1.7.11",
"@electric-eloquence/vinyl-fs": "^3.0.8",
"@electric-eloquence/vinyl-fs": "^3.0.9",
"archy": "^1.0.0",
"chalk": "^4.1.2",
"end-of-stream": "^1.4.4",
"fancy-log": "^1.3.3",
"fined": "^1.2.0",
"fined": "^2.0.0",
"flagged-respawn": "^1.0.1",
"lodash.debounce": "^4.0.8",
"minimist": "^1.2.5",
"object.defaults": "^1.1.0",
"object.map": "^1.0.1",
"plugin-error": "^1.0.1",
"plugin-error": "^2.0.1",
"pretty-hrtime": "^1.0.3",
"resolve": "^1.12.0",
"sequencify": "^0.0.7",
Expand Down
3 changes: 2 additions & 1 deletion test/bin.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ describe('`bin/gulp.js` command line interface', function() {
it('errors when passed an erroring task', function(done) {
exec('node ../../bin/gulp.js error', function(err, stdout, stderr) {
should(err.message).equal('Command failed: node ../../bin/gulp.js error\n');
should(stdout).containEql('SyntaxError: Unexpected end of JSON input');
should(stdout).containEql('SyntaxError:');
should(stdout).containEql(' at JSON.parse (<anonymous>)');
should(stderr).equal('');
done();
});
Expand Down

0 comments on commit 091c2ff

Please sign in to comment.