From 5582a2dc3eae4fd113854cf94d693625592fc6c4 Mon Sep 17 00:00:00 2001 From: Giorgi Rostomashvili Date: Thu, 11 Jun 2020 11:12:50 +0200 Subject: [PATCH] haste-map now ignores vcs directories --- packages/jest-haste-map/package.json | 1 + .../src/__tests__/index.test.js | 39 +++++++++++++++++++ packages/jest-haste-map/src/index.ts | 32 +++++++++++---- yarn.lock | 3 +- 4 files changed, 67 insertions(+), 8 deletions(-) diff --git a/packages/jest-haste-map/package.json b/packages/jest-haste-map/package.json index 76e34ab3ea23..22df1b8907ca 100644 --- a/packages/jest-haste-map/package.json +++ b/packages/jest-haste-map/package.json @@ -16,6 +16,7 @@ "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", "graceful-fs": "^4.2.4", + "jest-regex-util": "^26.0.0", "jest-serializer": "^26.1.0", "jest-util": "^26.1.0", "jest-worker": "^26.1.0", diff --git a/packages/jest-haste-map/src/__tests__/index.test.js b/packages/jest-haste-map/src/__tests__/index.test.js index 5d67e670dcde..1135360eb698 100644 --- a/packages/jest-haste-map/src/__tests__/index.test.js +++ b/packages/jest-haste-map/src/__tests__/index.test.js @@ -294,6 +294,45 @@ describe('HasteMap', () => { }); }); + it('ignores vcs directories without ignore pattern', () => { + mockFs['/project/fruits/.git/fruit-history.js'] = ` + // test + `; + return new HasteMap(defaultConfig).build().then(({hasteFS}) => { + expect(hasteFS.matchFiles('.git')).toEqual([]); + }); + }); + + it('ignores vcs directories with ignore pattern regex', () => { + const config = {...defaultConfig, ignorePattern: /Kiwi/}; + mockFs['/project/fruits/Kiwi.js'] = ` + // Kiwi! + `; + + mockFs['/project/fruits/.git/fruit-history.js'] = ` + // test + `; + return new HasteMap(config).build().then(({hasteFS}) => { + expect(hasteFS.matchFiles(/Kiwi/)).toEqual([]); + expect(hasteFS.matchFiles('.git')).toEqual([]); + }); + }); + + it('ignores vcs directories with ignore pattern function', () => { + const config = {...defaultConfig, ignorePattern: f => /Kiwi/.test(f)}; + mockFs['/project/fruits/Kiwi.js'] = ` + // Kiwi! + `; + + mockFs['/project/fruits/.git/fruit-history.js'] = ` + // test + `; + return new HasteMap(config).build().then(({hasteFS}) => { + expect(hasteFS.matchFiles(/Kiwi/)).toEqual([]); + expect(hasteFS.matchFiles('.git')).toEqual([]); + }); + }); + it('builds a haste map on a fresh cache', () => { // Include these files in the map mockFs['/project/fruits/node_modules/react/React.js'] = ` diff --git a/packages/jest-haste-map/src/index.ts b/packages/jest-haste-map/src/index.ts index 572164a4bbf2..8de73059e305 100644 --- a/packages/jest-haste-map/src/index.ts +++ b/packages/jest-haste-map/src/index.ts @@ -15,6 +15,7 @@ import {NodeWatcher, Watcher as SaneWatcher} from 'sane'; import type {Config} from '@jest/types'; import serializer from 'jest-serializer'; import Worker from 'jest-worker'; +import {escapePathForRegex} from 'jest-regex-util'; import {getSha1, worker} from './worker'; import getMockName from './getMockName'; import getPlatformExtension from './lib/getPlatformExtension'; @@ -113,6 +114,9 @@ const CHANGE_INTERVAL = 30; const MAX_WAIT_TIME = 240000; const NODE_MODULES = path.sep + 'node_modules' + path.sep; const PACKAGE_JSON = path.sep + 'package.json'; +const VCS_DIRECTORIES = ['.git', '.hg'] + .map(vcs => escapePathForRegex(path.sep + vcs + path.sep)) + .join('|'); // TypeScript doesn't like us importing from outside `rootDir`, but it doesn't // understand `require`. @@ -233,7 +237,6 @@ class HasteMap extends EventEmitter { extensions: options.extensions, forceNodeFilesystemAPI: !!options.forceNodeFilesystemAPI, hasteImplModulePath: options.hasteImplModulePath, - ignorePattern: options.ignorePattern, maxWorkers: options.maxWorkers, mocksPattern: options.mocksPattern ? new RegExp(options.mocksPattern) @@ -250,11 +253,26 @@ class HasteMap extends EventEmitter { watch: !!options.watch, }; this._console = options.console || global.console; - if (options.ignorePattern && !(options.ignorePattern instanceof RegExp)) { - this._console.warn( - 'jest-haste-map: the `ignorePattern` options as a function is being ' + - 'deprecated. Provide a RegExp instead. See https://github.com/facebook/jest/pull/4063.', - ); + + if (options.ignorePattern) { + if (options.ignorePattern instanceof RegExp) { + this._options.ignorePattern = new RegExp( + options.ignorePattern.source.concat('|' + VCS_DIRECTORIES), + options.ignorePattern.flags, + ); + } else { + const ignorePattern = options.ignorePattern; + const vcsIgnoreRegExp = new RegExp(VCS_DIRECTORIES); + this._options.ignorePattern = (filePath: string) => + vcsIgnoreRegExp.test(filePath) || ignorePattern(filePath); + + this._console.warn( + 'jest-haste-map: the `ignorePattern` options as a function is being ' + + 'deprecated. Provide a RegExp instead. See https://github.com/facebook/jest/pull/4063.', + ); + } + } else { + this._options.ignorePattern = new RegExp(VCS_DIRECTORIES); } const rootDirHash = createHash('md5').update(options.rootDir).digest('hex'); @@ -790,7 +808,7 @@ class HasteMap extends EventEmitter { const createWatcher = (root: Config.Path): Promise => { // @ts-expect-error: TODO how? "Cannot use 'new' with an expression whose type lacks a call or construct signature." const watcher = new Watcher(root, { - dot: false, + dot: true, glob: extensions.map(extension => '**/*.' + extension), ignored: ignorePattern, }); diff --git a/yarn.lock b/yarn.lock index 42b35e08e785..b227072a4d7f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3,7 +3,7 @@ __metadata: version: 4 - cacheKey: 5 + cacheKey: 6 "@angular/common@npm:^10.0.2": version: 10.0.2 @@ -11213,6 +11213,7 @@ fsevents@^1.2.7: fb-watchman: ^2.0.0 fsevents: ^2.1.2 graceful-fs: ^4.2.4 + jest-regex-util: ^26.0.0 jest-serializer: ^26.1.0 jest-util: ^26.1.0 jest-worker: ^26.1.0