From 5cbc1721ce1111188e5f717709381fbd306e4739 Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Mon, 9 Dec 2019 17:38:48 -0800 Subject: [PATCH] Upgrade to package:pedantic 1.9.0 (#641) Fix newly enforced lints: - prefer_conditional_assignment - prefer_if_null_operators - unnecessary_this Drop unused author field from pubspec. --- CHANGELOG.md | 4 ++ analysis_options.yaml | 2 +- lib/src/cli_app.dart | 6 +- lib/src/generators/console_full.g.dart | 10 ++-- lib/src/generators/package_simple.g.dart | 13 ++--- lib/src/generators/server_shelf.g.dart | 39 +++++++------ lib/src/generators/web_angular.g.dart | 11 ++-- lib/src/generators/web_simple.g.dart | 7 +-- lib/src/generators/web_stagexl.g.dart | 57 +++++++++---------- lib/src/version.dart | 2 +- lib/stagehand.dart | 6 +- pubspec.yaml | 3 +- templates/console-full/bin/main.dart | 2 +- templates/console-full/pubspec.yaml | 1 - .../example/__projectName___example.dart | 2 +- templates/package-simple/pubspec.yaml | 1 - templates/server-shelf/bin/server.dart | 2 +- templates/server-shelf/pubspec.yaml | 1 - templates/web-angular/pubspec.yaml | 1 - templates/web-simple/pubspec.yaml | 1 - templates/web-stagexl/pubspec.yaml | 1 - templates/web-stagexl/web/main.dart | 8 +-- test/validate_templates.dart | 1 - 23 files changed, 85 insertions(+), 96 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26ba3db2..44f6b1a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.3.5-dev + +- Internal cleanup. + ## 3.3.4 - Dropped `flutter_web_preview`, because you can now use the Flutter SDK to diff --git a/analysis_options.yaml b/analysis_options.yaml index 5cac3c15..433ab8ff 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,4 +1,4 @@ -include: package:pedantic/analysis_options.1.8.0.yaml +include: package:pedantic/analysis_options.1.9.0.yaml analyzer: exclude: - 'templates/**' diff --git a/lib/src/cli_app.dart b/lib/src/cli_app.dart index 3db5ca21..b7484fea 100644 --- a/lib/src/cli_app.dart +++ b/lib/src/cli_app.dart @@ -49,7 +49,7 @@ class CliApp { generators.sort(); } - io.Directory get cwd => _cwd != null ? _cwd : io.Directory.current; + io.Directory get cwd => _cwd ?? io.Directory.current; /// An override for the directory to generate into; public for testing. set cwd(io.Directory value) { @@ -159,9 +159,7 @@ additional analytics to help us improve Stagehand [y/yes/no]?'''); var projectName = path.basename(dir.path); projectName = normalizeProjectName(projectName); - if (target == null) { - target = _DirectoryGeneratorTarget(logger, dir); - } + target ??= _DirectoryGeneratorTarget(logger, dir); _out('Creating $generatorName application `$projectName`:'); diff --git a/lib/src/generators/console_full.g.dart b/lib/src/generators/console_full.g.dart index dbb862b2..a64bc460 100644 --- a/lib/src/generators/console_full.g.dart +++ b/lib/src/generators/console_full.g.dart @@ -40,8 +40,8 @@ CiMgICAgIC0gcGF0aC90by9leGNsdWRlZC9maWxlcy8qKgo=''', 'text', ''' aW1wb3J0ICdwYWNrYWdlOl9fcHJvamVjdE5hbWVfXy9fX3Byb2plY3ROYW1lX18uZGFydCcgYXMg -X19wcm9qZWN0TmFtZV9fOwoKbWFpbihMaXN0PFN0cmluZz4gYXJndW1lbnRzKSB7CiAgcHJpbnQo -J0hlbGxvIHdvcmxkOiAke19fcHJvamVjdE5hbWVfXy5jYWxjdWxhdGUoKX0hJyk7Cn0K''', +X19wcm9qZWN0TmFtZV9fOwoKdm9pZCBtYWluKExpc3Q8U3RyaW5nPiBhcmd1bWVudHMpIHsKICBw +cmludCgnSGVsbG8gd29ybGQ6ICR7X19wcm9qZWN0TmFtZV9fLmNhbGN1bGF0ZSgpfSEnKTsKfQo=''', 'lib/__projectName__.dart', 'text', 'aW50IGNhbGN1bGF0ZSgpIHsKICByZXR1cm4gNiAqIDc7Cn0K', @@ -50,9 +50,9 @@ J0hlbGxvIHdvcmxkOiAke19fcHJvamVjdE5hbWVfXy5jYWxjdWxhdGUoKX0hJyk7Cn0K''', ''' bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNhbXBsZSBjb21tYW5kLWxpbmUg YXBwbGljYXRpb24uCiMgdmVyc2lvbjogMS4wLjAKIyBob21lcGFnZTogaHR0cHM6Ly93d3cuZXhh -bXBsZS5jb20KIyBhdXRob3I6IF9fYXV0aG9yX18gPF9fZW1haWxfXz4KCmVudmlyb25tZW50Ogog -IHNkazogJz49Mi41LjAgPDMuMC4wJwoKI2RlcGVuZGVuY2llczoKIyAgcGF0aDogXjEuNi4wCgpk -ZXZfZGVwZW5kZW5jaWVzOgogIHBlZGFudGljOiBeMS44LjAKICB0ZXN0OiBeMS42LjAK''', +bXBsZS5jb20KCmVudmlyb25tZW50OgogIHNkazogJz49Mi41LjAgPDMuMC4wJwoKI2RlcGVuZGVu +Y2llczoKIyAgcGF0aDogXjEuNi4wCgpkZXZfZGVwZW5kZW5jaWVzOgogIHBlZGFudGljOiBeMS44 +LjAKICB0ZXN0OiBeMS42LjAK''', 'test/__projectName___test.dart', 'text', ''' diff --git a/lib/src/generators/package_simple.g.dart b/lib/src/generators/package_simple.g.dart index d3db3aea..0ef6a0c0 100644 --- a/lib/src/generators/package_simple.g.dart +++ b/lib/src/generators/package_simple.g.dart @@ -44,9 +44,9 @@ CiMgICAgIC0gcGF0aC90by9leGNsdWRlZC9maWxlcy8qKgo=''', 'example/__projectName___example.dart', 'text', ''' -aW1wb3J0ICdwYWNrYWdlOl9fcHJvamVjdE5hbWVfXy9fX3Byb2plY3ROYW1lX18uZGFydCc7Cgpt -YWluKCkgewogIHZhciBhd2Vzb21lID0gQXdlc29tZSgpOwogIHByaW50KCdhd2Vzb21lOiAke2F3 -ZXNvbWUuaXNBd2Vzb21lfScpOwp9Cg==''', +aW1wb3J0ICdwYWNrYWdlOl9fcHJvamVjdE5hbWVfXy9fX3Byb2plY3ROYW1lX18uZGFydCc7Cgp2 +b2lkIG1haW4oKSB7CiAgdmFyIGF3ZXNvbWUgPSBBd2Vzb21lKCk7CiAgcHJpbnQoJ2F3ZXNvbWU6 +ICR7YXdlc29tZS5pc0F3ZXNvbWV9Jyk7Cn0K''', 'lib/__projectName__.dart', 'text', ''' @@ -65,10 +65,9 @@ IGJvb2wgZ2V0IGlzQXdlc29tZSA9PiB0cnVlOwp9Cg==''', ''' bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHN0YXJ0aW5nIHBvaW50IGZvciBE YXJ0IGxpYnJhcmllcyBvciBhcHBsaWNhdGlvbnMuCiMgdmVyc2lvbjogMS4wLjAKIyBob21lcGFn -ZTogaHR0cHM6Ly93d3cuZXhhbXBsZS5jb20KIyBhdXRob3I6IF9fYXV0aG9yX18gPF9fZW1haWxf -Xz4KCmVudmlyb25tZW50OgogIHNkazogJz49Mi41LjAgPDMuMC4wJwoKI2RlcGVuZGVuY2llczoK -IyAgcGF0aDogXjEuNi4wCgpkZXZfZGVwZW5kZW5jaWVzOgogIHBlZGFudGljOiBeMS44LjAKICB0 -ZXN0OiBeMS42LjAK''', +ZTogaHR0cHM6Ly93d3cuZXhhbXBsZS5jb20KCmVudmlyb25tZW50OgogIHNkazogJz49Mi41LjAg +PDMuMC4wJwoKI2RlcGVuZGVuY2llczoKIyAgcGF0aDogXjEuNi4wCgpkZXZfZGVwZW5kZW5jaWVz +OgogIHBlZGFudGljOiBeMS44LjAKICB0ZXN0OiBeMS42LjAK''', 'test/__projectName___test.dart', 'text', ''' diff --git a/lib/src/generators/server_shelf.g.dart b/lib/src/generators/server_shelf.g.dart index 0832be72..9d4c20ee 100644 --- a/lib/src/generators/server_shelf.g.dart +++ b/lib/src/generators/server_shelf.g.dart @@ -42,29 +42,28 @@ CiMgICAgIC0gcGF0aC90by9leGNsdWRlZC9maWxlcy8qKgo=''', aW1wb3J0ICdkYXJ0OmlvJzsKCmltcG9ydCAncGFja2FnZTphcmdzL2FyZ3MuZGFydCc7CmltcG9y dCAncGFja2FnZTpzaGVsZi9zaGVsZi5kYXJ0JyBhcyBzaGVsZjsKaW1wb3J0ICdwYWNrYWdlOnNo ZWxmL3NoZWxmX2lvLmRhcnQnIGFzIGlvOwoKLy8gRm9yIEdvb2dsZSBDbG91ZCBSdW4sIHNldCBf -aG9zdG5hbWUgdG8gJzAuMC4wLjAnLgpjb25zdCBfaG9zdG5hbWUgPSAnbG9jYWxob3N0JzsKCm1h -aW4oTGlzdDxTdHJpbmc+IGFyZ3MpIGFzeW5jIHsKICB2YXIgcGFyc2VyID0gQXJnUGFyc2VyKCku -LmFkZE9wdGlvbigncG9ydCcsIGFiYnI6ICdwJyk7CiAgdmFyIHJlc3VsdCA9IHBhcnNlci5wYXJz -ZShhcmdzKTsKCiAgLy8gRm9yIEdvb2dsZSBDbG91ZCBSdW4sIHdlIHJlc3BlY3QgdGhlIFBPUlQg -ZW52aXJvbm1lbnQgdmFyaWFibGUKICB2YXIgcG9ydFN0ciA9IHJlc3VsdFsncG9ydCddID8/IFBs -YXRmb3JtLmVudmlyb25tZW50WydQT1JUJ10gPz8gJzgwODAnOwogIHZhciBwb3J0ID0gaW50LnRy -eVBhcnNlKHBvcnRTdHIpOwoKICBpZiAocG9ydCA9PSBudWxsKSB7CiAgICBzdGRvdXQud3JpdGVs -bignQ291bGQgbm90IHBhcnNlIHBvcnQgdmFsdWUgIiRwb3J0U3RyIiBpbnRvIGEgbnVtYmVyLicp -OwogICAgLy8gNjQ6IGNvbW1hbmQgbGluZSB1c2FnZSBlcnJvcgogICAgZXhpdENvZGUgPSA2NDsK -ICAgIHJldHVybjsKICB9CgogIHZhciBoYW5kbGVyID0gY29uc3Qgc2hlbGYuUGlwZWxpbmUoKQog -ICAgICAuYWRkTWlkZGxld2FyZShzaGVsZi5sb2dSZXF1ZXN0cygpKQogICAgICAuYWRkSGFuZGxl -cihfZWNob1JlcXVlc3QpOwoKICB2YXIgc2VydmVyID0gYXdhaXQgaW8uc2VydmUoaGFuZGxlciwg -X2hvc3RuYW1lLCBwb3J0KTsKICBwcmludCgnU2VydmluZyBhdCBodHRwOi8vJHtzZXJ2ZXIuYWRk -cmVzcy5ob3N0fToke3NlcnZlci5wb3J0fScpOwp9CgpzaGVsZi5SZXNwb25zZSBfZWNob1JlcXVl -c3Qoc2hlbGYuUmVxdWVzdCByZXF1ZXN0KSA9PgogICAgc2hlbGYuUmVzcG9uc2Uub2soJ1JlcXVl -c3QgZm9yICIke3JlcXVlc3QudXJsfSInKTsK''', +aG9zdG5hbWUgdG8gJzAuMC4wLjAnLgpjb25zdCBfaG9zdG5hbWUgPSAnbG9jYWxob3N0JzsKCnZv +aWQgbWFpbihMaXN0PFN0cmluZz4gYXJncykgYXN5bmMgewogIHZhciBwYXJzZXIgPSBBcmdQYXJz +ZXIoKS4uYWRkT3B0aW9uKCdwb3J0JywgYWJicjogJ3AnKTsKICB2YXIgcmVzdWx0ID0gcGFyc2Vy +LnBhcnNlKGFyZ3MpOwoKICAvLyBGb3IgR29vZ2xlIENsb3VkIFJ1biwgd2UgcmVzcGVjdCB0aGUg +UE9SVCBlbnZpcm9ubWVudCB2YXJpYWJsZQogIHZhciBwb3J0U3RyID0gcmVzdWx0Wydwb3J0J10g +Pz8gUGxhdGZvcm0uZW52aXJvbm1lbnRbJ1BPUlQnXSA/PyAnODA4MCc7CiAgdmFyIHBvcnQgPSBp +bnQudHJ5UGFyc2UocG9ydFN0cik7CgogIGlmIChwb3J0ID09IG51bGwpIHsKICAgIHN0ZG91dC53 +cml0ZWxuKCdDb3VsZCBub3QgcGFyc2UgcG9ydCB2YWx1ZSAiJHBvcnRTdHIiIGludG8gYSBudW1i +ZXIuJyk7CiAgICAvLyA2NDogY29tbWFuZCBsaW5lIHVzYWdlIGVycm9yCiAgICBleGl0Q29kZSA9 +IDY0OwogICAgcmV0dXJuOwogIH0KCiAgdmFyIGhhbmRsZXIgPSBjb25zdCBzaGVsZi5QaXBlbGlu +ZSgpCiAgICAgIC5hZGRNaWRkbGV3YXJlKHNoZWxmLmxvZ1JlcXVlc3RzKCkpCiAgICAgIC5hZGRI +YW5kbGVyKF9lY2hvUmVxdWVzdCk7CgogIHZhciBzZXJ2ZXIgPSBhd2FpdCBpby5zZXJ2ZShoYW5k +bGVyLCBfaG9zdG5hbWUsIHBvcnQpOwogIHByaW50KCdTZXJ2aW5nIGF0IGh0dHA6Ly8ke3NlcnZl +ci5hZGRyZXNzLmhvc3R9OiR7c2VydmVyLnBvcnR9Jyk7Cn0KCnNoZWxmLlJlc3BvbnNlIF9lY2hv +UmVxdWVzdChzaGVsZi5SZXF1ZXN0IHJlcXVlc3QpID0+CiAgICBzaGVsZi5SZXNwb25zZS5vaygn +UmVxdWVzdCBmb3IgIiR7cmVxdWVzdC51cmx9IicpOwo=''', 'pubspec.yaml', 'text', ''' bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHdlYiBzZXJ2ZXIgYnVpbHQgdXNp bmcgdGhlIHNoZWxmIHBhY2thZ2UuCiMgdmVyc2lvbjogMS4wLjAKIyBob21lcGFnZTogaHR0cHM6 -Ly93d3cuZXhhbXBsZS5jb20KIyBhdXRob3I6IF9fYXV0aG9yX18gPF9fZW1haWxfXz4KCmVudmly -b25tZW50OgogIHNkazogJz49Mi41LjAgPDMuMC4wJwoKZGVwZW5kZW5jaWVzOgogIGFyZ3M6IF4x -LjUuMAogIHNoZWxmOiBeMC43LjUKCmRldl9kZXBlbmRlbmNpZXM6CiAgcGVkYW50aWM6IF4xLjgu -MAo=''' +Ly93d3cuZXhhbXBsZS5jb20KCmVudmlyb25tZW50OgogIHNkazogJz49Mi41LjAgPDMuMC4wJwoK +ZGVwZW5kZW5jaWVzOgogIGFyZ3M6IF4xLjUuMAogIHNoZWxmOiBeMC43LjUKCmRldl9kZXBlbmRl +bmNpZXM6CiAgcGVkYW50aWM6IF4xLjguMAo=''' ]; diff --git a/lib/src/generators/web_angular.g.dart b/lib/src/generators/web_angular.g.dart index 7f61ecf1..0a99d3e9 100644 --- a/lib/src/generators/web_angular.g.dart +++ b/lib/src/generators/web_angular.g.dart @@ -123,12 +123,11 @@ bmc+PiBnZXRUb2RvTGlzdCgpIGFzeW5jID0+IG1vY2tUb2RvTGlzdDsKfQo=''', ''' bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHdlYiBhcHAgdGhhdCB1c2VzIEFu Z3VsYXJEYXJ0IENvbXBvbmVudHMKIyB2ZXJzaW9uOiAxLjAuMAojIGhvbWVwYWdlOiBodHRwczov -L3d3dy5leGFtcGxlLmNvbQojIGF1dGhvcjogX19hdXRob3JfXyA8X19lbWFpbF9fPgoKZW52aXJv -bm1lbnQ6CiAgc2RrOiAnPj0yLjUuMCA8My4wLjAnCgpkZXBlbmRlbmNpZXM6CiAgYW5ndWxhcjog -XjUuMy4wCiAgYW5ndWxhcl9jb21wb25lbnRzOiBeMC4xMy4wCgpkZXZfZGVwZW5kZW5jaWVzOgog -IGFuZ3VsYXJfdGVzdDogXjIuMy4wCiAgYnVpbGRfcnVubmVyOiBeMS42LjAKICBidWlsZF90ZXN0 -OiBeMC4xMC44CiAgYnVpbGRfd2ViX2NvbXBpbGVyczogXjIuMy4wCiAgcGVkYW50aWM6IF4xLjgu -MAogIHRlc3Q6IF4xLjYuMAo=''', +L3d3dy5leGFtcGxlLmNvbQoKZW52aXJvbm1lbnQ6CiAgc2RrOiAnPj0yLjUuMCA8My4wLjAnCgpk +ZXBlbmRlbmNpZXM6CiAgYW5ndWxhcjogXjUuMy4wCiAgYW5ndWxhcl9jb21wb25lbnRzOiBeMC4x +My4wCgpkZXZfZGVwZW5kZW5jaWVzOgogIGFuZ3VsYXJfdGVzdDogXjIuMy4wCiAgYnVpbGRfcnVu +bmVyOiBeMS42LjAKICBidWlsZF90ZXN0OiBeMC4xMC44CiAgYnVpbGRfd2ViX2NvbXBpbGVyczog +XjIuMy4wCiAgcGVkYW50aWM6IF4xLjguMAogIHRlc3Q6IF4xLjYuMAo=''', 'test/app_test.dart', 'text', ''' diff --git a/lib/src/generators/web_simple.g.dart b/lib/src/generators/web_simple.g.dart index b962354e..80a81c92 100644 --- a/lib/src/generators/web_simple.g.dart +++ b/lib/src/generators/web_simple.g.dart @@ -41,10 +41,9 @@ CiMgICAgIC0gcGF0aC90by9leGNsdWRlZC9maWxlcy8qKgo=''', ''' bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBbiBhYnNvbHV0ZSBiYXJlLWJvbmVz IHdlYiBhcHAuCiMgdmVyc2lvbjogMS4wLjAKI2hvbWVwYWdlOiBodHRwczovL3d3dy5leGFtcGxl -LmNvbQojYXV0aG9yOiBfX2F1dGhvcl9fIDxfX2VtYWlsX18+CgplbnZpcm9ubWVudDoKICBzZGs6 -ICc+PTIuNS4wIDwzLjAuMCcKCiNkZXBlbmRlbmNpZXM6CiMgIHBhdGg6IF4xLjYuMAoKZGV2X2Rl -cGVuZGVuY2llczoKICBidWlsZF9ydW5uZXI6IF4xLjYuMAogIGJ1aWxkX3dlYl9jb21waWxlcnM6 -IF4yLjMuMAogIHBlZGFudGljOiBeMS44LjAK''', +LmNvbQoKZW52aXJvbm1lbnQ6CiAgc2RrOiAnPj0yLjUuMCA8My4wLjAnCgojZGVwZW5kZW5jaWVz +OgojICBwYXRoOiBeMS42LjAKCmRldl9kZXBlbmRlbmNpZXM6CiAgYnVpbGRfcnVubmVyOiBeMS42 +LjAKICBidWlsZF93ZWJfY29tcGlsZXJzOiBeMi4zLjAKICBwZWRhbnRpYzogXjEuOC4wCg==''', 'web/favicon.ico', 'binary', ''' diff --git a/lib/src/generators/web_stagexl.g.dart b/lib/src/generators/web_stagexl.g.dart index 2e9daf11..7bef94c9 100644 --- a/lib/src/generators/web_stagexl.g.dart +++ b/lib/src/generators/web_stagexl.g.dart @@ -40,11 +40,10 @@ CiMgICAgIC0gcGF0aC90by9leGNsdWRlZC9maWxlcy8qKgo=''', 'text', ''' bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNpbXBsZSBTdGFnZVhMIHdlYiBh -cHAuCiMgdmVyc2lvbjogMS4wLjAKI2hvbWVwYWdlOiBodHRwczovL3d3dy5leGFtcGxlLmNvbQoj -YXV0aG9yOiBfX2F1dGhvcl9fIDxfX2VtYWlsX18+CgplbnZpcm9ubWVudDoKICBzZGs6ICc+PTIu -NS4wIDwzLjAuMCcKCmRlcGVuZGVuY2llczoKICBzdGFnZXhsOiBeMS40LjAKCmRldl9kZXBlbmRl -bmNpZXM6CiAgYnVpbGRfcnVubmVyOiBeMS42LjAKICBidWlsZF93ZWJfY29tcGlsZXJzOiBeMi4z -LjAKICBwZWRhbnRpYzogXjEuOC4wCg==''', +cHAuCiMgdmVyc2lvbjogMS4wLjAKI2hvbWVwYWdlOiBodHRwczovL3d3dy5leGFtcGxlLmNvbQoK +ZW52aXJvbm1lbnQ6CiAgc2RrOiAnPj0yLjUuMCA8My4wLjAnCgpkZXBlbmRlbmNpZXM6CiAgc3Rh +Z2V4bDogXjEuNC4wCgpkZXZfZGVwZW5kZW5jaWVzOgogIGJ1aWxkX3J1bm5lcjogXjEuNi4wCiAg +YnVpbGRfd2ViX2NvbXBpbGVyczogXjIuMy4wCiAgcGVkYW50aWM6IF4xLjguMAo=''', 'web/images/dart@1x.png', 'binary', ''' @@ -517,30 +516,30 @@ bGxzY3JlZW4iPjwvY2FudmFzPgoKPC9ib2R5Pgo8L2h0bWw+Cg==''', ''' aW1wb3J0ICdkYXJ0OmFzeW5jJzsKaW1wb3J0ICdkYXJ0Omh0bWwnIGFzIGh0bWw7CmltcG9ydCAn cGFja2FnZTpzdGFnZXhsL3N0YWdleGwuZGFydCc7CmltcG9ydCAnZGFydDptYXRoJzsKCkZ1dHVy -ZTxOdWxsPiBtYWluKCkgYXN5bmMgewogIFN0YWdlT3B0aW9ucyBvcHRpb25zID0gU3RhZ2VPcHRp -b25zKCkKICAgIC4uYmFja2dyb3VuZENvbG9yID0gQ29sb3IuV2hpdGUKICAgIC4ucmVuZGVyRW5n -aW5lID0gUmVuZGVyRW5naW5lLldlYkdMOwoKICB2YXIgY2FudmFzID0gaHRtbC5xdWVyeVNlbGVj -dG9yKCcjc3RhZ2UnKTsKICB2YXIgc3RhZ2UgPSBTdGFnZShjYW52YXMsIHdpZHRoOiAxMjgwLCBo -ZWlnaHQ6IDgwMCwgb3B0aW9uczogb3B0aW9ucyk7CgogIHZhciByZW5kZXJMb29wID0gUmVuZGVy -TG9vcCgpOwogIHJlbmRlckxvb3AuYWRkU3RhZ2Uoc3RhZ2UpOwoKICB2YXIgcmVzb3VyY2VNYW5h -Z2VyID0gUmVzb3VyY2VNYW5hZ2VyKCk7CiAgcmVzb3VyY2VNYW5hZ2VyLmFkZEJpdG1hcERhdGEo -ImRhcnQiLCAiaW1hZ2VzL2RhcnRAMXgucG5nIik7CgogIGF3YWl0IHJlc291cmNlTWFuYWdlci5s -b2FkKCk7CgogIHZhciBsb2dvRGF0YSA9IHJlc291cmNlTWFuYWdlci5nZXRCaXRtYXBEYXRhKCJk -YXJ0Iik7CiAgdmFyIGxvZ28gPSBTcHJpdGUoKTsKICBsb2dvLmFkZENoaWxkKEJpdG1hcChsb2dv -RGF0YSkpOwoKICBsb2dvLnBpdm90WCA9IGxvZ29EYXRhLndpZHRoIC8gMjsKICBsb2dvLnBpdm90 -WSA9IGxvZ29EYXRhLmhlaWdodCAvIDI7CgogIC8vIFBsYWNlIGl0IGF0IHRvcCBjZW50ZXIuCiAg -bG9nby54ID0gMTI4MCAvIDI7CiAgbG9nby55ID0gMDsKCiAgc3RhZ2UuYWRkQ2hpbGQobG9nbyk7 -CgogIC8vIEFuZCBsZXQgaXQgZmFsbC4KICB2YXIgdHdlZW4gPSBzdGFnZS5qdWdnbGVyLmFkZFR3 -ZWVuKGxvZ28sIDMsIFRyYW5zaXRpb24uZWFzZU91dEJvdW5jZSk7CiAgdHdlZW4uYW5pbWF0ZS55 -LnRvKDgwMCAvIDIpOwoKICAvLyBBZGQgc29tZSBpbnRlcmFjdGlvbiBvbiBtb3VzZSBjbGljay4K -ICBUd2VlbiByb3RhdGlvbjsKICBsb2dvLm9uTW91c2VDbGljay5saXN0ZW4oKE1vdXNlRXZlbnQg -ZSkgewogICAgLy8gRG9uJ3QgcnVuIG1vcmUgcm90YXRpb25zIGF0IHRoZSBzYW1lIHRpbWUuCiAg -ICBpZiAocm90YXRpb24gIT0gbnVsbCkgcmV0dXJuOwogICAgcm90YXRpb24gPSBzdGFnZS5qdWdn -bGVyLmFkZFR3ZWVuKGxvZ28sIDAuNSwgVHJhbnNpdGlvbi5lYXNlSW5PdXRDdWJpYyk7CiAgICBy -b3RhdGlvbi5hbmltYXRlLnJvdGF0aW9uLmJ5KDIgKiBwaSk7CiAgICByb3RhdGlvbi5vbkNvbXBs -ZXRlID0gKCkgPT4gcm90YXRpb24gPSBudWxsOwogIH0pOwogIGxvZ28ubW91c2VDdXJzb3IgPSBN -b3VzZUN1cnNvci5QT0lOVEVSOwoKICAvLyBTZWUgbW9yZSBleGFtcGxlczoKICAvLyBodHRwczov -L2dpdGh1Yi5jb20vYnA3NC9TdGFnZVhMX1NhbXBsZXMKfQo=''', +ZTx2b2lkPiBtYWluKCkgYXN5bmMgewogIHZhciBvcHRpb25zID0gU3RhZ2VPcHRpb25zKCkKICAg +IC4uYmFja2dyb3VuZENvbG9yID0gQ29sb3IuV2hpdGUKICAgIC4ucmVuZGVyRW5naW5lID0gUmVu +ZGVyRW5naW5lLldlYkdMOwoKICB2YXIgY2FudmFzID0gaHRtbC5xdWVyeVNlbGVjdG9yKCcjc3Rh +Z2UnKTsKICB2YXIgc3RhZ2UgPSBTdGFnZShjYW52YXMsIHdpZHRoOiAxMjgwLCBoZWlnaHQ6IDgw +MCwgb3B0aW9uczogb3B0aW9ucyk7CgogIHZhciByZW5kZXJMb29wID0gUmVuZGVyTG9vcCgpOwog +IHJlbmRlckxvb3AuYWRkU3RhZ2Uoc3RhZ2UpOwoKICB2YXIgcmVzb3VyY2VNYW5hZ2VyID0gUmVz +b3VyY2VNYW5hZ2VyKCk7CiAgcmVzb3VyY2VNYW5hZ2VyLmFkZEJpdG1hcERhdGEoJ2RhcnQnLCAn +aW1hZ2VzL2RhcnRAMXgucG5nJyk7CgogIGF3YWl0IHJlc291cmNlTWFuYWdlci5sb2FkKCk7Cgog +IHZhciBsb2dvRGF0YSA9IHJlc291cmNlTWFuYWdlci5nZXRCaXRtYXBEYXRhKCdkYXJ0Jyk7CiAg +dmFyIGxvZ28gPSBTcHJpdGUoKTsKICBsb2dvLmFkZENoaWxkKEJpdG1hcChsb2dvRGF0YSkpOwoK +ICBsb2dvLnBpdm90WCA9IGxvZ29EYXRhLndpZHRoIC8gMjsKICBsb2dvLnBpdm90WSA9IGxvZ29E +YXRhLmhlaWdodCAvIDI7CgogIC8vIFBsYWNlIGl0IGF0IHRvcCBjZW50ZXIuCiAgbG9nby54ID0g +MTI4MCAvIDI7CiAgbG9nby55ID0gMDsKCiAgc3RhZ2UuYWRkQ2hpbGQobG9nbyk7CgogIC8vIEFu +ZCBsZXQgaXQgZmFsbC4KICB2YXIgdHdlZW4gPSBzdGFnZS5qdWdnbGVyLmFkZFR3ZWVuKGxvZ28s +IDMsIFRyYW5zaXRpb24uZWFzZU91dEJvdW5jZSk7CiAgdHdlZW4uYW5pbWF0ZS55LnRvKDgwMCAv +IDIpOwoKICAvLyBBZGQgc29tZSBpbnRlcmFjdGlvbiBvbiBtb3VzZSBjbGljay4KICBUd2VlbiBy +b3RhdGlvbjsKICBsb2dvLm9uTW91c2VDbGljay5saXN0ZW4oKE1vdXNlRXZlbnQgZSkgewogICAg +Ly8gRG9uJ3QgcnVuIG1vcmUgcm90YXRpb25zIGF0IHRoZSBzYW1lIHRpbWUuCiAgICBpZiAocm90 +YXRpb24gIT0gbnVsbCkgcmV0dXJuOwogICAgcm90YXRpb24gPSBzdGFnZS5qdWdnbGVyLmFkZFR3 +ZWVuKGxvZ28sIDAuNSwgVHJhbnNpdGlvbi5lYXNlSW5PdXRDdWJpYyk7CiAgICByb3RhdGlvbi5h +bmltYXRlLnJvdGF0aW9uLmJ5KDIgKiBwaSk7CiAgICByb3RhdGlvbi5vbkNvbXBsZXRlID0gKCkg +PT4gcm90YXRpb24gPSBudWxsOwogIH0pOwogIGxvZ28ubW91c2VDdXJzb3IgPSBNb3VzZUN1cnNv +ci5QT0lOVEVSOwoKICAvLyBTZWUgbW9yZSBleGFtcGxlczoKICAvLyBodHRwczovL2dpdGh1Yi5j +b20vYnA3NC9TdGFnZVhMX1NhbXBsZXMKfQo=''', 'web/styles.css', 'text', ''' diff --git a/lib/src/version.dart b/lib/src/version.dart index 83a6125a..24950cac 100644 --- a/lib/src/version.dart +++ b/lib/src/version.dart @@ -1,2 +1,2 @@ // Generated code. Do not modify. -const packageVersion = '3.3.4'; +const packageVersion = '3.3.5-dev'; diff --git a/lib/stagehand.dart b/lib/stagehand.dart index f6941bb9..cdbbec98 100644 --- a/lib/stagehand.dart +++ b/lib/stagehand.dart @@ -87,7 +87,7 @@ abstract class Generator implements Comparable { void setEntrypoint(TemplateFile entrypoint) { if (_entrypoint != null) throw StateError('entrypoint already set'); if (entrypoint == null) throw StateError('entrypoint is null'); - this._entrypoint = entrypoint; + _entrypoint = entrypoint; } Future generate(String projectName, GeneratorTarget target, @@ -116,7 +116,7 @@ abstract class Generator implements Comparable { @override int compareTo(Generator other) => - this.id.toLowerCase().compareTo(other.id.toLowerCase()); + id.toLowerCase().compareTo(other.id.toLowerCase()); /// Return some user facing instructions about how to finish installation of /// the template. @@ -145,7 +145,7 @@ class TemplateFile { TemplateFile(this.path, this.content); - TemplateFile.fromBinary(this.path, this._binaryData) : this.content = null; + TemplateFile.fromBinary(this.path, this._binaryData) : content = null; FileContents runSubstitution(Map parameters) { if (path == 'pubspec.yaml' && parameters['author'] == '') { diff --git a/pubspec.yaml b/pubspec.yaml index 19c2a00f..5be1e66b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,9 +7,8 @@ description: > A scaffolding generator for your Dart projects. Stagehand helps you get set up! # After changing the version, run `pub run build_runner build`. -version: 3.3.4 +version: 3.3.5-dev homepage: https://github.com/dart-lang/stagehand -author: Dart Team environment: # Make sure this Dart SDK version is no higher than the stable Flutter Dart diff --git a/templates/console-full/bin/main.dart b/templates/console-full/bin/main.dart index 820ea90e..a49382c7 100644 --- a/templates/console-full/bin/main.dart +++ b/templates/console-full/bin/main.dart @@ -1,5 +1,5 @@ import 'package:__projectName__/__projectName__.dart' as __projectName__; -main(List arguments) { +void main(List arguments) { print('Hello world: ${__projectName__.calculate()}!'); } diff --git a/templates/console-full/pubspec.yaml b/templates/console-full/pubspec.yaml index bd188788..9807d846 100644 --- a/templates/console-full/pubspec.yaml +++ b/templates/console-full/pubspec.yaml @@ -2,7 +2,6 @@ name: __projectName__ description: A sample command-line application. # version: 1.0.0 # homepage: https://www.example.com -# author: __author__ <__email__> environment: sdk: '>=2.5.0 <3.0.0' diff --git a/templates/package-simple/example/__projectName___example.dart b/templates/package-simple/example/__projectName___example.dart index 5d2486ed..9855c7d3 100644 --- a/templates/package-simple/example/__projectName___example.dart +++ b/templates/package-simple/example/__projectName___example.dart @@ -1,6 +1,6 @@ import 'package:__projectName__/__projectName__.dart'; -main() { +void main() { var awesome = Awesome(); print('awesome: ${awesome.isAwesome}'); } diff --git a/templates/package-simple/pubspec.yaml b/templates/package-simple/pubspec.yaml index c07d0da2..b34d1918 100644 --- a/templates/package-simple/pubspec.yaml +++ b/templates/package-simple/pubspec.yaml @@ -2,7 +2,6 @@ name: __projectName__ description: A starting point for Dart libraries or applications. # version: 1.0.0 # homepage: https://www.example.com -# author: __author__ <__email__> environment: sdk: '>=2.5.0 <3.0.0' diff --git a/templates/server-shelf/bin/server.dart b/templates/server-shelf/bin/server.dart index 53b132e6..08c37817 100644 --- a/templates/server-shelf/bin/server.dart +++ b/templates/server-shelf/bin/server.dart @@ -7,7 +7,7 @@ import 'package:shelf/shelf_io.dart' as io; // For Google Cloud Run, set _hostname to '0.0.0.0'. const _hostname = 'localhost'; -main(List args) async { +void main(List args) async { var parser = ArgParser()..addOption('port', abbr: 'p'); var result = parser.parse(args); diff --git a/templates/server-shelf/pubspec.yaml b/templates/server-shelf/pubspec.yaml index 00e235c5..6ce7d58d 100644 --- a/templates/server-shelf/pubspec.yaml +++ b/templates/server-shelf/pubspec.yaml @@ -2,7 +2,6 @@ name: __projectName__ description: A web server built using the shelf package. # version: 1.0.0 # homepage: https://www.example.com -# author: __author__ <__email__> environment: sdk: '>=2.5.0 <3.0.0' diff --git a/templates/web-angular/pubspec.yaml b/templates/web-angular/pubspec.yaml index addc4fc9..fd8757ed 100644 --- a/templates/web-angular/pubspec.yaml +++ b/templates/web-angular/pubspec.yaml @@ -2,7 +2,6 @@ name: __projectName__ description: A web app that uses AngularDart Components # version: 1.0.0 # homepage: https://www.example.com -# author: __author__ <__email__> environment: sdk: '>=2.5.0 <3.0.0' diff --git a/templates/web-simple/pubspec.yaml b/templates/web-simple/pubspec.yaml index 015a9c99..8da16d38 100644 --- a/templates/web-simple/pubspec.yaml +++ b/templates/web-simple/pubspec.yaml @@ -2,7 +2,6 @@ name: __projectName__ description: An absolute bare-bones web app. # version: 1.0.0 #homepage: https://www.example.com -#author: __author__ <__email__> environment: sdk: '>=2.5.0 <3.0.0' diff --git a/templates/web-stagexl/pubspec.yaml b/templates/web-stagexl/pubspec.yaml index 86ef46cd..bd9b1830 100644 --- a/templates/web-stagexl/pubspec.yaml +++ b/templates/web-stagexl/pubspec.yaml @@ -2,7 +2,6 @@ name: __projectName__ description: A simple StageXL web app. # version: 1.0.0 #homepage: https://www.example.com -#author: __author__ <__email__> environment: sdk: '>=2.5.0 <3.0.0' diff --git a/templates/web-stagexl/web/main.dart b/templates/web-stagexl/web/main.dart index 8e324691..37d6306a 100644 --- a/templates/web-stagexl/web/main.dart +++ b/templates/web-stagexl/web/main.dart @@ -3,8 +3,8 @@ import 'dart:html' as html; import 'package:stagexl/stagexl.dart'; import 'dart:math'; -Future main() async { - StageOptions options = StageOptions() +Future main() async { + var options = StageOptions() ..backgroundColor = Color.White ..renderEngine = RenderEngine.WebGL; @@ -15,11 +15,11 @@ Future main() async { renderLoop.addStage(stage); var resourceManager = ResourceManager(); - resourceManager.addBitmapData("dart", "images/dart@1x.png"); + resourceManager.addBitmapData('dart', 'images/dart@1x.png'); await resourceManager.load(); - var logoData = resourceManager.getBitmapData("dart"); + var logoData = resourceManager.getBitmapData('dart'); var logo = Sprite(); logo.addChild(Bitmap(logoData)); diff --git a/test/validate_templates.dart b/test/validate_templates.dart index ae4439b7..fbb53ad2 100644 --- a/test/validate_templates.dart +++ b/test/validate_templates.dart @@ -18,7 +18,6 @@ final _pubspecOrder = const [ 'description', 'version', 'homepage', - 'author(s)?', 'environment', 'dependencies', 'dev_dependencies',