From 6103f56fcbbb76135d0d2c6ac203c48da4a368c9 Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Wed, 17 Sep 2025 09:46:07 +0200 Subject: [PATCH 1/4] Remove null-safety badge. --- app/lib/frontend/templates/package_misc.dart | 8 ---- .../frontend/templates/views/pkg/header.dart | 1 - .../templates/views/pkg/package_list.dart | 3 -- .../views/pkg/versions/version_row.dart | 7 +-- app/test/frontend/golden/pkg_index_page.html | 1 - .../frontend/golden/pkg_versions_page.html | 12 ++--- .../goldens/packages/oxygen/versions.html | 12 ++--- .../packages/oxygen/versions/1.0.0.html | 14 +----- .../oxygen/versions/1.0.0/changelog.html | 14 +----- .../oxygen/versions/1.0.0/example.html | 14 +----- .../oxygen/versions/1.0.0/install.html | 14 +----- .../oxygen/versions/1.0.0/license.html | 14 +----- .../packages/oxygen/versions/1.0.0/score.html | 47 +++++++------------ 13 files changed, 34 insertions(+), 127 deletions(-) diff --git a/app/lib/frontend/templates/package_misc.dart b/app/lib/frontend/templates/package_misc.dart index 5735c03b19..02175f17ac 100644 --- a/app/lib/frontend/templates/package_misc.dart +++ b/app/lib/frontend/templates/package_misc.dart @@ -35,14 +35,6 @@ final nameMatchBadgeNode = packageBadgeNode( color: 'name-match', ); -/// Renders the null-safe badge used by package listing and package page. -d.Node nullSafeBadgeNode({String? title}) { - return packageBadgeNode( - label: 'Null safety', - title: title ?? 'Supports the null safety language feature.', - ); -} - /// Renders the Dart 3 compatible badge. final dart3CompatibleNode = packageBadgeNode( label: 'Dart 3 compatible', diff --git a/app/lib/frontend/templates/views/pkg/header.dart b/app/lib/frontend/templates/views/pkg/header.dart index 2a0398b27e..6cd9dccdbe 100644 --- a/app/lib/frontend/templates/views/pkg/header.dart +++ b/app/lib/frontend/templates/views/pkg/header.dart @@ -22,7 +22,6 @@ d.Node packageHeaderNode({ d.span(child: d.xAgoTimestamp(published)), d.text(' '), if (publisherId != null) ..._publisher(publisherId), - if (isNullSafe && !isDart3Compatible) nullSafeBadgeNode(), if (isDart3Compatible) dart3CompatibleNode, if (isDart3Incompatible) dart3IncompatibleNode, if (releases != null) ..._releases(packageName, releases), diff --git a/app/lib/frontend/templates/views/pkg/package_list.dart b/app/lib/frontend/templates/views/pkg/package_list.dart index a4c0874824..92690f6bff 100644 --- a/app/lib/frontend/templates/views/pkg/package_list.dart +++ b/app/lib/frontend/templates/views/pkg/package_list.dart @@ -73,7 +73,6 @@ d.Node _sdkLibraryItem(SdkLibraryHit hit) { text: sdkDict.libraryTypeLabel, ), coreLibraryBadgeNode, - nullSafeBadgeNode(), ]), tagsNode: null, replacedBy: null, @@ -94,7 +93,6 @@ d.Node _packageItem( required bool isLiked, }) { final isFlutterFavorite = view.tags.contains(PackageTags.isFlutterFavorite); - final isNullSafe = view.tags.contains(PackageVersionTags.isNullSafe); final isDart3Compatible = view.tags.contains( PackageVersionTags.isDart3Compatible, ); @@ -157,7 +155,6 @@ d.Node _packageItem( if (licenseNode != null) d.span(classes: ['packages-metadata-block'], child: licenseNode), if (isFlutterFavorite) flutterFavoriteBadgeNode, - if (isNullSafe && !isDart3Compatible) nullSafeBadgeNode(), if (isDart3Compatible) dart3CompatibleNode, if (isDart3Incompatible) dart3IncompatibleNode, ]); diff --git a/app/lib/frontend/templates/views/pkg/versions/version_row.dart b/app/lib/frontend/templates/views/pkg/versions/version_row.dart index 4ca48587cb..d4f9b1961f 100644 --- a/app/lib/frontend/templates/views/pkg/versions/version_row.dart +++ b/app/lib/frontend/templates/views/pkg/versions/version_row.dart @@ -9,7 +9,6 @@ import '../../../../../package/model_properties.dart'; import '../../../../../shared/urls.dart' as urls; import '../../../../dom/dom.dart' as d; import '../../../../static_files.dart'; -import '../../../package_misc.dart'; d.Node versionRowNode( String package, @@ -31,11 +30,7 @@ d.Node versionRowNode( ), d.td( classes: ['badge'], - child: pubspec.hasOptedIntoNullSafety - ? nullSafeBadgeNode( - title: 'Package version is opted into null safety.', - ) - : null, + child: null, ), d.td( classes: ['sdk'], diff --git a/app/test/frontend/golden/pkg_index_page.html b/app/test/frontend/golden/pkg_index_page.html index d07692a691..bd8fe6c3ee 100644 --- a/app/test/frontend/golden/pkg_index_page.html +++ b/app/test/frontend/golden/pkg_index_page.html @@ -446,7 +446,6 @@

Dart SDK library Core library - Null safety

diff --git a/app/test/frontend/golden/pkg_versions_page.html b/app/test/frontend/golden/pkg_versions_page.html index f3e51ffe3e..d704f9592e 100644 --- a/app/test/frontend/golden/pkg_versions_page.html +++ b/app/test/frontend/golden/pkg_versions_page.html @@ -249,9 +249,7 @@

Stable versions of oxygen

1.2.0 - - Null safety - + 3.0 %%x-ago%% @@ -271,9 +269,7 @@

Stable versions of oxygen

1.0.0 - - Null safety - + 3.0 %%x-ago%% @@ -316,9 +312,7 @@

Prerelease versions of oxygen

2.0.0-dev - - Null safety - + 3.0 %%x-ago%% diff --git a/app/test/task/testdata/goldens/packages/oxygen/versions.html b/app/test/task/testdata/goldens/packages/oxygen/versions.html index 39ccd3a3d7..86d8b86ff6 100644 --- a/app/test/task/testdata/goldens/packages/oxygen/versions.html +++ b/app/test/task/testdata/goldens/packages/oxygen/versions.html @@ -235,9 +235,7 @@

Stable versions of oxygen

2.0.0 - - Null safety - + 3.0 %%time-ago%% @@ -257,16 +255,14 @@

Stable versions of oxygen

1.0.0 - - Null safety - + 3.0 %%time-ago%% - - Go to the documentation of oxygen 1.0.0 + + Check the analysis logs for oxygen 1.0.0 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..d30b91f3af 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 @@ -229,7 +229,7 @@

- 140 + 130
points
@@ -264,11 +264,6 @@

Topics

#chemical-element

-

Documentation

-

- API reference -
-

Funding

Consider supporting this project: @@ -308,7 +303,7 @@

- 140 + 130
points
@@ -343,11 +338,6 @@

Topics

#chemical-element

-

Documentation

-

- API reference -
-

Funding

Consider supporting this project: 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..77281e5e4c 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 @@ -235,7 +235,7 @@

- 140 + 130
points
@@ -270,11 +270,6 @@

Topics

#chemical-element

-

Documentation

-

- API reference -
-

Funding

Consider supporting this project: @@ -314,7 +309,7 @@

- 140 + 130
points
@@ -349,11 +344,6 @@

Topics

#chemical-element

-

Documentation

-

- API reference -
-

Funding

Consider supporting this project: 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..203e3fa015 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 @@ -230,7 +230,7 @@

Metadata

- 140 + 130
points
@@ -265,11 +265,6 @@

Topics

#chemical-element

-

Documentation

-

- API reference -
-

Funding

Consider supporting this project: @@ -309,7 +304,7 @@

- 140 + 130
points
@@ -344,11 +339,6 @@

Topics

#chemical-element

-

Documentation

-

- API reference -
-

Funding

Consider supporting this project: 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..be939b8601 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 @@ -258,7 +258,7 @@

Import it

- 140 + 130
points
@@ -293,11 +293,6 @@

Topics

#chemical-element

-

Documentation

-

- API reference -
-

Funding

Consider supporting this project: @@ -337,7 +332,7 @@

- 140 + 130
points
@@ -372,11 +367,6 @@

Topics

#chemical-element

-

Documentation

-

- API reference -
-

Funding

Consider supporting this project: 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..54f8261a42 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 @@ -231,7 +231,7 @@

License

- 140 + 130
points
@@ -266,11 +266,6 @@

Topics

#chemical-element

-

Documentation

-

- API reference -
-

Funding

Consider supporting this project: @@ -310,7 +305,7 @@

- 140 + 130
points
@@ -345,11 +340,6 @@

Topics

#chemical-element

-

Documentation

-

- API reference -
-

Funding

Consider supporting this project: 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..87bbdaf494 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 @@ -219,7 +219,7 @@

Metadata

- 140 + 130 / 160
pub points
@@ -235,7 +235,7 @@

Metadata

We analyzed this package %%time-ago%% - , and awarded it 140 pub points (of a possible 160): + , and awarded it 130 pub points (of a possible 160):

@@ -336,11 +336,11 @@

- Passed report section + Failed report section
Provide documentation
-
- 20 +
+ 10 / 20 trigger folding of the section @@ -350,22 +350,17 @@

- Passed check - 10/10 points: 20% or more of the public API has dartdoc comments + Failed check + 0/10 points: 20% or more of the public API has dartdoc comments

-

2 out of 8 API elements (25.0 %) have documentation comments.

- Some symbols that are missing documentation: - oxygen - , - oxygen.MainClass - , - oxygen.MainClass.MainClass.new - , - oxygen.MainClass.text - , - oxygen.TypeEnum - . + Could not run + dartdoc + : Exception: -9 < + + > Package dartdoc is currently active at version 8.3.4. Resolving dependencies... < + + > Exceeded timeout of 0:02:00.000000

Passed check @@ -539,7 +534,7 @@

- 140 + 130
points
@@ -574,11 +569,6 @@

Topics

#chemical-element

-

Documentation

-

- API reference -
-

Funding

Consider supporting this project: @@ -618,7 +608,7 @@

- 140 + 130
points
@@ -653,11 +643,6 @@

Topics

#chemical-element

-

Documentation

-

- API reference -
-

Funding

Consider supporting this project: From c00fbb44e39067d59291a1dbecdf55661c9cfe02 Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Wed, 17 Sep 2025 10:01:14 +0200 Subject: [PATCH 2/4] format --- .../frontend/templates/views/pkg/versions/version_row.dart | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/lib/frontend/templates/views/pkg/versions/version_row.dart b/app/lib/frontend/templates/views/pkg/versions/version_row.dart index d4f9b1961f..b0e9cff84b 100644 --- a/app/lib/frontend/templates/views/pkg/versions/version_row.dart +++ b/app/lib/frontend/templates/views/pkg/versions/version_row.dart @@ -28,10 +28,7 @@ d.Node versionRowNode( title: 'Visit $package ${version.version} page', ), ), - d.td( - classes: ['badge'], - child: null, - ), + d.td(classes: ['badge'], child: null), d.td( classes: ['sdk'], child: sdk != null From 144a0e11abc366a6817b433c26d85c2eb92a7a13 Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Wed, 17 Sep 2025 10:28:08 +0200 Subject: [PATCH 3/4] goldens --- app/test/task/end2end_test.dart | 2 +- .../goldens/packages/oxygen/versions.html | 4 +- .../packages/oxygen/versions/1.0.0.html | 14 +++++- .../oxygen/versions/1.0.0/changelog.html | 14 +++++- .../oxygen/versions/1.0.0/example.html | 14 +++++- .../oxygen/versions/1.0.0/install.html | 14 +++++- .../oxygen/versions/1.0.0/license.html | 14 +++++- .../packages/oxygen/versions/1.0.0/score.html | 47 ++++++++++++------- 8 files changed, 94 insertions(+), 29 deletions(-) diff --git a/app/test/task/end2end_test.dart b/app/test/task/end2end_test.dart index e89fe6400b..1c9d4f4479 100644 --- a/app/test/task/end2end_test.dart +++ b/app/test/task/end2end_test.dart @@ -19,7 +19,7 @@ import '../shared/utils.dart'; const String goldenDir = 'test/task/testdata/goldens'; // TODO: generalize golden testing, use env var for regenerating all goldens. -final _regenerateGoldens = false; +final _regenerateGoldens = true; // We use a small test profile without flutter packages, because we have to // run pana+dartdoc for all these package versions, naturally this is slow. diff --git a/app/test/task/testdata/goldens/packages/oxygen/versions.html b/app/test/task/testdata/goldens/packages/oxygen/versions.html index 86d8b86ff6..62714c3c21 100644 --- a/app/test/task/testdata/goldens/packages/oxygen/versions.html +++ b/app/test/task/testdata/goldens/packages/oxygen/versions.html @@ -261,8 +261,8 @@

Stable versions of oxygen

%%time-ago%% - - Check the analysis logs for oxygen 1.0.0 + + Go to the documentation of oxygen 1.0.0 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 d30b91f3af..5460275eea 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 @@ -229,7 +229,7 @@

- 130 + 140
points
@@ -264,6 +264,11 @@

Topics

#chemical-element

+

Documentation

+

+ API reference +
+

Funding

Consider supporting this project: @@ -303,7 +308,7 @@

- 130 + 140
points
@@ -338,6 +343,11 @@

Topics

#chemical-element

+

Documentation

+

+ API reference +
+

Funding

Consider supporting this project: 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 77281e5e4c..fcc3637be1 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 @@ -235,7 +235,7 @@

- 130 + 140
points
@@ -270,6 +270,11 @@

Topics

#chemical-element

+

Documentation

+

+ API reference +
+

Funding

Consider supporting this project: @@ -309,7 +314,7 @@

- 130 + 140
points
@@ -344,6 +349,11 @@

Topics

#chemical-element

+

Documentation

+

+ API reference +
+

Funding

Consider supporting this project: 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 203e3fa015..098fbcc61b 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 @@ -230,7 +230,7 @@

Metadata

- 130 + 140
points
@@ -265,6 +265,11 @@

Topics

#chemical-element

+

Documentation

+

+ API reference +
+

Funding

Consider supporting this project: @@ -304,7 +309,7 @@

- 130 + 140
points
@@ -339,6 +344,11 @@

Topics

#chemical-element

+

Documentation

+

+ API reference +
+

Funding

Consider supporting this project: 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 be939b8601..53783e83e0 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 @@ -258,7 +258,7 @@

Import it

- 130 + 140
points
@@ -293,6 +293,11 @@

Topics

#chemical-element

+

Documentation

+

+ API reference +
+

Funding

Consider supporting this project: @@ -332,7 +337,7 @@

- 130 + 140
points
@@ -367,6 +372,11 @@

Topics

#chemical-element

+

Documentation

+

+ API reference +
+

Funding

Consider supporting this project: 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 54f8261a42..f2007604e8 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 @@ -231,7 +231,7 @@

License

- 130 + 140
points
@@ -266,6 +266,11 @@

Topics

#chemical-element

+

Documentation

+

+ API reference +
+

Funding

Consider supporting this project: @@ -305,7 +310,7 @@

- 130 + 140
points
@@ -340,6 +345,11 @@

Topics

#chemical-element

+

Documentation

+

+ API reference +
+

Funding

Consider supporting this project: 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 87bbdaf494..6c1a0b95c7 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 @@ -219,7 +219,7 @@

Metadata

- 130 + 140 / 160
pub points
@@ -235,7 +235,7 @@

Metadata

We analyzed this package %%time-ago%% - , and awarded it 130 pub points (of a possible 160): + , and awarded it 140 pub points (of a possible 160):

@@ -336,11 +336,11 @@

- Failed report section + Passed report section
Provide documentation
-
- 10 +
+ 20 / 20 trigger folding of the section @@ -350,17 +350,22 @@

- Failed check - 0/10 points: 20% or more of the public API has dartdoc comments + Passed check + 10/10 points: 20% or more of the public API has dartdoc comments

+

2 out of 8 API elements (25.0 %) have documentation comments.

- Could not run - dartdoc - : Exception: -9 < - - > Package dartdoc is currently active at version 8.3.4. Resolving dependencies... < - - > Exceeded timeout of 0:02:00.000000 + Some symbols that are missing documentation: + oxygen + , + oxygen.MainClass + , + oxygen.MainClass.MainClass.new + , + oxygen.MainClass.text + , + oxygen.TypeEnum + .

Passed check @@ -534,7 +539,7 @@

- 130 + 140
points
@@ -569,6 +574,11 @@

Topics

#chemical-element

+

Documentation

+

+ API reference +
+

Funding

Consider supporting this project: @@ -608,7 +618,7 @@

- 130 + 140
points
@@ -643,6 +653,11 @@

Topics

#chemical-element

+

Documentation

+

+ API reference +
+

Funding

Consider supporting this project: From 30b60b6e9524bb9a27be42feb06ce00311a80b94 Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Wed, 17 Sep 2025 10:35:38 +0200 Subject: [PATCH 4/4] flip goldens --- app/test/task/end2end_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/test/task/end2end_test.dart b/app/test/task/end2end_test.dart index 1c9d4f4479..e89fe6400b 100644 --- a/app/test/task/end2end_test.dart +++ b/app/test/task/end2end_test.dart @@ -19,7 +19,7 @@ import '../shared/utils.dart'; const String goldenDir = 'test/task/testdata/goldens'; // TODO: generalize golden testing, use env var for regenerating all goldens. -final _regenerateGoldens = true; +final _regenerateGoldens = false; // We use a small test profile without flutter packages, because we have to // run pana+dartdoc for all these package versions, naturally this is slow.