Merge branch 'dev' into npm

.eslintrc.json

@@ -23,7 +23,7 @@
     }],
     "max-depth": [1, 4],
     "max-len": [1, 120],
-    "max-nested-callbacks": [1, 5],
+    "max-nested-callbacks": [1, 7],
     "new-cap": 1,
     "no-console": 2,
     "no-empty": [2, {

.gitattributes

@@ -0,0 +1 @@
+* text eol=lf

.github/workflows/linux-ci.yml

@@ -0,0 +1,42 @@
+name: Linux build
+
+on:
+  push:
+    branches:
+      - dev
+      - npm
+      - v3-lts
+      # After releasing, bump to next anticpated version.
+      - v3-lts@3.9.17
+  pull_request:
+    branches:
+      - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version:
+          - 10.x
+          - 12.x
+          - 14.x
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Build
+        run: |
+          npm install
+          npm test
+          npx nyc report --reporter=text-lcov > ./lcov.info
+
+      - name: Coverage
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: ./lcov.info

.github/workflows/mac-ci.yml

@@ -0,0 +1,35 @@
+name: Mac build
+
+on:
+  push:
+    branches:
+      - dev
+      - npm
+      - v3-lts
+      # After releasing, bump to next anticpated version.
+      - v3-lts@3.9.17
+  pull_request:
+    branches:
+      - '*'
+
+jobs:
+  build:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        node-version:
+          - 10.x
+          - 12.x
+          - 14.x
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Build
+        run: |
+          npm install
+          npm test

.github/workflows/windows-ci.yml

@@ -0,0 +1,35 @@
+name: Windows build
+
+on:
+  push:
+    branches:
+      - dev
+      - npm
+      - v3-lts
+      # After releasing, bump to next anticpated version.
+      - v3-lts@3.9.17
+  pull_request:
+    branches:
+      - '*'
+
+jobs:
+  build:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        node-version:
+          - 10.x
+          - 12.x
+          - 14.x
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Build
+        run: |
+          npm install
+          npm test

.npmignore

@@ -1,4 +1,4 @@
 *.log
 .*
-appveyor.yml
+!.gitkeep
 test/

CHANGELOG.md

@@ -1,5 +1,8 @@
 # gulp changelog
 
+### 3.9.17
+* Updated dependency tree to no longer contain glob-parent and its regex dos vulnerability
+
 ### 3.9.16
 * Bumped dependency minimist version to fix vulnerability
 * Bumped devDependency mkdirp version

README.md

@@ -3,8 +3,9 @@
 > The streaming build system
 
 [![Known Vulnerabilities][snyk-image]][snyk-url]
-[![Mac/Linux Build Status][travis-image]][travis-url]
-[![Windows Build Status][appveyor-image]][appveyor-url]
+[![Linux Build Status][linux-image]][linux-url]
+[![Mac Build Status][mac-image]][mac-url]
+[![Windows Build Status][windows-image]][windows-url]
 [![Coverage Status][coveralls-image]][coveralls-url]
 [![License][license-image]][license-url]
 
@@ -21,15 +22,15 @@ Instead, follow these instructions:
 ## Install
 
 * Latest version (without Git):
-  * `npm install https://github.com/electric-eloquence/gulp/tarball/v3-lts@3.9.16`
-  * Or add `"gulp": "https://github.com/electric-eloquence/gulp/tarball/v3-lts@3.9.16"`
+  * `npm install https://github.com/electric-eloquence/gulp/tarball/v3-lts@3.9.17`
+  * Or add `"gulp": "https://github.com/electric-eloquence/gulp/tarball/v3-lts@3.9.17"`
     as a dependency in package.json.
 * Latest version (with Git):
   * `npm install electric-eloquence/gulp`
 * Specific version (with Git):
-  * `npm install electric-eloquence/gulp#3.9.16`
+  * `npm install electric-eloquence/gulp#3.9.17`
 * Semver range (with Git):
-  * `npm install electric-eloquence/gulp#semver:^3.9.16`
+  * `npm install electric-eloquence/gulp#semver:^3.9.17`
 * When installed one of these ways, other packages depending on gulp will get
   gulp 3 with long-term support.
 
@@ -145,11 +146,14 @@ project, which may otherwise be burdensome for them to commit time to.
 [snyk-image]: https://snyk.io/test/github/electric-eloquence/gulp/v3-lts/badge.svg
 [snyk-url]: https://snyk.io/test/github/electric-eloquence/gulp/v3-lts
 
-[travis-image]: https://img.shields.io/travis/electric-eloquence/gulp/v3-lts.svg?label=mac%20%26%20linux
-[travis-url]: https://travis-ci.org/electric-eloquence/gulp
+[linux-image]: https://github.com/electric-eloquence/gulp/workflows/Linux%20build/badge.svg?branch=v3-lts
+[linux-url]: https://github.com/electric-eloquence/gulp/actions?query=workflow%3A"Linux+build"
 
-[appveyor-image]: https://img.shields.io/appveyor/ci/e2tha-e/gulp/v3-lts.svg?label=windows
-[appveyor-url]: https://ci.appveyor.com/project/e2tha-e/gulp
+[mac-image]: https://github.com/electric-eloquence/gulp/workflows/Mac%20build/badge.svg?branch=v3-lts
+[mac-url]: https://github.com/electric-eloquence/gulp/actions?query=workflow%3A"Mac+build"
+
+[windows-image]: https://github.com/electric-eloquence/gulp/workflows/Windows%20build/badge.svg?branch=v3-lts
+[windows-url]: https://github.com/electric-eloquence/gulp/actions?query=workflow%3A"Windows+build"
 
 [coveralls-image]: https://img.shields.io/coveralls/electric-eloquence/gulp/v3-lts.svg
 [coveralls-url]: https://coveralls.io/github/electric-eloquence/gulp?branch=v3-lts

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@electric-eloquence/gulp",
   "description": "The streaming build system (v3 with long-term support)",
-  "version": "3.9.16",
+  "version": "3.9.17",
   "homepage": "https://github.com/electric-eloquence/gulp",
   "repository": {
     "type": "git",
@@ -35,16 +35,16 @@
     "gulp": "bin/gulp.js"
   },
   "dependencies": {
-    "@electric-eloquence/chokidar": "^1.7.10",
-    "@electric-eloquence/vinyl-fs": "^3.0.7",
+    "@electric-eloquence/chokidar": "^1.7.11",
+    "@electric-eloquence/vinyl-fs": "^3.0.8",
     "archy": "^1.0.0",
     "chalk": "1.1.3",
     "end-of-stream": "^1.4.4",
     "fancy-log": "^1.3.3",
     "fined": "^1.2.0",
     "flagged-respawn": "^1.0.1",
     "lodash.debounce": "^4.0.8",
-    "minimist": "^1.2.4",
+    "minimist": "^1.2.5",
     "object.defaults": "^1.1.0",
     "object.map": "^1.0.1",
     "plugin-error": "^1.0.1",
@@ -57,11 +57,11 @@
   },
   "devDependencies": {
     "coveralls": "3.x",
-    "eslint": "6.x",
+    "eslint": "7.x",
     "event-stream": "^4.0.1",
     "map-stream": "0.0.7",
     "mkdirp": "^1.0.3",
-    "mocha": "7.x",
+    "mocha": "8.x",
     "nyc": "15.x",
     "q": "^1.5.1",
     "rimraf": "^2.7.1",

test/glob-watcher.js

@@ -13,7 +13,7 @@ require('mocha');
 var timeout = 200;
 
 describe('globWatcher()', function() {
-  this.timeout(4000);
+  this.timeout(6000);
 
   var outDir = path.join(__dirname, './fixtures/');
   var outFile1 = path.join(outDir, 'changed.js');
@@ -135,7 +135,7 @@ describe('globWatcher()', function() {
       runs++;
       if (runs === 1) {
         setTimeout(function() {
-          // Expect 2 because run 2 completes before this timeout completes and the queue is disabled
+          // Expect 2 because run 2 completes before 6his timeout completes and the queue is disabled
           should(runs).equal(2);
           watcher.close();
           done();

test/orchestrator/taskTimings.js

@@ -14,7 +14,7 @@ describe('orchestrator', function() {
       var timeout;
 
       // Arrange
-      timeout = 0.1; // seconds
+      timeout = 0.2; // seconds
       a = 0;
       fn = function(cb) {
         setTimeout(function() {
@@ -28,7 +28,7 @@ describe('orchestrator', function() {
 
       orchestrator.on('task_stop', function(args) {
         // Assert
-        args.duration.should.be.approximately(timeout, 0.1);
+        args.duration.should.be.approximately(timeout, 0.2);
         args.duration.should.be.above(0);
         ++a;
       });