From b94dc91efda6519d29c8e6e483192f75a40f77cd Mon Sep 17 00:00:00 2001 From: pq Date: Wed, 16 Jan 2019 10:49:17 -0800 Subject: [PATCH 1/8] migrate template defaults to use package:pedantic for lints --- templates/console-full/pubspec.yaml | 1 + templates/package-simple/pubspec.yaml | 1 + templates/server-shelf/analysis_options.yaml | 21 ++++++++++---------- templates/server-shelf/pubspec.yaml | 3 ++- templates/web-angular/pubspec.yaml | 1 + templates/web-simple/pubspec.yaml | 1 + templates/web-stagexl/pubspec.yaml | 1 + 7 files changed, 17 insertions(+), 12 deletions(-) diff --git a/templates/console-full/pubspec.yaml b/templates/console-full/pubspec.yaml index ec469621..f3640fca 100644 --- a/templates/console-full/pubspec.yaml +++ b/templates/console-full/pubspec.yaml @@ -11,4 +11,5 @@ environment: # path: ^1.4.1 dev_dependencies: + pedantic: ^1.0.0 test: ^1.0.0 diff --git a/templates/package-simple/pubspec.yaml b/templates/package-simple/pubspec.yaml index 76d13a3e..4ea83403 100644 --- a/templates/package-simple/pubspec.yaml +++ b/templates/package-simple/pubspec.yaml @@ -11,4 +11,5 @@ environment: # path: ^1.4.1 dev_dependencies: + pedantic: ^1.0.0 test: ^1.0.0 diff --git a/templates/server-shelf/analysis_options.yaml b/templates/server-shelf/analysis_options.yaml index 97d4b470..27bed585 100644 --- a/templates/server-shelf/analysis_options.yaml +++ b/templates/server-shelf/analysis_options.yaml @@ -1,14 +1,13 @@ +# Defines a reasonable default set of lint rules. +# For details and rationale, see: https://github.com/dart-lang/pedantic#enabled-lints. +include: package:pedantic/analysis_options.yaml + +# For lint rules and documentation, see http://dart-lang.github.io/linter/lints. +# Uncomment to specify additional rules. +# linter: +# rules: +# - camel_case_types + analyzer: # exclude: # - path/to/excluded/files/** - -# Lint rules and documentation, see http://dart-lang.github.io/linter/lints -linter: - rules: - - cancel_subscriptions - - hash_and_equals - - iterable_contains_unrelated_type - - list_remove_unrelated_type - - test_types_in_equals - - unrelated_type_equality_checks - - valid_regexps diff --git a/templates/server-shelf/pubspec.yaml b/templates/server-shelf/pubspec.yaml index a338938e..5fff7cf7 100644 --- a/templates/server-shelf/pubspec.yaml +++ b/templates/server-shelf/pubspec.yaml @@ -11,5 +11,6 @@ dependencies: args: ^1.4.2 shelf: ^0.7.2 -#dev_dependencies: +dev_dependencies: + pedantic: ^1.0.0 # test: ^1.0.0 diff --git a/templates/web-angular/pubspec.yaml b/templates/web-angular/pubspec.yaml index 37de2ffa..c6b46b40 100644 --- a/templates/web-angular/pubspec.yaml +++ b/templates/web-angular/pubspec.yaml @@ -16,4 +16,5 @@ dev_dependencies: build_runner: ^1.1.2 build_test: ^0.10.3 build_web_compilers: ^1.0.0 + pedantic: ^1.0.0 test: ^1.5.1 diff --git a/templates/web-simple/pubspec.yaml b/templates/web-simple/pubspec.yaml index 2bcb3b2e..c9a449c9 100644 --- a/templates/web-simple/pubspec.yaml +++ b/templates/web-simple/pubspec.yaml @@ -13,3 +13,4 @@ environment: dev_dependencies: build_runner: ^1.1.2 build_web_compilers: ^1.0.0 + pedantic: ^1.0.0 diff --git a/templates/web-stagexl/pubspec.yaml b/templates/web-stagexl/pubspec.yaml index f6f49813..60689e9f 100644 --- a/templates/web-stagexl/pubspec.yaml +++ b/templates/web-stagexl/pubspec.yaml @@ -13,3 +13,4 @@ dependencies: dev_dependencies: build_runner: ^1.1.2 build_web_compilers: ^1.0.0 + pedantic: ^1.0.0 From 3394497c1404d6cb820761572bb30114fd5127cb Mon Sep 17 00:00:00 2001 From: pq Date: Fri, 18 Jan 2019 10:28:10 -0800 Subject: [PATCH 2/8] inline rules --- templates/server-shelf/analysis_options.yaml | 38 +++++++++++++++----- templates/server-shelf/pubspec.yaml | 2 +- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/templates/server-shelf/analysis_options.yaml b/templates/server-shelf/analysis_options.yaml index 27bed585..e611b3d4 100644 --- a/templates/server-shelf/analysis_options.yaml +++ b/templates/server-shelf/analysis_options.yaml @@ -1,12 +1,34 @@ -# Defines a reasonable default set of lint rules. -# For details and rationale, see: https://github.com/dart-lang/pedantic#enabled-lints. -include: package:pedantic/analysis_options.yaml +# Google-default lint rules as defined in package:pedantic. +# See: https://github.com/dart-lang/pedantic for rationale +# and details. +linter: + # For additional lint rules and documentation, see + # http://dart-lang.github.io/linter/lints. + rules: + - avoid_empty_else + - avoid_init_to_null + - avoid_relative_lib_imports + - avoid_return_types_on_setters + - avoid_types_as_parameter_names + - no_duplicate_case_values + - null_closures + - prefer_contains + - prefer_equal_for_default_values + - prefer_is_empty + - prefer_is_not_empty + - recursive_getters + - unrelated_type_equality_checks + - use_rethrow_when_possible + - unawaited_futures + - valid_regexps -# For lint rules and documentation, see http://dart-lang.github.io/linter/lints. -# Uncomment to specify additional rules. -# linter: -# rules: -# - camel_case_types +# The equivalent rules can be included by removing this list +# and including the pedantic options file like this: +# +# include: package:pedantic/analysis_options.yaml +# +# (Note that this will require you to add package:pedantic +# to your pubspec.yaml.) analyzer: # exclude: diff --git a/templates/server-shelf/pubspec.yaml b/templates/server-shelf/pubspec.yaml index 5fff7cf7..516b460e 100644 --- a/templates/server-shelf/pubspec.yaml +++ b/templates/server-shelf/pubspec.yaml @@ -12,5 +12,5 @@ dependencies: shelf: ^0.7.2 dev_dependencies: - pedantic: ^1.0.0 +# pedantic: ^1.0.0 # test: ^1.0.0 From 5f2db09adbaf7d25135cf10b3ceea89ae31634e9 Mon Sep 17 00:00:00 2001 From: pq Date: Fri, 18 Jan 2019 10:31:19 -0800 Subject: [PATCH 3/8] removed pedantic dep --- templates/console-full/pubspec.yaml | 2 +- templates/package-simple/pubspec.yaml | 2 +- templates/web-angular/pubspec.yaml | 2 +- templates/web-simple/pubspec.yaml | 2 +- templates/web-stagexl/pubspec.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/console-full/pubspec.yaml b/templates/console-full/pubspec.yaml index f3640fca..06205059 100644 --- a/templates/console-full/pubspec.yaml +++ b/templates/console-full/pubspec.yaml @@ -11,5 +11,5 @@ environment: # path: ^1.4.1 dev_dependencies: - pedantic: ^1.0.0 + # pedantic: ^1.0.0 test: ^1.0.0 diff --git a/templates/package-simple/pubspec.yaml b/templates/package-simple/pubspec.yaml index 4ea83403..fbed4c5e 100644 --- a/templates/package-simple/pubspec.yaml +++ b/templates/package-simple/pubspec.yaml @@ -11,5 +11,5 @@ environment: # path: ^1.4.1 dev_dependencies: - pedantic: ^1.0.0 + # pedantic: ^1.0.0 test: ^1.0.0 diff --git a/templates/web-angular/pubspec.yaml b/templates/web-angular/pubspec.yaml index c6b46b40..11021f50 100644 --- a/templates/web-angular/pubspec.yaml +++ b/templates/web-angular/pubspec.yaml @@ -16,5 +16,5 @@ dev_dependencies: build_runner: ^1.1.2 build_test: ^0.10.3 build_web_compilers: ^1.0.0 - pedantic: ^1.0.0 + # pedantic: ^1.0.0 test: ^1.5.1 diff --git a/templates/web-simple/pubspec.yaml b/templates/web-simple/pubspec.yaml index c9a449c9..8ffd0ac5 100644 --- a/templates/web-simple/pubspec.yaml +++ b/templates/web-simple/pubspec.yaml @@ -13,4 +13,4 @@ environment: dev_dependencies: build_runner: ^1.1.2 build_web_compilers: ^1.0.0 - pedantic: ^1.0.0 + # pedantic: ^1.0.0 diff --git a/templates/web-stagexl/pubspec.yaml b/templates/web-stagexl/pubspec.yaml index 60689e9f..8f896116 100644 --- a/templates/web-stagexl/pubspec.yaml +++ b/templates/web-stagexl/pubspec.yaml @@ -13,4 +13,4 @@ dependencies: dev_dependencies: build_runner: ^1.1.2 build_web_compilers: ^1.0.0 - pedantic: ^1.0.0 + # pedantic: ^1.0.0 From 6bee6836fc922a1b02fce9772172eeb427162408 Mon Sep 17 00:00:00 2001 From: pq Date: Fri, 18 Jan 2019 11:08:05 -0800 Subject: [PATCH 4/8] version details --- templates/server-shelf/analysis_options.yaml | 6 +++--- templates/server-shelf/pubspec.yaml | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/templates/server-shelf/analysis_options.yaml b/templates/server-shelf/analysis_options.yaml index e611b3d4..7b88f27f 100644 --- a/templates/server-shelf/analysis_options.yaml +++ b/templates/server-shelf/analysis_options.yaml @@ -1,6 +1,6 @@ -# Google-default lint rules as defined in package:pedantic. -# See: https://github.com/dart-lang/pedantic for rationale -# and details. +# Google-default lint rules as defined in package:pedantic (v1.4.0). +# See: https://github.com/dart-lang/pedantic for details and the +# latest ruleset. linter: # For additional lint rules and documentation, see # http://dart-lang.github.io/linter/lints. diff --git a/templates/server-shelf/pubspec.yaml b/templates/server-shelf/pubspec.yaml index 516b460e..17ed2b05 100644 --- a/templates/server-shelf/pubspec.yaml +++ b/templates/server-shelf/pubspec.yaml @@ -12,5 +12,8 @@ dependencies: shelf: ^0.7.2 dev_dependencies: +# include the latest pedantic rules # pedantic: ^1.0.0 +# alternatively, pin to a specific version, if you want to ensure that newly added rules can't break us +# pedantic: 1.4.0 # test: ^1.0.0 From 9d264325197ecc80dc993ddd53ac1bbbbbbbb6ac Mon Sep 17 00:00:00 2001 From: pq Date: Fri, 18 Jan 2019 15:31:58 -0800 Subject: [PATCH 5/8] => pedantic include --- templates/analysis_options.yaml | 22 +++++------ templates/console-full/analysis_options.yaml | 22 +++++------ templates/console-full/pubspec.yaml | 2 +- .../package-simple/analysis_options.yaml | 22 +++++------ templates/package-simple/pubspec.yaml | 2 +- templates/server-shelf/analysis_options.yaml | 39 +++++-------------- templates/server-shelf/pubspec.yaml | 6 +-- templates/web-angular/analysis_options.yaml | 22 +++++------ templates/web-angular/pubspec.yaml | 2 +- templates/web-simple/analysis_options.yaml | 22 +++++------ templates/web-simple/pubspec.yaml | 2 +- templates/web-stagexl/analysis_options.yaml | 22 +++++------ templates/web-stagexl/pubspec.yaml | 2 +- 13 files changed, 81 insertions(+), 106 deletions(-) diff --git a/templates/analysis_options.yaml b/templates/analysis_options.yaml index 97d4b470..7204c720 100644 --- a/templates/analysis_options.yaml +++ b/templates/analysis_options.yaml @@ -1,14 +1,14 @@ +# Defines a default set of lint rules enforced for +# projects at Google. For details and rationale, +# see: https://github.com/dart-lang/pedantic#enabled-lints. +include: package:pedantic/analysis_options.yaml + +# For lint rules and documentation, see http://dart-lang.github.io/linter/lints. +# Uncomment to specify additional rules. +# linter: +# rules: +# - camel_case_types + analyzer: # exclude: # - path/to/excluded/files/** - -# Lint rules and documentation, see http://dart-lang.github.io/linter/lints -linter: - rules: - - cancel_subscriptions - - hash_and_equals - - iterable_contains_unrelated_type - - list_remove_unrelated_type - - test_types_in_equals - - unrelated_type_equality_checks - - valid_regexps diff --git a/templates/console-full/analysis_options.yaml b/templates/console-full/analysis_options.yaml index 97d4b470..7204c720 100644 --- a/templates/console-full/analysis_options.yaml +++ b/templates/console-full/analysis_options.yaml @@ -1,14 +1,14 @@ +# Defines a default set of lint rules enforced for +# projects at Google. For details and rationale, +# see: https://github.com/dart-lang/pedantic#enabled-lints. +include: package:pedantic/analysis_options.yaml + +# For lint rules and documentation, see http://dart-lang.github.io/linter/lints. +# Uncomment to specify additional rules. +# linter: +# rules: +# - camel_case_types + analyzer: # exclude: # - path/to/excluded/files/** - -# Lint rules and documentation, see http://dart-lang.github.io/linter/lints -linter: - rules: - - cancel_subscriptions - - hash_and_equals - - iterable_contains_unrelated_type - - list_remove_unrelated_type - - test_types_in_equals - - unrelated_type_equality_checks - - valid_regexps diff --git a/templates/console-full/pubspec.yaml b/templates/console-full/pubspec.yaml index 06205059..f3640fca 100644 --- a/templates/console-full/pubspec.yaml +++ b/templates/console-full/pubspec.yaml @@ -11,5 +11,5 @@ environment: # path: ^1.4.1 dev_dependencies: - # pedantic: ^1.0.0 + pedantic: ^1.0.0 test: ^1.0.0 diff --git a/templates/package-simple/analysis_options.yaml b/templates/package-simple/analysis_options.yaml index 97d4b470..7204c720 100644 --- a/templates/package-simple/analysis_options.yaml +++ b/templates/package-simple/analysis_options.yaml @@ -1,14 +1,14 @@ +# Defines a default set of lint rules enforced for +# projects at Google. For details and rationale, +# see: https://github.com/dart-lang/pedantic#enabled-lints. +include: package:pedantic/analysis_options.yaml + +# For lint rules and documentation, see http://dart-lang.github.io/linter/lints. +# Uncomment to specify additional rules. +# linter: +# rules: +# - camel_case_types + analyzer: # exclude: # - path/to/excluded/files/** - -# Lint rules and documentation, see http://dart-lang.github.io/linter/lints -linter: - rules: - - cancel_subscriptions - - hash_and_equals - - iterable_contains_unrelated_type - - list_remove_unrelated_type - - test_types_in_equals - - unrelated_type_equality_checks - - valid_regexps diff --git a/templates/package-simple/pubspec.yaml b/templates/package-simple/pubspec.yaml index fbed4c5e..4ea83403 100644 --- a/templates/package-simple/pubspec.yaml +++ b/templates/package-simple/pubspec.yaml @@ -11,5 +11,5 @@ environment: # path: ^1.4.1 dev_dependencies: - # pedantic: ^1.0.0 + pedantic: ^1.0.0 test: ^1.0.0 diff --git a/templates/server-shelf/analysis_options.yaml b/templates/server-shelf/analysis_options.yaml index 7b88f27f..7204c720 100644 --- a/templates/server-shelf/analysis_options.yaml +++ b/templates/server-shelf/analysis_options.yaml @@ -1,34 +1,13 @@ -# Google-default lint rules as defined in package:pedantic (v1.4.0). -# See: https://github.com/dart-lang/pedantic for details and the -# latest ruleset. -linter: - # For additional lint rules and documentation, see - # http://dart-lang.github.io/linter/lints. - rules: - - avoid_empty_else - - avoid_init_to_null - - avoid_relative_lib_imports - - avoid_return_types_on_setters - - avoid_types_as_parameter_names - - no_duplicate_case_values - - null_closures - - prefer_contains - - prefer_equal_for_default_values - - prefer_is_empty - - prefer_is_not_empty - - recursive_getters - - unrelated_type_equality_checks - - use_rethrow_when_possible - - unawaited_futures - - valid_regexps +# Defines a default set of lint rules enforced for +# projects at Google. For details and rationale, +# see: https://github.com/dart-lang/pedantic#enabled-lints. +include: package:pedantic/analysis_options.yaml -# The equivalent rules can be included by removing this list -# and including the pedantic options file like this: -# -# include: package:pedantic/analysis_options.yaml -# -# (Note that this will require you to add package:pedantic -# to your pubspec.yaml.) +# For lint rules and documentation, see http://dart-lang.github.io/linter/lints. +# Uncomment to specify additional rules. +# linter: +# rules: +# - camel_case_types analyzer: # exclude: diff --git a/templates/server-shelf/pubspec.yaml b/templates/server-shelf/pubspec.yaml index 17ed2b05..87127fc9 100644 --- a/templates/server-shelf/pubspec.yaml +++ b/templates/server-shelf/pubspec.yaml @@ -12,8 +12,4 @@ dependencies: shelf: ^0.7.2 dev_dependencies: -# include the latest pedantic rules -# pedantic: ^1.0.0 -# alternatively, pin to a specific version, if you want to ensure that newly added rules can't break us -# pedantic: 1.4.0 -# test: ^1.0.0 + pedantic: ^1.0.0 diff --git a/templates/web-angular/analysis_options.yaml b/templates/web-angular/analysis_options.yaml index d7333e19..38348d76 100644 --- a/templates/web-angular/analysis_options.yaml +++ b/templates/web-angular/analysis_options.yaml @@ -1,3 +1,14 @@ +# Defines a default set of lint rules enforced for +# projects at Google. For details and rationale, +# see: https://github.com/dart-lang/pedantic#enabled-lints. +include: package:pedantic/analysis_options.yaml + +# For lint rules and documentation, see http://dart-lang.github.io/linter/lints. +# Uncomment to specify additional rules. +# linter: +# rules: +# - camel_case_types + analyzer: exclude: [build/**] errors: @@ -6,14 +17,3 @@ analyzer: # 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: - rules: - - cancel_subscriptions - - hash_and_equals - - iterable_contains_unrelated_type - - list_remove_unrelated_type - - test_types_in_equals - - unrelated_type_equality_checks - - valid_regexps diff --git a/templates/web-angular/pubspec.yaml b/templates/web-angular/pubspec.yaml index 11021f50..c6b46b40 100644 --- a/templates/web-angular/pubspec.yaml +++ b/templates/web-angular/pubspec.yaml @@ -16,5 +16,5 @@ dev_dependencies: build_runner: ^1.1.2 build_test: ^0.10.3 build_web_compilers: ^1.0.0 - # pedantic: ^1.0.0 + pedantic: ^1.0.0 test: ^1.5.1 diff --git a/templates/web-simple/analysis_options.yaml b/templates/web-simple/analysis_options.yaml index 97d4b470..7204c720 100644 --- a/templates/web-simple/analysis_options.yaml +++ b/templates/web-simple/analysis_options.yaml @@ -1,14 +1,14 @@ +# Defines a default set of lint rules enforced for +# projects at Google. For details and rationale, +# see: https://github.com/dart-lang/pedantic#enabled-lints. +include: package:pedantic/analysis_options.yaml + +# For lint rules and documentation, see http://dart-lang.github.io/linter/lints. +# Uncomment to specify additional rules. +# linter: +# rules: +# - camel_case_types + analyzer: # exclude: # - path/to/excluded/files/** - -# Lint rules and documentation, see http://dart-lang.github.io/linter/lints -linter: - rules: - - cancel_subscriptions - - hash_and_equals - - iterable_contains_unrelated_type - - list_remove_unrelated_type - - test_types_in_equals - - unrelated_type_equality_checks - - valid_regexps diff --git a/templates/web-simple/pubspec.yaml b/templates/web-simple/pubspec.yaml index 8ffd0ac5..c9a449c9 100644 --- a/templates/web-simple/pubspec.yaml +++ b/templates/web-simple/pubspec.yaml @@ -13,4 +13,4 @@ environment: dev_dependencies: build_runner: ^1.1.2 build_web_compilers: ^1.0.0 - # pedantic: ^1.0.0 + pedantic: ^1.0.0 diff --git a/templates/web-stagexl/analysis_options.yaml b/templates/web-stagexl/analysis_options.yaml index 97d4b470..7204c720 100644 --- a/templates/web-stagexl/analysis_options.yaml +++ b/templates/web-stagexl/analysis_options.yaml @@ -1,14 +1,14 @@ +# Defines a default set of lint rules enforced for +# projects at Google. For details and rationale, +# see: https://github.com/dart-lang/pedantic#enabled-lints. +include: package:pedantic/analysis_options.yaml + +# For lint rules and documentation, see http://dart-lang.github.io/linter/lints. +# Uncomment to specify additional rules. +# linter: +# rules: +# - camel_case_types + analyzer: # exclude: # - path/to/excluded/files/** - -# Lint rules and documentation, see http://dart-lang.github.io/linter/lints -linter: - rules: - - cancel_subscriptions - - hash_and_equals - - iterable_contains_unrelated_type - - list_remove_unrelated_type - - test_types_in_equals - - unrelated_type_equality_checks - - valid_regexps diff --git a/templates/web-stagexl/pubspec.yaml b/templates/web-stagexl/pubspec.yaml index 8f896116..60689e9f 100644 --- a/templates/web-stagexl/pubspec.yaml +++ b/templates/web-stagexl/pubspec.yaml @@ -13,4 +13,4 @@ dependencies: dev_dependencies: build_runner: ^1.1.2 build_web_compilers: ^1.0.0 - # pedantic: ^1.0.0 + pedantic: ^1.0.0 From bacd38ca1ffc4c1620bc9ce674bb3ccf7f4821fa Mon Sep 17 00:00:00 2001 From: pq Date: Fri, 18 Jan 2019 23:45:49 -0800 Subject: [PATCH 6/8] regenerated compressed templates --- lib/src/generators/console_full.g.dart | 18 ++++++++-------- lib/src/generators/package_simple.g.dart | 19 +++++++++-------- lib/src/generators/server_shelf.g.dart | 19 +++++++++-------- lib/src/generators/web_angular.g.dart | 26 +++++++++++++----------- lib/src/generators/web_simple.g.dart | 17 ++++++++-------- lib/src/generators/web_stagexl.g.dart | 17 ++++++++-------- 6 files changed, 62 insertions(+), 54 deletions(-) diff --git a/lib/src/generators/console_full.g.dart b/lib/src/generators/console_full.g.dart index 7e243902..139859b7 100644 --- a/lib/src/generators/console_full.g.dart +++ b/lib/src/generators/console_full.g.dart @@ -28,13 +28,14 @@ U0UpLgo=''', 'analysis_options.yaml', 'text', ''' -YW5hbHl6ZXI6CiMgICBleGNsdWRlOgojICAgICAtIHBhdGgvdG8vZXhjbHVkZWQvZmlsZXMvKioK -CiMgTGludCBydWxlcyBhbmQgZG9jdW1lbnRhdGlvbiwgc2VlIGh0dHA6Ly9kYXJ0LWxhbmcuZ2l0 -aHViLmlvL2xpbnRlci9saW50cwpsaW50ZXI6CiAgcnVsZXM6CiAgICAtIGNhbmNlbF9zdWJzY3Jp -cHRpb25zCiAgICAtIGhhc2hfYW5kX2VxdWFscwogICAgLSBpdGVyYWJsZV9jb250YWluc191bnJl -bGF0ZWRfdHlwZQogICAgLSBsaXN0X3JlbW92ZV91bnJlbGF0ZWRfdHlwZQogICAgLSB0ZXN0X3R5 -cGVzX2luX2VxdWFscwogICAgLSB1bnJlbGF0ZWRfdHlwZV9lcXVhbGl0eV9jaGVja3MKICAgIC0g -dmFsaWRfcmVnZXhwcwo=''', +IyBEZWZpbmVzIGEgZGVmYXVsdCBzZXQgb2YgbGludCBydWxlcyBlbmZvcmNlZCBmb3IKIyBwcm9q +ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlOiBodHRwczov +L2dpdGh1Yi5jb20vZGFydC1sYW5nL3BlZGFudGljI2VuYWJsZWQtbGludHMuCmluY2x1ZGU6IHBh +Y2thZ2U6cGVkYW50aWMvYW5hbHlzaXNfb3B0aW9ucy55YW1sCgojIEZvciBsaW50IHJ1bGVzIGFu +ZCBkb2N1bWVudGF0aW9uLCBzZWUgaHR0cDovL2RhcnQtbGFuZy5naXRodWIuaW8vbGludGVyL2xp +bnRzLgojIFVuY29tbWVudCB0byBzcGVjaWZ5IGFkZGl0aW9uYWwgcnVsZXMuCiMgbGludGVyOgoj +ICAgcnVsZXM6CiMgICAgIC0gY2FtZWxfY2FzZV90eXBlcwoKYW5hbHl6ZXI6CiMgICBleGNsdWRl +OgojICAgICAtIHBhdGgvdG8vZXhjbHVkZWQvZmlsZXMvKioK''', 'bin/main.dart', 'text', ''' @@ -51,7 +52,8 @@ bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNhbXBsZSBjb21tYW5kLWxpbmUg YXBwbGljYXRpb24uCiMgdmVyc2lvbjogMS4wLjAKIyBob21lcGFnZTogaHR0cHM6Ly93d3cuZXhh bXBsZS5jb20KIyBhdXRob3I6IF9fYXV0aG9yX18gPGVtYWlsQGV4YW1wbGUuY29tPgoKZW52aXJv bm1lbnQ6CiAgc2RrOiAnPj0yLjEuMCA8My4wLjAnCgojZGVwZW5kZW5jaWVzOgojICBwYXRoOiBe -MS40LjEKCmRldl9kZXBlbmRlbmNpZXM6CiAgdGVzdDogXjEuMC4wCg==''', +MS40LjEKCmRldl9kZXBlbmRlbmNpZXM6CiAgcGVkYW50aWM6IF4xLjAuMAogIHRlc3Q6IF4xLjAu +MAo=''', 'test/__projectName___test.dart', 'text', ''' diff --git a/lib/src/generators/package_simple.g.dart b/lib/src/generators/package_simple.g.dart index 048841a1..a5c0c1a1 100644 --- a/lib/src/generators/package_simple.g.dart +++ b/lib/src/generators/package_simple.g.dart @@ -33,13 +33,14 @@ ZW1lCg==''', 'analysis_options.yaml', 'text', ''' -YW5hbHl6ZXI6CiMgICBleGNsdWRlOgojICAgICAtIHBhdGgvdG8vZXhjbHVkZWQvZmlsZXMvKioK -CiMgTGludCBydWxlcyBhbmQgZG9jdW1lbnRhdGlvbiwgc2VlIGh0dHA6Ly9kYXJ0LWxhbmcuZ2l0 -aHViLmlvL2xpbnRlci9saW50cwpsaW50ZXI6CiAgcnVsZXM6CiAgICAtIGNhbmNlbF9zdWJzY3Jp -cHRpb25zCiAgICAtIGhhc2hfYW5kX2VxdWFscwogICAgLSBpdGVyYWJsZV9jb250YWluc191bnJl -bGF0ZWRfdHlwZQogICAgLSBsaXN0X3JlbW92ZV91bnJlbGF0ZWRfdHlwZQogICAgLSB0ZXN0X3R5 -cGVzX2luX2VxdWFscwogICAgLSB1bnJlbGF0ZWRfdHlwZV9lcXVhbGl0eV9jaGVja3MKICAgIC0g -dmFsaWRfcmVnZXhwcwo=''', +IyBEZWZpbmVzIGEgZGVmYXVsdCBzZXQgb2YgbGludCBydWxlcyBlbmZvcmNlZCBmb3IKIyBwcm9q +ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlOiBodHRwczov +L2dpdGh1Yi5jb20vZGFydC1sYW5nL3BlZGFudGljI2VuYWJsZWQtbGludHMuCmluY2x1ZGU6IHBh +Y2thZ2U6cGVkYW50aWMvYW5hbHlzaXNfb3B0aW9ucy55YW1sCgojIEZvciBsaW50IHJ1bGVzIGFu +ZCBkb2N1bWVudGF0aW9uLCBzZWUgaHR0cDovL2RhcnQtbGFuZy5naXRodWIuaW8vbGludGVyL2xp +bnRzLgojIFVuY29tbWVudCB0byBzcGVjaWZ5IGFkZGl0aW9uYWwgcnVsZXMuCiMgbGludGVyOgoj +ICAgcnVsZXM6CiMgICAgIC0gY2FtZWxfY2FzZV90eXBlcwoKYW5hbHl6ZXI6CiMgICBleGNsdWRl +OgojICAgICAtIHBhdGgvdG8vZXhjbHVkZWQvZmlsZXMvKioK''', 'example/__projectName___example.dart', 'text', ''' @@ -66,8 +67,8 @@ bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHN0YXJ0aW5nIHBvaW50IGZvciBE YXJ0IGxpYnJhcmllcyBvciBhcHBsaWNhdGlvbnMuCiMgdmVyc2lvbjogMS4wLjAKIyBob21lcGFn ZTogaHR0cHM6Ly93d3cuZXhhbXBsZS5jb20KIyBhdXRob3I6IF9fYXV0aG9yX18gPGVtYWlsQGV4 YW1wbGUuY29tPgoKZW52aXJvbm1lbnQ6CiAgc2RrOiAnPj0yLjEuMCA8My4wLjAnCgojZGVwZW5k -ZW5jaWVzOgojICBwYXRoOiBeMS40LjEKCmRldl9kZXBlbmRlbmNpZXM6CiAgdGVzdDogXjEuMC4w -Cg==''', +ZW5jaWVzOgojICBwYXRoOiBeMS40LjEKCmRldl9kZXBlbmRlbmNpZXM6CiAgcGVkYW50aWM6IF4x +LjAuMAogIHRlc3Q6IF4xLjAuMAo=''', 'test/__projectName___test.dart', 'text', ''' diff --git a/lib/src/generators/server_shelf.g.dart b/lib/src/generators/server_shelf.g.dart index 840f9013..244d2abd 100644 --- a/lib/src/generators/server_shelf.g.dart +++ b/lib/src/generators/server_shelf.g.dart @@ -28,13 +28,14 @@ b20vZGFydC1sYW5nL3N0YWdlaGFuZC9ibG9iL21hc3Rlci9MSUNFTlNFKS4K''', 'analysis_options.yaml', 'text', ''' -YW5hbHl6ZXI6CiMgICBleGNsdWRlOgojICAgICAtIHBhdGgvdG8vZXhjbHVkZWQvZmlsZXMvKioK -CiMgTGludCBydWxlcyBhbmQgZG9jdW1lbnRhdGlvbiwgc2VlIGh0dHA6Ly9kYXJ0LWxhbmcuZ2l0 -aHViLmlvL2xpbnRlci9saW50cwpsaW50ZXI6CiAgcnVsZXM6CiAgICAtIGNhbmNlbF9zdWJzY3Jp -cHRpb25zCiAgICAtIGhhc2hfYW5kX2VxdWFscwogICAgLSBpdGVyYWJsZV9jb250YWluc191bnJl -bGF0ZWRfdHlwZQogICAgLSBsaXN0X3JlbW92ZV91bnJlbGF0ZWRfdHlwZQogICAgLSB0ZXN0X3R5 -cGVzX2luX2VxdWFscwogICAgLSB1bnJlbGF0ZWRfdHlwZV9lcXVhbGl0eV9jaGVja3MKICAgIC0g -dmFsaWRfcmVnZXhwcwo=''', +IyBEZWZpbmVzIGEgZGVmYXVsdCBzZXQgb2YgbGludCBydWxlcyBlbmZvcmNlZCBmb3IKIyBwcm9q +ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlOiBodHRwczov +L2dpdGh1Yi5jb20vZGFydC1sYW5nL3BlZGFudGljI2VuYWJsZWQtbGludHMuCmluY2x1ZGU6IHBh +Y2thZ2U6cGVkYW50aWMvYW5hbHlzaXNfb3B0aW9ucy55YW1sCgojIEZvciBsaW50IHJ1bGVzIGFu +ZCBkb2N1bWVudGF0aW9uLCBzZWUgaHR0cDovL2RhcnQtbGFuZy5naXRodWIuaW8vbGludGVyL2xp +bnRzLgojIFVuY29tbWVudCB0byBzcGVjaWZ5IGFkZGl0aW9uYWwgcnVsZXMuCiMgbGludGVyOgoj +ICAgcnVsZXM6CiMgICAgIC0gY2FtZWxfY2FzZV90eXBlcwoKYW5hbHl6ZXI6CiMgICBleGNsdWRl +OgojICAgICAtIHBhdGgvdG8vZXhjbHVkZWQvZmlsZXMvKioK''', 'bin/server.dart', 'text', ''' @@ -61,6 +62,6 @@ bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHdlYiBzZXJ2ZXIgYnVpbHQgdXNp bmcgdGhlIHNoZWxmIHBhY2thZ2UuCiMgdmVyc2lvbjogMS4wLjAKIyBob21lcGFnZTogaHR0cHM6 Ly93d3cuZXhhbXBsZS5jb20KIyBhdXRob3I6IF9fYXV0aG9yX18gPGVtYWlsQGV4YW1wbGUuY29t PgoKZW52aXJvbm1lbnQ6CiAgc2RrOiAnPj0yLjEuMCA8My4wLjAnCgpkZXBlbmRlbmNpZXM6CiAg -YXJnczogXjEuNC4yCiAgc2hlbGY6IF4wLjcuMgoKI2Rldl9kZXBlbmRlbmNpZXM6CiMgIHRlc3Q6 -IF4xLjAuMAo=''' +YXJnczogXjEuNC4yCiAgc2hlbGY6IF4wLjcuMgoKZGV2X2RlcGVuZGVuY2llczoKICBwZWRhbnRp +YzogXjEuMC4wCg==''' ]; diff --git a/lib/src/generators/web_angular.g.dart b/lib/src/generators/web_angular.g.dart index 8abaab8d..8bb673f8 100644 --- a/lib/src/generators/web_angular.g.dart +++ b/lib/src/generators/web_angular.g.dart @@ -30,16 +30,18 @@ YXN0ZXIvTElDRU5TRSkuCg==''', 'analysis_options.yaml', 'text', ''' -YW5hbHl6ZXI6CiAgZXhjbHVkZTogW2J1aWxkLyoqXQogIGVycm9yczoKICAgIHVyaV9oYXNfbm90 -X2JlZW5fZ2VuZXJhdGVkOiBpZ25vcmUKICAjIEFuZ3VsYXIgcGx1Z2luIHN1cHBvcnQgaXMgaW4g -YmV0YS4gWW91J3JlIHdlbGNvbWUgdG8gdHJ5IGl0IGFuZCByZXBvcnQKICAjIGlzc3VlczogaHR0 -cHM6Ly9naXRodWIuY29tL2RhcnQtbGFuZy9hbmd1bGFyX2FuYWx5emVyX3BsdWdpbi9pc3N1ZXMK -ICAjIHBsdWdpbnM6CiAgICAjIC0gYW5ndWxhcgoKIyBMaW50IHJ1bGVzIGFuZCBkb2N1bWVudGF0 -aW9uLCBzZWUgaHR0cDovL2RhcnQtbGFuZy5naXRodWIuaW8vbGludGVyL2xpbnRzCmxpbnRlcjoK -ICBydWxlczoKICAgIC0gY2FuY2VsX3N1YnNjcmlwdGlvbnMKICAgIC0gaGFzaF9hbmRfZXF1YWxz -CiAgICAtIGl0ZXJhYmxlX2NvbnRhaW5zX3VucmVsYXRlZF90eXBlCiAgICAtIGxpc3RfcmVtb3Zl -X3VucmVsYXRlZF90eXBlCiAgICAtIHRlc3RfdHlwZXNfaW5fZXF1YWxzCiAgICAtIHVucmVsYXRl -ZF90eXBlX2VxdWFsaXR5X2NoZWNrcwogICAgLSB2YWxpZF9yZWdleHBzCg==''', +IyBEZWZpbmVzIGEgZGVmYXVsdCBzZXQgb2YgbGludCBydWxlcyBlbmZvcmNlZCBmb3IKIyBwcm9q +ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlOiBodHRwczov +L2dpdGh1Yi5jb20vZGFydC1sYW5nL3BlZGFudGljI2VuYWJsZWQtbGludHMuCmluY2x1ZGU6IHBh +Y2thZ2U6cGVkYW50aWMvYW5hbHlzaXNfb3B0aW9ucy55YW1sCgojIEZvciBsaW50IHJ1bGVzIGFu +ZCBkb2N1bWVudGF0aW9uLCBzZWUgaHR0cDovL2RhcnQtbGFuZy5naXRodWIuaW8vbGludGVyL2xp +bnRzLgojIFVuY29tbWVudCB0byBzcGVjaWZ5IGFkZGl0aW9uYWwgcnVsZXMuCiMgbGludGVyOgoj +ICAgcnVsZXM6CiMgICAgIC0gY2FtZWxfY2FzZV90eXBlcwoKYW5hbHl6ZXI6CiAgZXhjbHVkZTog +W2J1aWxkLyoqXQogIGVycm9yczoKICAgIHVyaV9oYXNfbm90X2JlZW5fZ2VuZXJhdGVkOiBpZ25v +cmUKICAjIEFuZ3VsYXIgcGx1Z2luIHN1cHBvcnQgaXMgaW4gYmV0YS4gWW91J3JlIHdlbGNvbWUg +dG8gdHJ5IGl0IGFuZCByZXBvcnQKICAjIGlzc3VlczogaHR0cHM6Ly9naXRodWIuY29tL2RhcnQt +bGFuZy9hbmd1bGFyX2FuYWx5emVyX3BsdWdpbi9pc3N1ZXMKICAjIHBsdWdpbnM6CiAgICAjIC0g +YW5ndWxhcgo=''', 'lib/app_component.css', 'text', ''' @@ -125,8 +127,8 @@ L3d3dy5leGFtcGxlLmNvbQojIGF1dGhvcjogX19hdXRob3JfXyA8ZW1haWxAZXhhbXBsZS5jb20+ CgplbnZpcm9ubWVudDoKICBzZGs6ICc+PTIuMS4wIDwzLjAuMCcKCmRlcGVuZGVuY2llczoKICBh bmd1bGFyOiBeNS4yLjAKICBhbmd1bGFyX2NvbXBvbmVudHM6IF4wLjExLjAKCmRldl9kZXBlbmRl bmNpZXM6CiAgYW5ndWxhcl90ZXN0OiBeMi4yLjAKICBidWlsZF9ydW5uZXI6IF4xLjEuMgogIGJ1 -aWxkX3Rlc3Q6IF4wLjEwLjMKICBidWlsZF93ZWJfY29tcGlsZXJzOiBeMS4wLjAKICB0ZXN0OiBe -MS41LjEK''', +aWxkX3Rlc3Q6IF4wLjEwLjMKICBidWlsZF93ZWJfY29tcGlsZXJzOiBeMS4wLjAKICBwZWRhbnRp +YzogXjEuMC4wCiAgdGVzdDogXjEuNS4xCg==''', 'test/app_test.dart', 'text', ''' diff --git a/lib/src/generators/web_simple.g.dart b/lib/src/generators/web_simple.g.dart index 693a4bd2..4dd8fc51 100644 --- a/lib/src/generators/web_simple.g.dart +++ b/lib/src/generators/web_simple.g.dart @@ -28,13 +28,14 @@ Lgo=''', 'analysis_options.yaml', 'text', ''' -YW5hbHl6ZXI6CiMgICBleGNsdWRlOgojICAgICAtIHBhdGgvdG8vZXhjbHVkZWQvZmlsZXMvKioK -CiMgTGludCBydWxlcyBhbmQgZG9jdW1lbnRhdGlvbiwgc2VlIGh0dHA6Ly9kYXJ0LWxhbmcuZ2l0 -aHViLmlvL2xpbnRlci9saW50cwpsaW50ZXI6CiAgcnVsZXM6CiAgICAtIGNhbmNlbF9zdWJzY3Jp -cHRpb25zCiAgICAtIGhhc2hfYW5kX2VxdWFscwogICAgLSBpdGVyYWJsZV9jb250YWluc191bnJl -bGF0ZWRfdHlwZQogICAgLSBsaXN0X3JlbW92ZV91bnJlbGF0ZWRfdHlwZQogICAgLSB0ZXN0X3R5 -cGVzX2luX2VxdWFscwogICAgLSB1bnJlbGF0ZWRfdHlwZV9lcXVhbGl0eV9jaGVja3MKICAgIC0g -dmFsaWRfcmVnZXhwcwo=''', +IyBEZWZpbmVzIGEgZGVmYXVsdCBzZXQgb2YgbGludCBydWxlcyBlbmZvcmNlZCBmb3IKIyBwcm9q +ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlOiBodHRwczov +L2dpdGh1Yi5jb20vZGFydC1sYW5nL3BlZGFudGljI2VuYWJsZWQtbGludHMuCmluY2x1ZGU6IHBh +Y2thZ2U6cGVkYW50aWMvYW5hbHlzaXNfb3B0aW9ucy55YW1sCgojIEZvciBsaW50IHJ1bGVzIGFu +ZCBkb2N1bWVudGF0aW9uLCBzZWUgaHR0cDovL2RhcnQtbGFuZy5naXRodWIuaW8vbGludGVyL2xp +bnRzLgojIFVuY29tbWVudCB0byBzcGVjaWZ5IGFkZGl0aW9uYWwgcnVsZXMuCiMgbGludGVyOgoj +ICAgcnVsZXM6CiMgICAgIC0gY2FtZWxfY2FzZV90eXBlcwoKYW5hbHl6ZXI6CiMgICBleGNsdWRl +OgojICAgICAtIHBhdGgvdG8vZXhjbHVkZWQvZmlsZXMvKioK''', 'pubspec.yaml', 'text', ''' @@ -43,7 +44,7 @@ IHdlYiBhcHAuCiMgdmVyc2lvbjogMS4wLjAKI2hvbWVwYWdlOiBodHRwczovL3d3dy5leGFtcGxl LmNvbQojYXV0aG9yOiBfX2F1dGhvcl9fIDxlbWFpbEBleGFtcGxlLmNvbT4KCmVudmlyb25tZW50 OgogIHNkazogJz49Mi4xLjAgPDMuMC4wJwoKI2RlcGVuZGVuY2llczoKIyAgcGF0aDogXjEuNC4x CgpkZXZfZGVwZW5kZW5jaWVzOgogIGJ1aWxkX3J1bm5lcjogXjEuMS4yCiAgYnVpbGRfd2ViX2Nv -bXBpbGVyczogXjEuMC4wCg==''', +bXBpbGVyczogXjEuMC4wCiAgcGVkYW50aWM6IF4xLjAuMAo=''', 'web/favicon.ico', 'binary', ''' diff --git a/lib/src/generators/web_stagexl.g.dart b/lib/src/generators/web_stagexl.g.dart index cc82e23d..6732b4dc 100644 --- a/lib/src/generators/web_stagexl.g.dart +++ b/lib/src/generators/web_stagexl.g.dart @@ -28,13 +28,14 @@ Yi9tYXN0ZXIvTElDRU5TRSkuCg==''', 'analysis_options.yaml', 'text', ''' -YW5hbHl6ZXI6CiMgICBleGNsdWRlOgojICAgICAtIHBhdGgvdG8vZXhjbHVkZWQvZmlsZXMvKioK -CiMgTGludCBydWxlcyBhbmQgZG9jdW1lbnRhdGlvbiwgc2VlIGh0dHA6Ly9kYXJ0LWxhbmcuZ2l0 -aHViLmlvL2xpbnRlci9saW50cwpsaW50ZXI6CiAgcnVsZXM6CiAgICAtIGNhbmNlbF9zdWJzY3Jp -cHRpb25zCiAgICAtIGhhc2hfYW5kX2VxdWFscwogICAgLSBpdGVyYWJsZV9jb250YWluc191bnJl -bGF0ZWRfdHlwZQogICAgLSBsaXN0X3JlbW92ZV91bnJlbGF0ZWRfdHlwZQogICAgLSB0ZXN0X3R5 -cGVzX2luX2VxdWFscwogICAgLSB1bnJlbGF0ZWRfdHlwZV9lcXVhbGl0eV9jaGVja3MKICAgIC0g -dmFsaWRfcmVnZXhwcwo=''', +IyBEZWZpbmVzIGEgZGVmYXVsdCBzZXQgb2YgbGludCBydWxlcyBlbmZvcmNlZCBmb3IKIyBwcm9q +ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlOiBodHRwczov +L2dpdGh1Yi5jb20vZGFydC1sYW5nL3BlZGFudGljI2VuYWJsZWQtbGludHMuCmluY2x1ZGU6IHBh +Y2thZ2U6cGVkYW50aWMvYW5hbHlzaXNfb3B0aW9ucy55YW1sCgojIEZvciBsaW50IHJ1bGVzIGFu +ZCBkb2N1bWVudGF0aW9uLCBzZWUgaHR0cDovL2RhcnQtbGFuZy5naXRodWIuaW8vbGludGVyL2xp +bnRzLgojIFVuY29tbWVudCB0byBzcGVjaWZ5IGFkZGl0aW9uYWwgcnVsZXMuCiMgbGludGVyOgoj +ICAgcnVsZXM6CiMgICAgIC0gY2FtZWxfY2FzZV90eXBlcwoKYW5hbHl6ZXI6CiMgICBleGNsdWRl +OgojICAgICAtIHBhdGgvdG8vZXhjbHVkZWQvZmlsZXMvKioK''', 'pubspec.yaml', 'text', ''' @@ -43,7 +44,7 @@ cHAuCiMgdmVyc2lvbjogMS4wLjAKI2hvbWVwYWdlOiBodHRwczovL3d3dy5leGFtcGxlLmNvbQoj YXV0aG9yOiBfX2F1dGhvcl9fIDxlbWFpbEBleGFtcGxlLmNvbT4KCmVudmlyb25tZW50OgogIHNk azogJz49Mi4xLjAgPDMuMC4wJwoKZGVwZW5kZW5jaWVzOgogIHN0YWdleGw6IF4xLjEuMAoKZGV2 X2RlcGVuZGVuY2llczoKICBidWlsZF9ydW5uZXI6IF4xLjEuMgogIGJ1aWxkX3dlYl9jb21waWxl -cnM6IF4xLjAuMAo=''', +cnM6IF4xLjAuMAogIHBlZGFudGljOiBeMS4wLjAK''', 'web/images/dart@1x.png', 'binary', ''' From 33120c042c5e78929741da5f24d194ea75c53aa6 Mon Sep 17 00:00:00 2001 From: pq Date: Sat, 19 Jan 2019 00:37:20 -0800 Subject: [PATCH 7/8] update test --- test/validate_templates.dart | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/validate_templates.dart b/test/validate_templates.dart index 261935ca..0a8557b0 100644 --- a/test/validate_templates.dart +++ b/test/validate_templates.dart @@ -31,15 +31,14 @@ final String _expectedGitIgnore = _getMetaTemplateFile('.gitignore'); final String _expectedAnalysisOptions = _getMetaTemplateFile('templates/analysis_options.yaml'); final String _expectedAngularAnalysisOptions = [ - _expectedAnalysisOptions.split('\n').take(1), + _expectedAnalysisOptions.split('\n').take(12), ' exclude: [build/**]', ' errors:', ' uri_has_not_been_generated: ignore', " # 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), + ' # - angular\n', ].expand((e) => e is Iterable ? e : [e]).join('\n'); void main() { From b6d0ff4aede90b51998c7faf154992adba4b87a4 Mon Sep 17 00:00:00 2001 From: pq Date: Tue, 22 Jan 2019 13:50:33 -0800 Subject: [PATCH 8/8] dropped colon; regenerated templates --- lib/src/generators/console_full.g.dart | 14 ++++++------ lib/src/generators/package_simple.g.dart | 14 ++++++------ lib/src/generators/server_shelf.g.dart | 14 ++++++------ lib/src/generators/web_angular.g.dart | 22 +++++++++---------- lib/src/generators/web_simple.g.dart | 14 ++++++------ lib/src/generators/web_stagexl.g.dart | 14 ++++++------ templates/analysis_options.yaml | 2 +- templates/console-full/analysis_options.yaml | 2 +- .../package-simple/analysis_options.yaml | 2 +- templates/server-shelf/analysis_options.yaml | 2 +- templates/web-angular/analysis_options.yaml | 2 +- templates/web-simple/analysis_options.yaml | 2 +- templates/web-stagexl/analysis_options.yaml | 2 +- 13 files changed, 53 insertions(+), 53 deletions(-) diff --git a/lib/src/generators/console_full.g.dart b/lib/src/generators/console_full.g.dart index 139859b7..ab2f57b1 100644 --- a/lib/src/generators/console_full.g.dart +++ b/lib/src/generators/console_full.g.dart @@ -29,13 +29,13 @@ U0UpLgo=''', 'text', ''' IyBEZWZpbmVzIGEgZGVmYXVsdCBzZXQgb2YgbGludCBydWxlcyBlbmZvcmNlZCBmb3IKIyBwcm9q -ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlOiBodHRwczov -L2dpdGh1Yi5jb20vZGFydC1sYW5nL3BlZGFudGljI2VuYWJsZWQtbGludHMuCmluY2x1ZGU6IHBh -Y2thZ2U6cGVkYW50aWMvYW5hbHlzaXNfb3B0aW9ucy55YW1sCgojIEZvciBsaW50IHJ1bGVzIGFu -ZCBkb2N1bWVudGF0aW9uLCBzZWUgaHR0cDovL2RhcnQtbGFuZy5naXRodWIuaW8vbGludGVyL2xp -bnRzLgojIFVuY29tbWVudCB0byBzcGVjaWZ5IGFkZGl0aW9uYWwgcnVsZXMuCiMgbGludGVyOgoj -ICAgcnVsZXM6CiMgICAgIC0gY2FtZWxfY2FzZV90eXBlcwoKYW5hbHl6ZXI6CiMgICBleGNsdWRl -OgojICAgICAtIHBhdGgvdG8vZXhjbHVkZWQvZmlsZXMvKioK''', +ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlIGh0dHBzOi8v +Z2l0aHViLmNvbS9kYXJ0LWxhbmcvcGVkYW50aWMjZW5hYmxlZC1saW50cy4KaW5jbHVkZTogcGFj +a2FnZTpwZWRhbnRpYy9hbmFseXNpc19vcHRpb25zLnlhbWwKCiMgRm9yIGxpbnQgcnVsZXMgYW5k +IGRvY3VtZW50YXRpb24sIHNlZSBodHRwOi8vZGFydC1sYW5nLmdpdGh1Yi5pby9saW50ZXIvbGlu +dHMuCiMgVW5jb21tZW50IHRvIHNwZWNpZnkgYWRkaXRpb25hbCBydWxlcy4KIyBsaW50ZXI6CiMg +ICBydWxlczoKIyAgICAgLSBjYW1lbF9jYXNlX3R5cGVzCgphbmFseXplcjoKIyAgIGV4Y2x1ZGU6 +CiMgICAgIC0gcGF0aC90by9leGNsdWRlZC9maWxlcy8qKgo=''', 'bin/main.dart', 'text', ''' diff --git a/lib/src/generators/package_simple.g.dart b/lib/src/generators/package_simple.g.dart index a5c0c1a1..faa6c4ee 100644 --- a/lib/src/generators/package_simple.g.dart +++ b/lib/src/generators/package_simple.g.dart @@ -34,13 +34,13 @@ ZW1lCg==''', 'text', ''' IyBEZWZpbmVzIGEgZGVmYXVsdCBzZXQgb2YgbGludCBydWxlcyBlbmZvcmNlZCBmb3IKIyBwcm9q -ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlOiBodHRwczov -L2dpdGh1Yi5jb20vZGFydC1sYW5nL3BlZGFudGljI2VuYWJsZWQtbGludHMuCmluY2x1ZGU6IHBh -Y2thZ2U6cGVkYW50aWMvYW5hbHlzaXNfb3B0aW9ucy55YW1sCgojIEZvciBsaW50IHJ1bGVzIGFu -ZCBkb2N1bWVudGF0aW9uLCBzZWUgaHR0cDovL2RhcnQtbGFuZy5naXRodWIuaW8vbGludGVyL2xp -bnRzLgojIFVuY29tbWVudCB0byBzcGVjaWZ5IGFkZGl0aW9uYWwgcnVsZXMuCiMgbGludGVyOgoj -ICAgcnVsZXM6CiMgICAgIC0gY2FtZWxfY2FzZV90eXBlcwoKYW5hbHl6ZXI6CiMgICBleGNsdWRl -OgojICAgICAtIHBhdGgvdG8vZXhjbHVkZWQvZmlsZXMvKioK''', +ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlIGh0dHBzOi8v +Z2l0aHViLmNvbS9kYXJ0LWxhbmcvcGVkYW50aWMjZW5hYmxlZC1saW50cy4KaW5jbHVkZTogcGFj +a2FnZTpwZWRhbnRpYy9hbmFseXNpc19vcHRpb25zLnlhbWwKCiMgRm9yIGxpbnQgcnVsZXMgYW5k +IGRvY3VtZW50YXRpb24sIHNlZSBodHRwOi8vZGFydC1sYW5nLmdpdGh1Yi5pby9saW50ZXIvbGlu +dHMuCiMgVW5jb21tZW50IHRvIHNwZWNpZnkgYWRkaXRpb25hbCBydWxlcy4KIyBsaW50ZXI6CiMg +ICBydWxlczoKIyAgICAgLSBjYW1lbF9jYXNlX3R5cGVzCgphbmFseXplcjoKIyAgIGV4Y2x1ZGU6 +CiMgICAgIC0gcGF0aC90by9leGNsdWRlZC9maWxlcy8qKgo=''', 'example/__projectName___example.dart', 'text', ''' diff --git a/lib/src/generators/server_shelf.g.dart b/lib/src/generators/server_shelf.g.dart index 244d2abd..bddc2622 100644 --- a/lib/src/generators/server_shelf.g.dart +++ b/lib/src/generators/server_shelf.g.dart @@ -29,13 +29,13 @@ b20vZGFydC1sYW5nL3N0YWdlaGFuZC9ibG9iL21hc3Rlci9MSUNFTlNFKS4K''', 'text', ''' IyBEZWZpbmVzIGEgZGVmYXVsdCBzZXQgb2YgbGludCBydWxlcyBlbmZvcmNlZCBmb3IKIyBwcm9q -ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlOiBodHRwczov -L2dpdGh1Yi5jb20vZGFydC1sYW5nL3BlZGFudGljI2VuYWJsZWQtbGludHMuCmluY2x1ZGU6IHBh -Y2thZ2U6cGVkYW50aWMvYW5hbHlzaXNfb3B0aW9ucy55YW1sCgojIEZvciBsaW50IHJ1bGVzIGFu -ZCBkb2N1bWVudGF0aW9uLCBzZWUgaHR0cDovL2RhcnQtbGFuZy5naXRodWIuaW8vbGludGVyL2xp -bnRzLgojIFVuY29tbWVudCB0byBzcGVjaWZ5IGFkZGl0aW9uYWwgcnVsZXMuCiMgbGludGVyOgoj -ICAgcnVsZXM6CiMgICAgIC0gY2FtZWxfY2FzZV90eXBlcwoKYW5hbHl6ZXI6CiMgICBleGNsdWRl -OgojICAgICAtIHBhdGgvdG8vZXhjbHVkZWQvZmlsZXMvKioK''', +ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlIGh0dHBzOi8v +Z2l0aHViLmNvbS9kYXJ0LWxhbmcvcGVkYW50aWMjZW5hYmxlZC1saW50cy4KaW5jbHVkZTogcGFj +a2FnZTpwZWRhbnRpYy9hbmFseXNpc19vcHRpb25zLnlhbWwKCiMgRm9yIGxpbnQgcnVsZXMgYW5k +IGRvY3VtZW50YXRpb24sIHNlZSBodHRwOi8vZGFydC1sYW5nLmdpdGh1Yi5pby9saW50ZXIvbGlu +dHMuCiMgVW5jb21tZW50IHRvIHNwZWNpZnkgYWRkaXRpb25hbCBydWxlcy4KIyBsaW50ZXI6CiMg +ICBydWxlczoKIyAgICAgLSBjYW1lbF9jYXNlX3R5cGVzCgphbmFseXplcjoKIyAgIGV4Y2x1ZGU6 +CiMgICAgIC0gcGF0aC90by9leGNsdWRlZC9maWxlcy8qKgo=''', 'bin/server.dart', 'text', ''' diff --git a/lib/src/generators/web_angular.g.dart b/lib/src/generators/web_angular.g.dart index 8bb673f8..8a316180 100644 --- a/lib/src/generators/web_angular.g.dart +++ b/lib/src/generators/web_angular.g.dart @@ -31,17 +31,17 @@ YXN0ZXIvTElDRU5TRSkuCg==''', 'text', ''' IyBEZWZpbmVzIGEgZGVmYXVsdCBzZXQgb2YgbGludCBydWxlcyBlbmZvcmNlZCBmb3IKIyBwcm9q -ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlOiBodHRwczov -L2dpdGh1Yi5jb20vZGFydC1sYW5nL3BlZGFudGljI2VuYWJsZWQtbGludHMuCmluY2x1ZGU6IHBh -Y2thZ2U6cGVkYW50aWMvYW5hbHlzaXNfb3B0aW9ucy55YW1sCgojIEZvciBsaW50IHJ1bGVzIGFu -ZCBkb2N1bWVudGF0aW9uLCBzZWUgaHR0cDovL2RhcnQtbGFuZy5naXRodWIuaW8vbGludGVyL2xp -bnRzLgojIFVuY29tbWVudCB0byBzcGVjaWZ5IGFkZGl0aW9uYWwgcnVsZXMuCiMgbGludGVyOgoj -ICAgcnVsZXM6CiMgICAgIC0gY2FtZWxfY2FzZV90eXBlcwoKYW5hbHl6ZXI6CiAgZXhjbHVkZTog -W2J1aWxkLyoqXQogIGVycm9yczoKICAgIHVyaV9oYXNfbm90X2JlZW5fZ2VuZXJhdGVkOiBpZ25v -cmUKICAjIEFuZ3VsYXIgcGx1Z2luIHN1cHBvcnQgaXMgaW4gYmV0YS4gWW91J3JlIHdlbGNvbWUg -dG8gdHJ5IGl0IGFuZCByZXBvcnQKICAjIGlzc3VlczogaHR0cHM6Ly9naXRodWIuY29tL2RhcnQt -bGFuZy9hbmd1bGFyX2FuYWx5emVyX3BsdWdpbi9pc3N1ZXMKICAjIHBsdWdpbnM6CiAgICAjIC0g -YW5ndWxhcgo=''', +ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlIGh0dHBzOi8v +Z2l0aHViLmNvbS9kYXJ0LWxhbmcvcGVkYW50aWMjZW5hYmxlZC1saW50cy4KaW5jbHVkZTogcGFj +a2FnZTpwZWRhbnRpYy9hbmFseXNpc19vcHRpb25zLnlhbWwKCiMgRm9yIGxpbnQgcnVsZXMgYW5k +IGRvY3VtZW50YXRpb24sIHNlZSBodHRwOi8vZGFydC1sYW5nLmdpdGh1Yi5pby9saW50ZXIvbGlu +dHMuCiMgVW5jb21tZW50IHRvIHNwZWNpZnkgYWRkaXRpb25hbCBydWxlcy4KIyBsaW50ZXI6CiMg +ICBydWxlczoKIyAgICAgLSBjYW1lbF9jYXNlX3R5cGVzCgphbmFseXplcjoKICBleGNsdWRlOiBb +YnVpbGQvKipdCiAgZXJyb3JzOgogICAgdXJpX2hhc19ub3RfYmVlbl9nZW5lcmF0ZWQ6IGlnbm9y +ZQogICMgQW5ndWxhciBwbHVnaW4gc3VwcG9ydCBpcyBpbiBiZXRhLiBZb3UncmUgd2VsY29tZSB0 +byB0cnkgaXQgYW5kIHJlcG9ydAogICMgaXNzdWVzOiBodHRwczovL2dpdGh1Yi5jb20vZGFydC1s +YW5nL2FuZ3VsYXJfYW5hbHl6ZXJfcGx1Z2luL2lzc3VlcwogICMgcGx1Z2luczoKICAgICMgLSBh +bmd1bGFyCg==''', 'lib/app_component.css', 'text', ''' diff --git a/lib/src/generators/web_simple.g.dart b/lib/src/generators/web_simple.g.dart index 4dd8fc51..1916b5b9 100644 --- a/lib/src/generators/web_simple.g.dart +++ b/lib/src/generators/web_simple.g.dart @@ -29,13 +29,13 @@ Lgo=''', 'text', ''' IyBEZWZpbmVzIGEgZGVmYXVsdCBzZXQgb2YgbGludCBydWxlcyBlbmZvcmNlZCBmb3IKIyBwcm9q -ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlOiBodHRwczov -L2dpdGh1Yi5jb20vZGFydC1sYW5nL3BlZGFudGljI2VuYWJsZWQtbGludHMuCmluY2x1ZGU6IHBh -Y2thZ2U6cGVkYW50aWMvYW5hbHlzaXNfb3B0aW9ucy55YW1sCgojIEZvciBsaW50IHJ1bGVzIGFu -ZCBkb2N1bWVudGF0aW9uLCBzZWUgaHR0cDovL2RhcnQtbGFuZy5naXRodWIuaW8vbGludGVyL2xp -bnRzLgojIFVuY29tbWVudCB0byBzcGVjaWZ5IGFkZGl0aW9uYWwgcnVsZXMuCiMgbGludGVyOgoj -ICAgcnVsZXM6CiMgICAgIC0gY2FtZWxfY2FzZV90eXBlcwoKYW5hbHl6ZXI6CiMgICBleGNsdWRl -OgojICAgICAtIHBhdGgvdG8vZXhjbHVkZWQvZmlsZXMvKioK''', +ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlIGh0dHBzOi8v +Z2l0aHViLmNvbS9kYXJ0LWxhbmcvcGVkYW50aWMjZW5hYmxlZC1saW50cy4KaW5jbHVkZTogcGFj +a2FnZTpwZWRhbnRpYy9hbmFseXNpc19vcHRpb25zLnlhbWwKCiMgRm9yIGxpbnQgcnVsZXMgYW5k +IGRvY3VtZW50YXRpb24sIHNlZSBodHRwOi8vZGFydC1sYW5nLmdpdGh1Yi5pby9saW50ZXIvbGlu +dHMuCiMgVW5jb21tZW50IHRvIHNwZWNpZnkgYWRkaXRpb25hbCBydWxlcy4KIyBsaW50ZXI6CiMg +ICBydWxlczoKIyAgICAgLSBjYW1lbF9jYXNlX3R5cGVzCgphbmFseXplcjoKIyAgIGV4Y2x1ZGU6 +CiMgICAgIC0gcGF0aC90by9leGNsdWRlZC9maWxlcy8qKgo=''', 'pubspec.yaml', 'text', ''' diff --git a/lib/src/generators/web_stagexl.g.dart b/lib/src/generators/web_stagexl.g.dart index 6732b4dc..861bb44d 100644 --- a/lib/src/generators/web_stagexl.g.dart +++ b/lib/src/generators/web_stagexl.g.dart @@ -29,13 +29,13 @@ Yi9tYXN0ZXIvTElDRU5TRSkuCg==''', 'text', ''' IyBEZWZpbmVzIGEgZGVmYXVsdCBzZXQgb2YgbGludCBydWxlcyBlbmZvcmNlZCBmb3IKIyBwcm9q -ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlOiBodHRwczov -L2dpdGh1Yi5jb20vZGFydC1sYW5nL3BlZGFudGljI2VuYWJsZWQtbGludHMuCmluY2x1ZGU6IHBh -Y2thZ2U6cGVkYW50aWMvYW5hbHlzaXNfb3B0aW9ucy55YW1sCgojIEZvciBsaW50IHJ1bGVzIGFu -ZCBkb2N1bWVudGF0aW9uLCBzZWUgaHR0cDovL2RhcnQtbGFuZy5naXRodWIuaW8vbGludGVyL2xp -bnRzLgojIFVuY29tbWVudCB0byBzcGVjaWZ5IGFkZGl0aW9uYWwgcnVsZXMuCiMgbGludGVyOgoj -ICAgcnVsZXM6CiMgICAgIC0gY2FtZWxfY2FzZV90eXBlcwoKYW5hbHl6ZXI6CiMgICBleGNsdWRl -OgojICAgICAtIHBhdGgvdG8vZXhjbHVkZWQvZmlsZXMvKioK''', +ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlIGh0dHBzOi8v +Z2l0aHViLmNvbS9kYXJ0LWxhbmcvcGVkYW50aWMjZW5hYmxlZC1saW50cy4KaW5jbHVkZTogcGFj +a2FnZTpwZWRhbnRpYy9hbmFseXNpc19vcHRpb25zLnlhbWwKCiMgRm9yIGxpbnQgcnVsZXMgYW5k +IGRvY3VtZW50YXRpb24sIHNlZSBodHRwOi8vZGFydC1sYW5nLmdpdGh1Yi5pby9saW50ZXIvbGlu +dHMuCiMgVW5jb21tZW50IHRvIHNwZWNpZnkgYWRkaXRpb25hbCBydWxlcy4KIyBsaW50ZXI6CiMg +ICBydWxlczoKIyAgICAgLSBjYW1lbF9jYXNlX3R5cGVzCgphbmFseXplcjoKIyAgIGV4Y2x1ZGU6 +CiMgICAgIC0gcGF0aC90by9leGNsdWRlZC9maWxlcy8qKgo=''', 'pubspec.yaml', 'text', ''' diff --git a/templates/analysis_options.yaml b/templates/analysis_options.yaml index 7204c720..a686c1b4 100644 --- a/templates/analysis_options.yaml +++ b/templates/analysis_options.yaml @@ -1,6 +1,6 @@ # Defines a default set of lint rules enforced for # projects at Google. For details and rationale, -# see: https://github.com/dart-lang/pedantic#enabled-lints. +# see https://github.com/dart-lang/pedantic#enabled-lints. include: package:pedantic/analysis_options.yaml # For lint rules and documentation, see http://dart-lang.github.io/linter/lints. diff --git a/templates/console-full/analysis_options.yaml b/templates/console-full/analysis_options.yaml index 7204c720..a686c1b4 100644 --- a/templates/console-full/analysis_options.yaml +++ b/templates/console-full/analysis_options.yaml @@ -1,6 +1,6 @@ # Defines a default set of lint rules enforced for # projects at Google. For details and rationale, -# see: https://github.com/dart-lang/pedantic#enabled-lints. +# see https://github.com/dart-lang/pedantic#enabled-lints. include: package:pedantic/analysis_options.yaml # For lint rules and documentation, see http://dart-lang.github.io/linter/lints. diff --git a/templates/package-simple/analysis_options.yaml b/templates/package-simple/analysis_options.yaml index 7204c720..a686c1b4 100644 --- a/templates/package-simple/analysis_options.yaml +++ b/templates/package-simple/analysis_options.yaml @@ -1,6 +1,6 @@ # Defines a default set of lint rules enforced for # projects at Google. For details and rationale, -# see: https://github.com/dart-lang/pedantic#enabled-lints. +# see https://github.com/dart-lang/pedantic#enabled-lints. include: package:pedantic/analysis_options.yaml # For lint rules and documentation, see http://dart-lang.github.io/linter/lints. diff --git a/templates/server-shelf/analysis_options.yaml b/templates/server-shelf/analysis_options.yaml index 7204c720..a686c1b4 100644 --- a/templates/server-shelf/analysis_options.yaml +++ b/templates/server-shelf/analysis_options.yaml @@ -1,6 +1,6 @@ # Defines a default set of lint rules enforced for # projects at Google. For details and rationale, -# see: https://github.com/dart-lang/pedantic#enabled-lints. +# see https://github.com/dart-lang/pedantic#enabled-lints. include: package:pedantic/analysis_options.yaml # For lint rules and documentation, see http://dart-lang.github.io/linter/lints. diff --git a/templates/web-angular/analysis_options.yaml b/templates/web-angular/analysis_options.yaml index 38348d76..80249c77 100644 --- a/templates/web-angular/analysis_options.yaml +++ b/templates/web-angular/analysis_options.yaml @@ -1,6 +1,6 @@ # Defines a default set of lint rules enforced for # projects at Google. For details and rationale, -# see: https://github.com/dart-lang/pedantic#enabled-lints. +# see https://github.com/dart-lang/pedantic#enabled-lints. include: package:pedantic/analysis_options.yaml # For lint rules and documentation, see http://dart-lang.github.io/linter/lints. diff --git a/templates/web-simple/analysis_options.yaml b/templates/web-simple/analysis_options.yaml index 7204c720..a686c1b4 100644 --- a/templates/web-simple/analysis_options.yaml +++ b/templates/web-simple/analysis_options.yaml @@ -1,6 +1,6 @@ # Defines a default set of lint rules enforced for # projects at Google. For details and rationale, -# see: https://github.com/dart-lang/pedantic#enabled-lints. +# see https://github.com/dart-lang/pedantic#enabled-lints. include: package:pedantic/analysis_options.yaml # For lint rules and documentation, see http://dart-lang.github.io/linter/lints. diff --git a/templates/web-stagexl/analysis_options.yaml b/templates/web-stagexl/analysis_options.yaml index 7204c720..a686c1b4 100644 --- a/templates/web-stagexl/analysis_options.yaml +++ b/templates/web-stagexl/analysis_options.yaml @@ -1,6 +1,6 @@ # Defines a default set of lint rules enforced for # projects at Google. For details and rationale, -# see: https://github.com/dart-lang/pedantic#enabled-lints. +# see https://github.com/dart-lang/pedantic#enabled-lints. include: package:pedantic/analysis_options.yaml # For lint rules and documentation, see http://dart-lang.github.io/linter/lints.