Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions app/lib/frontend/templates/package.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand Down
6 changes: 0 additions & 6 deletions app/lib/frontend/templates/package_misc.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 0 additions & 3 deletions app/lib/frontend/templates/views/pkg/header.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}) {
Expand All @@ -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),
]);
Expand Down
7 changes: 0 additions & 7 deletions app/lib/frontend/templates/views/pkg/index.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 0 additions & 4 deletions app/lib/frontend/templates/views/pkg/package_list.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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,
);
Expand Down Expand Up @@ -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,
]);

Expand Down
17 changes: 0 additions & 17 deletions app/test/frontend/golden/pkg_index_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -353,23 +353,6 @@ <h3 class="search-form-section-header foldable-button">
</label>
</div>
</div>
<div class="search-form-linked-checkbox" title="Show only packages compatible with Dart 3.">
<div class="mdc-form-field">
<div class="mdc-checkbox">
<input id="search-form-checkbox-is-dart3-compatible" class="mdc-checkbox__native-control" type="checkbox"/>
<div class="mdc-checkbox__background">
<svg class="mdc-checkbox__checkmark" viewBox="0 0 24 24">
<path class="mdc-checkbox__checkmark-path" fill="none" d="M1.73,12.91 8.1,19.28 22.79,4.59"/>
</svg>
<div class="mdc-checkbox__mixedmark"></div>
</div>
<div class="mdc-checkbox__ripple"></div>
</div>
<label for="search-form-checkbox-is-dart3-compatible">
<a href="/packages?q=sdk%3Adart+is%3Adart3-compatible" rel="nofollow" data-action="filter-is-dart3-compatible" data-tag="is:dart3-compatible">Dart 3 compatible</a>
</label>
</div>
</div>
<div class="search-form-linked-checkbox" title="Show only Flutter plugins.">
<div class="mdc-form-field">
<div class="mdc-checkbox">
Expand Down
17 changes: 0 additions & 17 deletions app/test/frontend/golden/search_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -354,23 +354,6 @@ <h3 class="search-form-section-header foldable-button">
</label>
</div>
</div>
<div class="search-form-linked-checkbox" title="Show only packages compatible with Dart 3.">
<div class="mdc-form-field">
<div class="mdc-checkbox">
<input id="search-form-checkbox-is-dart3-compatible" class="mdc-checkbox__native-control" type="checkbox"/>
<div class="mdc-checkbox__background">
<svg class="mdc-checkbox__checkmark" viewBox="0 0 24 24">
<path class="mdc-checkbox__checkmark-path" fill="none" d="M1.73,12.91 8.1,19.28 22.79,4.59"/>
</svg>
<div class="mdc-checkbox__mixedmark"></div>
</div>
<div class="mdc-checkbox__ripple"></div>
</div>
<label for="search-form-checkbox-is-dart3-compatible">
<a href="/packages?q=is%3Adart3-compatible+foobar&amp;sort=top" rel="nofollow" data-action="filter-is-dart3-compatible" data-tag="is:dart3-compatible">Dart 3 compatible</a>
</label>
</div>
</div>
<div class="search-form-linked-checkbox" title="Show only Flutter plugins.">
<div class="mdc-form-field">
<div class="mdc-checkbox">
Expand Down
1 change: 0 additions & 1 deletion app/test/task/testdata/goldens/packages/oxygen.html
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ <h1 class="title pub-monochrome-icon-hoverable">
<span>
<a class="-x-ago" href="" title="%%short-dateformat%%" role="button" data-timestamp="%%time-ago-millis%%">%%time-ago%%</a>
</span>
<span class="package-badge" title="Package is compatible with Dart 3.">Dart 3 compatible</span>
</div>
<div class="detail-tags-and-like">
<div class="detail-tags">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ <h1 class="title pub-monochrome-icon-hoverable">
<span>
<a class="-x-ago" href="" title="%%short-dateformat%%" role="button" data-timestamp="%%time-ago-millis%%">%%time-ago%%</a>
</span>
<span class="package-badge" title="Package is compatible with Dart 3.">Dart 3 compatible</span>
</div>
<div class="detail-tags-and-like">
<div class="detail-tags">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ <h1 class="title pub-monochrome-icon-hoverable">
<span>
<a class="-x-ago" href="" title="%%short-dateformat%%" role="button" data-timestamp="%%time-ago-millis%%">%%time-ago%%</a>
</span>
<span class="package-badge" title="Package is compatible with Dart 3.">Dart 3 compatible</span>
</div>
<div class="detail-tags-and-like">
<div class="detail-tags">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ <h1 class="title pub-monochrome-icon-hoverable">
<span>
<a class="-x-ago" href="" title="%%short-dateformat%%" role="button" data-timestamp="%%time-ago-millis%%">%%time-ago%%</a>
</span>
<span class="package-badge" title="Package is compatible with Dart 3.">Dart 3 compatible</span>
</div>
<div class="detail-tags-and-like">
<div class="detail-tags">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ <h1 class="title pub-monochrome-icon-hoverable">
<span>
<a class="-x-ago" href="" title="%%short-dateformat%%" role="button" data-timestamp="%%time-ago-millis%%">%%time-ago%%</a>
</span>
<span class="package-badge" title="Package is compatible with Dart 3.">Dart 3 compatible</span>
</div>
<div class="detail-tags-and-like">
<div class="detail-tags">
Expand Down
1 change: 0 additions & 1 deletion app/test/task/testdata/goldens/packages/oxygen/score.html
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ <h1 class="title pub-monochrome-icon-hoverable">
<span>
<a class="-x-ago" href="" title="%%short-dateformat%%" role="button" data-timestamp="%%time-ago-millis%%">%%time-ago%%</a>
</span>
<span class="package-badge" title="Package is compatible with Dart 3.">Dart 3 compatible</span>
</div>
<div class="detail-tags-and-like">
<div class="detail-tags">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ <h1 class="title pub-monochrome-icon-hoverable">
<span>
<a class="-x-ago" href="" title="%%short-dateformat%%" role="button" data-timestamp="%%time-ago-millis%%">%%time-ago%%</a>
</span>
<span class="package-badge" title="Package is compatible with Dart 3.">Dart 3 compatible</span>
</div>
<div class="detail-tags-and-like">
<div class="detail-tags">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ <h1 class="title pub-monochrome-icon-hoverable">
<span>
<a class="-x-ago" href="" title="%%short-dateformat%%" role="button" data-timestamp="%%time-ago-millis%%">%%time-ago%%</a>
</span>
<span class="package-badge" title="Package is compatible with Dart 3.">Dart 3 compatible</span>
• Latest:
<span>
<a href="/packages/oxygen" title="View the latest version of oxygen">2.0.0</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ <h1 class="title pub-monochrome-icon-hoverable">
<span>
<a class="-x-ago" href="" title="%%short-dateformat%%" role="button" data-timestamp="%%time-ago-millis%%">%%time-ago%%</a>
</span>
<span class="package-badge" title="Package is compatible with Dart 3.">Dart 3 compatible</span>
• Latest:
<span>
<a href="/packages/oxygen" title="View the latest version of oxygen">2.0.0</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ <h1 class="title pub-monochrome-icon-hoverable">
<span>
<a class="-x-ago" href="" title="%%short-dateformat%%" role="button" data-timestamp="%%time-ago-millis%%">%%time-ago%%</a>
</span>
<span class="package-badge" title="Package is compatible with Dart 3.">Dart 3 compatible</span>
• Latest:
<span>
<a href="/packages/oxygen" title="View the latest version of oxygen">2.0.0</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ <h1 class="title pub-monochrome-icon-hoverable">
<span>
<a class="-x-ago" href="" title="%%short-dateformat%%" role="button" data-timestamp="%%time-ago-millis%%">%%time-ago%%</a>
</span>
<span class="package-badge" title="Package is compatible with Dart 3.">Dart 3 compatible</span>
• Latest:
<span>
<a href="/packages/oxygen" title="View the latest version of oxygen">2.0.0</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ <h1 class="title pub-monochrome-icon-hoverable">
<span>
<a class="-x-ago" href="" title="%%short-dateformat%%" role="button" data-timestamp="%%time-ago-millis%%">%%time-ago%%</a>
</span>
<span class="package-badge" title="Package is compatible with Dart 3.">Dart 3 compatible</span>
• Latest:
<span>
<a href="/packages/oxygen" title="View the latest version of oxygen">2.0.0</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ <h1 class="title pub-monochrome-icon-hoverable">
<span>
<a class="-x-ago" href="" title="%%short-dateformat%%" role="button" data-timestamp="%%time-ago-millis%%">%%time-ago%%</a>
</span>
<span class="package-badge" title="Package is compatible with Dart 3.">Dart 3 compatible</span>
• Latest:
<span>
<a href="/packages/oxygen" title="View the latest version of oxygen">2.0.0</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ <h1 class="title pub-monochrome-icon-hoverable">
<span>
<a class="-x-ago" href="" title="%%short-dateformat%%" role="button" data-timestamp="%%time-ago-millis%%">%%time-ago%%</a>
</span>
<span class="package-badge" title="Package is compatible with Dart 3.">Dart 3 compatible</span>
</div>
<div class="detail-tags-and-like">
<div class="detail-tags">
Expand Down
1 change: 0 additions & 1 deletion pkg/_pub_shared/lib/search/search_form.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
3 changes: 1 addition & 2 deletions pkg/_pub_shared/lib/search/tags.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/_pub_shared/test/search/tags_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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'];
Expand Down
2 changes: 1 addition & 1 deletion pkg/pub_integration/test/search_update_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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');
});

Expand Down