fix(watch): fix git ignore parsing

using a more reliable module
nfroidure · Nov 27, 2023 · 392e53f · 392e53f
1 parent 09292c7
commit 392e53f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 28 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/whook-create/src/services/__snapshots__/createWhook.test.ts.snap b/packages/whook-create/src/services/__snapshots__/createWhook.test.ts.snap
@@ -170,7 +170,6 @@ DEV_MODE=1
     "eslint-plugin-prettier": "^5.0.1",
     "jest": "^29.7.0",
     "jsarch": "^6.0.3",
-    "parse-gitignore": "^2.0.0",
     "prettier": "^3.0.3",
     "rimraf": "^5.0.5",
     "schema2dts": "^5.3.0",
@@ -510,7 +509,6 @@ DEV_MODE=1
     "eslint-plugin-prettier": "^5.0.1",
     "jest": "^29.7.0",
     "jsarch": "^6.0.3",
-    "parse-gitignore": "^2.0.0",
     "prettier": "^3.0.3",
     "rimraf": "^5.0.5",
     "schema2dts": "^5.3.0",
@@ -882,7 +880,6 @@ DEV_MODE=1
     "eslint-plugin-prettier": "^5.0.1",
     "jest": "^29.7.0",
     "jsarch": "^6.0.3",
-    "parse-gitignore": "^2.0.0",
     "prettier": "^3.0.3",
     "rimraf": "^5.0.5",
     "schema2dts": "^5.3.0",
@@ -1237,7 +1234,6 @@ DEV_MODE=1
     "eslint-plugin-prettier": "^5.0.1",
     "jest": "^29.7.0",
     "jsarch": "^6.0.3",
-    "parse-gitignore": "^2.0.0",
     "prettier": "^3.0.3",
     "rimraf": "^5.0.5",
     "schema2dts": "^5.3.0",

diff --git a/packages/whook-create/src/services/createWhook.test.ts b/packages/whook-create/src/services/createWhook.test.ts
@@ -194,7 +194,6 @@ describe('initCreateWhook', () => {
     "eslint-plugin-prettier": "^5.0.1",
     "jest": "^29.7.0",
     "jsarch": "^6.0.3",
-    "parse-gitignore": "^2.0.0",
     "prettier": "^3.0.3",
     "rimraf": "^5.0.5",
     "schema2dts": "^5.3.0",
@@ -416,7 +415,6 @@ describe('initCreateWhook', () => {
     "eslint-plugin-prettier": "^5.0.1",
     "jest": "^29.7.0",
     "jsarch": "^6.0.3",
-    "parse-gitignore": "^2.0.0",
     "prettier": "^3.0.3",
     "rimraf": "^5.0.5",
     "schema2dts": "^5.3.0",
@@ -623,7 +621,6 @@ describe('initCreateWhook', () => {
     "eslint-plugin-prettier": "^5.0.1",
     "jest": "^29.7.0",
     "jsarch": "^6.0.3",
-    "parse-gitignore": "^2.0.0",
     "prettier": "^3.0.3",
     "rimraf": "^5.0.5",
     "schema2dts": "^5.3.0",

diff --git a/packages/whook-example/package.json b/packages/whook-example/package.json
@@ -116,7 +116,6 @@
     "jsarch": "^6.0.3",
     "metapak": "^5.1.7",
     "metapak-nfroidure": "15.0.4",
-    "parse-gitignore": "^2.0.0",
     "prettier": "^3.0.3",
     "rimraf": "^5.0.5",
     "schema2dts": "^5.3.0",

diff --git a/packages/whook/package.json b/packages/whook/package.json
@@ -116,6 +116,7 @@
     "debug": "^4.3.4",
     "dotenv": "^16.3.1",
     "fs-extra": "^11.1.1",
+    "ignore": "^5.3.0",
     "inquirer": "^9.2.12",
     "internal-ip": "^8.0.0",
     "knifecycle": "^17.0.1",

diff --git a/packages/whook/src/watch.ts b/packages/whook/src/watch.ts
@@ -7,7 +7,7 @@ import initGenerateOpenAPITypes from './commands/generateOpenAPITypes.js';
 import initGetOpenAPI from './handlers/getOpenAPI.js';
 import { readFile } from 'fs';
 import { promisify } from 'util';
-import parseGitIgnore from 'parse-gitignore';
+import ignore from 'ignore';
 import { createRequire } from 'module';
 import { AppEnvVars } from 'application-services';
 import type { Dependencies, Knifecycle } from 'knifecycle';
@@ -43,12 +43,14 @@ export async function watchDevServer<T extends Dependencies>(
     injectedNames: [],
   },
 ): Promise<void> {
-  let ignored = ['node_modules', '*.d.ts', '.git'];
+  let ignoreFilter;
 
   try {
-    ignored = ignored.concat(
-      parseGitIgnore((await promisify(readFile)('.gitignore')).toString()),
-    );
+    ignoreFilter = ignore
+      .default()
+      .add(['node_modules', '*.d.ts', '.git'])
+      .add((await promisify(readFile)('.gitignore')).toString())
+      .createFilter();
   } catch (err) {
     // TODO: requires a deeper integration of Knifecycle to
     // start with a silo containing only the environment
@@ -63,7 +65,7 @@ export async function watchDevServer<T extends Dependencies>(
   await new Promise<void>((resolve, reject) => {
     chokidar
       .watch(['**/*.ts', 'package*.json'], {
-        ignored,
+        ignored: ignoreFilter,
         ignoreInitial: true,
       })
       .once('ready', () => {