wip: make sure this compiles and fix the test

parcel-bundler · Dec 12, 2022 · aa1630a · bpasero · Dec 12, 2022 · aa1630a
1 parent 5065a5d
commit aa1630a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -3,7 +3,7 @@
     {
       "target_name": "watcher",
       "defines": [ "NAPI_DISABLE_CPP_EXCEPTIONS" ],
-      "sources": [ "src/binding.cc", "src/Watcher.cc", "src/Backend.cc", "src/DirTree.cc" ],
+      "sources": [ "src/binding.cc", "src/Watcher.cc", "src/Backend.cc", "src/DirTree.cc", "src/Glob.cc" ],
       "include_dirs" : ["<!(node -p \"require('node-addon-api').include_dir\")"],
       "dependencies": ["<!(node -p \"require('node-addon-api').gyp\")"],
       'cflags!': [ '-fno-exceptions' ],

diff --git a/index.js b/index.js
@@ -15,7 +15,8 @@ function normalizeOptions(dir, opts = {}) {
           opts.ignoreGlobs = [];
         }
 
-        opts.ignoreGlobs.push(micromatch.makeRe(value).toString());
+        const regex = micromatch.makeRe(value).toString();
+        opts.ignoreGlobs.push(regex.substring(1, regex.length - 1));
       } else {
         if (!opts.ignorePaths) {
           opts.ignorePaths = [];

diff --git a/test/watcher.js b/test/watcher.js
@@ -57,6 +57,8 @@ describe('watcher', () => {
         ignoreDir = getFilename();
         ignoreFile = getFilename();
         ignoreGlobDir = getFilename();
+        await fs.mkdir(ignoreGlobDir);
+        await fs.mkdir(path.join(ignoreGlobDir, 'ignore'));
         fileToRename = getFilename();
         dirToRename = getFilename();
         fs.writeFileSync(fileToRename, 'hi');
@@ -518,9 +520,7 @@ describe('watcher', () => {
           assert.deepEqual(res, [{type: 'create', path: f1}]);
         });
 
-        it('should ignore globs', async () => {
-          await fs.mkdir(path.join(ignoreGlobDir, 'ignore'));
-
+        it.only('should ignore globs', async () => {
           fs.writeFile(path.join(ignoreGlobDir, 'test.txt'), 'hello');
           fs.writeFile(path.join(ignoreGlobDir, 'test.ignore'), 'hello');
           fs.writeFile(path.join(ignoreGlobDir, 'ignore', 'test.txt'), 'hello');