Switch to micromatch: fixes #3336 (#3339)

* Switch to micromatch: fixes #3336 * Trim patterns before generating RegExp Test suite now passes * Add test + test fixtures to test micromatch * Oops. Actually add the fixtures to Git this time * Update yarn.lock reverted registry change
yarnpkg · May 12, 2017 · d223116 · d223116
1 parent 6e54578
commit d223116
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 25 deletions.
diff --git a/__tests__/commands/pack.js b/__tests__/commands/pack.js
@@ -41,7 +41,8 @@ export async function getFilesFromArchive(source, destination): Promise<Array<st
   return files;
 }
 
-test.concurrent('pack should work with a minimal example', (): Promise<void> => {
+test.concurrent('pack should work with a minimal example',
+(): Promise<void> => {
   return runPack([], {}, 'minimal', async (config): Promise<void> => {
     const {cwd} = config;
     const files = await getFilesFromArchive(
@@ -53,7 +54,8 @@ test.concurrent('pack should work with a minimal example', (): Promise<void> =>
   });
 });
 
-test.concurrent('pack should include all files listed in the files array', (): Promise<void> => {
+test.concurrent('pack should include all files listed in the files array',
+(): Promise<void> => {
   return runPack([], {}, 'files-include', async (config): Promise<void> => {
     const {cwd} = config;
     const files = await getFilesFromArchive(
@@ -71,6 +73,24 @@ test.concurrent('pack should include all files listed in the files array', (): P
   });
 });
 
+test.concurrent('pack should included globbed files',
+(): Promise<void> => {
+  return runPack([], {}, 'files-glob', async (config): Promise<void> => {
+    const {cwd} = config;
+    const files = await getFilesFromArchive(
+      path.join(cwd, 'files-glob-v1.0.0.tgz'),
+      path.join(cwd, 'files-glob-v1.0.0'),
+    );
+    expect(files.sort()).toEqual([
+      'lib',
+      'lib/a.js',
+      'lib/b.js',
+      'index.js',
+      'package.json',
+    ].sort());
+  });
+});
+
 test.concurrent('pack should include mandatory files not listed in files array if files not empty',
 (): Promise<void> => {
   return runPack([], {}, 'files-include-mandatory', async (config): Promise<void> => {
@@ -86,7 +106,8 @@ test.concurrent('pack should include mandatory files not listed in files array i
   });
 });
 
-test.concurrent('pack should exclude mandatory files from ignored directories', (): Promise<void> => {
+test.concurrent('pack should exclude mandatory files from ignored directories',
+(): Promise<void> => {
   return runPack([], {}, 'exclude-mandatory-files-from-ignored-directories', async (config): Promise<void> => {
     const {cwd} = config;
     const files = await getFilesFromArchive(
@@ -126,7 +147,7 @@ test.concurrent('pack should exclude all dotflies if not in files and files not
   });
 });
 
-test.concurrent('pack should exclude all files in dot-directories if not in files and files not empty ',
+test.concurrent('pack should exclude all files in dot-directories if not in files and files not empty',
 (): Promise<void> => {
   return runPack([], {}, 'files-exclude-dotdir', async (config): Promise<void> => {
     const {cwd} = config;

diff --git a/__tests__/fixtures/pack/files-glob/index.js b/__tests__/fixtures/pack/files-glob/index.js
@@ -0,0 +1,2 @@
+/* @flow */
+console.log('hello world');
diff --git a/__tests__/fixtures/pack/files-glob/lib/a.js b/__tests__/fixtures/pack/files-glob/lib/a.js
@@ -0,0 +1,2 @@
+/* @flow */
+console.log('hello world');
diff --git a/__tests__/fixtures/pack/files-glob/lib/b.js b/__tests__/fixtures/pack/files-glob/lib/b.js
@@ -0,0 +1,2 @@
+/* @flow */
+console.log('hello world');
diff --git a/__tests__/fixtures/pack/files-glob/package.json b/__tests__/fixtures/pack/files-glob/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "files-glob",
+  "version": "1.0.0",
+  "main": "index.js",
+  "license": "MIT",
+  "files": ["lib/**/*.js"]
+}
diff --git a/__tests__/fixtures/pack/files-glob/src/a.js b/__tests__/fixtures/pack/files-glob/src/a.js
@@ -0,0 +1,2 @@
+/* @flow */
+console.log('hello world');
diff --git a/__tests__/fixtures/pack/files-glob/src/b.js b/__tests__/fixtures/pack/files-glob/src/b.js
@@ -0,0 +1,2 @@
+/* @flow */
+console.log('hello world');
diff --git a/__tests__/util/filter.js b/__tests__/util/filter.js
@@ -29,22 +29,22 @@ test('ignoreLinesToRegex', () => {
     '! F # # ',
     '#! G',
   ])).toEqual([
-    {base: '.', isNegation: false, pattern: 'a', regex: /^(?:(?=.)a)$/i},
-    {base: '.', isNegation: false, pattern: 'b ', regex: /^(?:(?=.)b)$/i},
-    {base: '.', isNegation: false, pattern: ' c ', regex: /^(?:(?=.)c)$/i},
-    {base: '.', isNegation: false, pattern: 'd #', regex: /^(?:(?=.)d #)$/i},
-    {base: '.', isNegation: false, pattern: 'e#', regex: /^(?:(?=.)e#)$/i},
-    {base: '.', isNegation: false, pattern: 'f # ', regex: /^(?:(?=.)f #)$/i},
-    {base: '.', isNegation: false, pattern: 'g# ', regex: /^(?:(?=.)g#)$/i},
-    {base: '.', isNegation: false, pattern: 'h # foo', regex: /^(?:(?=.)h # foo)$/i},
-    {base: '.', isNegation: false, pattern: 'i# foo', regex: /^(?:(?=.)i# foo)$/i},
-    {base: '.', isNegation: false, pattern: 'j # foo #', regex: /^(?:(?=.)j # foo #)$/i},
-    {base: '.', isNegation: false, pattern: 'k # foo # #', regex: /^(?:(?=.)k # foo # #)$/i},
-    {base: '.', isNegation: true, pattern: 'A', regex: /^(?:(?=.)A)$/i},
-    {base: '.', isNegation: true, pattern: ' B', regex: /^(?:(?=.)B)$/i},
-    {base: '.', isNegation: true, pattern: ' C ', regex: /^(?:(?=.)C)$/i},
-    {base: '.', isNegation: true, pattern: ' D #', regex: /^(?:(?=.)D #)$/i},
-    {base: '.', isNegation: true, pattern: ' E # ', regex: /^(?:(?=.)E #)$/i},
-    {base: '.', isNegation: true, pattern: ' F # # ', regex: /^(?:(?=.)F # #)$/i},
+    {base: '.', isNegation: false, pattern: 'a', regex: /^(?:a)$/i},
+    {base: '.', isNegation: false, pattern: 'b ', regex: /^(?:b)$/i},
+    {base: '.', isNegation: false, pattern: ' c ', regex: /^(?:c)$/i},
+    {base: '.', isNegation: false, pattern: 'd #', regex: /^(?:d #)$/i},
+    {base: '.', isNegation: false, pattern: 'e#', regex: /^(?:e#)$/i},
+    {base: '.', isNegation: false, pattern: 'f # ', regex: /^(?:f #)$/i},
+    {base: '.', isNegation: false, pattern: 'g# ', regex: /^(?:g#)$/i},
+    {base: '.', isNegation: false, pattern: 'h # foo', regex: /^(?:h # foo)$/i},
+    {base: '.', isNegation: false, pattern: 'i# foo', regex: /^(?:i# foo)$/i},
+    {base: '.', isNegation: false, pattern: 'j # foo #', regex: /^(?:j # foo #)$/i},
+    {base: '.', isNegation: false, pattern: 'k # foo # #', regex: /^(?:k # foo # #)$/i},
+    {base: '.', isNegation: true, pattern: 'A', regex: /^(?:A)$/i},
+    {base: '.', isNegation: true, pattern: ' B', regex: /^(?:B)$/i},
+    {base: '.', isNegation: true, pattern: ' C ', regex: /^(?:C)$/i},
+    {base: '.', isNegation: true, pattern: ' D #', regex: /^(?:D #)$/i},
+    {base: '.', isNegation: true, pattern: ' E # ', regex: /^(?:E #)$/i},
+    {base: '.', isNegation: true, pattern: ' F # # ', regex: /^(?:F # #)$/i},
   ]);
 });
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
     "is-ci": "^1.0.10",
     "leven": "^2.0.0",
     "loud-rejection": "^1.2.0",
-    "minimatch": "^3.0.3",
+    "micromatch": "^2.3.11",
     "mkdirp": "^0.5.1",
     "node-emoji": "^1.0.4",
     "object-path": "^0.11.2",

diff --git a/src/util/filter.js b/src/util/filter.js
@@ -3,7 +3,7 @@
 import type {WalkFiles} from './fs.js';
 import {removeSuffix} from './misc.js';
 
-const minimatch = require('minimatch');
+const mm = require('micromatch');
 const path = require('path');
 
 const WHITESPACE_RE = /^\s+$/;
@@ -101,7 +101,7 @@ export function matchesFilter(filter: IgnoreFilter, basename: string, loc: strin
   return filter.regex.test(loc) ||
          filter.regex.test(`/${loc}`) ||
          filter.regex.test(basename) ||
-         minimatch(loc, filter.pattern);
+         mm.isMatch(loc, filter.pattern);
 }
 
 export function ignoreLinesToRegex(lines: Array<string>, base: string = '.'): Array<IgnoreFilter> {
@@ -126,7 +126,7 @@ export function ignoreLinesToRegex(lines: Array<string>, base: string = '.'): Ar
       // remove trailing slash
       pattern = removeSuffix(pattern, '/');
 
-      const regex: ?RegExp = minimatch.makeRe(pattern, {nocase: true});
+      const regex: ?RegExp = mm.makeRe(pattern.trim(), {nocase: true});
 
       if (regex) {
         return {