From 5e68eee8c33c55efc687cab3516fa7fef4b2ecd9 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Mon, 8 Jul 2024 19:06:29 +0000 Subject: [PATCH] [deps] rev args, bazel_worker, benchmark_harness, collection, ecosystem, file, glob, http, http_multi_server, http_parser, json_rpc_2, logging, mockito, package_config, source_maps, source_span, sync_http, test, yaml_edit Revisions updated by `dart tools/rev_sdk_deps.dart`. args (https://github.com/dart-lang/args/compare/6a5a2e6..1a24d61): 1a24d61 2024-07-01 dependabot[bot] Bump the github-actions group with 2 updates (dart-lang/args#278) bazel_worker (https://github.com/dart-lang/bazel_worker/compare/c76d7c8..02f190b): 02f190b 2024-07-01 Kevin Moore blast_repo fixes (dart-lang/bazel_worker#94) benchmark_harness (https://github.com/dart-lang/benchmark_harness/compare/f6ef33d..a06785c): a06785c 2024-07-01 Kevin Moore blast_repo fixes (dart-lang/benchmark_harness#108) collection (https://github.com/dart-lang/collection/compare/9354f38..0c1f829): 0c1f829 2024-07-01 dependabot[bot] Bump the github-actions group with 2 updates (dart-lang/collection#354) ecosystem (https://github.com/dart-lang/ecosystem/compare/54ca01a..4171189): 4171189 2024-07-02 Jacob MacDonald support nested packages in firehose (dart-lang/ecosystem#277) 459041b 2024-07-01 dependabot[bot] Bump the github-actions group with 4 updates (dart-lang/ecosystem#275) file (https://github.com/google/file.dart/compare/07cacae..855831c): 855831c 2024-07-01 dependabot[bot] Bump actions/checkout from 4.1.6 to 4.1.7 (google/file.dart#242) da79121 2024-07-01 dependabot[bot] Bump dart-lang/setup-dart from 1.6.4 to 1.6.5 (google/file.dart#241) glob (https://github.com/dart-lang/glob/compare/6d3ba5e..8b05be8): 8b05be8 2024-07-01 dependabot[bot] Bump the github-actions group with 2 updates (dart-lang/glob#96) http (https://github.com/dart-lang/http/compare/8d89385..4178b67): 4178b67 2024-07-03 Brian Quinlan Clarify when Client.close must be called (dart-lang/http#1255) 719dc5f 2024-07-02 Brian Quinlan Upgrade to http_image_provider: 0.0.3 (dart-lang/http#1253) 75b1efb 2024-07-02 dependabot[bot] Bump the github-actions group across 1 directory with 4 updates (dart-lang/http#1251) cdfb94c 2024-07-01 Brian Quinlan Add an section explaining the benefits of using `package:ok_http`. (dart-lang/http#1252) http_multi_server (https://github.com/dart-lang/http_multi_server/compare/25941e2..8348be1): 8348be1 2024-07-01 dependabot[bot] Bump the github-actions group with 2 updates (dart-lang/http_multi_server#71) http_parser (https://github.com/dart-lang/http_parser/compare/9bf7bd9..ce528cf): ce528cf 2024-07-01 dependabot[bot] Bump the github-actions group with 2 updates (dart-lang/http_parser#101) json_rpc_2 (https://github.com/dart-lang/json_rpc_2/compare/616937f..b4810dc): b4810dc 2024-07-01 dependabot[bot] Bump the github-actions group with 2 updates (dart-lang/json_rpc_2#117) logging (https://github.com/dart-lang/logging/compare/6c3fb37..8752902): 8752902 2024-07-01 Kevin Moore blast_repo fixes (dart-lang/logging#170) mockito (https://github.com/dart-lang/mockito/compare/a7fdf71..eb4d1da): eb4d1da 2024-07-03 James Lin Update with review feedback from srawlins db19e8c 2024-06-05 James Lin Provide better documentation for `provideDummy`/`provideDummyBuilder` 330976e 2024-07-01 dependabot[bot] Bump the github-actions group across 1 directory with 2 updates (dart-lang/mockito#761) package_config (https://github.com/dart-lang/package_config/compare/903a0e5..f0b7256): f0b7256 2024-07-01 dependabot[bot] Bump the github-actions group with 2 updates (dart-lang/package_config#156) source_maps (https://github.com/dart-lang/source_maps/compare/caa79c2..5f82c61): 5f82c61 2024-07-01 dependabot[bot] Bump the github-actions group with 2 updates (dart-lang/source_maps#95) source_span (https://github.com/dart-lang/source_span/compare/89520f3..f81cd4a): f81cd4a 2024-07-01 dependabot[bot] Bump the github-actions group with 2 updates (dart-lang/source_span#115) sync_http (https://github.com/dart-lang/sync_http/compare/7622bdd..ab8377e): ab8377e 2024-07-01 dependabot[bot] Bump dart-lang/setup-dart from 1.6.2 to 1.6.5 (dart-lang/sync_http#48) test (https://github.com/dart-lang/test/compare/3256c23..14f9b3e): 14f9b3ec 2024-07-08 Jacob MacDonald use pub workspaces (dart-lang/test#2249) c14ce93a 2024-07-03 Nate Bosch Prepare to publish (dart-lang/test#2250) yaml_edit (https://github.com/dart-lang/yaml_edit/compare/57a28da..d605cce): d605cce 2024-07-04 Kavisi Fix fold literal encoding with trailing line break (dart-lang/yaml_edit#91) Change-Id: I70ee32b3fa1912457b7b08affb3446523ef3b0d1 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/374860 Reviewed-by: Brian Quinlan Commit-Queue: Devon Carew --- DEPS | 38 +++++++++++++++--------------- tools/generate_package_config.dart | 26 +++++++++++++++----- 2 files changed, 39 insertions(+), 25 deletions(-) diff --git a/DEPS b/DEPS index cbba8a9b6f0b..02b06310e238 100644 --- a/DEPS +++ b/DEPS @@ -120,16 +120,16 @@ vars = { # EOL comment after a dependency to disable this and pin it at its current # revision. - "args_rev": "6a5a2e6b1f0020b873c7ffbdd36a784c4f9ee300", + "args_rev": "1a24d614423e7861ae2e341bfb19050959cef0cd", "async_rev": "c0d81f8699682d01d657a9bf827107d11904a247", - "bazel_worker_rev": "c76d7c86381a6ed594641ba03b55c65b84ee11a6", - "benchmark_harness_rev": "f6ef33dc88d7cbc9e4a8a087f1e652eb0d6cc254", + "bazel_worker_rev": "02f190b88df771fc8e05c07d4b64ae942c02f456", + "benchmark_harness_rev": "a06785cdfc51538e3556c1d59bb4f03426e9e1c5", "boolean_selector_rev": "c5468f44fd9ca0ea3435e1a0a84ff9b6fac38261", "browser_launcher_rev": "60126904a26b761d29b4f2d76292ff3c089160de", "characters_rev": "7633a16a22c626e19ca750223237396315268a06", "cli_util_rev": "64192706344d0598784bebe1abc4a9bfc2608de0", "clock_rev": "ad428ea8b75fa0d7ba629791552d40478745c54a", - "collection_rev": "9354f386de3c57f5486b01ab4dfa1a2f033307d9", + "collection_rev": "0c1f829c29da1d63488be774f430b2035a565d6f", "convert_rev": "9035cafefc1da4315f26058734d0c2a19d5ab56a", "crypto_rev": "1216790ba704a0ab194f9cd0da2d65e1767f3342", "csslib_rev": "192d720f121792ab05ca157ea280edc7e0410e9c", @@ -145,27 +145,27 @@ vars = { # For more details, see https://github.com/dart-lang/sdk/issues/30164. "dart_style_rev": "a6ad7693555a9add6f98ad6fd94de80d35c89415", # disable tools/rev_sdk_deps.dart "dartdoc_rev": "7e5da6090e6a48cebaee8789ca0fc396b34fd8a4", # https://github.com/dart-lang/dartdoc/issues/3808 - "ecosystem_rev": "54ca01abe4b7b62419ee88814d3dc98df36ff8ff", - "file_rev": "07cacaed6679a173e29176747e6ce0325742749f", + "ecosystem_rev": "4171189c0dd0f5e02426fcded7d1fa2d09be6133", + "file_rev": "855831c242a17c2dee163828d52710d9043c7c8d", "fixnum_rev": "6c19e60366ce3d5edfaed51a7c12c98e7977977e", "flute_rev": "a531c96a8b43d015c6bfbbfe3ab54867b0763b8b", - "glob_rev": "6d3ba5ec02817e62d17ace040590bb81a3e1242f", + "glob_rev": "8b05be87f84f74d90dc0c15956f3ff95805322e5", "html_rev": "0da420ca1e196cda54ede476d0d8d3ecf55375ef", - "http_rev": "8d893851904d8cd292a66e39812b59aca2cc4d96", - "http_multi_server_rev": "25941e260658efb324de857e6022f418faf9bdd1", - "http_parser_rev": "9bf7bd981a39137da1e5d7fe64f4652b078c7aa9", + "http_rev": "4178b67e7970ff02926e79649db5ab473b46cf30", + "http_multi_server_rev": "8348be1bf8fd17881e2643086e68c9d2b28dd9ce", + "http_parser_rev": "ce528cf82f3d26ac761e29b2494a9e0c270d4939", "intl_rev": "5d65e3808ce40e6282e40881492607df4e35669f", - "json_rpc_2_rev": "616937f6d3837e38a2a287653ddaf722de260702", + "json_rpc_2_rev": "b4810dc7bee5828f240586c81f3f34853cacdbce", "leak_tracker_rev": "f5620600a5ce1c44f65ddaa02001e200b096e14c", # manually rolled "lints_rev": "f6b5d36485f6f067ac0f5a7193006ebe82ee6113", - "logging_rev": "6c3fb37fecb2e30415072f327b834a3e95517fa9", + "logging_rev": "8752902b75a476d2c7b64dcf01aaaee885f35c4c", "markdown_rev": "62424376d0b5fe35a2957b3caed4b75db010ba82", "matcher_rev": "d6d573d0f8d65b36550ce62aad3ce6b5e987b642", "material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e", "mime_rev": "11fec7d6df509a4efd554051cc27e3bf82df9c96", - "mockito_rev": "a7fdf7101fbd31132a59188a6057d21004345927", + "mockito_rev": "eb4d1daa20c105c94ac29689c1975f0850fa18f2", "native_rev": "cd8eddf8ad5b953127acf884f2b8a614482a8b0f", # mosum@ and dacoharkes@ are rolling breaking changes manually while the assets features are in experimental. - "package_config_rev": "903a0e528f91aef90821c8f5eaafbc1ae27198ab", + "package_config_rev": "f0b72567d85b827aa0f53991fe8a4a8bf36eb479", "path_rev": "e969f42ed112dd702a9453beb9df6c12ae2d3805", "pool_rev": "924fb04353cec915d927f9f1aed88e2eda92b98a", "protobuf_rev": "ccf104dbc36929c0f8708285d5f3a8fae206343e", @@ -173,16 +173,16 @@ vars = { "pub_semver_rev": "d9e5ee68a350fbf4319bd4dfcb895fc016337d3a", "shelf_rev": "9f2dffecbe8f219146a077e401758602752d486a", "source_map_stack_trace_rev": "741b6ceb4b6cdb8ff620664337d7ecc63ca52cc1", - "source_maps_rev": "caa79c2011015759c6cf3299f299f5cccdf8bb61", - "source_span_rev": "89520f3009e332ce2b6675f71dca166521c36cc4", + "source_maps_rev": "5f82c613664ade03c7a6d0e6c59687c69dec894b", + "source_span_rev": "f81cd4a2df630a97264fb4015fb93944b5b98b11", "sse_rev": "52d042ff9ab2d0e5bc26805d74a03077a67861e1", "stack_trace_rev": "4fd3e2a2dc6611febf4cfb9197ebf9e60fc6a34d", "stream_channel_rev": "28a65331aa2d66a5e953205aa462bcdb1e240a5b", "string_scanner_rev": "0de03b5279a04aa05052ce306f90fca473c6fd1a", - "sync_http_rev": "7622bdd07501f3f279212e355325b7c84a2b0a08", + "sync_http_rev": "ab8377eba79baff3d77e8c75d502efc2b85a9342", "tar_rev": "552a49d7595e444184d4f91e9afd533aa253a31d", "term_glyph_rev": "38a158f55006cf30942c928171ea601ee5e0308f", - "test_rev": "3256c23cc753a184bb3bf27610a7c8410735e3ac", + "test_rev": "14f9b3ec7e06f987dd70bb1f47267462ce218048", "test_descriptor_rev": "90743bc16bc00526a1b9a64f813614be9b2479d9", "test_process_rev": "6223572ca16d7585d5f08d9281de6a5734e45150", "test_reflective_loader_rev": "6e648863b39aab8d0204e769d25805eea9db0ac4", @@ -196,7 +196,7 @@ vars = { "webdriver_rev": "718e4c37d004fceb9856de980782c46bf9576df5", "webkit_inspection_protocol_rev": "32fffa53df3f54005c742ddf4f859fb585a6b254", "yaml_rev": "30fd9e0cd49b2e04f74769f9b24a0300e400403e", - "yaml_edit_rev": "57a28daea82a3f00f57a90d5ea6df6a458b2f781", + "yaml_edit_rev": "d605cce3946828253a97f4b3de1a43260b6edf3b", # Windows deps "crashpad_rev": "bf327d8ceb6a669607b0dbab5a83a275d03f99ed", diff --git a/tools/generate_package_config.dart b/tools/generate_package_config.dart index 3f9a24207b0a..c713edaa186e 100644 --- a/tools/generate_package_config.dart +++ b/tools/generate_package_config.dart @@ -203,7 +203,10 @@ Iterable listSubdirectories(String parentPath) sync* { // Don't recurse into dot directories. if (name.startsWith('.')) continue; - if (File(join(child.path, 'pubspec.yaml')).existsSync()) { + final pubspecFile = File(join(child.path, 'pubspec.yaml')); + if (pubspecFile.existsSync() && !isWorkspacePubspec(pubspecFile)) { + // Stop recursing when we find a pubspec file (and that pubspec does not + // define a pub workspace). yield join(parentPath, name); } else { yield* listSubdirectories(join(parentPath, name)); @@ -213,18 +216,18 @@ Iterable listSubdirectories(String parentPath) sync* { final versionRE = RegExp(r"(?:\^|>=)(\d+\.\d+)"); -/// Parses the package name in the pubspec for [packageDir] +/// Parses the package name in the pubspec for [packageDir]. String pubspecName(String packageDir) { var pubspecFile = File(join(repoRoot, packageDir, 'pubspec.yaml')); if (!pubspecFile.existsSync()) { - print("Error: Missing pubspec for $packageDir."); + print('Error: Missing pubspec for $packageDir'); exit(1); } var contents = pubspecFile.readAsLinesSync(); if (!contents.any((line) => line.contains('name: '))) { - print("Error: Pubspec for $packageDir has no name."); + print('Error: Pubspec for $packageDir has no name.'); exit(1); } @@ -232,6 +235,17 @@ String pubspecName(String packageDir) { return name.trim().substring('name:'.length).trim(); } +/// Returns whether the given pubspec defines a workspace. +bool isWorkspacePubspec(File pubspecFile) { + if (!pubspecFile.existsSync()) { + print('Error: Missing pubspec for ${pubspecFile.path}'); + exit(1); + } + + var contents = pubspecFile.readAsLinesSync(); + return contents.any((line) => line.startsWith('workspace:')); +} + /// Infers the language version from the SDK constraint in the pubspec for /// [packageDir]. /// @@ -240,13 +254,13 @@ String pubspecLanguageVersion(String packageDir) { var pubspecFile = File(join(repoRoot, packageDir, 'pubspec.yaml')); if (!pubspecFile.existsSync()) { - print("Error: Missing pubspec for $packageDir."); + print('Error: Missing pubspec for $packageDir'); exit(1); } var contents = pubspecFile.readAsLinesSync(); if (!contents.any((line) => line.contains('sdk: '))) { - print("Error: Pubspec for $packageDir has no SDK constraint."); + print('Error: Pubspec for $packageDir has no SDK constraint.'); exit(1); }