diff --git a/lib/globs.js b/lib/globs.js index 132c7424ab..09d92fba25 100644 --- a/lib/globs.js +++ b/lib/globs.js @@ -12,7 +12,6 @@ import { normalizePattern, normalizePatterns } from './glob-helpers.cjs'; -import providerManager from './provider-manager.js'; export { classify, @@ -69,10 +68,8 @@ export function normalizeGlobs({extensions, files: filePatterns, ignoredByWatche ignoredByWatcherPatterns = ignoredByWatcherPatterns ? [...defaultIgnoredByWatcherPatterns, ...normalizePatterns(ignoredByWatcherPatterns)] : [...defaultIgnoredByWatcherPatterns]; - for (const {level, main} of providers) { - if (level >= providerManager.levels.pathRewrites) { - ({filePatterns, ignoredByWatcherPatterns} = main.updateGlobs({filePatterns, ignoredByWatcherPatterns})); - } + for (const {main} of providers) { + ({filePatterns, ignoredByWatcherPatterns} = main.updateGlobs({filePatterns, ignoredByWatcherPatterns})); } return {extensions, filePatterns, ignoredByWatcherPatterns}; diff --git a/lib/provider-manager.js b/lib/provider-manager.js index 81fa8ca340..1bee5ff7bf 100644 --- a/lib/provider-manager.js +++ b/lib/provider-manager.js @@ -2,13 +2,15 @@ import * as globs from './globs.js'; import pkg from './pkg.cjs'; const levels = { - ava3: 1, - pathRewrites: 2 + // As the protocol changes, comparing levels by integer allows AVA to be + // compatible with different versions. Currently there is only one supported + // version, so this is effectively unused. The infrastructure is retained for + // future use. + levelIntegersAreCurrentlyUnused: 0 }; const levelsByProtocol = { - 'ava-3': levels.ava3, - 'ava-3.2': levels.pathRewrites + 'ava-3.2': levels.levelIntegersAreCurrentlyUnused }; async function load(providerModule, projectDir) { diff --git a/lib/watcher.js b/lib/watcher.js index fe512eb383..a8b2b99ea7 100644 --- a/lib/watcher.js +++ b/lib/watcher.js @@ -7,7 +7,6 @@ import flatten from 'lodash/flatten.js'; import {chalk} from './chalk.js'; import {applyTestFileFilter, classify, getChokidarIgnorePatterns} from './globs.js'; -import providerManager from './provider-manager.js'; let chokidar = chokidar_; export function _testOnlyReplaceChokidar(replacement) { @@ -99,7 +98,7 @@ export default class Watcher { const patternFilters = filter.map(({pattern}) => pattern); - this.providers = providers.filter(({level}) => level >= providerManager.levels.pathRewrites); + this.providers = providers; this.run = (specificFiles = [], updateSnapshots = false) => { const clearLogOnNextRun = this.clearLogOnNextRun && this.runVector > 0; if (this.runVector > 0) {