Skip to content

Commit 35f1bb8

Browse files
authored
Remove the SDK version from SDK hits and index. (#8771)
1 parent f37550a commit 35f1bb8

File tree

8 files changed

+3
-24
lines changed

8 files changed

+3
-24
lines changed

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ d.Node listOfPackagesNode({
4747

4848
d.Node _sdkLibraryItem(SdkLibraryHit hit) {
4949
final sdkDict = getSdkDict(hit.sdk!);
50-
final metadataText = [
51-
if (hit.version != null) 'v ${hit.version}',
52-
sdkDict.libraryTypeLabel,
53-
].join(' • ');
5450

5551
return _item(
5652
url: hit.url!,
@@ -60,7 +56,8 @@ d.Node _sdkLibraryItem(SdkLibraryHit hit) {
6056
labeledScoresNode: null,
6157
description: hit.description ?? '',
6258
metadataNode: d.fragment([
63-
d.span(classes: ['packages-metadata-block'], text: metadataText),
59+
d.span(
60+
classes: ['packages-metadata-block'], text: sdkDict.libraryTypeLabel),
6461
coreLibraryBadgeNode,
6562
nullSafeBadgeNode(),
6663
]),

app/lib/search/sdk_mem_index.dart

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import 'package:pana/src/dartdoc/dartdoc_index.dart';
1010
import 'package:path/path.dart' as p;
1111
import 'package:pub_dev/search/flutter_sdk_mem_index.dart';
1212

13-
import '../shared/versions.dart';
1413
import 'search_service.dart';
1514
import 'token_index.dart';
1615

@@ -34,7 +33,6 @@ const _defaultApiPageDirWeights = {
3433
/// In-memory index for SDK library search queries.
3534
class SdkMemIndex {
3635
final String _sdk;
37-
final String? _version;
3836
final Uri _baseUri;
3937
final _tokensPerLibrary = <String, TokenIndex<String>>{};
4038
final _baseUriPerLibrary = <String, String>{};
@@ -43,13 +41,11 @@ class SdkMemIndex {
4341

4442
SdkMemIndex({
4543
required String sdk,
46-
required String? version,
4744
required Uri baseUri,
4845
required DartdocIndex index,
4946
Set<String>? allowedLibraries,
5047
Map<String, double>? apiPageDirWeights,
5148
}) : _sdk = sdk,
52-
_version = version,
5349
_baseUri = baseUri,
5450
_apiPageDirWeights = apiPageDirWeights ?? _defaultApiPageDirWeights {
5551
_addDartdocIndex(index, allowedLibraries);
@@ -58,7 +54,6 @@ class SdkMemIndex {
5854
static SdkMemIndex dart({required DartdocIndex index}) {
5955
return SdkMemIndex(
6056
sdk: 'dart',
61-
version: runtimeSdkVersion,
6257
baseUri: Uri.parse('https://api.dart.dev/stable/latest/'),
6358
index: index,
6459
);
@@ -67,7 +62,6 @@ class SdkMemIndex {
6762
factory SdkMemIndex.flutter({required DartdocIndex index}) {
6863
return SdkMemIndex(
6964
sdk: 'flutter',
70-
version: null,
7165
baseUri: Uri.parse('https://api.flutter.dev/flutter/'),
7266
index: index,
7367
allowedLibraries: flutterSdkAllowedLibraries,
@@ -159,7 +153,6 @@ class SdkMemIndex {
159153
.where((h) => h.score >= minScore)
160154
.map((hit) => SdkLibraryHit(
161155
sdk: _sdk,
162-
version: _version,
163156
library: hit.library,
164157
description: _descriptionPerLibrary[hit.library],
165158
url: _baseUriPerLibrary[hit.library] ?? _baseUri.toString(),

app/lib/search/search_service.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,6 @@ class PackageSearchResult {
427427
@JsonSerializable(includeIfNull: false, explicitToJson: true)
428428
class SdkLibraryHit {
429429
final String? sdk;
430-
final String? version;
431430
final String? library;
432431
final String? description;
433432
final String? url;
@@ -436,7 +435,6 @@ class SdkLibraryHit {
436435

437436
SdkLibraryHit({
438437
required this.sdk,
439-
required this.version,
440438
required this.library,
441439
required this.description,
442440
required this.url,

app/lib/search/search_service.g.dart

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/test/frontend/golden/pkg_index_page.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ <h3 class="packages-title pub-monochrome-icon-hoverable">
443443
<span>core description</span>
444444
</div>
445445
<p class="packages-metadata">
446-
<span class="packages-metadata-block">v 2.14.0 • Dart SDK library</span>
446+
<span class="packages-metadata-block">Dart SDK library</span>
447447
<span class="package-badge">Core library</span>
448448
<span class="package-badge" title="Supports the null safety language feature.">Null safety</span>
449449
</p>

app/test/frontend/templates_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,6 @@ void main() {
469469
sdkLibraryHits: [
470470
SdkLibraryHit(
471471
sdk: 'dart',
472-
version: '2.14.0',
473472
library: 'dart:core',
474473
description: 'core description',
475474
url: 'https://api.dart.dev/library-page.html',

app/test/search/result_combiner_test.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ void main() {
3232
primaryIndex: primaryIndex,
3333
dartSdkMemIndex: SdkMemIndex(
3434
sdk: 'dart',
35-
version: runtimeSdkVersion,
3635
baseUri: Uri.parse('https://api.dart.dev/stable/$runtimeSdkVersion/'),
3736
index: DartdocIndex.fromJsonList([
3837
{
@@ -111,7 +110,6 @@ void main() {
111110
'sdkLibraryHits': [
112111
{
113112
'sdk': 'dart',
114-
'version': isNotEmpty,
115113
'library': 'dart:core',
116114
'url': contains('dart-core-library.html'),
117115
'score': closeTo(0.98, 0.01),

app/test/search/sdk_mem_index_test.dart

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ void main() {
1414
setUpAll(() async {
1515
index = SdkMemIndex(
1616
sdk: 'dart',
17-
version: '',
1817
baseUri: Uri.parse('https://api.dart.dev/x/'),
1918
index: DartdocIndex.fromJsonList([
2019
{
@@ -91,7 +90,6 @@ void main() {
9190
[
9291
{
9392
'sdk': 'dart',
94-
'version': '',
9593
'library': 'dart:async',
9694
'description': 'async description',
9795
'url': 'https://api.dart.dev/x/dart-async/dart-async-library.html',
@@ -124,7 +122,6 @@ void main() {
124122
[
125123
{
126124
'sdk': 'dart',
127-
'version': '',
128125
'library': 'dart:async',
129126
'description': 'async description',
130127
'url': 'https://api.dart.dev/x/dart-async/dart-async-library.html',
@@ -148,7 +145,6 @@ void main() {
148145
[
149146
{
150147
'sdk': 'dart',
151-
'version': '',
152148
'library': 'dart:async',
153149
'description': 'async description',
154150
'url': 'https://api.dart.dev/x/dart-async/dart-async-library.html',

0 commit comments

Comments
 (0)