diff --git a/build_daemon/example/example.dart b/build_daemon/example/example.dart index 94f12bbe0..39132115f 100644 --- a/build_daemon/example/example.dart +++ b/build_daemon/example/example.dart @@ -51,8 +51,7 @@ void main(List args) async { ..outputLocation = OutputLocation((b) => b ..output = 'web_output' ..useSymlinks = false - ..hoist = true).toBuilder() - ..blackListPatterns.replace([RegExp(r'.*_test\.dart$')]))); + ..hoist = true).toBuilder())); print('Registered example web target...'); } else { client.registerBuildTarget(DefaultBuildTarget((b) => b diff --git a/build_daemon/lib/data/build_target.dart b/build_daemon/lib/data/build_target.dart index f5203b7d2..ef35467d5 100644 --- a/build_daemon/lib/data/build_target.dart +++ b/build_daemon/lib/data/build_target.dart @@ -27,11 +27,6 @@ abstract class DefaultBuildTarget DefaultBuildTarget._(); - /// A set of file path patterns to match changes against. - /// - /// If a change matches a pattern this target will not be built. - BuiltSet get blackListPatterns; - OutputLocation? get outputLocation; /// A set of globs patterns for files to build. diff --git a/build_daemon/lib/data/build_target.g.dart b/build_daemon/lib/data/build_target.g.dart index 0514bd301..e511b2e48 100644 --- a/build_daemon/lib/data/build_target.g.dart +++ b/build_daemon/lib/data/build_target.g.dart @@ -23,10 +23,6 @@ class _$DefaultBuildTargetSerializer Serializers serializers, DefaultBuildTarget object, {FullType specifiedType = FullType.unspecified}) { final result = [ - 'blackListPatterns', - serializers.serialize(object.blackListPatterns, - specifiedType: - const FullType(BuiltSet, const [const FullType(RegExp)])), 'reportChangedAssets', serializers.serialize(object.reportChangedAssets, specifiedType: const FullType(bool)), @@ -65,12 +61,6 @@ class _$DefaultBuildTargetSerializer iterator.moveNext(); final Object? value = iterator.current; switch (key) { - case 'blackListPatterns': - result.blackListPatterns.replace(serializers.deserialize(value, - specifiedType: - const FullType(BuiltSet, const [const FullType(RegExp)]))! - as BuiltSet); - break; case 'outputLocation': result.outputLocation.replace(serializers.deserialize(value, specifiedType: const FullType(OutputLocation))! @@ -153,8 +143,6 @@ class _$OutputLocationSerializer } class _$DefaultBuildTarget extends DefaultBuildTarget { - @override - final BuiltSet blackListPatterns; @override final OutputLocation? outputLocation; @override @@ -169,14 +157,11 @@ class _$DefaultBuildTarget extends DefaultBuildTarget { (new DefaultBuildTargetBuilder()..update(updates))._build(); _$DefaultBuildTarget._( - {required this.blackListPatterns, - this.outputLocation, + {this.outputLocation, this.buildFilters, required this.reportChangedAssets, required this.target}) : super._() { - BuiltValueNullFieldError.checkNotNull( - blackListPatterns, r'DefaultBuildTarget', 'blackListPatterns'); BuiltValueNullFieldError.checkNotNull( reportChangedAssets, r'DefaultBuildTarget', 'reportChangedAssets'); BuiltValueNullFieldError.checkNotNull( @@ -196,7 +181,6 @@ class _$DefaultBuildTarget extends DefaultBuildTarget { bool operator ==(Object other) { if (identical(other, this)) return true; return other is DefaultBuildTarget && - blackListPatterns == other.blackListPatterns && outputLocation == other.outputLocation && buildFilters == other.buildFilters && reportChangedAssets == other.reportChangedAssets && @@ -206,7 +190,6 @@ class _$DefaultBuildTarget extends DefaultBuildTarget { @override int get hashCode { var _$hash = 0; - _$hash = $jc(_$hash, blackListPatterns.hashCode); _$hash = $jc(_$hash, outputLocation.hashCode); _$hash = $jc(_$hash, buildFilters.hashCode); _$hash = $jc(_$hash, reportChangedAssets.hashCode); @@ -218,7 +201,6 @@ class _$DefaultBuildTarget extends DefaultBuildTarget { @override String toString() { return (newBuiltValueToStringHelper(r'DefaultBuildTarget') - ..add('blackListPatterns', blackListPatterns) ..add('outputLocation', outputLocation) ..add('buildFilters', buildFilters) ..add('reportChangedAssets', reportChangedAssets) @@ -231,12 +213,6 @@ class DefaultBuildTargetBuilder implements Builder { _$DefaultBuildTarget? _$v; - SetBuilder? _blackListPatterns; - SetBuilder get blackListPatterns => - _$this._blackListPatterns ??= new SetBuilder(); - set blackListPatterns(SetBuilder? blackListPatterns) => - _$this._blackListPatterns = blackListPatterns; - OutputLocationBuilder? _outputLocation; OutputLocationBuilder get outputLocation => _$this._outputLocation ??= new OutputLocationBuilder(); @@ -265,7 +241,6 @@ class DefaultBuildTargetBuilder DefaultBuildTargetBuilder get _$this { final $v = _$v; if ($v != null) { - _blackListPatterns = $v.blackListPatterns.toBuilder(); _outputLocation = $v.outputLocation?.toBuilder(); _buildFilters = $v.buildFilters?.toBuilder(); _reportChangedAssets = $v.reportChangedAssets; @@ -294,7 +269,6 @@ class DefaultBuildTargetBuilder try { _$result = _$v ?? new _$DefaultBuildTarget._( - blackListPatterns: blackListPatterns.build(), outputLocation: _outputLocation?.build(), buildFilters: _buildFilters?.build(), reportChangedAssets: BuiltValueNullFieldError.checkNotNull( @@ -306,8 +280,6 @@ class DefaultBuildTargetBuilder } catch (_) { late String _$failedField; try { - _$failedField = 'blackListPatterns'; - blackListPatterns.build(); _$failedField = 'outputLocation'; _outputLocation?.build(); _$failedField = 'buildFilters'; diff --git a/build_daemon/lib/data/serializers.g.dart b/build_daemon/lib/data/serializers.g.dart index 6acd08364..4466e2c50 100644 --- a/build_daemon/lib/data/serializers.g.dart +++ b/build_daemon/lib/data/serializers.g.dart @@ -23,9 +23,6 @@ Serializers _$serializers = (new Serializers().toBuilder() ..addBuilderFactory( const FullType(BuiltList, const [const FullType(Uri)]), () => new ListBuilder()) - ..addBuilderFactory( - const FullType(BuiltSet, const [const FullType(RegExp)]), - () => new SetBuilder()) ..addBuilderFactory( const FullType(BuiltSet, const [const FullType(String)]), () => new SetBuilder())) diff --git a/build_daemon/lib/src/managers/build_target_manager.dart b/build_daemon/lib/src/managers/build_target_manager.dart index 94d51727f..421d6e281 100644 --- a/build_daemon/lib/src/managers/build_target_manager.dart +++ b/build_daemon/lib/src/managers/build_target_manager.dart @@ -7,13 +7,8 @@ import 'package:web_socket_channel/web_socket_channel.dart'; import '../../data/build_target.dart'; -bool _isBlacklistedPath(String filePath, Set blackListedPatterns) => - blackListedPatterns.any((pattern) => filePath.contains(pattern)); - bool _shouldBuild(BuildTarget target, Iterable changes) => - target is DefaultBuildTarget && - changes.any((change) => - !_isBlacklistedPath(change.path, target.blackListPatterns.toSet())); + target is DefaultBuildTarget; /// Manages the set of build targets, and corresponding listeners, tracked by /// the Dart Build Daemon. diff --git a/build_daemon/test/managers/build_target_manager_test.dart b/build_daemon/test/managers/build_target_manager_test.dart index 48e89c33b..17997bb65 100644 --- a/build_daemon/test/managers/build_target_manager_test.dart +++ b/build_daemon/test/managers/build_target_manager_test.dart @@ -6,7 +6,6 @@ import 'package:build_daemon/data/build_target.dart'; import 'package:build_daemon/src/managers/build_target_manager.dart'; import 'package:mockito/mockito.dart'; import 'package:test/test.dart'; -import 'package:watcher/watcher.dart'; import 'package:web_socket_channel/web_socket_channel.dart'; void main() { @@ -78,53 +77,16 @@ void main() { expect(manager.targets.isEmpty, isTrue); }); - test( - 'a build target will be reused if the target and the blackListPattern ' - 'is the same', () { - var manager = BuildTargetManager(); - var channelA = DummyChannel(); - var channelB = DummyChannel(); - var targetA = DefaultBuildTarget((b) => b - ..target = 'foo' - ..blackListPatterns.replace([RegExp('bar')])); - var targetB = DefaultBuildTarget((b) => b - ..target = 'foo' - ..blackListPatterns.replace([RegExp('bar')])); - manager - ..addBuildTarget(targetA, channelA) - ..addBuildTarget(targetB, channelB); - expect(manager.targets.length, 1); - }); - - test('different blackListPatterns result in different build targets', () { + test('a build target will be reused if the target is the same', () { var manager = BuildTargetManager(); var channelA = DummyChannel(); var channelB = DummyChannel(); var targetA = DefaultBuildTarget((b) => b..target = 'foo'); - var targetB = DefaultBuildTarget((b) => b - ..target = 'foo' - ..blackListPatterns.replace([RegExp('bar')])); + var targetB = DefaultBuildTarget((b) => b..target = 'foo'); manager ..addBuildTarget(targetA, channelA) ..addBuildTarget(targetB, channelB); - expect(manager.targets.length, 2); - }); - - test( - 'correctly uses the blackListPattern to filter build targets for changes', - () { - var manager = BuildTargetManager(); - var channel = DummyChannel(); - var target = DefaultBuildTarget((b) => b - ..target = 'foo' - ..blackListPatterns.replace([RegExp(r'.*_test\.dart$')])); - manager.addBuildTarget(target, channel); - var targets = manager.targetsForChanges( - [WatchEvent(ChangeType.ADD, 'foo/bar/blah/some_file.dart')]); - expect(targets.map((target) => target.target), contains('foo')); - targets = manager.targetsForChanges( - [WatchEvent(ChangeType.ADD, 'foo/bar/blah/some_test.dart')]); - expect(targets.isEmpty, isTrue); + expect(manager.targets.length, 1); }); }