From 1bf8cdc0451ccbca2901d1af4ad4d710a367677e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 22:09:21 +0000 Subject: [PATCH 1/4] chore(deps): bump very_good_analysis Bumps [very_good_analysis](https://github.com/VeryGoodOpenSource/very_good_analysis) from 6.0.0 to 7.0.0. - [Release notes](https://github.com/VeryGoodOpenSource/very_good_analysis/releases) - [Changelog](https://github.com/VeryGoodOpenSource/very_good_analysis/blob/main/CHANGELOG.md) - [Commits](https://github.com/VeryGoodOpenSource/very_good_analysis/compare/v6.0.0...v7.0.0) --- updated-dependencies: - dependency-name: very_good_analysis dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- bricks/dart_frog_prod_server/hooks/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bricks/dart_frog_prod_server/hooks/pubspec.yaml b/bricks/dart_frog_prod_server/hooks/pubspec.yaml index 6640f4b81..d67881be3 100644 --- a/bricks/dart_frog_prod_server/hooks/pubspec.yaml +++ b/bricks/dart_frog_prod_server/hooks/pubspec.yaml @@ -15,4 +15,4 @@ dependencies: dev_dependencies: mocktail: ^1.0.0 test: ^1.25.0 - very_good_analysis: ^6.0.0 + very_good_analysis: ^7.0.0 From a5ae366842040f24aef59ac873ef6539e8bb2654 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Dec 2024 17:18:59 +0000 Subject: [PATCH 2/4] chore(deps): bump very_good_analysis Bumps [very_good_analysis](https://github.com/VeryGoodOpenSource/very_good_analysis) from 6.0.0 to 7.0.0. - [Release notes](https://github.com/VeryGoodOpenSource/very_good_analysis/releases) - [Changelog](https://github.com/VeryGoodOpenSource/very_good_analysis/blob/main/CHANGELOG.md) - [Commits](https://github.com/VeryGoodOpenSource/very_good_analysis/compare/v6.0.0...v7.0.0) --- updated-dependencies: - dependency-name: very_good_analysis dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- bricks/dart_frog_prod_server/hooks/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bricks/dart_frog_prod_server/hooks/pubspec.yaml b/bricks/dart_frog_prod_server/hooks/pubspec.yaml index 6640f4b81..d67881be3 100644 --- a/bricks/dart_frog_prod_server/hooks/pubspec.yaml +++ b/bricks/dart_frog_prod_server/hooks/pubspec.yaml @@ -15,4 +15,4 @@ dependencies: dev_dependencies: mocktail: ^1.0.0 test: ^1.25.0 - very_good_analysis: ^6.0.0 + very_good_analysis: ^7.0.0 From 34044d08c5c1353556eaa8a6b41352e4cebcd2ed Mon Sep 17 00:00:00 2001 From: Tom Arra Date: Fri, 20 Dec 2024 11:19:02 -0600 Subject: [PATCH 3/4] update analysis file --- bricks/dart_frog_prod_server/hooks/analysis_options.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bricks/dart_frog_prod_server/hooks/analysis_options.yaml b/bricks/dart_frog_prod_server/hooks/analysis_options.yaml index 3a6b5d4c4..c59316b7a 100644 --- a/bricks/dart_frog_prod_server/hooks/analysis_options.yaml +++ b/bricks/dart_frog_prod_server/hooks/analysis_options.yaml @@ -1,4 +1,4 @@ -include: package:very_good_analysis/analysis_options.6.0.0.yaml +include: package:very_good_analysis/analysis_options.7.0.0.yaml linter: rules: public_member_api_docs: false From 2ae3a53e88418500de9421d73517e1ade174e96c Mon Sep 17 00:00:00 2001 From: Tom Arra Date: Fri, 20 Dec 2024 11:23:50 -0600 Subject: [PATCH 4/4] analysis fixes --- .../dart_frog_prod_server/hooks/lib/src/create_bundle.dart | 2 +- .../hooks/lib/src/pubspec_lock/pubspec_lock.dart | 6 +++--- bricks/dart_frog_prod_server/hooks/pre_gen.dart | 2 +- bricks/dart_frog_prod_server/hooks/test/pubspec_locks.dart | 2 +- .../hooks/test/src/pubspec_lock/pubspec_lock_test.dart | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bricks/dart_frog_prod_server/hooks/lib/src/create_bundle.dart b/bricks/dart_frog_prod_server/hooks/lib/src/create_bundle.dart index 69d703367..72d2f8e4c 100644 --- a/bricks/dart_frog_prod_server/hooks/lib/src/create_bundle.dart +++ b/bricks/dart_frog_prod_server/hooks/lib/src/create_bundle.dart @@ -29,7 +29,7 @@ Future createBundle({ '${tempDirectory.path}${path.separator}', ); bundlingProgress.complete(); - } catch (error) { + } on Exception catch (error) { bundlingProgress.fail(); context.logger.err('$error'); return exit(1); diff --git a/bricks/dart_frog_prod_server/hooks/lib/src/pubspec_lock/pubspec_lock.dart b/bricks/dart_frog_prod_server/hooks/lib/src/pubspec_lock/pubspec_lock.dart index 8e5872bbd..f3d832310 100644 --- a/bricks/dart_frog_prod_server/hooks/lib/src/pubspec_lock/pubspec_lock.dart +++ b/bricks/dart_frog_prod_server/hooks/lib/src/pubspec_lock/pubspec_lock.dart @@ -3,7 +3,7 @@ /// This is used by the bundling process to check for those dependencies that /// are external path dependencies. Hence, it is not a complete parser, it only /// parses the information that is needed for the bundling process. -library pubspec_lock; +library; import 'dart:collection'; @@ -35,7 +35,7 @@ class PubspecLock { late final YamlMap yaml; try { yaml = loadYaml(content) as YamlMap; - } catch (_) { + } on Exception catch (_) { throw const PubspecLockParseException(); } @@ -53,7 +53,7 @@ class PubspecLock { data: entry.value as YamlMap, ); parsedPackages.add(package); - } catch (_) { + } on Exception catch (_) { // Ignore those packages that for some reason cannot be parsed. } } diff --git a/bricks/dart_frog_prod_server/hooks/pre_gen.dart b/bricks/dart_frog_prod_server/hooks/pre_gen.dart index 885184151..4e8caf88f 100644 --- a/bricks/dart_frog_prod_server/hooks/pre_gen.dart +++ b/bricks/dart_frog_prod_server/hooks/pre_gen.dart @@ -48,7 +48,7 @@ Future preGen( final RouteConfiguration configuration; try { configuration = buildConfiguration(projectDirectory); - } catch (error) { + } on Exception catch (error) { context.logger.err('$error'); return exit(1); } diff --git a/bricks/dart_frog_prod_server/hooks/test/pubspec_locks.dart b/bricks/dart_frog_prod_server/hooks/test/pubspec_locks.dart index db375c594..b35583e41 100644 --- a/bricks/dart_frog_prod_server/hooks/test/pubspec_locks.dart +++ b/bricks/dart_frog_prod_server/hooks/test/pubspec_locks.dart @@ -1,5 +1,5 @@ /// Collection of `pubspec.lock` files used as fixtures during testing. -library pubspec_locks; +library; /// An artificially crafted `pubspec.lock` file with: /// diff --git a/bricks/dart_frog_prod_server/hooks/test/src/pubspec_lock/pubspec_lock_test.dart b/bricks/dart_frog_prod_server/hooks/test/src/pubspec_lock/pubspec_lock_test.dart index f5e59360a..07c09acf0 100644 --- a/bricks/dart_frog_prod_server/hooks/test/src/pubspec_lock/pubspec_lock_test.dart +++ b/bricks/dart_frog_prod_server/hooks/test/src/pubspec_lock/pubspec_lock_test.dart @@ -1,3 +1,4 @@ +// Not required for test files // ignore_for_file: prefer_const_constructors import 'package:dart_frog_prod_server_hooks/src/pubspec_lock/pubspec_lock.dart';