From d90163322244f86d94724ac9bbf5e1a2aa721835 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 21:31:18 +0000 Subject: [PATCH 1/6] chore(deps): bump very_good_analysis in /packages/dart_frog_cli 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] --- packages/dart_frog_cli/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/dart_frog_cli/pubspec.yaml b/packages/dart_frog_cli/pubspec.yaml index 23083323b..0932f5ffd 100644 --- a/packages/dart_frog_cli/pubspec.yaml +++ b/packages/dart_frog_cli/pubspec.yaml @@ -34,7 +34,7 @@ dev_dependencies: build_version: ^2.1.1 mocktail: ^1.0.4 test: ^1.25.8 - very_good_analysis: ^6.0.0 + very_good_analysis: ">=6.0.0 <8.0.0" executables: dart_frog: From 4cb2bcceafb3a583d7c462c0ce81604e69179455 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 22:02:59 +0000 Subject: [PATCH 2/6] chore(deps): bump very_good_analysis in /packages/dart_frog_cli 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] --- packages/dart_frog_cli/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/dart_frog_cli/pubspec.yaml b/packages/dart_frog_cli/pubspec.yaml index 23083323b..0932f5ffd 100644 --- a/packages/dart_frog_cli/pubspec.yaml +++ b/packages/dart_frog_cli/pubspec.yaml @@ -34,7 +34,7 @@ dev_dependencies: build_version: ^2.1.1 mocktail: ^1.0.4 test: ^1.25.8 - very_good_analysis: ^6.0.0 + very_good_analysis: ">=6.0.0 <8.0.0" executables: dart_frog: From ac7d3a44a24fa077fbbaa62fd7da830ad788aad0 Mon Sep 17 00:00:00 2001 From: Tom Arra Date: Wed, 18 Dec 2024 16:08:08 -0600 Subject: [PATCH 3/6] update all of dart frog cli --- packages/dart_frog_cli/analysis_options.yaml | 2 +- packages/dart_frog_cli/e2e/analysis_options.yaml | 2 +- packages/dart_frog_cli/e2e/pubspec.yaml | 2 +- packages/dart_frog_cli/pubspec.yaml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/dart_frog_cli/analysis_options.yaml b/packages/dart_frog_cli/analysis_options.yaml index 17fe72a76..34f3e6872 100644 --- a/packages/dart_frog_cli/analysis_options.yaml +++ b/packages/dart_frog_cli/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 analyzer: exclude: - lib/src/version.dart diff --git a/packages/dart_frog_cli/e2e/analysis_options.yaml b/packages/dart_frog_cli/e2e/analysis_options.yaml index bb7209144..c2f4cbbca 100644 --- a/packages/dart_frog_cli/e2e/analysis_options.yaml +++ b/packages/dart_frog_cli/e2e/analysis_options.yaml @@ -1 +1 @@ -include: package:very_good_analysis/analysis_options.6.0.0.yaml +include: package:very_good_analysis/analysis_options.7.0.0.yaml diff --git a/packages/dart_frog_cli/e2e/pubspec.yaml b/packages/dart_frog_cli/e2e/pubspec.yaml index 3349f4732..954555c5d 100644 --- a/packages/dart_frog_cli/e2e/pubspec.yaml +++ b/packages/dart_frog_cli/e2e/pubspec.yaml @@ -14,4 +14,4 @@ dev_dependencies: meta: ^1.7.0 path: ^1.8.2 test: ^1.19.2 - very_good_analysis: ^6.0.0 + very_good_analysis: ^7.0.0 diff --git a/packages/dart_frog_cli/pubspec.yaml b/packages/dart_frog_cli/pubspec.yaml index 0932f5ffd..be0cc90fb 100644 --- a/packages/dart_frog_cli/pubspec.yaml +++ b/packages/dart_frog_cli/pubspec.yaml @@ -8,7 +8,7 @@ documentation: https://dartfrog.vgv.dev/docs/overview topics: [server, backend, shelf, dart-frog, cli] screenshots: - - description: 'Dart Frog logo.' + - description: "Dart Frog logo." path: assets/logo.png environment: @@ -34,7 +34,7 @@ dev_dependencies: build_version: ^2.1.1 mocktail: ^1.0.4 test: ^1.25.8 - very_good_analysis: ">=6.0.0 <8.0.0" + very_good_analysis: ^7.0.0 executables: dart_frog: From 626ff0de46fffcb11750c58aa7f643dfe72a2da7 Mon Sep 17 00:00:00 2001 From: Tom Arra Date: Wed, 18 Dec 2024 16:12:34 -0600 Subject: [PATCH 4/6] analyzer fixes --- packages/dart_frog_cli/lib/dart_frog_cli.dart | 2 +- packages/dart_frog_cli/lib/src/command_runner.dart | 4 ++-- packages/dart_frog_cli/lib/src/commands/build/build.dart | 2 +- packages/dart_frog_cli/lib/src/commands/dev/dev.dart | 2 +- packages/dart_frog_cli/lib/src/commands/update/update.dart | 4 ++-- .../lib/src/daemon/domain/dev_server_domain.dart | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/dart_frog_cli/lib/dart_frog_cli.dart b/packages/dart_frog_cli/lib/dart_frog_cli.dart index 95bfc8bba..d55e0f9ce 100644 --- a/packages/dart_frog_cli/lib/dart_frog_cli.dart +++ b/packages/dart_frog_cli/lib/dart_frog_cli.dart @@ -7,4 +7,4 @@ /// # 👀 See usage /// dart_frog --help /// ``` -library dart_frog_cli; +library; diff --git a/packages/dart_frog_cli/lib/src/command_runner.dart b/packages/dart_frog_cli/lib/src/command_runner.dart index ed670ef6d..80fecf471 100644 --- a/packages/dart_frog_cli/lib/src/command_runner.dart +++ b/packages/dart_frog_cli/lib/src/command_runner.dart @@ -73,7 +73,7 @@ class DartFrogCommandRunner extends CompletionCommandRunner { late final int exitCode; try { exitCode = await runCommand(argResults) ?? ExitCode.success.code; - } catch (error) { + } on Exception catch (error) { _logger.err('$error'); exitCode = ExitCode.software.code; } @@ -123,7 +123,7 @@ ${lightYellow.wrap('Changelog:')} $changelogLink Run ${lightCyan.wrap('$executableName update')} to update''', ); } - } catch (error, stackTrace) { + } on Exception catch (error, stackTrace) { _logger.detail( '[updater] update check error.\n$error\n$stackTrace', ); diff --git a/packages/dart_frog_cli/lib/src/commands/build/build.dart b/packages/dart_frog_cli/lib/src/commands/build/build.dart index a6de875a2..cde13ba07 100644 --- a/packages/dart_frog_cli/lib/src/commands/build/build.dart +++ b/packages/dart_frog_cli/lib/src/commands/build/build.dart @@ -49,7 +49,7 @@ class BuildCommand extends DartFrogCommand { try { return (await builder.build()).code; - } catch (e) { + } on Exception catch (e) { logger.err(e.toString()); return ExitCode.software.code; } diff --git a/packages/dart_frog_cli/lib/src/commands/dev/dev.dart b/packages/dart_frog_cli/lib/src/commands/dev/dev.dart index 80f60cd90..cc78c277b 100644 --- a/packages/dart_frog_cli/lib/src/commands/dev/dev.dart +++ b/packages/dart_frog_cli/lib/src/commands/dev/dev.dart @@ -133,7 +133,7 @@ class DevCommand extends DartFrogCommand { try { await _devServerRunner.start(); return (await _devServerRunner.exitCode).code; - } catch (e) { + } on Exception catch (e) { logger.err(e.toString()); return ExitCode.software.code; } finally { diff --git a/packages/dart_frog_cli/lib/src/commands/update/update.dart b/packages/dart_frog_cli/lib/src/commands/update/update.dart index c1c2c115f..532ceddab 100644 --- a/packages/dart_frog_cli/lib/src/commands/update/update.dart +++ b/packages/dart_frog_cli/lib/src/commands/update/update.dart @@ -43,7 +43,7 @@ class UpdateCommand extends DartFrogCommand { late final String latestVersion; try { latestVersion = await _pubUpdater.getLatestVersion(packageName); - } catch (error) { + } on Exception catch (error) { updateCheckProgress.fail(); _logger.err('$error'); return ExitCode.software.code; @@ -70,7 +70,7 @@ class UpdateCommand extends DartFrogCommand { packageName: packageName, versionConstraint: latestVersion, ); - } catch (error) { + } on Exception catch (error) { updateProgress.fail(); _logger.err('$error'); return ExitCode.software.code; diff --git a/packages/dart_frog_cli/lib/src/daemon/domain/dev_server_domain.dart b/packages/dart_frog_cli/lib/src/daemon/domain/dev_server_domain.dart index d9b9e2dd6..ddac60885 100644 --- a/packages/dart_frog_cli/lib/src/daemon/domain/dev_server_domain.dart +++ b/packages/dart_frog_cli/lib/src/daemon/domain/dev_server_domain.dart @@ -115,7 +115,7 @@ class DevServerDomain extends DomainBase { 'applicationId': applicationId, }, ); - } catch (e) { + } on Exception catch (e) { return DaemonResponse.error( id: request.id, error: { From 4e97888801fd2a0cfc93ef35a1d69d81a4ee581e Mon Sep 17 00:00:00 2001 From: Tom Arra Date: Wed, 18 Dec 2024 17:43:06 -0600 Subject: [PATCH 5/6] analysis fixes --- .../lib/src/daemon/domain/dev_server_domain.dart | 4 ++-- .../lib/src/daemon/domain/route_configuration_domain.dart | 2 +- .../route_configuration_watcher.dart | 2 +- .../dart_frog_cli/test/src/runtime_compatibility_test.dart | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/dart_frog_cli/lib/src/daemon/domain/dev_server_domain.dart b/packages/dart_frog_cli/lib/src/daemon/domain/dev_server_domain.dart index ddac60885..1a6fd7027 100644 --- a/packages/dart_frog_cli/lib/src/daemon/domain/dev_server_domain.dart +++ b/packages/dart_frog_cli/lib/src/daemon/domain/dev_server_domain.dart @@ -149,7 +149,7 @@ class DevServerDomain extends DomainBase { 'applicationId': applicationId, }, ); - } catch (e) { + } on Exception catch (e) { return DaemonResponse.error( id: request.id, error: { @@ -186,7 +186,7 @@ class DevServerDomain extends DomainBase { 'exitCode': exitCode.code, }, ); - } catch (e) { + } on Exception catch (e) { if (!runner.isCompleted) { _devServerRunners[applicationId] = runner; } diff --git a/packages/dart_frog_cli/lib/src/daemon/domain/route_configuration_domain.dart b/packages/dart_frog_cli/lib/src/daemon/domain/route_configuration_domain.dart index 131eb2d0d..fb9e63460 100644 --- a/packages/dart_frog_cli/lib/src/daemon/domain/route_configuration_domain.dart +++ b/packages/dart_frog_cli/lib/src/daemon/domain/route_configuration_domain.dart @@ -183,7 +183,7 @@ class RouteConfigurationDomain extends DomainBase { 'exitCode': exitCode.code, }, ); - } catch (e) { + } on Exception catch (e) { if (!watcher.isCompleted) { _routeConfigurationWatchers[watcherId] = watcher; } diff --git a/packages/dart_frog_cli/lib/src/route_configuration_watcher/route_configuration_watcher.dart b/packages/dart_frog_cli/lib/src/route_configuration_watcher/route_configuration_watcher.dart index 32b4bb55a..c57a3f397 100644 --- a/packages/dart_frog_cli/lib/src/route_configuration_watcher/route_configuration_watcher.dart +++ b/packages/dart_frog_cli/lib/src/route_configuration_watcher/route_configuration_watcher.dart @@ -152,7 +152,7 @@ class RouteConfigurationWatcher { final projectDirectory = workingDirectory; try { routeConfiguration = _routeConfigurationBuilder(projectDirectory); - } catch (error) { + } on Exception catch (error) { logger.err('$error'); return null; } diff --git a/packages/dart_frog_cli/test/src/runtime_compatibility_test.dart b/packages/dart_frog_cli/test/src/runtime_compatibility_test.dart index 387ae1367..204f18d1d 100644 --- a/packages/dart_frog_cli/test/src/runtime_compatibility_test.dart +++ b/packages/dart_frog_cli/test/src/runtime_compatibility_test.dart @@ -55,7 +55,7 @@ void main() { tearDown(() { try { tempDir.deleteSync(recursive: true); - } catch (_) {} + } on Exception catch (_) {} }); test('throws when a pubspec.yaml does not exist', () { From d46573cb3e9f12b0aa526b06c59787e3a73ce7ce Mon Sep 17 00:00:00 2001 From: Tom Arra Date: Fri, 20 Dec 2024 11:13:47 -0600 Subject: [PATCH 6/6] exception catch --- .../lib/src/daemon/domain/route_configuration_domain.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/dart_frog_cli/lib/src/daemon/domain/route_configuration_domain.dart b/packages/dart_frog_cli/lib/src/daemon/domain/route_configuration_domain.dart index fb9e63460..bb7b8e3da 100644 --- a/packages/dart_frog_cli/lib/src/daemon/domain/route_configuration_domain.dart +++ b/packages/dart_frog_cli/lib/src/daemon/domain/route_configuration_domain.dart @@ -83,7 +83,7 @@ class RouteConfigurationDomain extends DomainBase { }, ), ); - } catch (e) { + } on Exception catch (e) { return DaemonResponse.error( id: request.id, error: {