Merge pull request #5 from vanduynslagerp/fix-watched-matching

Fix watched file filter to match glob

Author: pvdlg

package.json

@@ -9,6 +9,7 @@
   "dependencies": {
     "chokidar": "^1.7.0",
     "lodash": "^4.17.4",
+    "minimatch": "^3.0.4",
     "nodeify": "^1.0.1",
     "source-map-url": "^0.4.0"
   },

src/index.js

@@ -3,6 +3,7 @@ import {merge} from 'lodash';
 import {FSWatcher} from 'chokidar';
 import nodeify from 'nodeify';
 import sourceMappingURL from 'source-map-url';
+import minimatch from 'minimatch';
 import postcss from 'postcss';
 
 /**
@@ -65,7 +66,9 @@ function createPostcssPreprocessor(args, config, logger, server) {
         .then(result => {
           if (
             config.autoWatch &&
-            config.files.find(configFile => configFile.pattern === file.originalPath && configFile.watched)
+            config.files.find(
+              configFile => configFile.watched && minimatch(file.originalPath, configFile.pattern, {dot: true})
+            )
           ) {
             const fullPath = path.resolve(file.originalPath);
             const includedFiles = [];

test/integration.test.js

@@ -63,9 +63,10 @@ test('Re-compile css file when dependency is modified', async t => {
     copy('test/fixtures/with-partial.css', fixture),
   ]);
 
-  const server = await watch([fixture, 'test/fixtures/styles.test.js'], {
-    options: {plugins: [atImport({path: [includePath]}), mixins, simpleVars, cssnano]},
-  });
+  const server = await watch(
+    [fixture.replace('fixtures', '*').replace('with', '+(with|nomatch)'), 'test/fixtures/styles.test.js'],
+    {options: {plugins: [atImport({path: [includePath]}), mixins, simpleVars, cssnano]}}
+  );
 
   try {
     let {success, error, disconnected} = await waitForRunComplete(server);

test/unit.test.js

@@ -194,6 +194,25 @@ test('Add dependency to watcher', async t => {
   t.true(add.calledOnce);
 });
 
+test('Add dependency to watcher for file added with glob', async t => {
+  const fixture = 'test/fixtures/with-partial.css';
+  const glob = 'test/*/+(with|nomatch)*+(partial|nomatch).css';
+  const partial = path.resolve('test/fixtures/partials/partial.css');
+  const subPartial = path.resolve('test/fixtures/partials/sub-partial.css');
+  const options = {plugins: [atImport({path: ['test/fixtures/partials']}), mixins, simpleVars, cssnano]};
+  const {preprocessor, add, debug} = mockPreprocessor(
+    {},
+    {files: [{pattern: glob, watched: true}], autoWatch: true, postcssPreprocessor: {options}}
+  );
+  const file = {originalPath: fixture};
+
+  await preprocessor(await readFile(fixture), file);
+  t.true(debug.secondCall.calledWith(match('Watching'), partial));
+  t.true(debug.thirdCall.calledWith(match('Watching'), subPartial));
+  t.true(add.firstCall.calledWith(match.array.deepEquals([partial, subPartial])));
+  t.true(add.calledOnce);
+});
+
 test('Do not add dependency to watcher if parent is not watched', async t => {
   const fixture = 'test/fixtures/with-partial.css';
   const options = {plugins: [atImport({path: ['test/fixtures/partials']}), mixins, simpleVars, cssnano]};