diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56d453a61c..93fc0fa5c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ AppEngine version, listed here to ease deployment and troubleshooting.
 ## Next Release (replace with git tag when deployed)
  * Bump runtimeVersion to `2025.09.08`.
  * Upgraded stable Flutter analysis SDK to `3.35.3`.
+ * Upgraded pana to `0.22.23`.
+ * Upgrade `package:analyzer` to `^8.0.0`.
  * Updated SDK constraint (and language version) to `3.9`
 
 ## `20250904t074800-all`
diff --git a/app/lib/admin/models.g.dart b/app/lib/admin/models.g.dart
index a0e41a35d2..367f931183 100644
--- a/app/lib/admin/models.g.dart
+++ b/app/lib/admin/models.g.dart
@@ -39,7 +39,7 @@ Map<String, dynamic> _$ModerationActionLogEntryToJson(
   'timestamp': instance.timestamp.toIso8601String(),
   'subject': instance.subject,
   'moderationAction': _$ModerationActionEnumMap[instance.moderationAction]!,
-  if (instance.note case final value?) 'note': value,
+  'note': ?instance.note,
 };
 
 const _$ModerationActionEnumMap = {
diff --git a/app/lib/dartdoc/models.g.dart b/app/lib/dartdoc/models.g.dart
index 06e57e4289..de08a7bf1f 100644
--- a/app/lib/dartdoc/models.g.dart
+++ b/app/lib/dartdoc/models.g.dart
@@ -19,7 +19,7 @@ Map<String, dynamic> _$ResolvedDocUrlVersionToJson(
 ) => <String, dynamic>{
   'version': instance.version,
   'urlSegment': instance.urlSegment,
-  if (instance.message case final value?) 'message': value,
+  'message': ?instance.message,
 };
 
 DocPageStatus _$DocPageStatusFromJson(Map<String, dynamic> json) =>
@@ -32,8 +32,8 @@ DocPageStatus _$DocPageStatusFromJson(Map<String, dynamic> json) =>
 Map<String, dynamic> _$DocPageStatusToJson(DocPageStatus instance) =>
     <String, dynamic>{
       'code': _$DocPageStatusCodeEnumMap[instance.code]!,
-      if (instance.redirectPath case final value?) 'redirectPath': value,
-      if (instance.errorMessage case final value?) 'errorMessage': value,
+      'redirectPath': ?instance.redirectPath,
+      'errorMessage': ?instance.errorMessage,
     };
 
 const _$DocPageStatusCodeEnumMap = {
diff --git a/app/lib/package/models.g.dart b/app/lib/package/models.g.dart
index 6ec5d1fadf..b49793ac16 100644
--- a/app/lib/package/models.g.dart
+++ b/app/lib/package/models.g.dart
@@ -59,10 +59,10 @@ AutomatedPublishing _$AutomatedPublishingFromJson(Map<String, dynamic> json) =>
 Map<String, dynamic> _$AutomatedPublishingToJson(
   AutomatedPublishing instance,
 ) => <String, dynamic>{
-  if (instance.githubConfig?.toJson() case final value?) 'githubConfig': value,
-  if (instance.githubLock?.toJson() case final value?) 'githubLock': value,
-  if (instance.gcpConfig?.toJson() case final value?) 'gcpConfig': value,
-  if (instance.gcpLock?.toJson() case final value?) 'gcpLock': value,
+  'githubConfig': ?instance.githubConfig?.toJson(),
+  'githubLock': ?instance.githubLock?.toJson(),
+  'gcpConfig': ?instance.gcpConfig?.toJson(),
+  'gcpLock': ?instance.gcpLock?.toJson(),
 };
 
 GitHubPublishingLock _$GitHubPublishingLockFromJson(
@@ -109,23 +109,21 @@ PackageView _$PackageViewFromJson(Map<String, dynamic> json) => PackageView(
   topics: (json['topics'] as List<dynamic>?)?.map((e) => e as String).toList(),
 );
 
-Map<String, dynamic> _$PackageViewToJson(
-  PackageView instance,
-) => <String, dynamic>{
-  'name': instance.name,
-  'releases': instance.releases,
-  if (instance.ellipsizedDescription case final value?)
-    'ellipsizedDescription': value,
-  'created': instance.created.toIso8601String(),
-  if (instance.publisherId case final value?) 'publisherId': value,
-  'isPending': instance.isPending,
-  'likes': instance.likes,
-  if (instance.grantedPubPoints case final value?) 'grantedPubPoints': value,
-  if (instance.maxPubPoints case final value?) 'maxPubPoints': value,
-  'tags': instance.tags,
-  if (instance.replacedBy case final value?) 'replacedBy': value,
-  if (instance.spdxIdentifiers case final value?) 'spdxIdentifiers': value,
-  if (instance.apiPages case final value?) 'apiPages': value,
-  if (instance.screenshots case final value?) 'screenshots': value,
-  if (instance.topics case final value?) 'topics': value,
-};
+Map<String, dynamic> _$PackageViewToJson(PackageView instance) =>
+    <String, dynamic>{
+      'name': instance.name,
+      'releases': instance.releases,
+      'ellipsizedDescription': ?instance.ellipsizedDescription,
+      'created': instance.created.toIso8601String(),
+      'publisherId': ?instance.publisherId,
+      'isPending': instance.isPending,
+      'likes': instance.likes,
+      'grantedPubPoints': ?instance.grantedPubPoints,
+      'maxPubPoints': ?instance.maxPubPoints,
+      'tags': instance.tags,
+      'replacedBy': ?instance.replacedBy,
+      'spdxIdentifiers': ?instance.spdxIdentifiers,
+      'apiPages': ?instance.apiPages,
+      'screenshots': ?instance.screenshots,
+      'topics': ?instance.topics,
+    };
diff --git a/app/lib/scorecard/models.g.dart b/app/lib/scorecard/models.g.dart
index 3d4c1a7962..5cb824c51d 100644
--- a/app/lib/scorecard/models.g.dart
+++ b/app/lib/scorecard/models.g.dart
@@ -87,17 +87,16 @@ PanaReport _$PanaReportFromJson(Map<String, dynamic> json) => PanaReport(
 
 Map<String, dynamic> _$PanaReportToJson(PanaReport instance) =>
     <String, dynamic>{
-      if (instance.timestamp?.toIso8601String() case final value?)
-        'timestamp': value,
-      if (instance.panaRuntimeInfo case final value?) 'panaRuntimeInfo': value,
-      if (instance.reportStatus case final value?) 'reportStatus': value,
-      if (instance.derivedTags case final value?) 'derivedTags': value,
-      if (instance.allDependencies case final value?) 'allDependencies': value,
-      if (instance.licenses case final value?) 'licenses': value,
-      if (instance.report case final value?) 'report': value,
-      if (instance.result case final value?) 'result': value,
-      if (instance.screenshots case final value?) 'screenshots': value,
-      if (instance.urlProblems case final value?) 'urlProblems': value,
+      'timestamp': ?instance.timestamp?.toIso8601String(),
+      'panaRuntimeInfo': ?instance.panaRuntimeInfo,
+      'reportStatus': ?instance.reportStatus,
+      'derivedTags': ?instance.derivedTags,
+      'allDependencies': ?instance.allDependencies,
+      'licenses': ?instance.licenses,
+      'report': ?instance.report,
+      'result': ?instance.result,
+      'screenshots': ?instance.screenshots,
+      'urlProblems': ?instance.urlProblems,
     };
 
 DartdocReport _$DartdocReportFromJson(Map<String, dynamic> json) =>
diff --git a/app/lib/search/search_service.g.dart b/app/lib/search/search_service.g.dart
index 2738930d80..6024acddae 100644
--- a/app/lib/search/search_service.g.dart
+++ b/app/lib/search/search_service.g.dart
@@ -102,11 +102,11 @@ Map<String, dynamic> _$PackageSearchResultToJson(
 ) => <String, dynamic>{
   'timestamp': instance.timestamp.toIso8601String(),
   'totalCount': instance.totalCount,
-  if (instance.nameMatches case final value?) 'nameMatches': value,
+  'nameMatches': ?instance.nameMatches,
   'sdkLibraryHits': instance.sdkLibraryHits.map((e) => e.toJson()).toList(),
   'packageHits': instance.packageHits.map((e) => e.toJson()).toList(),
-  if (instance.errorMessage case final value?) 'errorMessage': value,
-  if (instance.statusCode case final value?) 'statusCode': value,
+  'errorMessage': ?instance.errorMessage,
+  'statusCode': ?instance.statusCode,
 };
 
 SdkLibraryHit _$SdkLibraryHitFromJson(Map<String, dynamic> json) =>
@@ -123,13 +123,12 @@ SdkLibraryHit _$SdkLibraryHitFromJson(Map<String, dynamic> json) =>
 
 Map<String, dynamic> _$SdkLibraryHitToJson(SdkLibraryHit instance) =>
     <String, dynamic>{
-      if (instance.sdk case final value?) 'sdk': value,
-      if (instance.library case final value?) 'library': value,
-      if (instance.description case final value?) 'description': value,
-      if (instance.url case final value?) 'url': value,
+      'sdk': ?instance.sdk,
+      'library': ?instance.library,
+      'description': ?instance.description,
+      'url': ?instance.url,
       'score': instance.score,
-      if (instance.apiPages?.map((e) => e.toJson()).toList() case final value?)
-        'apiPages': value,
+      'apiPages': ?instance.apiPages?.map((e) => e.toJson()).toList(),
     };
 
 PackageHit _$PackageHitFromJson(Map<String, dynamic> json) => PackageHit(
@@ -143,9 +142,8 @@ PackageHit _$PackageHitFromJson(Map<String, dynamic> json) => PackageHit(
 Map<String, dynamic> _$PackageHitToJson(PackageHit instance) =>
     <String, dynamic>{
       'package': instance.package,
-      if (instance.score case final value?) 'score': value,
-      if (instance.apiPages?.map((e) => e.toJson()).toList() case final value?)
-        'apiPages': value,
+      'score': ?instance.score,
+      'apiPages': ?instance.apiPages?.map((e) => e.toJson()).toList(),
     };
 
 ApiPageRef _$ApiPageRefFromJson(Map<String, dynamic> json) => ApiPageRef(
@@ -156,7 +154,7 @@ ApiPageRef _$ApiPageRefFromJson(Map<String, dynamic> json) => ApiPageRef(
 
 Map<String, dynamic> _$ApiPageRefToJson(ApiPageRef instance) =>
     <String, dynamic>{
-      if (instance.title case final value?) 'title': value,
-      if (instance.path case final value?) 'path': value,
-      if (instance.url case final value?) 'url': value,
+      'title': ?instance.title,
+      'path': ?instance.path,
+      'url': ?instance.url,
     };
diff --git a/app/lib/service/download_counts/download_counts.g.dart b/app/lib/service/download_counts/download_counts.g.dart
index d32c1cc328..315ed4b5e1 100644
--- a/app/lib/service/download_counts/download_counts.g.dart
+++ b/app/lib/service/download_counts/download_counts.g.dart
@@ -56,8 +56,7 @@ CountData _$CountDataFromJson(Map<String, dynamic> json) =>
           : DateTime.parse(json['newestDate'] as String);
 
 Map<String, dynamic> _$CountDataToJson(CountData instance) => <String, dynamic>{
-  if (instance.newestDate?.toIso8601String() case final value?)
-    'newestDate': value,
+  'newestDate': ?instance.newestDate?.toIso8601String(),
   'majorRangeCounts': instance.majorRangeCounts
       .map(
         (e) => <String, dynamic>{
diff --git a/app/lib/service/openid/openid_models.g.dart b/app/lib/service/openid/openid_models.g.dart
index 834180a83a..36c3ac0731 100644
--- a/app/lib/service/openid/openid_models.g.dart
+++ b/app/lib/service/openid/openid_models.g.dart
@@ -64,18 +64,15 @@ JsonWebKey _$JsonWebKeyFromJson(Map<String, dynamic> json) => JsonWebKey(
   ),
 );
 
-Map<String, dynamic> _$JsonWebKeyToJson(JsonWebKey instance) =>
-    <String, dynamic>{
-      'alg': instance.alg,
-      if (instance.use case final value?) 'use': value,
-      if (instance.kid case final value?) 'kid': value,
-      if (instance.kty case final value?) 'kty': value,
-      if (instance.x5c case final value?) 'x5c': value,
-      if (instance.x5t case final value?) 'x5t': value,
-      if (const NullableUint8ListUnpaddedBase64UrlConverter().toJson(instance.n)
-          case final value?)
-        'n': value,
-      if (const NullableUint8ListUnpaddedBase64UrlConverter().toJson(instance.e)
-          case final value?)
-        'e': value,
-    };
+Map<String, dynamic> _$JsonWebKeyToJson(
+  JsonWebKey instance,
+) => <String, dynamic>{
+  'alg': instance.alg,
+  'use': ?instance.use,
+  'kid': ?instance.kid,
+  'kty': ?instance.kty,
+  'x5c': ?instance.x5c,
+  'x5t': ?instance.x5t,
+  'n': ?const NullableUint8ListUnpaddedBase64UrlConverter().toJson(instance.n),
+  'e': ?const NullableUint8ListUnpaddedBase64UrlConverter().toJson(instance.e),
+};
diff --git a/app/lib/shared/configuration.g.dart b/app/lib/shared/configuration.g.dart
index 516ecca8a7..34905ba874 100644
--- a/app/lib/shared/configuration.g.dart
+++ b/app/lib/shared/configuration.g.dart
@@ -307,9 +307,9 @@ RateLimit _$RateLimitFromJson(Map<String, dynamic> json) =>
 Map<String, dynamic> _$RateLimitToJson(RateLimit instance) => <String, dynamic>{
   'operation': instance.operation,
   'scope': _$RateLimitScopeEnumMap[instance.scope]!,
-  if (instance.burst case final value?) 'burst': value,
-  if (instance.hourly case final value?) 'hourly': value,
-  if (instance.daily case final value?) 'daily': value,
+  'burst': ?instance.burst,
+  'hourly': ?instance.hourly,
+  'daily': ?instance.daily,
 };
 
 const _$RateLimitScopeEnumMap = {
diff --git a/app/lib/tool/test_profile/models.g.dart b/app/lib/tool/test_profile/models.g.dart
index e8a374595c..c7a26c7e54 100644
--- a/app/lib/tool/test_profile/models.g.dart
+++ b/app/lib/tool/test_profile/models.g.dart
@@ -31,7 +31,7 @@ Map<String, dynamic> _$TestProfileToJson(
       .toList(),
   'publishers': instance.publishers.map((e) => e.toJson()).toList(),
   'users': instance.users.map((e) => e.toJson()).toList(),
-  if (instance.defaultUser case final value?) 'defaultUser': value,
+  'defaultUser': ?instance.defaultUser,
 };
 
 TestPackage _$TestPackageFromJson(Map<String, dynamic> json) => TestPackage(
@@ -53,21 +53,19 @@ TestPackage _$TestPackageFromJson(Map<String, dynamic> json) => TestPackage(
   likeCount: (json['likeCount'] as num?)?.toInt(),
 );
 
-Map<String, dynamic> _$TestPackageToJson(
-  TestPackage instance,
-) => <String, dynamic>{
-  'name': instance.name,
-  if (instance.uploaders case final value?) 'uploaders': value,
-  if (instance.publisher case final value?) 'publisher': value,
-  if (instance.versions?.map((e) => e.toJson()).toList() case final value?)
-    'versions': value,
-  if (instance.isDiscontinued case final value?) 'isDiscontinued': value,
-  if (instance.replacedBy case final value?) 'replacedBy': value,
-  if (instance.isUnlisted case final value?) 'isUnlisted': value,
-  if (instance.isFlutterFavorite case final value?) 'isFlutterFavorite': value,
-  if (instance.retractedVersions case final value?) 'retractedVersions': value,
-  if (instance.likeCount case final value?) 'likeCount': value,
-};
+Map<String, dynamic> _$TestPackageToJson(TestPackage instance) =>
+    <String, dynamic>{
+      'name': instance.name,
+      'uploaders': ?instance.uploaders,
+      'publisher': ?instance.publisher,
+      'versions': ?instance.versions?.map((e) => e.toJson()).toList(),
+      'isDiscontinued': ?instance.isDiscontinued,
+      'replacedBy': ?instance.replacedBy,
+      'isUnlisted': ?instance.isUnlisted,
+      'isFlutterFavorite': ?instance.isFlutterFavorite,
+      'retractedVersions': ?instance.retractedVersions,
+      'likeCount': ?instance.likeCount,
+    };
 
 TestVersion _$TestVersionFromJson(Map<String, dynamic> json) => TestVersion(
   version: json['version'] as String,
@@ -76,12 +74,11 @@ TestVersion _$TestVersionFromJson(Map<String, dynamic> json) => TestVersion(
       : DateTime.parse(json['created'] as String),
 );
 
-Map<String, dynamic> _$TestVersionToJson(
-  TestVersion instance,
-) => <String, dynamic>{
-  'version': instance.version,
-  if (instance.created?.toIso8601String() case final value?) 'created': value,
-};
+Map<String, dynamic> _$TestVersionToJson(TestVersion instance) =>
+    <String, dynamic>{
+      'version': instance.version,
+      'created': ?instance.created?.toIso8601String(),
+    };
 
 GeneratedTestPackage _$GeneratedTestPackageFromJson(
   Map<String, dynamic> json,
@@ -111,17 +108,16 @@ Map<String, dynamic> _$GeneratedTestPackageToJson(
   GeneratedTestPackage instance,
 ) => <String, dynamic>{
   'name': instance.name,
-  if (instance.uploaders case final value?) 'uploaders': value,
-  if (instance.publisher case final value?) 'publisher': value,
-  if (instance.isDiscontinued case final value?) 'isDiscontinued': value,
-  if (instance.replacedBy case final value?) 'replacedBy': value,
-  if (instance.isUnlisted case final value?) 'isUnlisted': value,
-  if (instance.isFlutterFavorite case final value?) 'isFlutterFavorite': value,
-  if (instance.retractedVersions case final value?) 'retractedVersions': value,
-  if (instance.likeCount case final value?) 'likeCount': value,
-  if (instance.versions?.map((e) => e.toJson()).toList() case final value?)
-    'versions': value,
-  if (instance.template?.toJson() case final value?) 'template': value,
+  'uploaders': ?instance.uploaders,
+  'publisher': ?instance.publisher,
+  'isDiscontinued': ?instance.isDiscontinued,
+  'replacedBy': ?instance.replacedBy,
+  'isUnlisted': ?instance.isUnlisted,
+  'isFlutterFavorite': ?instance.isFlutterFavorite,
+  'retractedVersions': ?instance.retractedVersions,
+  'likeCount': ?instance.likeCount,
+  'versions': ?instance.versions?.map((e) => e.toJson()).toList(),
+  'template': ?instance.template?.toJson(),
 };
 
 GeneratedTestVersion _$GeneratedTestVersionFromJson(
@@ -140,8 +136,8 @@ Map<String, dynamic> _$GeneratedTestVersionToJson(
   GeneratedTestVersion instance,
 ) => <String, dynamic>{
   'version': instance.version,
-  if (instance.created?.toIso8601String() case final value?) 'created': value,
-  if (instance.template?.toJson() case final value?) 'template': value,
+  'created': ?instance.created?.toIso8601String(),
+  'template': ?instance.template?.toJson(),
 };
 
 TestArchiveTemplate _$TestArchiveTemplateFromJson(Map<String, dynamic> json) =>
@@ -155,10 +151,10 @@ TestArchiveTemplate _$TestArchiveTemplateFromJson(Map<String, dynamic> json) =>
 Map<String, dynamic> _$TestArchiveTemplateToJson(
   TestArchiveTemplate instance,
 ) => <String, dynamic>{
-  if (instance.homepage case final value?) 'homepage': value,
-  if (instance.repository case final value?) 'repository': value,
-  if (instance.sdkConstraint case final value?) 'sdkConstraint': value,
-  if (instance.markdownSamples case final value?) 'markdownSamples': value,
+  'homepage': ?instance.homepage,
+  'repository': ?instance.repository,
+  'sdkConstraint': ?instance.sdkConstraint,
+  'markdownSamples': ?instance.markdownSamples,
 };
 
 TestPublisher _$TestPublisherFromJson(Map<String, dynamic> json) =>
@@ -200,10 +196,9 @@ ResolvedVersion _$ResolvedVersionFromJson(Map<String, dynamic> json) =>
           : DateTime.parse(json['created'] as String),
     );
 
-Map<String, dynamic> _$ResolvedVersionToJson(
-  ResolvedVersion instance,
-) => <String, dynamic>{
-  'package': instance.package,
-  'version': instance.version,
-  if (instance.created?.toIso8601String() case final value?) 'created': value,
-};
+Map<String, dynamic> _$ResolvedVersionToJson(ResolvedVersion instance) =>
+    <String, dynamic>{
+      'package': instance.package,
+      'version': instance.version,
+      'created': ?instance.created?.toIso8601String(),
+    };
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index abe75f41b3..6ed50000a9 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -46,7 +46,7 @@ dependencies:
   watcher: ^1.0.0
   yaml: ^3.1.0
   # pana version to be pinned
-  pana: '0.22.22'
+  pana: '0.22.23'
   # 3rd-party packages with pinned versions
   mailer: '6.5.0'
   ulid: '2.0.1'
@@ -59,6 +59,6 @@ dev_dependencies:
   coverage: any # test already depends on it
   json_serializable: ^6.0.1
   shelf_router_generator: ^1.0.0
-  source_gen: '^2.0.0'
+  source_gen: '^3.0.0'
   test: ^1.16.5
   xml: ^6.0.0
diff --git a/app/test/admin/api_test.dart b/app/test/admin/api_test.dart
index 3c53af0a5b..8bb5c3dce8 100644
--- a/app/test/admin/api_test.dart
+++ b/app/test/admin/api_test.dart
@@ -1111,4 +1111,4 @@ void main() {
   });
 }
 
-dynamic _json(value) => json.decode(json.encode(value));
+dynamic _json(Object? value) => json.decode(json.encode(value));
diff --git a/app/test/package/package_publisher_test.dart b/app/test/package/package_publisher_test.dart
index a71adb3930..7c55f4d0f0 100644
--- a/app/test/package/package_publisher_test.dart
+++ b/app/test/package/package_publisher_test.dart
@@ -295,7 +295,7 @@ void main() {
   });
 }
 
-dynamic _json(value) => json.decode(json.encode(value));
+dynamic _json(Object? value) => json.decode(json.encode(value));
 
 void _testUserNotMemberOfPublisher({
   required Future<void> Function(PubApiClient client) fn,
diff --git a/app/test/publisher/api_test.dart b/app/test/publisher/api_test.dart
index b8bfce4144..014334df4d 100644
--- a/app/test/publisher/api_test.dart
+++ b/app/test/publisher/api_test.dart
@@ -989,7 +989,7 @@ void main() {
   });
 }
 
-dynamic _json(value) => json.decode(json.encode(value));
+dynamic _json(Object? value) => json.decode(json.encode(value));
 
 void _testAdminAuthIssues(Future Function(PubApiClient client) fn) {
   setupTestsWithCallerAuthorizationIssues(fn);
diff --git a/pkg/_pub_shared/lib/data/advisories_api.g.dart b/pkg/_pub_shared/lib/data/advisories_api.g.dart
index 41a3920e26..090974ff4e 100644
--- a/pkg/_pub_shared/lib/data/advisories_api.g.dart
+++ b/pkg/_pub_shared/lib/data/advisories_api.g.dart
@@ -54,20 +54,20 @@ OSV _$OSVFromJson(Map<String, dynamic> json) => OSV(
 );
 
 Map<String, dynamic> _$OSVToJson(OSV instance) => <String, dynamic>{
-  if (instance.schemaVersion case final value?) 'schema_version': value,
+  'schema_version': ?instance.schemaVersion,
   'id': instance.id,
   'modified': instance.modified,
-  if (instance.published case final value?) 'published': value,
-  if (instance.withdrawn case final value?) 'withdrawn': value,
+  'published': ?instance.published,
+  'withdrawn': ?instance.withdrawn,
   'aliases': instance.aliases,
-  if (instance.related case final value?) 'related': value,
-  if (instance.summary case final value?) 'summary': value,
-  if (instance.details case final value?) 'details': value,
-  if (instance.severity case final value?) 'severity': value,
-  if (instance.affected case final value?) 'affected': value,
-  if (instance.references case final value?) 'references': value,
-  if (instance.credits case final value?) 'credits': value,
-  if (instance.databaseSpecific case final value?) 'database_specific': value,
+  'related': ?instance.related,
+  'summary': ?instance.summary,
+  'details': ?instance.details,
+  'severity': ?instance.severity,
+  'affected': ?instance.affected,
+  'references': ?instance.references,
+  'credits': ?instance.credits,
+  'database_specific': ?instance.databaseSpecific,
 };
 
 Severity _$SeverityFromJson(Map<String, dynamic> json) =>
diff --git a/pkg/_pub_shared/lib/data/package_api.g.dart b/pkg/_pub_shared/lib/data/package_api.g.dart
index 0a3323ade9..dcfd9902af 100644
--- a/pkg/_pub_shared/lib/data/package_api.g.dart
+++ b/pkg/_pub_shared/lib/data/package_api.g.dart
@@ -43,8 +43,8 @@ AutomatedPublishingConfig _$AutomatedPublishingConfigFromJson(
 Map<String, dynamic> _$AutomatedPublishingConfigToJson(
   AutomatedPublishingConfig instance,
 ) => <String, dynamic>{
-  if (instance.github?.toJson() case final value?) 'github': value,
-  if (instance.gcp?.toJson() case final value?) 'gcp': value,
+  'github': ?instance.github?.toJson(),
+  'gcp': ?instance.gcp?.toJson(),
 };
 
 GitHubPublishingConfig _$GitHubPublishingConfigFromJson(
@@ -64,10 +64,10 @@ Map<String, dynamic> _$GitHubPublishingConfigToJson(
   GitHubPublishingConfig instance,
 ) => <String, dynamic>{
   'isEnabled': instance.isEnabled,
-  if (instance.repository case final value?) 'repository': value,
-  if (instance.tagPattern case final value?) 'tagPattern': value,
+  'repository': ?instance.repository,
+  'tagPattern': ?instance.tagPattern,
   'requireEnvironment': instance.requireEnvironment,
-  if (instance.environment case final value?) 'environment': value,
+  'environment': ?instance.environment,
   'isPushEventEnabled': instance.isPushEventEnabled,
   'isWorkflowDispatchEventEnabled': instance.isWorkflowDispatchEventEnabled,
 };
@@ -82,8 +82,7 @@ Map<String, dynamic> _$GcpPublishingConfigToJson(
   GcpPublishingConfig instance,
 ) => <String, dynamic>{
   'isEnabled': instance.isEnabled,
-  if (instance.serviceAccountEmail case final value?)
-    'serviceAccountEmail': value,
+  'serviceAccountEmail': ?instance.serviceAccountEmail,
 };
 
 VersionOptions _$VersionOptionsFromJson(Map<String, dynamic> json) =>
@@ -131,12 +130,11 @@ PackageData _$PackageDataFromJson(Map<String, dynamic> json) => PackageData(
 Map<String, dynamic> _$PackageDataToJson(PackageData instance) =>
     <String, dynamic>{
       'name': instance.name,
-      if (instance.isDiscontinued case final value?) 'isDiscontinued': value,
-      if (instance.replacedBy case final value?) 'replacedBy': value,
+      'isDiscontinued': ?instance.isDiscontinued,
+      'replacedBy': ?instance.replacedBy,
       'latest': instance.latest,
       'versions': instance.versions,
-      if (instance.advisoriesUpdated?.toIso8601String() case final value?)
-        'advisoriesUpdated': value,
+      'advisoriesUpdated': ?instance.advisoriesUpdated?.toIso8601String(),
     };
 
 VersionInfo _$VersionInfoFromJson(Map<String, dynamic> json) => VersionInfo(
@@ -153,12 +151,11 @@ VersionInfo _$VersionInfoFromJson(Map<String, dynamic> json) => VersionInfo(
 Map<String, dynamic> _$VersionInfoToJson(VersionInfo instance) =>
     <String, dynamic>{
       'version': instance.version,
-      if (instance.retracted case final value?) 'retracted': value,
+      'retracted': ?instance.retracted,
       'pubspec': instance.pubspec,
-      if (instance.archiveUrl case final value?) 'archive_url': value,
-      if (instance.archiveSha256 case final value?) 'archive_sha256': value,
-      if (instance.published?.toIso8601String() case final value?)
-        'published': value,
+      'archive_url': ?instance.archiveUrl,
+      'archive_sha256': ?instance.archiveSha256,
+      'published': ?instance.published?.toIso8601String(),
     };
 
 VersionScore _$VersionScoreFromJson(Map<String, dynamic> json) => VersionScore(
diff --git a/pkg/_pub_shared/lib/data/page_data.g.dart b/pkg/_pub_shared/lib/data/page_data.g.dart
index ce57d6d944..11aad53a21 100644
--- a/pkg/_pub_shared/lib/data/page_data.g.dart
+++ b/pkg/_pub_shared/lib/data/page_data.g.dart
@@ -18,10 +18,10 @@ PageData _$PageDataFromJson(Map<String, dynamic> json) => PageData(
 );
 
 Map<String, dynamic> _$PageDataToJson(PageData instance) => <String, dynamic>{
-  if (instance.consentId case final value?) 'consentId': value,
-  if (instance.pkgData case final value?) 'pkgData': value,
-  if (instance.publisher case final value?) 'publisher': value,
-  if (instance.sessionAware case final value?) 'sessionAware': value,
+  'consentId': ?instance.consentId,
+  'pkgData': ?instance.pkgData,
+  'publisher': ?instance.publisher,
+  'sessionAware': ?instance.sessionAware,
 };
 
 PkgData _$PkgDataFromJson(Map<String, dynamic> json) => PkgData(
@@ -35,7 +35,7 @@ PkgData _$PkgDataFromJson(Map<String, dynamic> json) => PkgData(
 Map<String, dynamic> _$PkgDataToJson(PkgData instance) => <String, dynamic>{
   'package': instance.package,
   'version': instance.version,
-  if (instance.publisherId case final value?) 'publisherId': value,
+  'publisherId': ?instance.publisherId,
   'isDiscontinued': instance.isDiscontinued,
   'isLatest': instance.isLatest,
 };
diff --git a/pkg/_pub_shared/lib/utils/flutter_archive.g.dart b/pkg/_pub_shared/lib/utils/flutter_archive.g.dart
index ddec20d1d4..144624d0af 100644
--- a/pkg/_pub_shared/lib/utils/flutter_archive.g.dart
+++ b/pkg/_pub_shared/lib/utils/flutter_archive.g.dart
@@ -21,11 +21,9 @@ FlutterArchive _$FlutterArchiveFromJson(Map<String, dynamic> json) =>
 
 Map<String, dynamic> _$FlutterArchiveToJson(FlutterArchive instance) =>
     <String, dynamic>{
-      if (instance.baseUrl case final value?) 'baseUrl': value,
-      if (instance.currentRelease?.toJson() case final value?)
-        'current_release': value,
-      if (instance.releases?.map((e) => e.toJson()).toList() case final value?)
-        'releases': value,
+      'baseUrl': ?instance.baseUrl,
+      'current_release': ?instance.currentRelease?.toJson(),
+      'releases': ?instance.releases?.map((e) => e.toJson()).toList(),
     };
 
 FlutterCurrentRelease _$FlutterCurrentReleaseFromJson(
@@ -39,9 +37,9 @@ FlutterCurrentRelease _$FlutterCurrentReleaseFromJson(
 Map<String, dynamic> _$FlutterCurrentReleaseToJson(
   FlutterCurrentRelease instance,
 ) => <String, dynamic>{
-  if (instance.beta case final value?) 'beta': value,
-  if (instance.dev case final value?) 'dev': value,
-  if (instance.stable case final value?) 'stable': value,
+  'beta': ?instance.beta,
+  'dev': ?instance.dev,
+  'stable': ?instance.stable,
 };
 
 FlutterRelease _$FlutterReleaseFromJson(Map<String, dynamic> json) =>
@@ -59,12 +57,11 @@ FlutterRelease _$FlutterReleaseFromJson(Map<String, dynamic> json) =>
 
 Map<String, dynamic> _$FlutterReleaseToJson(FlutterRelease instance) =>
     <String, dynamic>{
-      if (instance.hash case final value?) 'hash': value,
-      if (instance.channel case final value?) 'channel': value,
-      if (instance.version case final value?) 'version': value,
-      if (instance.releaseDate?.toIso8601String() case final value?)
-        'release_date': value,
-      if (instance.archive case final value?) 'archive': value,
-      if (instance.sha256 case final value?) 'sha256': value,
-      if (instance.dartSdkVersion case final value?) 'dart_sdk_version': value,
+      'hash': ?instance.hash,
+      'channel': ?instance.channel,
+      'version': ?instance.version,
+      'release_date': ?instance.releaseDate?.toIso8601String(),
+      'archive': ?instance.archive,
+      'sha256': ?instance.sha256,
+      'dart_sdk_version': ?instance.dartSdkVersion,
     };
diff --git a/pkg/_pub_shared/pubspec.yaml b/pkg/_pub_shared/pubspec.yaml
index 50319b6d0e..3add4ced09 100644
--- a/pkg/_pub_shared/pubspec.yaml
+++ b/pkg/_pub_shared/pubspec.yaml
@@ -22,5 +22,5 @@ dev_dependencies:
   build_verify: ^3.0.0
   coverage: any # test already depends on it
   json_serializable: ^6.0.1
-  source_gen: '^2.0.0'
+  source_gen: '^3.0.0'
   test: '^1.16.5'
diff --git a/pkg/api_builder/lib/src/api_router_generator.dart b/pkg/api_builder/lib/src/api_router_generator.dart
index 6e82d7ad44..9e0f60b8a8 100644
--- a/pkg/api_builder/lib/src/api_router_generator.dart
+++ b/pkg/api_builder/lib/src/api_router_generator.dart
@@ -48,7 +48,7 @@ code.Method _buildRouterMethod({
       code.Parameter(
         (b) => b
           ..name = 'service'
-          ..type = code.refer(classElement.name),
+          ..type = code.refer(classElement.name!),
       ),
     )
     ..returns = code.refer('Router')
diff --git a/pkg/api_builder/lib/src/client_library_generator.dart b/pkg/api_builder/lib/src/client_library_generator.dart
index fcb3ada6ca..aff6f75142 100644
--- a/pkg/api_builder/lib/src/client_library_generator.dart
+++ b/pkg/api_builder/lib/src/client_library_generator.dart
@@ -15,8 +15,10 @@ import 'package:source_gen/source_gen.dart' as g;
 
 import 'shared.dart' show EndPointGenerator, Handler;
 
-code.Reference _referToType(DartType type) =>
-    code.refer(type.element!.name!, type.element!.source!.uri.toString());
+code.Reference _referToType(DartType type) => code.refer(
+  type.element!.name!,
+  type.element!.firstFragment.libraryFragment!.source.uri.toString(),
+);
 
 final _responseType = g.TypeChecker.fromRuntime(shelf.Response);
 
@@ -185,7 +187,7 @@ code.Method _buildClientMethod(Handler h) {
         for (final param in h.queryParameters)
           code.Parameter(
             (b) => b
-              ..name = param.name
+              ..name = param.name!
               ..type = code.refer('String?')
               ..named = true,
           ),
diff --git a/pkg/api_builder/lib/src/shared.dart b/pkg/api_builder/lib/src/shared.dart
index b2e80104e3..5a567d1dae 100644
--- a/pkg/api_builder/lib/src/shared.dart
+++ b/pkg/api_builder/lib/src/shared.dart
@@ -5,7 +5,7 @@
 // ignore_for_file: deprecated_member_use
 
 import 'package:analyzer/dart/element/element.dart'
-    show ClassElement, ExecutableElement, ParameterElement;
+    show ClassElement, ExecutableElement, FormalParameterElement;
 import 'package:analyzer/dart/element/type.dart' show DartType;
 import 'package:build/build.dart' show BuildStep, log;
 import 'package:collection/collection.dart';
@@ -27,20 +27,20 @@ class Handler {
   /// If this handler has a payload
   bool get hasPayload => payloadType != null;
 
-  DartType? get payloadType => element.parameters
+  DartType? get payloadType => element.formalParameters
       .skip(1)
       .lastWhereOrNull((p) => p.isPositional && !p.type.isDartCoreString)
       ?.type;
 
   /// List of parameters from the route.
-  List<String> get routeParameters => element.parameters
+  List<String> get routeParameters => element.formalParameters
       .skip(1)
       .takeWhile((p) => p.type.isDartCoreString && p.isPositional)
       .map((p) => p.displayName)
       .toList();
 
   /// Any optional named string parameters are query string parameters.
-  List<ParameterElement> get queryParameters => element.parameters
+  List<FormalParameterElement> get queryParameters => element.formalParameters
       .where((p) => p.isNamed && p.type.isDartCoreString)
       .toList();
 }
@@ -49,10 +49,14 @@ class Handler {
 List<ExecutableElement> _getAnnotatedElementsOrderBySourceOffset(
   ClassElement cls,
 ) {
-  return <ExecutableElement>[
-    ...cls.methods.where(_endPointType.hasAnnotationOfExact),
-    ...cls.accessors.where(_endPointType.hasAnnotationOfExact),
-  ]..sort((a, b) => (a.nameOffset).compareTo(b.nameOffset));
+  return cls.children
+      .whereType<ExecutableElement>()
+      .where(_endPointType.hasAnnotationOfExact)
+      .toList()
+    ..sort(
+      (a, b) =>
+          (a.firstFragment.nameOffset!).compareTo(b.firstFragment.nameOffset!),
+    );
 }
 
 abstract class EndPointGenerator extends g.Generator {
diff --git a/pkg/api_builder/pubspec.yaml b/pkg/api_builder/pubspec.yaml
index 4647de2b51..36c4632030 100644
--- a/pkg/api_builder/pubspec.yaml
+++ b/pkg/api_builder/pubspec.yaml
@@ -7,11 +7,11 @@ environment:
 resolution: workspace
 
 dependencies:
-  analyzer:  ^7.0.0
-  build: ^2.0.0
+  analyzer:  ^8.0.0
+  build: ^3.0.0
   build_config: ^1.0.0
   collection: ^1.18.0
-  source_gen: ^2.0.0
+  source_gen: ^3.0.0
   shelf_router: ^1.0.0
   code_builder: ^4.0.0
   shelf: ^1.0.0
diff --git a/pkg/pub_worker/pubspec.yaml b/pkg/pub_worker/pubspec.yaml
index b6056d3ad7..9aa86de454 100644
--- a/pkg/pub_worker/pubspec.yaml
+++ b/pkg/pub_worker/pubspec.yaml
@@ -10,9 +10,9 @@ dependencies:
   appengine: ^0.13.6
   json_annotation: ^4.3.0
   jsontool: ^2.0.0
-  pana: ^0.22.22
+  pana: ^0.22.23
   path: ^1.8.0
-  lints: ^5.0.0 # required for pana
+  lints: ^6.0.0 # required for pana
   meta: ^1.7.0
   api_builder:
   _pub_shared:
diff --git a/pubspec.lock b/pubspec.lock
index 62e51c19b7..abd2ecf9da 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -13,18 +13,18 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f
+      sha256: f0bb5d1648339c8308cc0b9838d8456b3cfe5c91f9dc1a735b4d003269e5da9a
       url: "https://pub.dev"
     source: hosted
-    version: "85.0.0"
+    version: "88.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d"
+      sha256: "0b7b9c329d2879f8f05d6c05b32ee9ec025f39b077864bdb5ac9a7b63418a98f"
       url: "https://pub.dev"
     source: hosted
-    version: "7.7.1"
+    version: "8.1.1"
   appengine:
     dependency: transitive
     description:
@@ -77,10 +77,10 @@ packages:
     dependency: transitive
     description:
       name: build
-      sha256: "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7"
+      sha256: "7174c5d84b0fed00a1f5e7543597b35d67560465ae3d909f0889b8b20419d5e3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.4"
+    version: "3.0.1"
   build_config:
     dependency: transitive
     description:
@@ -101,26 +101,26 @@ packages:
     dependency: transitive
     description:
       name: build_resolvers
-      sha256: ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62
+      sha256: "82730bf3d9043366ba8c02e4add05842a10739899520a6a22ddbd22d333bd5bb"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.4"
+    version: "3.0.1"
   build_runner:
     dependency: transitive
     description:
       name: build_runner
-      sha256: "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53"
+      sha256: "32c6b3d172f1f46b7c4df6bc4a47b8d88afb9e505dd4ace4af80b3c37e89832b"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.4"
+    version: "2.6.1"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792"
+      sha256: "4b188774b369104ad96c0e4ca2471e5162f0566ce277771b179bed5eabf2d048"
       url: "https://pub.dev"
     source: hosted
-    version: "9.1.2"
+    version: "9.2.1"
   build_verify:
     dependency: transitive
     description:
@@ -269,10 +269,10 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb"
+      sha256: c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.2"
   fake_async:
     dependency: transitive
     description:
@@ -461,10 +461,10 @@ packages:
     dependency: transitive
     description:
       name: json_serializable
-      sha256: c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c
+      sha256: "33a040668b31b320aafa4822b7b1e177e163fc3c1e835c6750319d4ab23aa6fe"
       url: "https://pub.dev"
     source: hosted
-    version: "6.9.5"
+    version: "6.11.1"
   jsontool:
     dependency: transitive
     description:
@@ -485,10 +485,10 @@ packages:
     dependency: "direct dev"
     description:
       name: lints
-      sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7
+      sha256: a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0
       url: "https://pub.dev"
     source: hosted
-    version: "5.1.1"
+    version: "6.0.0"
   logging:
     dependency: transitive
     description:
@@ -621,10 +621,10 @@ packages:
     dependency: transitive
     description:
       name: pana
-      sha256: "43a77d3aca0eb0f89b49030308b3b32745955a4f1bf4875e7b564a12ea9bb6d7"
+      sha256: e3bd09f4aa7eb997ac9d19d6df82781a92fb48917ddb2637b4cb7430e25de735
       url: "https://pub.dev"
     source: hosted
-    version: "0.22.22"
+    version: "0.22.23"
   path:
     dependency: transitive
     description:
@@ -749,10 +749,10 @@ packages:
     dependency: transitive
     description:
       name: shelf_router_generator
-      sha256: e7ee1ce30c6655586a57eaf0a8ae977a6759bad490ec21e08ec6100e9249c1cc
+      sha256: "03e5c598a7bad451f7f6cbd2867114023f7a677784f9f5ce38826091ab33de07"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   shelf_static:
     dependency: transitive
     description:
@@ -781,10 +781,10 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      sha256: "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b"
+      sha256: "7b19d6ba131c6eb98bfcbf8d56c1a7002eba438af2e7ae6f8398b2b0f4f381e3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "3.1.0"
   source_helper:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index d55537f015..bec665f480 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,5 +16,5 @@ workspace:
   - pkg/pub_package_reader
 
 dev_dependencies:
-  lints: ^5.1.0
+  lints: ^6.0.0
   mono_repo: ^6.6.2