From 00106501a5a5b9dcc18d67c8c5f9b033495d0eb0 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 14 Mar 2022 08:52:16 -0700 Subject: [PATCH 1/2] support null stack traces coming from the build_runner script isolate --- build_runner/CHANGELOG.md | 4 +++- build_runner/lib/src/build_script_generate/bootstrap.dart | 2 +- build_runner/pubspec.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build_runner/CHANGELOG.md b/build_runner/CHANGELOG.md index a53124ba8..5c8398e67 100644 --- a/build_runner/CHANGELOG.md +++ b/build_runner/CHANGELOG.md @@ -1,4 +1,6 @@ -## 2.1.8-dev +## 2.1.8 + +- Support null stack traces coming from the build runner script isolate. ## 2.1.7 diff --git a/build_runner/lib/src/build_script_generate/bootstrap.dart b/build_runner/lib/src/build_script_generate/bootstrap.dart index 24fb40a90..97bb290d8 100644 --- a/build_runner/lib/src/build_script_generate/bootstrap.dart +++ b/build_runner/lib/src/build_script_generate/bootstrap.dart @@ -74,7 +74,7 @@ Future generateAndRun( messagePort = ReceivePort(); errorListener = errorPort.listen((e) { final error = e[0] as Object? ?? NullThrownError(); - final trace = Trace.parse(e[1] as String).terse; + final trace = Trace.parse(e[1] as String? ?? '').terse; handleUncaughtError(error, trace); if (scriptExitCode == 0) scriptExitCode = 1; diff --git a/build_runner/pubspec.yaml b/build_runner/pubspec.yaml index 09e5ba3b3..62b469933 100644 --- a/build_runner/pubspec.yaml +++ b/build_runner/pubspec.yaml @@ -1,5 +1,5 @@ name: build_runner -version: 2.1.8-dev +version: 2.1.8 description: A build system for Dart code generation and modular compilation. repository: https://github.com/dart-lang/build/tree/master/build_runner From 510a3308b10a2fc0cecc7e8c19de485f4f8b6533 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 14 Mar 2022 09:08:09 -0700 Subject: [PATCH 2/2] format with the latest dartfmt --- build_daemon/lib/constants.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/build_daemon/lib/constants.dart b/build_daemon/lib/constants.dart index 11f7ae80a..94990782a 100644 --- a/build_daemon/lib/constants.dart +++ b/build_daemon/lib/constants.dart @@ -11,6 +11,7 @@ const versionSkew = 'DIFFERENT RUNNING VERSION'; const optionsSkew = 'DIFFERENT OPTIONS'; const buildModeFlag = 'build-mode'; + enum BuildMode { // ignore: constant_identifier_names Manual,