From a817726bcd287299c44b294759df94e1502a89bb 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 --- jest.config.js | 1 - packages/jest-haste-map/package.json | 1 + .../src/__tests__/includes_dotfiles.test.ts | 48 ------------------- .../src/__tests__/index.test.js | 39 +++++++++++++++ .../__tests__/test_dotfiles_root/.eslintrc.js | 6 --- .../src/__tests__/test_dotfiles_root/index.js | 6 --- packages/jest-haste-map/src/index.ts | 27 ++++++++--- packages/jest-haste-map/tsconfig.json | 1 + yarn.lock | 3 +- 9 files changed, 64 insertions(+), 68 deletions(-) delete mode 100644 packages/jest-haste-map/src/__tests__/includes_dotfiles.test.ts delete mode 100644 packages/jest-haste-map/src/__tests__/test_dotfiles_root/.eslintrc.js delete mode 100644 packages/jest-haste-map/src/__tests__/test_dotfiles_root/index.js diff --git a/jest.config.js b/jest.config.js index cb4e3eb6ae0b..18ad91a82b6d 100644 --- a/jest.config.js +++ b/jest.config.js @@ -49,7 +49,6 @@ module.exports = { '/packages/jest-cli/src/init/__tests__/fixtures/', '/packages/jest-haste-map/src/__tests__/haste_impl.js', '/packages/jest-haste-map/src/__tests__/dependencyExtractor.js', - '/packages/jest-haste-map/src/__tests__/test_dotfiles_root', '/packages/jest-resolve-dependencies/src/__tests__/__fixtures__/', '/packages/jest-runtime/src/__tests__/defaultResolver.js', '/packages/jest-runtime/src/__tests__/module_dir/', 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__/includes_dotfiles.test.ts b/packages/jest-haste-map/src/__tests__/includes_dotfiles.test.ts deleted file mode 100644 index 990a8d7bf849..000000000000 --- a/packages/jest-haste-map/src/__tests__/includes_dotfiles.test.ts +++ /dev/null @@ -1,48 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -import path from 'path'; -import HasteMap from '../index'; - -const rootDir = path.join(__dirname, './test_dotfiles_root'); - -const commonOptions = { - extensions: ['js'], - maxWorkers: 1, - platforms: [], - resetCache: true, - retainAllFiles: true, - rootDir, - roots: [rootDir], -}; - -test('watchman crawler and node crawler both include dotfiles', async () => { - const hasteMapWithWatchman = new HasteMap({ - ...commonOptions, - name: 'withWatchman', - useWatchman: true, - }); - - const hasteMapWithNode = new HasteMap({ - ...commonOptions, - name: 'withNode', - useWatchman: false, - }); - - const [builtHasteMapWithWatchman, builtHasteMapWithNode] = await Promise.all([ - hasteMapWithWatchman.build(), - hasteMapWithNode.build(), - ]); - - expect( - builtHasteMapWithWatchman.hasteFS.matchFiles('.eslintrc.js'), - ).toHaveLength(1); - - expect(builtHasteMapWithWatchman.hasteFS.getAllFiles().sort()).toEqual( - builtHasteMapWithNode.hasteFS.getAllFiles().sort(), - ); -}); 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/__tests__/test_dotfiles_root/.eslintrc.js b/packages/jest-haste-map/src/__tests__/test_dotfiles_root/.eslintrc.js deleted file mode 100644 index b6861b5fb248..000000000000 --- a/packages/jest-haste-map/src/__tests__/test_dotfiles_root/.eslintrc.js +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ diff --git a/packages/jest-haste-map/src/__tests__/test_dotfiles_root/index.js b/packages/jest-haste-map/src/__tests__/test_dotfiles_root/index.js deleted file mode 100644 index b6861b5fb248..000000000000 --- a/packages/jest-haste-map/src/__tests__/test_dotfiles_root/index.js +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ diff --git a/packages/jest-haste-map/src/index.ts b/packages/jest-haste-map/src/index.ts index 572164a4bbf2..e333e5b9ef85 100644 --- a/packages/jest-haste-map/src/index.ts +++ b/packages/jest-haste-map/src/index.ts @@ -113,6 +113,7 @@ 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 => '/' + vcs + '/').join('|'); // TypeScript doesn't like us importing from outside `rootDir`, but it doesn't // understand `require`. @@ -233,7 +234,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 +250,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'); diff --git a/packages/jest-haste-map/tsconfig.json b/packages/jest-haste-map/tsconfig.json index 8290de687869..f945d5e82cc1 100644 --- a/packages/jest-haste-map/tsconfig.json +++ b/packages/jest-haste-map/tsconfig.json @@ -7,6 +7,7 @@ "references": [ {"path": "../jest-worker"}, {"path": "../jest-serializer"}, + {"path": "../jest-regex-util"}, {"path": "../jest-util"}, {"path": "../jest-types"} ] diff --git a/yarn.lock b/yarn.lock index 42b35e08e785..0e2c65f6a462 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