Skip to content

Commit 905836d

Browse files
[web] Upgrade the test package to remove the dependency on package_resolver (#18135)
1 parent a0983d3 commit 905836d

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

lib/web_ui/dev/browser.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import 'package:pedantic/pedantic.dart';
1111
import 'package:stack_trace/stack_trace.dart';
1212
import 'package:typed_data/typed_buffers.dart';
1313

14-
import 'package:test_api/src/utils.dart';
14+
import 'package:test_api/src/utils.dart' show getErrorMessage;
1515

1616
import 'common.dart'; // ignore: unused_import
1717

lib/web_ui/dev/test_platform.dart

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import 'dart:isolate';
1111
import 'package:async/async.dart';
1212
import 'package:http_multi_server/http_multi_server.dart';
1313
import 'package:image/image.dart';
14-
import 'package:package_resolver/package_resolver.dart';
14+
import 'package:package_config/package_config.dart';
1515
import 'package:path/path.dart' as p;
1616
import 'package:pool/pool.dart';
1717
import 'package:shelf/shelf.dart' as shelf;
@@ -816,10 +816,14 @@ class BrowserManager {
816816
'build',
817817
'$path.browser_test.dart.js.map',
818818
);
819+
PackageConfig packageConfig = await loadPackageConfigUri(
820+
await Isolate.packageConfig);
821+
Map<String, Uri> packageMap =
822+
{for (var p in packageConfig.packages) p.name: p.packageUriRoot};
819823
final JSStackTraceMapper mapper = JSStackTraceMapper(
820824
await File(mapPath).readAsString(),
821825
mapUrl: p.toUri(mapPath),
822-
packageResolver: await PackageResolver.current.asSync,
826+
packageMap: packageMap,
823827
sdkRoot: p.toUri(sdkDir),
824828
);
825829

lib/web_ui/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ dev_dependencies:
1212
image: 2.1.4
1313
mockito: 4.1.1
1414
path: 1.6.4
15-
test: 1.6.5
15+
test: 1.14.3
1616
quiver: 2.0.5
1717
build_runner: 1.7.2
18-
build_test: 0.10.8
18+
build_test: 1.0.0
1919
build_web_compilers: 2.7.1
2020
yaml: 2.2.0
2121
watcher: 0.9.7+12

web_sdk/web_engine_tester/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ environment:
66
dependencies:
77
js: 0.6.1+1
88
stream_channel: 2.0.0
9-
test: 1.6.5
9+
test: 1.14.3
1010
webkit_inspection_protocol: 0.5.0
1111
ui:
1212
path: ../../lib/web_ui

0 commit comments

Comments
 (0)