From 24a7ac636f936d03a2ba392fa50437b8c08c8f7c Mon Sep 17 00:00:00 2001 From: Sigurd Meldgaard Date: Fri, 6 Mar 2026 08:07:17 -0800 Subject: [PATCH] Bump pub to 74408212b5348003381bc63f3b59274aaa23cfa3 Changes: ``` > git log --format="%C(auto) %h %s" 26c6985..7440821 https://dart.googlesource.com/pub.git/+/74408212b Bump actions/stale from 10.1.1 to 10.2.0 in the github-actions group (4788) https://dart.googlesource.com/pub.git/+/ac14a82d0 Finish override logic (4780) https://dart.googlesource.com/pub.git/+/26d41b4f6 Handle both tagged and lightweight tags in tag patterns (4781) https://dart.googlesource.com/pub.git/+/701d535d3 Make applicationConfigHome conditional, avoid it when dart:io is unavailable (4779) https://dart.googlesource.com/pub.git/+/526635f32 IOOverrides using package:file for testing (4774) https://dart.googlesource.com/pub.git/+/970c4f7c9 Wrap platform (4778) https://dart.googlesource.com/pub.git/+/3b6317778 Test for gzipDecoder (4772) https://dart.googlesource.com/pub.git/+/d60133739 Wrap path (4775) https://dart.googlesource.com/pub.git/+/eac9e600d 'Add @TestOn('vm') to all tests (4769) https://dart.googlesource.com/pub.git/+/e1d6f0679 Remove skipped feature test (4773) https://dart.googlesource.com/pub.git/+/27a584dcd Stop sending X-Pub headers (4764) https://dart.googlesource.com/pub.git/+/143730e76 Introduce platform-agnostic gzipDecoder abstraction (4768) https://dart.googlesource.com/pub.git/+/0062dc9b9 Support Git LFS for git dependencies (4761) https://dart.googlesource.com/pub.git/+/2ec22ec97 Allow (and prefer) using @ instead of : in `pub add` and `pub unpack` (4759) https://dart.googlesource.com/pub.git/+/d3d0824ab Fix path-activated packages not picking up source changes (4748) https://dart.googlesource.com/pub.git/+/54a30dd79 Bump analyzer from 10.0.1 to 10.0.2 (4750) https://dart.googlesource.com/pub.git/+/1d9b56e2f Bump meta from 1.17.0 to 1.18.1 (4751) ``` Diff: https://dart.googlesource.com/pub.git/+/26c6985c742593d081f8b58450f463a584a4203a..74408212b5348003381bc63f3b59274aaa23cfa3/ Change-Id: I53e9723c511561e9e7c4b10fdb41db00cc157e56 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/484580 Reviewed-by: Jonas Jensen Auto-Submit: Sigurd Meldgaard Commit-Queue: Sigurd Meldgaard --- CHANGELOG.md | 3 ++ DEPS | 2 +- pkg/dartdev/test/analytics_test.dart | 53 ++++++++++++++-------------- 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76891c70380..1eb9042c940 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -72,6 +72,9 @@ main() { - `dart pub cache repair` now by default only repairs the packages referenced by the current projects pubspec.lock. For the old behavior of repairing all packages use the `--all` flag. +- `dart pub add` and `dart pub unpack` now accept `@` as an alternative to `:` + for seperating a package name from its version constraint. +- Git dependencies now support LFS. #### dart2wasm diff --git a/DEPS b/DEPS index 10f4c5b1f34..8da8fead62b 100644 --- a/DEPS +++ b/DEPS @@ -145,7 +145,7 @@ vars = { "material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e", "native_rev": "fa77bf746b3ebd9e952f2e480f115d3147b65e65", # rolled manually while record_use is experimental "protobuf_rev": "d5639f45b8468fba684b076b9403ccd5f2290056", - "pub_rev": "26c6985c742593d081f8b58450f463a584a4203a", # rolled manually + "pub_rev": "74408212b5348003381bc63f3b59274aaa23cfa3", # rolled manually "shelf_rev": "900731b313dabf48927a82f2124e5a996c4a3d05", "sync_http_rev": "6666fff944221891182e1f80bf56569338164d72", "tar_rev": "13479f7c2a18f499e840ad470cfcca8c579f6909", diff --git a/pkg/dartdev/test/analytics_test.dart b/pkg/dartdev/test/analytics_test.dart index ced39b40c1c..50334647b0b 100644 --- a/pkg/dartdev/test/analytics_test.dart +++ b/pkg/dartdev/test/analytics_test.dart @@ -9,7 +9,7 @@ import 'package:dartdev/dartdev.dart'; import 'package:http/http.dart' as http; import 'package:path/path.dart' as path; // Needed to reset the global HTTP client after a test. -import 'package:pub/src/http.dart' show innerHttpClient; +import 'package:pub/src/http.dart' as pub show withHttpClient; import 'package:test/test.dart'; import 'package:unified_analytics/unified_analytics.dart'; @@ -92,11 +92,6 @@ void main() { }); group('pub', () { - setUp(() { - // Inside each pub test reset the pub http client. - innerHttpClient = http.Client(); - }); - test( 'get', () async { @@ -136,16 +131,18 @@ void main() { test('run', () async { final p = project(mainSrc: 'void main(List args) => print(args)'); - final analytics = await p.runLocalWithFakeAnalytics([ - 'run', - '--no-pause-isolates-on-exit', - '--enable-asserts', - 'lib/main.dart', - '--argument', - ]); - expect(analytics.sentEvents, [ - Event.dartCliCommandExecuted(name: 'run', enabledExperiments: ''), - ]); + await pub.withHttpClient(client: http.Client(), () async { + final analytics = await p.runLocalWithFakeAnalytics([ + 'run', + '--no-pause-isolates-on-exit', + '--enable-asserts', + 'lib/main.dart', + '--argument', + ]); + expect(analytics.sentEvents, [ + Event.dartCliCommandExecuted(name: 'run', enabledExperiments: ''), + ]); + }); }); group('run --enable-experiments', () { @@ -154,17 +151,19 @@ void main() { final p = project(mainSrc: experiment.validation); { for (final no in ['', 'no-']) { - final analytics = await p.runLocalWithFakeAnalytics([ - 'run', - '--enable-experiment=$no${experiment.name}', - 'lib/main.dart', - ]); - expect(analytics.sentEvents, [ - Event.dartCliCommandExecuted( - name: 'run', - enabledExperiments: '$no${experiment.name}', - ), - ]); + await pub.withHttpClient(client: http.Client(), () async { + final analytics = await p.runLocalWithFakeAnalytics([ + 'run', + '--enable-experiment=$no${experiment.name}', + 'lib/main.dart', + ]); + expect(analytics.sentEvents, [ + Event.dartCliCommandExecuted( + name: 'run', + enabledExperiments: '$no${experiment.name}', + ), + ]); + }); } } });