diff --git a/app/lib/frontend/templates/package.dart b/app/lib/frontend/templates/package.dart index 265b8040e2..912ee47879 100644 --- a/app/lib/frontend/templates/package.dart +++ b/app/lib/frontend/templates/package.dart @@ -116,15 +116,10 @@ d.Node renderPkgHeader(PackagePageData data) { !data.isLatestStable || showPrereleaseVersion || showPreviewVersion; final pkgView = data.toPackageView(); - final isNullSafe = pkgView.tags.contains(PackageVersionTags.isNullSafe); final metadataNode = packageHeaderNode( packageName: package.name!, publisherId: package.publisherId, published: data.version.created!, - isNullSafe: isNullSafe, - isDart3Compatible: pkgView.tags.contains( - PackageVersionTags.isDart3Compatible, - ), isDart3Incompatible: pkgView.tags.contains( PackageVersionTags.isDart3Incompatible, ), diff --git a/app/lib/frontend/templates/package_misc.dart b/app/lib/frontend/templates/package_misc.dart index 02175f17ac..262f66383d 100644 --- a/app/lib/frontend/templates/package_misc.dart +++ b/app/lib/frontend/templates/package_misc.dart @@ -35,12 +35,6 @@ final nameMatchBadgeNode = packageBadgeNode( color: 'name-match', ); -/// Renders the Dart 3 compatible badge. -final dart3CompatibleNode = packageBadgeNode( - label: 'Dart 3 compatible', - title: 'Package is compatible with Dart 3.', -); - /// Renders the Dart 3 incompatible badge. final dart3IncompatibleNode = packageBadgeNode( label: 'Dart 3 incompatible', diff --git a/app/lib/frontend/templates/views/pkg/header.dart b/app/lib/frontend/templates/views/pkg/header.dart index 6cd9dccdbe..c296da3329 100644 --- a/app/lib/frontend/templates/views/pkg/header.dart +++ b/app/lib/frontend/templates/views/pkg/header.dart @@ -12,8 +12,6 @@ d.Node packageHeaderNode({ required String packageName, required String? publisherId, required DateTime published, - required bool isNullSafe, - required bool isDart3Compatible, required bool isDart3Incompatible, required LatestReleases? releases, }) { @@ -22,7 +20,6 @@ d.Node packageHeaderNode({ d.span(child: d.xAgoTimestamp(published)), d.text(' '), if (publisherId != null) ..._publisher(publisherId), - if (isDart3Compatible) dart3CompatibleNode, if (isDart3Incompatible) dart3IncompatibleNode, if (releases != null) ..._releases(packageName, releases), ]); diff --git a/app/lib/frontend/templates/views/pkg/index.dart b/app/lib/frontend/templates/views/pkg/index.dart index c0f385f548..b819ce175b 100644 --- a/app/lib/frontend/templates/views/pkg/index.dart +++ b/app/lib/frontend/templates/views/pkg/index.dart @@ -149,13 +149,6 @@ d.Node _searchFormContainer({ searchForm: searchForm, title: 'Show only packages with screenshots.', ), - _tagBasedCheckbox( - tagPrefix: 'is', - tagValue: 'dart3-compatible', - label: 'Dart 3 compatible', - searchForm: searchForm, - title: 'Show only packages compatible with Dart 3.', - ), _tagBasedCheckbox( tagPrefix: 'is', tagValue: 'plugin', diff --git a/app/lib/frontend/templates/views/pkg/package_list.dart b/app/lib/frontend/templates/views/pkg/package_list.dart index 52c79ae423..78228ecb6f 100644 --- a/app/lib/frontend/templates/views/pkg/package_list.dart +++ b/app/lib/frontend/templates/views/pkg/package_list.dart @@ -91,9 +91,6 @@ d.Node _packageItem( required bool isLiked, }) { final isFlutterFavorite = view.tags.contains(PackageTags.isFlutterFavorite); - final isDart3Compatible = view.tags.contains( - PackageVersionTags.isDart3Compatible, - ); final isDart3Incompatible = view.tags.contains( PackageVersionTags.isDart3Incompatible, ); @@ -153,7 +150,6 @@ d.Node _packageItem( if (licenseNode != null) d.span(classes: ['packages-metadata-block'], child: licenseNode), if (isFlutterFavorite) flutterFavoriteBadgeNode, - if (isDart3Compatible) dart3CompatibleNode, if (isDart3Incompatible) dart3IncompatibleNode, ]); diff --git a/app/test/frontend/golden/pkg_index_page.html b/app/test/frontend/golden/pkg_index_page.html index 2288ec941c..0a1e6d0567 100644 --- a/app/test/frontend/golden/pkg_index_page.html +++ b/app/test/frontend/golden/pkg_index_page.html @@ -353,23 +353,6 @@

-
-
-
- -
- - - -
-
-
-
- -
-
diff --git a/app/test/frontend/golden/search_page.html b/app/test/frontend/golden/search_page.html index 609127d291..4f3399f290 100644 --- a/app/test/frontend/golden/search_page.html +++ b/app/test/frontend/golden/search_page.html @@ -354,23 +354,6 @@

-
-
-
- -
- - - -
-
-
-
- -
-
diff --git a/app/test/task/testdata/goldens/packages/oxygen.html b/app/test/task/testdata/goldens/packages/oxygen.html index 6245c89564..adc53b4970 100644 --- a/app/test/task/testdata/goldens/packages/oxygen.html +++ b/app/test/task/testdata/goldens/packages/oxygen.html @@ -133,7 +133,6 @@

%%time-ago%% - Dart 3 compatible

diff --git a/app/test/task/testdata/goldens/packages/oxygen/changelog.html b/app/test/task/testdata/goldens/packages/oxygen/changelog.html index 68a6c5213e..ad494d1b62 100644 --- a/app/test/task/testdata/goldens/packages/oxygen/changelog.html +++ b/app/test/task/testdata/goldens/packages/oxygen/changelog.html @@ -133,7 +133,6 @@

%%time-ago%% - Dart 3 compatible

diff --git a/app/test/task/testdata/goldens/packages/oxygen/example.html b/app/test/task/testdata/goldens/packages/oxygen/example.html index 9b24bf9544..758689bf16 100644 --- a/app/test/task/testdata/goldens/packages/oxygen/example.html +++ b/app/test/task/testdata/goldens/packages/oxygen/example.html @@ -133,7 +133,6 @@

%%time-ago%% - Dart 3 compatible

diff --git a/app/test/task/testdata/goldens/packages/oxygen/install.html b/app/test/task/testdata/goldens/packages/oxygen/install.html index a261d4bd6d..e18b4df135 100644 --- a/app/test/task/testdata/goldens/packages/oxygen/install.html +++ b/app/test/task/testdata/goldens/packages/oxygen/install.html @@ -133,7 +133,6 @@

%%time-ago%% - Dart 3 compatible

diff --git a/app/test/task/testdata/goldens/packages/oxygen/license.html b/app/test/task/testdata/goldens/packages/oxygen/license.html index 96b2aa6f0e..956e0d25cd 100644 --- a/app/test/task/testdata/goldens/packages/oxygen/license.html +++ b/app/test/task/testdata/goldens/packages/oxygen/license.html @@ -133,7 +133,6 @@

%%time-ago%% - Dart 3 compatible

diff --git a/app/test/task/testdata/goldens/packages/oxygen/score.html b/app/test/task/testdata/goldens/packages/oxygen/score.html index 3f362ac2d6..3ecc19e4a0 100644 --- a/app/test/task/testdata/goldens/packages/oxygen/score.html +++ b/app/test/task/testdata/goldens/packages/oxygen/score.html @@ -133,7 +133,6 @@

%%time-ago%% - Dart 3 compatible

diff --git a/app/test/task/testdata/goldens/packages/oxygen/versions.html b/app/test/task/testdata/goldens/packages/oxygen/versions.html index 62714c3c21..28d3553266 100644 --- a/app/test/task/testdata/goldens/packages/oxygen/versions.html +++ b/app/test/task/testdata/goldens/packages/oxygen/versions.html @@ -132,7 +132,6 @@

%%time-ago%% - Dart 3 compatible

diff --git a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0.html b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0.html index 5460275eea..16f146d689 100644 --- a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0.html +++ b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0.html @@ -133,7 +133,6 @@

%%time-ago%% - Dart 3 compatible • Latest: 2.0.0 diff --git a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/changelog.html b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/changelog.html index fcc3637be1..3adfa6c2bd 100644 --- a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/changelog.html +++ b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/changelog.html @@ -133,7 +133,6 @@

%%time-ago%% - Dart 3 compatible • Latest: 2.0.0 diff --git a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/example.html b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/example.html index 098fbcc61b..6ffc8dea0e 100644 --- a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/example.html +++ b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/example.html @@ -133,7 +133,6 @@

%%time-ago%% - Dart 3 compatible • Latest: 2.0.0 diff --git a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/install.html b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/install.html index 53783e83e0..6443362871 100644 --- a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/install.html +++ b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/install.html @@ -133,7 +133,6 @@

%%time-ago%% - Dart 3 compatible • Latest: 2.0.0 diff --git a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/license.html b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/license.html index f2007604e8..2cea285d38 100644 --- a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/license.html +++ b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/license.html @@ -133,7 +133,6 @@

%%time-ago%% - Dart 3 compatible • Latest: 2.0.0 diff --git a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/score.html b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/score.html index 6c1a0b95c7..7a1050c622 100644 --- a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/score.html +++ b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/score.html @@ -133,7 +133,6 @@

%%time-ago%% - Dart 3 compatible • Latest: 2.0.0 diff --git a/app/test/task/testdata/goldens/packages/oxygen/versions/2.0.0.html b/app/test/task/testdata/goldens/packages/oxygen/versions/2.0.0.html index 6245c89564..adc53b4970 100644 --- a/app/test/task/testdata/goldens/packages/oxygen/versions/2.0.0.html +++ b/app/test/task/testdata/goldens/packages/oxygen/versions/2.0.0.html @@ -133,7 +133,6 @@

%%time-ago%% - Dart 3 compatible

diff --git a/pkg/_pub_shared/lib/search/search_form.dart b/pkg/_pub_shared/lib/search/search_form.dart index 24b6033885..22d85c5c7e 100644 --- a/pkg/_pub_shared/lib/search/search_form.dart +++ b/pkg/_pub_shared/lib/search/search_form.dart @@ -442,7 +442,6 @@ class SearchForm { parsedQuery.tagsPredicate.hasTag(PackageTags.isFlutterFavorite) || parsedQuery.tagsPredicate.hasTag(PackageTags.showUnlisted) || parsedQuery.tagsPredicate.hasTag(PackageVersionTags.hasScreenshot) || - parsedQuery.tagsPredicate.hasTag(PackageVersionTags.isDart3Compatible) || parsedQuery.tagsPredicate.hasTag(PackageVersionTags.isPlugin) || parsedQuery.tagsPredicate.hasTag(PackageVersionTags.isWasmReady); diff --git a/pkg/_pub_shared/lib/search/tags.dart b/pkg/_pub_shared/lib/search/tags.dart index 22c3a819c4..21bb54f41b 100644 --- a/pkg/_pub_shared/lib/search/tags.dart +++ b/pkg/_pub_shared/lib/search/tags.dart @@ -104,11 +104,10 @@ abstract class PackageVersionTags { /// search results (e.g. a version may have compatibility errors or /// get `is:legacy` classification). static const _futurePackageVersionTags = { - PackageVersionTags.isNullSafe, PackageVersionTags.isPlugin, + PackageVersionTags.isWasmReady, PackageVersionTags.hasFundingLink, PackageVersionTags.hasScreenshot, - PackageVersionTags.isDart3Compatible, }; } diff --git a/pkg/_pub_shared/test/search/tags_test.dart b/pkg/_pub_shared/test/search/tags_test.dart index 89d28ba686..2362f7c9c6 100644 --- a/pkg/_pub_shared/test/search/tags_test.dart +++ b/pkg/_pub_shared/test/search/tags_test.dart @@ -11,7 +11,7 @@ void main() { final included = [ 'runtime:native-jit', 'sdk:dart', - 'is:null-safe', + 'is:wasm-ready', 'platform:linux', ]; final excluded = ['license:x', 'is:other']; diff --git a/pkg/pub_integration/test/search_update_test.dart b/pkg/pub_integration/test/search_update_test.dart index ed07620278..a4eebef680 100644 --- a/pkg/pub_integration/test/search_update_test.dart +++ b/pkg/pub_integration/test/search_update_test.dart @@ -222,7 +222,7 @@ void main() { expect(page.url, '$origin/packages?q=platform%3Aandroid+pkg'); } - await toggleMore('is', 'dart3-compatible'); + await toggleMore('is', 'wasm-ready'); await toggleMore('is', 'flutter-favorite'); });