From b26a039c95ae9e37bfb72d6ddc0f03ccf4e3b4e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Tue, 10 Jul 2018 18:11:32 +0200 Subject: [PATCH] Revert "use {dot: true} for all micromatches" This reverts commit 592d50bf9a4bc1f97c742e0141ab60b2d36132f3. --- packages/jest-cli/src/run_jest.js | 1 - packages/jest-haste-map/src/haste_fs.js | 2 +- packages/jest-message-util/src/index.js | 2 +- packages/jest-runtime/src/should_instrument.js | 5 ++--- scripts/build.js | 4 ++-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/jest-cli/src/run_jest.js b/packages/jest-cli/src/run_jest.js index d9f4b89fc736..caadcf170f08 100644 --- a/packages/jest-cli/src/run_jest.js +++ b/packages/jest-cli/src/run_jest.js @@ -176,7 +176,6 @@ export default (async function runJest({ !micromatch( [path.relative(globalConfig.rootDir, filename)], globalConfig.collectCoverageFrom, - {dot: true}, ).length ) { return false; diff --git a/packages/jest-haste-map/src/haste_fs.js b/packages/jest-haste-map/src/haste_fs.js index a11080618c55..5c2bd588bf92 100644 --- a/packages/jest-haste-map/src/haste_fs.js +++ b/packages/jest-haste-map/src/haste_fs.js @@ -58,7 +58,7 @@ export default class HasteFS { const files = new Set(); for (const file in this._files) { const filePath = root ? path.relative(root, file) : file; - if (micromatch([filePath], globs, {dot: true}).length) { + if (micromatch([filePath], globs).length) { files.add(file); } } diff --git a/packages/jest-message-util/src/index.js b/packages/jest-message-util/src/index.js index 76b1db788e4a..67bd810f795d 100644 --- a/packages/jest-message-util/src/index.js +++ b/packages/jest-message-util/src/index.js @@ -216,7 +216,7 @@ const formatPaths = (config: StackTraceConfig, relativeTestPath, line) => { if ( (config.testMatch && config.testMatch.length && - micromatch(filePath, config.testMatch, {dot: true})) || + micromatch(filePath, config.testMatch)) || filePath === relativeTestPath ) { filePath = chalk.reset.cyan(filePath); diff --git a/packages/jest-runtime/src/should_instrument.js b/packages/jest-runtime/src/should_instrument.js index 78ac5a66c07d..0a663ee56378 100644 --- a/packages/jest-runtime/src/should_instrument.js +++ b/packages/jest-runtime/src/should_instrument.js @@ -30,7 +30,7 @@ export default function shouldInstrument( if ( config.forceCoverageMatch && config.forceCoverageMatch.length && - micromatch.any(filename, config.forceCoverageMatch, {dot: true}) + micromatch.any(filename, config.forceCoverageMatch) ) { return true; } @@ -42,7 +42,7 @@ export default function shouldInstrument( if ( config.testMatch && config.testMatch.length && - micromatch.any(filename, config.testMatch, {dot: true}) + micromatch.any(filename, config.testMatch) ) { return false; } @@ -63,7 +63,6 @@ export default function shouldInstrument( !micromatch( [path.relative(config.rootDir, filename)], options.collectCoverageFrom, - {dot: true}, ).length ) { return false; diff --git a/scripts/build.js b/scripts/build.js index a44c8b3b2566..2a5f8b77aa91 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -125,14 +125,14 @@ function buildFile(file, silent) { const destPath = getBuildPath(file, BUILD_DIR); mkdirp.sync(path.dirname(destPath)); - if (micromatch.isMatch(file, IGNORE_PATTERN, {dot: true})) { + if (micromatch.isMatch(file, IGNORE_PATTERN)) { silent || process.stdout.write( chalk.dim(' \u2022 ') + path.relative(PACKAGES_DIR, file) + ' (ignore)\n' ); - } else if (!micromatch.isMatch(file, JS_FILES_PATTERN, {dot: true})) { + } else if (!micromatch.isMatch(file, JS_FILES_PATTERN)) { fs.createReadStream(file).pipe(fs.createWriteStream(destPath)); silent || process.stdout.write(