Merge branch 'webpack:main' into main

Author: ArjhanToteck

.github/workflows/test.yml

@@ -12,20 +12,14 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Use Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v4
         with:
-          node-version: 16.x
-      - id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v1
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: ${{ runner.os }}-yarn-
+          node-version: lts/*
+          cache: "yarn"
       - run: yarn --frozen-lockfile
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: .eslintcache
           key: lint-${{ env.GITHUB_SHA }}
@@ -36,7 +30,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        node-version: [10.x, 12.x, 14.x, 16.x, 17.x]
+        node-version: [10.x, 12.x, 14.x, 16.x, 18.x, 20.x, 21.x]
         polling: ["false", "200"]
         exclude:
           - os: macos-latest
@@ -52,27 +46,28 @@ jobs:
             node-version: 16.x
             polling: "200"
           - os: macos-latest
-            node-version: 17.x
+            node-version: 18.x
+            polling: "200"
+          - os: macos-latest
+            node-version: 20.x
+            polling: "200"
+          - os: macos-latest
+            node-version: 21.x
             polling: "200"
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
-      - id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v1
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: ${{ runner.os }}-yarn-
+          cache: "yarn"
       - run: yarn --frozen-lockfile
-      - run: yarn cover --report lcovonly
+      - run: yarn test:coverage --report lcovonly
         env:
           WATCHPACK_POLLING: ${{ matrix.polling }}
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v4
         with:
           flags: integration
           functionalities: gcov
+          token: ${{ secrets.CODECOV_TOKEN }}

.travis.yml

@@ -2,12 +2,9 @@
 
 Wrapper library for directory and file watching.
 
-[![Build Status][build-status]][build-status-url]
-[![Build status][build-status-veyor]][build-status-veyor-url]
-[![Test coverage][coveralls-image]][coveralls-url]
-[![codecov][codecov]][codecov-url]
-[![downloads][downloads]][downloads-url]
-[![Github contributors][contributors]][contributors-url]
+[![Test](https://github.com/webpack/watchpack/actions/workflows/test.yml/badge.svg)](https://github.com/webpack/watchpack/actions/workflows/test.yml)
+[![Codecov](https://codecov.io/gh/webpack/watchpack/graph/badge.svg?token=8xk2OrrxWm)](https://codecov.io/gh/webpack/watchpack)
+[![Downloads](https://img.shields.io/npm/dm/watchpack.svg)](https://www.npmjs.com/package/watchpack)
 
 ## Concept
 
@@ -133,16 +130,3 @@ var fileTimes = wp.getTimes();
 // this include timestamps from files not directly watched
 // key: absolute path, value: timestamp as number
 ```
-
-[build-status]: https://travis-ci.org/webpack/watchpack.svg?branch=main
-[build-status-url]: https://travis-ci.org/webpack/watchpack
-[build-status-veyor]: https://ci.appveyor.com/api/projects/status/e5u2qvmugtv0r647/branch/main?svg=true
-[build-status-veyor-url]: https://ci.appveyor.com/project/sokra/watchpack/branch/main
-[coveralls-url]: https://coveralls.io/r/webpack/watchpack/
-[coveralls-image]: https://img.shields.io/coveralls/webpack/watchpack.svg
-[codecov]: https://codecov.io/gh/webpack/watchpack/branch/main/graph/badge.svg
-[codecov-url]: https://codecov.io/gh/webpack/watchpack
-[downloads]: https://img.shields.io/npm/dm/watchpack.svg
-[downloads-url]: https://www.npmjs.com/package/watchpack
-[contributors]: https://img.shields.io/github/contributors/webpack/watchpack.svg
-[contributors-url]: https://github.com/webpack/watchpack/graphs/contributors

README.md

@@ -362,6 +362,7 @@ class DirectoryWatcher extends EventEmitter {
 				});
 			}
 		} else if (
+			filePath !== this.path &&
 			!this.directories.has(filePath) &&
 			watcher.checkStartTime(this.initialScanFinished, false)
 		) {