From 7752833988f3a1c8035f940390ca435aebf88b8f Mon Sep 17 00:00:00 2001 From: Kathy Walrath Date: Fri, 20 Jul 2018 15:30:09 -0700 Subject: [PATCH] Disable the angular analyzer (#562) Also: * Update version to 3.1.1 * Temporary disable Travis job that uses dart_coveralls Contributes to #561. --- CHANGELOG.md | 6 ++++++ lib/src/cli_app.g.dart | 2 +- lib/src/generators/web_angular.g.dart | 16 +++++++++------- pubspec.yaml | 2 +- templates/web-angular/analysis_options.yaml | 6 ++++-- test/validate_templates.dart | 6 ++++-- tool/travis.sh | 21 +++++++++++---------- 7 files changed, 36 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6f6bd62..1167f97d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 3.1.1 + +- `web-angular` template: Disabled the Angular analyzer plugin. To re-enable + the plugin, edit `analysis_options.yaml` and uncomment the two lines + `plugins: ... angular`. + ## 3.1.0 - Set max SDK version to <3.0.0 everywhere. diff --git a/lib/src/cli_app.g.dart b/lib/src/cli_app.g.dart index b3180552..008c3276 100644 --- a/lib/src/cli_app.g.dart +++ b/lib/src/cli_app.g.dart @@ -10,4 +10,4 @@ part of 'cli_app.dart'; // VersionGenerator // ************************************************************************** -const appVersion = '3.1.0'; +const appVersion = '3.1.1'; diff --git a/lib/src/generators/web_angular.g.dart b/lib/src/generators/web_angular.g.dart index e8dd11e4..67ca5adf 100644 --- a/lib/src/generators/web_angular.g.dart +++ b/lib/src/generators/web_angular.g.dart @@ -35,13 +35,15 @@ YXN0ZXIvTElDRU5TRSkuCg==''', 'text', ''' YW5hbHl6ZXI6CiAgZXhjbHVkZTogW2J1aWxkLyoqXQogIGVycm9yczoKICAgIHVyaV9oYXNfbm90 -X2JlZW5fZ2VuZXJhdGVkOiBpZ25vcmUKICBwbHVnaW5zOgogICAgLSBhbmd1bGFyCgojIExpbnQg -cnVsZXMgYW5kIGRvY3VtZW50YXRpb24sIHNlZSBodHRwOi8vZGFydC1sYW5nLmdpdGh1Yi5pby9s -aW50ZXIvbGludHMKbGludGVyOgogIHJ1bGVzOgogICAgLSBjYW5jZWxfc3Vic2NyaXB0aW9ucwog -ICAgLSBoYXNoX2FuZF9lcXVhbHMKICAgIC0gaXRlcmFibGVfY29udGFpbnNfdW5yZWxhdGVkX3R5 -cGUKICAgIC0gbGlzdF9yZW1vdmVfdW5yZWxhdGVkX3R5cGUKICAgIC0gdGVzdF90eXBlc19pbl9l -cXVhbHMKICAgIC0gdW5yZWxhdGVkX3R5cGVfZXF1YWxpdHlfY2hlY2tzCiAgICAtIHZhbGlkX3Jl -Z2V4cHMK''', +X2JlZW5fZ2VuZXJhdGVkOiBpZ25vcmUKICAjIEFuZ3VsYXIgcGx1Z2luIHN1cHBvcnQgaXMgaW4g +YmV0YS4gWW91J3JlIHdlbGNvbWUgdG8gdHJ5IGl0IGFuZCByZXBvcnQKICAjIGlzc3VlczogaHR0 +cHM6Ly9naXRodWIuY29tL2RhcnQtbGFuZy9hbmd1bGFyX2FuYWx5emVyX3BsdWdpbi9pc3N1ZXMK +ICAjIHBsdWdpbnM6CiAgICAjIC0gYW5ndWxhcgoKIyBMaW50IHJ1bGVzIGFuZCBkb2N1bWVudGF0 +aW9uLCBzZWUgaHR0cDovL2RhcnQtbGFuZy5naXRodWIuaW8vbGludGVyL2xpbnRzCmxpbnRlcjoK +ICBydWxlczoKICAgIC0gY2FuY2VsX3N1YnNjcmlwdGlvbnMKICAgIC0gaGFzaF9hbmRfZXF1YWxz +CiAgICAtIGl0ZXJhYmxlX2NvbnRhaW5zX3VucmVsYXRlZF90eXBlCiAgICAtIGxpc3RfcmVtb3Zl +X3VucmVsYXRlZF90eXBlCiAgICAtIHRlc3RfdHlwZXNfaW5fZXF1YWxzCiAgICAtIHVucmVsYXRl +ZF90eXBlX2VxdWFsaXR5X2NoZWNrcwogICAgLSB2YWxpZF9yZWdleHBzCg==''', 'lib/app_component.css', 'text', ''' diff --git a/pubspec.yaml b/pubspec.yaml index e44f65de..1d0dff8e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,7 +7,7 @@ name: stagehand description: > A scaffolding generator for your Dart projects. Stagehand helps you get set up! -version: 3.1.0 +version: 3.1.1 homepage: https://github.com/dart-lang/stagehand author: Dart Team diff --git a/templates/web-angular/analysis_options.yaml b/templates/web-angular/analysis_options.yaml index b8cd5175..d7333e19 100644 --- a/templates/web-angular/analysis_options.yaml +++ b/templates/web-angular/analysis_options.yaml @@ -2,8 +2,10 @@ analyzer: exclude: [build/**] errors: uri_has_not_been_generated: ignore - plugins: - - angular + # Angular plugin support is in beta. You're welcome to try it and report + # issues: https://github.com/dart-lang/angular_analyzer_plugin/issues + # plugins: + # - angular # Lint rules and documentation, see http://dart-lang.github.io/linter/lints linter: diff --git a/test/validate_templates.dart b/test/validate_templates.dart index 83798175..f02b4035 100644 --- a/test/validate_templates.dart +++ b/test/validate_templates.dart @@ -36,8 +36,10 @@ final String _expectedAngularAnalysisOptions = [ ' exclude: [build/**]', ' errors:', ' uri_has_not_been_generated: ignore', - ' plugins:', - ' - angular', + " # Angular plugin support is in beta. You're welcome to try it and report", + ' # issues: https://github.com/dart-lang/angular_analyzer_plugin/issues', + ' # plugins:', + ' # - angular', _expectedAnalysisOptions.split('\n').skip(3), ].expand((e) => e is Iterable ? e : [e]).join('\n'); diff --git a/tool/travis.sh b/tool/travis.sh index 7adb41d1..86bfd989 100755 --- a/tool/travis.sh +++ b/tool/travis.sh @@ -43,14 +43,15 @@ travis_fold start validate_templates pub run test test/validate_templates.dart travis_fold end validate_templates +# DISABLED due to https://github.com/block-forest/dart-coveralls/issues/81. # Install dart_coveralls; gather and send coverage data. -if [ "$COVERALLS_TOKEN" ]; then - travis_fold start dart_coveralls - pub global activate dart_coveralls - pub global run dart_coveralls report \ - --token $COVERALLS_TOKEN \ - --retry 2 \ - --exclude-test-files \ - test/all.dart - travis_fold end dart_coveralls -fi +# if [ "$COVERALLS_TOKEN" ]; then + # travis_fold start dart_coveralls + # pub global activate dart_coveralls + # pub global run dart_coveralls report \ + # --token $COVERALLS_TOKEN \ + # --retry 2 \ + # --exclude-test-files \ + # test/all.dart + # travis_fold end dart_coveralls +# fi