Merge pull request #307 from Kleak/master

remove library keyword
dart-archive · Mar 7, 2016 · c131eca · c131eca
2 parents f2bb2a5 + da4c5b5
commit c131eca
Show file tree

Hide file tree

Showing 31 changed files with 83 additions and 134 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -12,3 +12,4 @@ Kunal Deo <[email protected]>
 Guillermo López-Anglada <[email protected]>
 ntaoo <[email protected]>
 Andrés Araujo <[email protected]>
+Kevin Segaud <[email protected]>
diff --git a/bin/stagehand.dart b/bin/stagehand.dart
@@ -2,8 +2,6 @@
 // All rights reserved. Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-library stagehand.cli;
-
 import 'dart:async';
 import 'dart:io' as io;
 

diff --git a/lib/generators/console_full.dart b/lib/generators/console_full.dart
@@ -2,8 +2,6 @@
 // All rights reserved. Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-library stagehand.console.full;
-
 import '../stagehand.dart';
 import '../src/common.dart';
 import 'console_full_data.dart';

diff --git a/lib/generators/console_full_data.dart b/lib/generators/console_full_data.dart
@@ -59,9 +59,8 @@ cmxkOiAke19fcHJvamVjdE5hbWVfXy5jYWxjdWxhdGUoKX0hJyk7Cn0K""",
   "text",
   """Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
 ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
-bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKLy8vIFRoZSBf
-X3Byb2plY3ROYW1lX18gbGlicmFyeS4KbGlicmFyeSBfX3Byb2plY3ROYW1lX187CgppbnQgY2Fs
-Y3VsYXRlKCkgewogIHJldHVybiA2ICogNzsKfQo=""",
+bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKaW50IGNhbGN1
+bGF0ZSgpIHsKICByZXR1cm4gNiAqIDc7Cn0K""",
   "pubspec.yaml",
   "text",
   """bmFtZTogX19wcm9qZWN0TmFtZV9fCnZlcnNpb246IDAuMC4xCmRlc2NyaXB0aW9uOiBBIHNhbXBs
@@ -74,9 +73,8 @@ LjAnCg==""",
   "text",
   """Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
 ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
-bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKbGlicmFyeSBf
-X3Byb2plY3ROYW1lX18udGVzdDsKCmltcG9ydCAncGFja2FnZTpfX3Byb2plY3ROYW1lX18vX19w
-cm9qZWN0TmFtZV9fLmRhcnQnOwppbXBvcnQgJ3BhY2thZ2U6dGVzdC90ZXN0LmRhcnQnOwoKdm9p
-ZCBtYWluKCkgewogIHRlc3QoJ2NhbGN1bGF0ZScsICgpIHsKICAgIGV4cGVjdChjYWxjdWxhdGUo
-KSwgNDIpOwogIH0pOwp9Cg=="""
+bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKaW1wb3J0ICdw
+YWNrYWdlOl9fcHJvamVjdE5hbWVfXy9fX3Byb2plY3ROYW1lX18uZGFydCc7CmltcG9ydCAncGFj
+a2FnZTp0ZXN0L3Rlc3QuZGFydCc7Cgp2b2lkIG1haW4oKSB7CiAgdGVzdCgnY2FsY3VsYXRlJywg
+KCkgewogICAgZXhwZWN0KGNhbGN1bGF0ZSgpLCA0Mik7CiAgfSk7Cn0K"""
 ];
diff --git a/lib/generators/console_simple.dart b/lib/generators/console_simple.dart
@@ -2,8 +2,6 @@
 // All rights reserved. Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-library stagehand.console.simple;
-
 import '../stagehand.dart';
 import '../src/common.dart';
 import 'console_simple_data.dart';

diff --git a/lib/generators/package_simple.dart b/lib/generators/package_simple.dart
@@ -2,8 +2,6 @@
 // All rights reserved. Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-library stagehand.package.simple;
-
 import '../stagehand.dart';
 import '../src/common.dart';
 import 'package_simple_data.dart';

diff --git a/lib/generators/package_simple_data.dart b/lib/generators/package_simple_data.dart
@@ -56,27 +56,27 @@ c3Vlcy9yZXBsYWNlbWUK""",
   "text",
   """Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
 ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
-bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKbGlicmFyeSBf
-X3Byb2plY3ROYW1lX18uZXhhbXBsZTsKCmltcG9ydCAncGFja2FnZTpfX3Byb2plY3ROYW1lX18v
-X19wcm9qZWN0TmFtZV9fLmRhcnQnOwoKbWFpbigpIHsKICB2YXIgYXdlc29tZSA9IG5ldyBBd2Vz
-b21lKCk7CiAgcHJpbnQoJ2F3ZXNvbWU6ICR7YXdlc29tZS5pc0F3ZXNvbWV9Jyk7Cn0K""",
+bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKaW1wb3J0ICdw
+YWNrYWdlOl9fcHJvamVjdE5hbWVfXy9fX3Byb2plY3ROYW1lX18uZGFydCc7CgptYWluKCkgewog
+IHZhciBhd2Vzb21lID0gbmV3IEF3ZXNvbWUoKTsKICBwcmludCgnYXdlc29tZTogJHthd2Vzb21l
+LmlzQXdlc29tZX0nKTsKfQo=""",
   "lib/__projectName__.dart",
   "text",
   """Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
 ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
-bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKLy8vIFRoZSBf
-X3Byb2plY3ROYW1lX18gbGlicmFyeS4KLy8vCi8vLyBUaGlzIGlzIGFuIGF3ZXNvbWUgbGlicmFy
-eS4gTW9yZSBkYXJ0ZG9jcyBnbyBoZXJlLgpsaWJyYXJ5IF9fcHJvamVjdE5hbWVfXzsKCi8vIFRP
-RE86IEV4cG9ydCBhbnkgbGlicmFyaWVzIGludGVuZGVkIGZvciBjbGllbnRzIG9mIHRoaXMgcGFj
-a2FnZS4KCmV4cG9ydCAnc3JjL19fcHJvamVjdE5hbWVfX19iYXNlLmRhcnQnOwo=""",
+bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKLy8vIFN1cHBv
+cnQgZm9yIGRvaW5nIHNvbWV0aGluZyBhd2Vzb21lLgovLy8KLy8vIE1vcmUgZGFydGRvY3MgZ28g
+aGVyZS4KbGlicmFyeSBfX3Byb2plY3ROYW1lX187CgpleHBvcnQgJ3NyYy9fX3Byb2plY3ROYW1l
+X19fYmFzZS5kYXJ0JzsKCi8vIFRPRE86IEV4cG9ydCBhbnkgbGlicmFyaWVzIGludGVuZGVkIGZv
+ciBjbGllbnRzIG9mIHRoaXMgcGFja2FnZS4K""",
   "lib/src/__projectName___base.dart",
   "text",
   """Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
 ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
 bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKLy8gVE9ETzog
-UHV0IHB1YmxpYyBmYWNpbmcgdHlwZXMgaW4gdGhpcyBmaWxlLgoKbGlicmFyeSBfX3Byb2plY3RO
-YW1lX18uYmFzZTsKCi8vLyBDaGVja3MgaWYgeW91IGFyZSBhd2Vzb21lLiBTcG9pbGVyOiB5b3Ug
-YXJlLgpjbGFzcyBBd2Vzb21lIHsKICBib29sIGdldCBpc0F3ZXNvbWUgPT4gdHJ1ZTsKfQo=""",
+UHV0IHB1YmxpYyBmYWNpbmcgdHlwZXMgaW4gdGhpcyBmaWxlLgoKLy8vIENoZWNrcyBpZiB5b3Ug
+YXJlIGF3ZXNvbWUuIFNwb2lsZXI6IHlvdSBhcmUuCmNsYXNzIEF3ZXNvbWUgewogIGJvb2wgZ2V0
+IGlzQXdlc29tZSA9PiB0cnVlOwp9Cg==""",
   "pubspec.yaml",
   "text",
   """bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHN0YXJ0aW5nIHBvaW50IGZvciBE
@@ -89,11 +89,11 @@ IDwwLjEzLjAnCg==""",
   "text",
   """Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
 ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
-bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKbGlicmFyeSBf
-X3Byb2plY3ROYW1lX18udGVzdDsKCmltcG9ydCAncGFja2FnZTpfX3Byb2plY3ROYW1lX18vX19w
-cm9qZWN0TmFtZV9fLmRhcnQnOwppbXBvcnQgJ3BhY2thZ2U6dGVzdC90ZXN0LmRhcnQnOwoKdm9p
-ZCBtYWluKCkgewogIGdyb3VwKCdBIGdyb3VwIG9mIHRlc3RzJywgKCkgewogICAgQXdlc29tZSBh
-d2Vzb21lOwoKICAgIHNldFVwKCgpIHsKICAgICAgYXdlc29tZSA9IG5ldyBBd2Vzb21lKCk7CiAg
-ICB9KTsKCiAgICB0ZXN0KCdGaXJzdCBUZXN0JywgKCkgewogICAgICBleHBlY3QoYXdlc29tZS5p
-c0F3ZXNvbWUsIGlzVHJ1ZSk7CiAgICB9KTsKICB9KTsKfQo="""
+bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKaW1wb3J0ICdw
+YWNrYWdlOl9fcHJvamVjdE5hbWVfXy9fX3Byb2plY3ROYW1lX18uZGFydCc7CmltcG9ydCAncGFj
+a2FnZTp0ZXN0L3Rlc3QuZGFydCc7Cgp2b2lkIG1haW4oKSB7CiAgZ3JvdXAoJ0EgZ3JvdXAgb2Yg
+dGVzdHMnLCAoKSB7CiAgICBBd2Vzb21lIGF3ZXNvbWU7CgogICAgc2V0VXAoKCkgewogICAgICBh
+d2Vzb21lID0gbmV3IEF3ZXNvbWUoKTsKICAgIH0pOwoKICAgIHRlc3QoJ0ZpcnN0IFRlc3QnLCAo
+KSB7CiAgICAgIGV4cGVjdChhd2Vzb21lLmlzQXdlc29tZSwgaXNUcnVlKTsKICAgIH0pOwogIH0p
+Owp9Cg=="""
 ];
diff --git a/lib/generators/server_appengine.dart b/lib/generators/server_appengine.dart
@@ -2,8 +2,6 @@
 // All rights reserved. Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-library stagehand.server.appengine;
-
 import 'server_appengine_data.dart';
 import '../stagehand.dart';
 import '../src/common.dart';

diff --git a/lib/generators/server_appengine_data.dart b/lib/generators/server_appengine_data.dart
@@ -120,34 +120,33 @@ aW5pdGlhbCBrZXkvdmFsdWUgcGFpci4KICAgIDwvcHJlPgogIDwvYm9keT4KPC9odG1sPgo=""",
   "text",
   """Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
 ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
-bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKbGlicmFyeSBf
-X3Byb2plY3ROYW1lX18ubWVtY2FjaGU7CgppbXBvcnQgJ2RhcnQ6YXN5bmMnOwoKaW1wb3J0ICdw
-YWNrYWdlOmFwcGVuZ2luZS9hcHBlbmdpbmUuZGFydCc7Cgpjb25zdCBTdHJpbmcgREVGQVVMVF9L
-RVkgPSAnaGVsbG8nOwpib29sIGNhY2hlSW5pdGlhbGl6ZWQgPSBmYWxzZTsKCi8vLyBJbml0aWFs
-aXplIHRoZSBjYWNoZS4KRnV0dXJlIGluaXRpYWxpemUoKSBhc3luYyB7CiAgLy8gSWYgdGhlIGNh
-Y2hlIGlzIGFscmVhZHkgaW5pdGlhbGl6ZWQsIGp1c3QgcmV0dXJuLgogIGlmIChjYWNoZUluaXRp
-YWxpemVkKSByZXR1cm47CgogIC8vIFRoZSBBcHBFbmdpbmUgZW52aXJvbm1lbnQgaGFzIGEgcHJl
-Y29uZmlndXJlZCAnY29udGV4dCcgd2hpY2ggcHJvdmlkZXMKICAvLyBhdXRob3JpemVkIGFjY2Vz
-cyB0byB0aGUgZGVmYXVsdCBhcGkgc2VydmljZXMuCiAgdmFyIG1lbWNhY2hlID0gY29udGV4dC5z
-ZXJ2aWNlcy5tZW1jYWNoZTsKCiAgLy8gSW5pdGlhbGl6ZSB0aGUgY2FjaGUgYW5kIHNldCB0aGUg
-ZGVmYXVsdCB2YWx1ZS4KICBhd2FpdCBtZW1jYWNoZS5jbGVhcigpOwogIGF3YWl0IG1lbWNhY2hl
-LnNldChERUZBVUxUX0tFWSwgJ3RoZXJlIScpOwogIGNhY2hlSW5pdGlhbGl6ZWQgPSB0cnVlOwp9
-CgovLy8gQ2xlYXJzIHRoZSBjYWNoZSBhbmQgcmVzZXRzIHRoZSBkZWZhdWx0LgpGdXR1cmUgY2xl
-YXIoKSBhc3luYyB7CiAgY2FjaGVJbml0aWFsaXplZCA9IGZhbHNlOwogIGF3YWl0IGluaXRpYWxp
-emUoKTsKfQoKLy8vIEhlbHBlciBtZXRob2QgdG8gd3JpdGUgYSBzZXQgb2Yga2V5L3ZhbHVlIHBh
-aXJzIHRvIHRoZSBtZW1jYWNoZS4KRnV0dXJlIHdyaXRlKE1hcDxTdHJpbmcsIFN0cmluZz4gdmFs
-dWVNYXAsIFN0cmluZ1NpbmsgYnVmZmVyKSBhc3luYyB7CiAgdmFyIG1lbWNhY2hlID0gY29udGV4
-dC5zZXJ2aWNlcy5tZW1jYWNoZTsKCiAgZm9yICh2YXIga2V5IGluIHZhbHVlTWFwLmtleXMpIHsK
-ICAgIHZhciB2YWx1ZSA9IHZhbHVlTWFwW2tleV07CgogICAgYXdhaXQgbWVtY2FjaGUuc2V0KGtl
-eSwgdmFsdWUpOwoKICAgIGJ1ZmZlci53cml0ZWxuKCcke2tleX06ICR7RXJyb3Iuc2FmZVRvU3Ry
-aW5nKHZhbHVlKX0nKTsKICB9Cn0KCi8vLyBIZWxwZXIgbWV0aG9kIHRvIHJlYWQgYSBzZXQgb2Yg
-dmFsdWVzIGZyb20gdGhlIG1lbWNhY2hlLgpGdXR1cmUgcmVhZChJdGVyYWJsZTxTdHJpbmc+IGtl
-eXMsIFN0cmluZ1NpbmsgYnVmZmVyICkgYXN5bmMgewogIHZhciBtZW1jYWNoZSA9IGNvbnRleHQu
-c2VydmljZXMubWVtY2FjaGU7CgogIGZvciAodmFyIGtleSBpbiBrZXlzKSB7CiAgICB0cnkgewog
-ICAgICB2YXIgdmFsdWUgPSBhd2FpdCBtZW1jYWNoZS5nZXQoa2V5KTsKICAgICAgYnVmZmVyLndy
-aXRlbG4oJyR7a2V5fTogJHtFcnJvci5zYWZlVG9TdHJpbmcodmFsdWUpfScpOwogICAgfSBjYXRj
-aCAoXykgewogICAgICBidWZmZXIud3JpdGVsbignIiR7a2V5fSI6IGVycm9yIHJlYWRpbmcga2V5
-IScpOwogICAgfQogIH0KfQo=""",
+bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKaW1wb3J0ICdk
+YXJ0OmFzeW5jJzsKCmltcG9ydCAncGFja2FnZTphcHBlbmdpbmUvYXBwZW5naW5lLmRhcnQnOwoK
+Y29uc3QgU3RyaW5nIERFRkFVTFRfS0VZID0gJ2hlbGxvJzsKYm9vbCBjYWNoZUluaXRpYWxpemVk
+ID0gZmFsc2U7CgovLy8gSW5pdGlhbGl6ZSB0aGUgY2FjaGUuCkZ1dHVyZSBpbml0aWFsaXplKCkg
+YXN5bmMgewogIC8vIElmIHRoZSBjYWNoZSBpcyBhbHJlYWR5IGluaXRpYWxpemVkLCBqdXN0IHJl
+dHVybi4KICBpZiAoY2FjaGVJbml0aWFsaXplZCkgcmV0dXJuOwoKICAvLyBUaGUgQXBwRW5naW5l
+IGVudmlyb25tZW50IGhhcyBhIHByZWNvbmZpZ3VyZWQgJ2NvbnRleHQnIHdoaWNoIHByb3ZpZGVz
+CiAgLy8gYXV0aG9yaXplZCBhY2Nlc3MgdG8gdGhlIGRlZmF1bHQgYXBpIHNlcnZpY2VzLgogIHZh
+ciBtZW1jYWNoZSA9IGNvbnRleHQuc2VydmljZXMubWVtY2FjaGU7CgogIC8vIEluaXRpYWxpemUg
+dGhlIGNhY2hlIGFuZCBzZXQgdGhlIGRlZmF1bHQgdmFsdWUuCiAgYXdhaXQgbWVtY2FjaGUuY2xl
+YXIoKTsKICBhd2FpdCBtZW1jYWNoZS5zZXQoREVGQVVMVF9LRVksICd0aGVyZSEnKTsKICBjYWNo
+ZUluaXRpYWxpemVkID0gdHJ1ZTsKfQoKLy8vIENsZWFycyB0aGUgY2FjaGUgYW5kIHJlc2V0cyB0
+aGUgZGVmYXVsdC4KRnV0dXJlIGNsZWFyKCkgYXN5bmMgewogIGNhY2hlSW5pdGlhbGl6ZWQgPSBm
+YWxzZTsKICBhd2FpdCBpbml0aWFsaXplKCk7Cn0KCi8vLyBIZWxwZXIgbWV0aG9kIHRvIHdyaXRl
+IGEgc2V0IG9mIGtleS92YWx1ZSBwYWlycyB0byB0aGUgbWVtY2FjaGUuCkZ1dHVyZSB3cml0ZShN
+YXA8U3RyaW5nLCBTdHJpbmc+IHZhbHVlTWFwLCBTdHJpbmdTaW5rIGJ1ZmZlcikgYXN5bmMgewog
+IHZhciBtZW1jYWNoZSA9IGNvbnRleHQuc2VydmljZXMubWVtY2FjaGU7CgogIGZvciAodmFyIGtl
+eSBpbiB2YWx1ZU1hcC5rZXlzKSB7CiAgICB2YXIgdmFsdWUgPSB2YWx1ZU1hcFtrZXldOwoKICAg
+IGF3YWl0IG1lbWNhY2hlLnNldChrZXksIHZhbHVlKTsKCiAgICBidWZmZXIud3JpdGVsbignJHtr
+ZXl9OiAke0Vycm9yLnNhZmVUb1N0cmluZyh2YWx1ZSl9Jyk7CiAgfQp9CgovLy8gSGVscGVyIG1l
+dGhvZCB0byByZWFkIGEgc2V0IG9mIHZhbHVlcyBmcm9tIHRoZSBtZW1jYWNoZS4KRnV0dXJlIHJl
+YWQoSXRlcmFibGU8U3RyaW5nPiBrZXlzLCBTdHJpbmdTaW5rIGJ1ZmZlcikgYXN5bmMgewogIHZh
+ciBtZW1jYWNoZSA9IGNvbnRleHQuc2VydmljZXMubWVtY2FjaGU7CgogIGZvciAodmFyIGtleSBp
+biBrZXlzKSB7CiAgICB0cnkgewogICAgICB2YXIgdmFsdWUgPSBhd2FpdCBtZW1jYWNoZS5nZXQo
+a2V5KTsKICAgICAgYnVmZmVyLndyaXRlbG4oJyR7a2V5fTogJHtFcnJvci5zYWZlVG9TdHJpbmco
+dmFsdWUpfScpOwogICAgfSBjYXRjaCAoXykgewogICAgICBidWZmZXIud3JpdGVsbignIiR7a2V5
+fSI6IGVycm9yIHJlYWRpbmcga2V5IScpOwogICAgfQogIH0KfQo=""",
   "pubspec.yaml",
   "text",
   """bmFtZTogX19wcm9qZWN0TmFtZV9fCnZlcnNpb246IDAuMC4xCmRlc2NyaXB0aW9uOiBBIHNpbXBs

diff --git a/lib/generators/server_shelf.dart b/lib/generators/server_shelf.dart
@@ -2,8 +2,6 @@
 // All rights reserved. Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-library stagehand.server.shelf;
-
 import '../stagehand.dart';
 import '../src/common.dart';
 import 'server_shelf_data.dart';

diff --git a/lib/generators/web_angular.dart b/lib/generators/web_angular.dart
@@ -2,8 +2,6 @@
 // All rights reserved. Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-library stagehand.web.angular;
-
 import '../stagehand.dart';
 import '../src/common.dart';
 import 'web_angular_data.dart';

diff --git a/lib/generators/web_polymer.dart b/lib/generators/web_polymer.dart
@@ -2,8 +2,6 @@
 // All rights reserved. Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-library stagehand.web.polymer;
-
 import '../stagehand.dart';
 import '../src/common.dart';
 import 'web_polymer_data.dart';

diff --git a/lib/generators/web_polymer_data.dart b/lib/generators/web_polymer_data.dart
@@ -52,28 +52,27 @@ SVRZIE9GIFNVQ0ggREFNQUdFLgo=""",
   """Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
 ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
 bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgpASHRtbEltcG9y
-dCgnbWFpbl9hcHAuaHRtbCcpCmxpYnJhcnkgX19wcm9qZWN0TmFtZV9fLmxpYi5tYWluX2FwcDsK
-CmltcG9ydCAnZGFydDpodG1sJzsKCmltcG9ydCAncGFja2FnZTpwb2x5bWVyX2VsZW1lbnRzL3Bh
-cGVyX2lucHV0LmRhcnQnOwppbXBvcnQgJ3BhY2thZ2U6cG9seW1lci9wb2x5bWVyLmRhcnQnOwpp
-bXBvcnQgJ3BhY2thZ2U6d2ViX2NvbXBvbmVudHMvd2ViX2NvbXBvbmVudHMuZGFydCc7CgovLy8g
-VXNlcyBbUGFwZXJJbnB1dF0KQFBvbHltZXJSZWdpc3RlcignbWFpbi1hcHAnKQpjbGFzcyBNYWlu
-QXBwIGV4dGVuZHMgUG9seW1lckVsZW1lbnQgewogIEBwcm9wZXJ0eQogIFN0cmluZyB0ZXh0OwoK
-ICAvLy8gQ29uc3RydWN0b3IgdXNlZCB0byBjcmVhdGUgaW5zdGFuY2Ugb2YgTWFpbkFwcC4KICBN
-YWluQXBwLmNyZWF0ZWQoKSA6IHN1cGVyLmNyZWF0ZWQoKTsKCiAgQHJlZmxlY3RhYmxlCiAgU3Ry
-aW5nIHJldmVyc2VUZXh0KFN0cmluZyB0ZXh0KSB7CiAgICByZXR1cm4gdGV4dC5zcGxpdCgnJyku
-cmV2ZXJzZWQuam9pbignJyk7CiAgfQoKICAvLyBPcHRpb25hbCBsaWZlY3ljbGUgbWV0aG9kcyAt
-IHVuY29tbWVudCBpZiBuZWVkZWQuCgovLyAgLy8vIENhbGxlZCB3aGVuIGFuIGluc3RhbmNlIG9m
-IG1haW4tYXBwIGlzIGluc2VydGVkIGludG8gdGhlIERPTS4KLy8gIGF0dGFjaGVkKCkgewovLyAg
-ICBzdXBlci5hdHRhY2hlZCgpOwovLyAgfQoKLy8gIC8vLyBDYWxsZWQgd2hlbiBhbiBpbnN0YW5j
-ZSBvZiBtYWluLWFwcCBpcyByZW1vdmVkIGZyb20gdGhlIERPTS4KLy8gIGRldGFjaGVkKCkgewov
-LyAgICBzdXBlci5kZXRhY2hlZCgpOwovLyAgfQoKLy8gIC8vLyBDYWxsZWQgd2hlbiBhbiBhdHRy
-aWJ1dGUgKHN1Y2ggYXMgYSBjbGFzcykgb2YgYW4gaW5zdGFuY2Ugb2YKLy8gIC8vLyBtYWluLWFw
-cCBpcyBhZGRlZCwgY2hhbmdlZCwgb3IgcmVtb3ZlZC4KLy8gIGF0dHJpYnV0ZUNoYW5nZWQoU3Ry
-aW5nIG5hbWUsIFN0cmluZyBvbGRWYWx1ZSwgU3RyaW5nIG5ld1ZhbHVlKSB7Ci8vICAgIHN1cGVy
-LmF0dHJpYnV0ZUNoYW5nZWQobmFtZSwgb2xkVmFsdWUsIG5ld1ZhbHVlKTsKLy8gIH0KCi8vICAv
-Ly8gQ2FsbGVkIHdoZW4gbWFpbi1hcHAgaGFzIGJlZW4gZnVsbHkgcHJlcGFyZWQgKFNoYWRvdyBE
-T00gY3JlYXRlZCwKLy8gIC8vLyBwcm9wZXJ0eSBvYnNlcnZlcnMgc2V0IHVwLCBldmVudCBsaXN0
-ZW5lcnMgYXR0YWNoZWQpLgovLyAgcmVhZHkoKSB7Ci8vICB9Cn0K""",
+dCgnbWFpbl9hcHAuaHRtbCcpCmltcG9ydCAnZGFydDpodG1sJzsKCmltcG9ydCAncGFja2FnZTpw
+b2x5bWVyX2VsZW1lbnRzL3BhcGVyX2lucHV0LmRhcnQnOwppbXBvcnQgJ3BhY2thZ2U6cG9seW1l
+ci9wb2x5bWVyLmRhcnQnOwppbXBvcnQgJ3BhY2thZ2U6d2ViX2NvbXBvbmVudHMvd2ViX2NvbXBv
+bmVudHMuZGFydCc7CgovLy8gVXNlcyBbUGFwZXJJbnB1dF0KQFBvbHltZXJSZWdpc3RlcignbWFp
+bi1hcHAnKQpjbGFzcyBNYWluQXBwIGV4dGVuZHMgUG9seW1lckVsZW1lbnQgewogIEBwcm9wZXJ0
+eQogIFN0cmluZyB0ZXh0OwoKICAvLy8gQ29uc3RydWN0b3IgdXNlZCB0byBjcmVhdGUgaW5zdGFu
+Y2Ugb2YgTWFpbkFwcC4KICBNYWluQXBwLmNyZWF0ZWQoKSA6IHN1cGVyLmNyZWF0ZWQoKTsKCiAg
+QHJlZmxlY3RhYmxlCiAgU3RyaW5nIHJldmVyc2VUZXh0KFN0cmluZyB0ZXh0KSB7CiAgICByZXR1
+cm4gdGV4dC5zcGxpdCgnJykucmV2ZXJzZWQuam9pbignJyk7CiAgfQoKICAvLyBPcHRpb25hbCBs
+aWZlY3ljbGUgbWV0aG9kcyAtIHVuY29tbWVudCBpZiBuZWVkZWQuCgovLyAgLy8vIENhbGxlZCB3
+aGVuIGFuIGluc3RhbmNlIG9mIG1haW4tYXBwIGlzIGluc2VydGVkIGludG8gdGhlIERPTS4KLy8g
+IGF0dGFjaGVkKCkgewovLyAgICBzdXBlci5hdHRhY2hlZCgpOwovLyAgfQoKLy8gIC8vLyBDYWxs
+ZWQgd2hlbiBhbiBpbnN0YW5jZSBvZiBtYWluLWFwcCBpcyByZW1vdmVkIGZyb20gdGhlIERPTS4K
+Ly8gIGRldGFjaGVkKCkgewovLyAgICBzdXBlci5kZXRhY2hlZCgpOwovLyAgfQoKLy8gIC8vLyBD
+YWxsZWQgd2hlbiBhbiBhdHRyaWJ1dGUgKHN1Y2ggYXMgYSBjbGFzcykgb2YgYW4gaW5zdGFuY2Ug
+b2YKLy8gIC8vLyBtYWluLWFwcCBpcyBhZGRlZCwgY2hhbmdlZCwgb3IgcmVtb3ZlZC4KLy8gIGF0
+dHJpYnV0ZUNoYW5nZWQoU3RyaW5nIG5hbWUsIFN0cmluZyBvbGRWYWx1ZSwgU3RyaW5nIG5ld1Zh
+bHVlKSB7Ci8vICAgIHN1cGVyLmF0dHJpYnV0ZUNoYW5nZWQobmFtZSwgb2xkVmFsdWUsIG5ld1Zh
+bHVlKTsKLy8gIH0KCi8vICAvLy8gQ2FsbGVkIHdoZW4gbWFpbi1hcHAgaGFzIGJlZW4gZnVsbHkg
+cHJlcGFyZWQgKFNoYWRvdyBET00gY3JlYXRlZCwKLy8gIC8vLyBwcm9wZXJ0eSBvYnNlcnZlcnMg
+c2V0IHVwLCBldmVudCBsaXN0ZW5lcnMgYXR0YWNoZWQpLgovLyAgcmVhZHkoKSB7Ci8vICB9Cn0K""",
   "lib/main_app.html",
   "text",
   """PCEtLQogIENvcHlyaWdodCAoYykgX195ZWFyX18sIF9fYXV0aG9yX18uIEFsbCByaWdodHMgcmVz
@@ -277,10 +276,10 @@ AABJRU5ErkJggg==""",
   "text",
   """Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
 ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
-bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgpsaWJyYXJ5IG15
-X3Byb2plY3Qud2ViLmluZGV4OwoKaW1wb3J0ICdwYWNrYWdlOl9fcHJvamVjdE5hbWVfXy9tYWlu
-X2FwcC5kYXJ0JzsKaW1wb3J0ICdwYWNrYWdlOnBvbHltZXIvcG9seW1lci5kYXJ0JzsKCi8vLyBb
-TWFpbkFwcF0gdXNlZCEKbWFpbigpIGFzeW5jIHsKICBhd2FpdCBpbml0UG9seW1lcigpOwp9Cg==""",
+bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKaW1wb3J0ICdw
+YWNrYWdlOl9fcHJvamVjdE5hbWVfXy9tYWluX2FwcC5kYXJ0JzsKaW1wb3J0ICdwYWNrYWdlOnBv
+bHltZXIvcG9seW1lci5kYXJ0JzsKCi8vLyBbTWFpbkFwcF0gdXNlZCEKbWFpbigpIGFzeW5jIHsK
+ICBhd2FpdCBpbml0UG9seW1lcigpOwp9Cg==""",
   "web/index.html",
   "text",
   """PCFET0NUWVBFIGh0bWw+Cgo8IS0tCiAgQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3Jf

diff --git a/lib/generators/web_simple.dart b/lib/generators/web_simple.dart
@@ -2,8 +2,6 @@
 // All rights reserved. Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-library stagehand.web.simple;
-
 import '../stagehand.dart';
 import '../src/common.dart';
 import 'web_simple_data.dart';

diff --git a/lib/src/cli_app.dart b/lib/src/cli_app.dart
@@ -2,8 +2,6 @@
 // All rights reserved. Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-library stagehand.cli_app;
-
 import 'dart:async';
 import 'dart:convert' show JSON;
 import 'dart:io' as io;

diff --git a/lib/src/common.dart b/lib/src/common.dart
@@ -5,7 +5,6 @@
 /**
  * Some utility methods for stagehand.
  */
-library stagehand.utils;
 
 import 'dart:convert' show UTF8;
 

diff --git a/lib/stagehand.dart b/lib/stagehand.dart
@@ -21,7 +21,6 @@
  *
  * to create a new instance of the `webapp` template in a `foobar` directory.
  */
-library stagehand;
 
 import 'dart:async';
 import 'dart:convert';

diff --git a/templates/console-full/lib/__projectName__.dart b/templates/console-full/lib/__projectName__.dart
@@ -1,9 +1,6 @@
 // Copyright (c) __year__, __author__. All rights reserved. Use of this source code
 // is governed by a BSD-style license that can be found in the LICENSE file.
 
-/// The __projectName__ library.
-library __projectName__;
-
 int calculate() {
   return 6 * 7;
 }
diff --git a/templates/console-full/test/__projectName___test.dart b/templates/console-full/test/__projectName___test.dart
@@ -1,8 +1,6 @@
 // Copyright (c) __year__, __author__. All rights reserved. Use of this source code
 // is governed by a BSD-style license that can be found in the LICENSE file.
 
-library __projectName__.test;
-
 import 'package:__projectName__/__projectName__.dart';
 import 'package:test/test.dart';
 

diff --git a/templates/package-simple/example/__projectName___example.dart b/templates/package-simple/example/__projectName___example.dart
@@ -1,8 +1,6 @@
 // Copyright (c) __year__, __author__. All rights reserved. Use of this source code
 // is governed by a BSD-style license that can be found in the LICENSE file.
 
-library __projectName__.example;
-
 import 'package:__projectName__/__projectName__.dart';
 
 main() {

diff --git a/templates/package-simple/lib/__projectName__.dart b/templates/package-simple/lib/__projectName__.dart
@@ -1,11 +1,11 @@
 // Copyright (c) __year__, __author__. All rights reserved. Use of this source code
 // is governed by a BSD-style license that can be found in the LICENSE file.
 
-/// The __projectName__ library.
+/// Support for doing something awesome.
 ///
-/// This is an awesome library. More dartdocs go here.
+/// More dartdocs go here.
 library __projectName__;
 
-// TODO: Export any libraries intended for clients of this package.
-
 export 'src/__projectName___base.dart';
+
+// TODO: Export any libraries intended for clients of this package.
diff --git a/templates/package-simple/lib/src/__projectName___base.dart b/templates/package-simple/lib/src/__projectName___base.dart
@@ -3,8 +3,6 @@
 
 // TODO: Put public facing types in this file.
 
-library __projectName__.base;
-
 /// Checks if you are awesome. Spoiler: you are.
 class Awesome {
   bool get isAwesome => true;

diff --git a/templates/package-simple/test/__projectName___test.dart b/templates/package-simple/test/__projectName___test.dart
@@ -1,8 +1,6 @@
 // Copyright (c) __year__, __author__. All rights reserved. Use of this source code
 // is governed by a BSD-style license that can be found in the LICENSE file.
 
-library __projectName__.test;
-
 import 'package:__projectName__/__projectName__.dart';
 import 'package:test/test.dart';
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ @@
     /**
      * Some utility methods for stagehand.
      */
-    library stagehand.utils;
     import 'dart:convert' show UTF8;
@@ Expand Down @@