Merge remote-tracking branch 'origin/master' into bump_dartdoc_size_limit

Author: sigurdm

.github/workflows/dart.yml

@@ -2,6 +2,13 @@ Important changes to data models, configuration, and migrations between each
 AppEngine version, listed here to ease deployment and troubleshooting.
 
 ## Next Release (replace with git tag when deployed)
+ * Bumped runtimeVersion to `2023.02.01`
+ * Upgraded runtime Dart SDK to `2.19.0`.
+ * Upgraded stable Dart analysis SDK to `2.19.1`.
+ * Upgraded preview Dart analysis SDK to `3.0.0-179.0.dev`.
+ * Upgraded dartdoc to `6.1.5`.
+ * Upgraded dependencies.
+ * Updated `osd.xml`: using inlined URL parameter.
 
 ## `20230125t151100-all`
  * Enabled `dart3` experiment, displaying "Dart-3 ready" badges.

CHANGELOG.md

@@ -1,5 +1,5 @@
 # Keep version in-sync with .mono_repo.yml and app/lib/shared/versions.dart
-FROM dart:2.18.0
+FROM dart:2.19.0
 
 # After install we remove the apt-index again to keep the docker image diff small.
 RUN apt-get update && \
@@ -33,9 +33,9 @@ WORKDIR /project/app
 RUN dart /project/tool/pub_get_offline.dart /project/app
 
 # Setup analysis Dart SDKs
-RUN /project/tool/setup-dart.sh /tool/stable 2.19.0
-RUN /project/tool/setup-dart.sh /tool/preview 3.0.0-151.0.dev
-RUN /project/tool/setup-dart.sh /tool/future 3.0.0-151.0.dev
+RUN /project/tool/setup-dart.sh /tool/stable 2.19.1
+RUN /project/tool/setup-dart.sh /tool/preview 3.0.0-179.0.dev
+RUN /project/tool/setup-dart.sh /tool/future 3.0.0-179.0.dev
 
 # Setup analysis Flutter SDKs
 RUN /project/tool/setup-flutter.sh /tool/stable 3.7.0

Dockerfile.app

@@ -18,9 +18,9 @@ COPY --chown=worker:worker . /home/worker/pub-dev
 WORKDIR /home/worker/pub-dev
 
 # Setup Dart SDK into /home/worker/dart/{stable,preview}/
-RUN tool/setup-dart.sh /home/worker/dart 2.19.0
+RUN tool/setup-dart.sh /home/worker/dart 2.19.1
 RUN mv /home/worker/dart/dart-sdk /home/worker/dart/stable
-RUN tool/setup-dart.sh /home/worker/dart 3.0.0-151.0.dev
+RUN tool/setup-dart.sh /home/worker/dart 3.0.0-179.0.dev
 RUN mv /home/worker/dart/dart-sdk /home/worker/dart/preview
 
 # Setup Flutter SDK into /home/worker/flutter/{stable,preview}/

Dockerfile.worker

@@ -8,7 +8,6 @@ const _publicFlags = <String>{};
 
 const _allFlags = <String>{
   ..._publicFlags,
-  'dart3',
   'signin',
   'sandbox',
 };
@@ -42,9 +41,6 @@ class ExperimentalFlags {
     return ExperimentalFlags(_allFlags);
   }
 
-  /// Whether to show the "Dart 3 ready" badge or the search checkbox.
-  bool get showDart3ReadyOnUI => true;
-
   /// Whether to return dartdoc from sandboxing output.
   bool get showSandboxedOutput => _enabled.contains('sandbox');
 

app/lib/frontend/handlers/experimental.dart

@@ -5,7 +5,6 @@
 import 'package:_pub_shared/data/page_data.dart';
 import 'package:_pub_shared/search/tags.dart';
 import 'package:collection/collection.dart' show IterableExtension;
-import 'package:pub_dev/frontend/request_context.dart';
 
 import '../../package/models.dart';
 import '../../package/overrides.dart' show devDependencyPackages;
@@ -123,8 +122,7 @@ d.Node renderPkgHeader(PackagePageData data) {
     publisherId: package.publisherId,
     published: data.version!.created!,
     isNullSafe: isNullSafe,
-    isDart3Ready: requestContext.experimentalFlags.showDart3ReadyOnUI &&
-        pkgView.tags.contains(PackageVersionTags.isDart3Ready),
+    isDart3Ready: pkgView.tags.contains(PackageVersionTags.isDart3Ready),
     releases: showReleases ? data.latestReleases : null,
   );
 

app/lib/frontend/templates/package.dart

@@ -7,7 +7,6 @@ import 'package:_pub_shared/search/tags.dart';
 
 import '../../../dom/dom.dart' as d;
 import '../../../dom/material.dart' as material;
-import '../../../request_context.dart';
 import '../../../static_files.dart';
 
 /// Renders the package listing.
@@ -153,16 +152,13 @@ d.Node _searchFormContainer({
                 searchForm: searchForm,
                 title: 'Show only packages with screenshots.',
               ),
-              if (requestContext.experimentalFlags.showDart3ReadyOnUI ||
-                  searchForm.parsedQuery.tagsPredicate
-                      .hasTag(PackageVersionTags.isDart3Ready))
-                _tagBasedCheckbox(
-                  tagPrefix: 'is',
-                  tagValue: 'dart3-ready',
-                  label: 'Dart 3 ready',
-                  searchForm: searchForm,
-                  title: 'Show only packages compatible with Dart 3.',
-                ),
+              _tagBasedCheckbox(
+                tagPrefix: 'is',
+                tagValue: 'dart3-ready',
+                label: 'Dart 3 ready',
+                searchForm: searchForm,
+                title: 'Show only packages compatible with Dart 3.',
+              ),
             ],
           ),
         ],

app/lib/frontend/templates/views/pkg/index.dart

@@ -7,7 +7,6 @@ import 'package:_pub_shared/search/tags.dart';
 import 'package:clock/clock.dart';
 import 'package:pana/pana.dart';
 
-import '../../../../frontend/request_context.dart';
 import '../../../../package/models.dart';
 import '../../../../package/screenshots/backend.dart';
 import '../../../../search/search_service.dart';
@@ -74,8 +73,7 @@ d.Node _packageItem(
 }) {
   final isFlutterFavorite = view.tags.contains(PackageTags.isFlutterFavorite);
   final isNullSafe = view.tags.contains(PackageVersionTags.isNullSafe);
-  final isDart3Ready = requestContext.experimentalFlags.showDart3ReadyOnUI &&
-      view.tags.contains(PackageVersionTags.isDart3Ready);
+  final isDart3Ready = view.tags.contains(PackageVersionTags.isDart3Ready);
 
   Iterable<d.Node> versionAndTimestamp(
     Release release, {

app/lib/frontend/templates/views/pkg/package_list.dart

@@ -65,7 +65,10 @@ class IntegrityChecker {
       count++;
       _logger.warning('[pub-integrity-problem] $problem');
     }
-    _logger.info('Integrity check completed with $count issue(s).');
+    _logger.info([
+      'Integrity check completed with $count issue(s).',
+      if (count == 0) '[pub-integrity-no-problems-found]',
+    ].join(' '));
   }
 
   /// Runs integrity checks, and returns the list of problems.

app/lib/shared/integrity.dart

@@ -35,7 +35,6 @@ class DatastoreHeadTaskSource implements TaskSource {
   DatastoreHeadTaskSource(
     this._db,
     this._model, {
-
     /// Whether to scan the entire datastore in the first run or skip old ones.
     bool skipHistory = false,
 

app/lib/shared/task_sources.dart

@@ -22,11 +22,10 @@ final RegExp runtimeVersionPattern = RegExp(r'^\d{4}\.\d{2}\.\d{2}$');
 /// when the version switch happens.
 const acceptedRuntimeVersions = <String>[
   // The current [runtimeVersion].
-  '2023.01.25',
+  '2023.02.01',
   // Fallback runtime versions.
+  '2023.01.25',
   '2023.01.24',
-  '2023.01.20',
-  '2023.01.16',
 ];
 
 /// Represents a combined version of the overall toolchain and processing,
@@ -54,10 +53,10 @@ bool shouldGCVersion(String version) =>
     version.compareTo(gcBeforeRuntimeVersion) < 0;
 
 // keep in-sync with SDK version in .mono_repo.yml and Dockerfile
-final String runtimeSdkVersion = '2.18.0';
-final String toolStableDartSdkVersion = '2.19.0';
+final String runtimeSdkVersion = '2.19.0';
+final String toolStableDartSdkVersion = '2.19.1';
 final String toolStableFlutterSdkVersion = '3.7.0';
-final String toolPreviewDartSdkVersion = '3.0.0-151.0.dev';
+final String toolPreviewDartSdkVersion = '3.0.0-179.0.dev';
 final String toolPreviewFlutterSdkVersion = '3.7.0';
 
 final semanticToolStableDartSdkVersion =
@@ -69,7 +68,7 @@ final semanticToolStableFlutterSdkVersion =
 final String panaVersion = pana.packageVersion;
 
 // keep in-sync with pkg/pub_dartdoc/pubspec.yaml
-final String dartdocVersion = '6.1.1';
+final String dartdocVersion = '6.1.5';
 
 /// Whether the given runtime version (stored with the dartdoc entry) should
 /// be displayed on the live site (or a coordinated upgrade is in progress).

app/lib/shared/versions.dart

@@ -61,7 +61,7 @@ Future<List<ResolvedVersion>> resolveVersions(
       }
     }
     final pubHostedDir =
-        Directory(p.join(pubCacheDir.path, 'hosted', 'pub.dartlang.org'));
+        Directory(p.join(pubCacheDir.path, 'hosted', 'pub.dev'));
     final dirs = await pubHostedDir.list().toList();
     final versions = <ResolvedVersion>[];
     for (final dir in dirs.whereType<Directory>()) {

app/lib/tool/test_profile/resolver.dart

@@ -1,6 +1,6 @@
 # See https://github.com/dart-lang/mono_repo for details
 sdk:
-  - 2.18.0
+  - 2.19.0
 
 stages:
   - smoke_test: