Merge pull request #262 from google/ddc_bump_version

bump the stagehand version
dart-archive · Aug 17, 2015 · 7b5713f · 7b5713f
2 parents e6c9cac + 9aa7d97
commit 7b5713f
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 27 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 .idea
 .DS_Store
 cache/
+.packages
 packages
 pubspec.lock
 build

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,11 @@
 # CHANGELOG
 
+## 0.2.2+1
+- Moved the script tags for the web templates into the head section
+
 ## 0.2.2
-- added a `console-simple` template
-- updated the `web-simple` and `web-full` templates
+- Added a `console-simple` template
+- Updated the `web-simple` and `web-full` templates
 
 ## 0.2.1
 - All templates updated to use the latest `test` package

diff --git a/lib/generators/web_full_data.dart b/lib/generators/web_full_data.dart
@@ -334,8 +334,8 @@ CiAgPCEtLSBUT0RPOiBUbyB1c2UgU2Fzcywgc3dhcCB0aGUgdHdvIHN0eWxlc2hlZXQgcmVmZXJl
 bmNlcyBhbmQKICAgICAgIHVuY29tbWVudCB0aGUgc2FzcyB0cmFuc2Zvcm1lciBpbiB0aGUgcHVi
 c3BlYy55YW1sIGZpbGUuIC0tPgogIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0ic3R5bGVz
 L21haW5fZ2VuLmNzcyI+CiAgPCEtLSBsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0ic3R5bGVz
-L21haW4uY3NzIiAtLT4KCiAgPHNjcmlwdCBhc3luYyB0eXBlPSJhcHBsaWNhdGlvbi9kYXJ0IiBz
-cmM9Im1haW4uZGFydCI+PC9zY3JpcHQ+CiAgPHNjcmlwdCBhc3luYyBzcmM9InBhY2thZ2VzL2Jy
+L21haW4uY3NzIiAtLT4KCiAgPHNjcmlwdCBhc3luYyBzcmM9Im1haW4uZGFydCIgdHlwZT0iYXBw
+bGljYXRpb24vZGFydCI+PC9zY3JpcHQ+CiAgPHNjcmlwdCBhc3luYyBzcmM9InBhY2thZ2VzL2Jy
 b3dzZXIvZGFydC5qcyI+PC9zY3JpcHQ+CjwvaGVhZD4KCjxib2R5PgoKICA8IS0tIGV4YW1wbGUg
 Y29udGVudC4gcmVtb3ZlIGlmIHlvdSB1c2UgeW91ciBvd24gc3R5bGVzIGFuZCB3aWRnZXRzIC0t
 PgoKICA8aGVhZGVyIGNsYXNzPSJhcHAtYmFyIHByb21vdGUtbGF5ZXIiPgogICAgPGRpdiBjbGFz
@@ -350,22 +350,21 @@ b248L2g0PgogICAgPHVsPgogICAgICA8bGk+PGEgaHJlZj0iLyI+SG9tZTwvYT48L2xpPgogICAg
 ICA8bGk+PGEgaHJlZj0iL2Fib3V0Ij5BYm91dDwvYT48L2xpPgogICAgPC91bD4KICA8L25hdj4K
 CiAgPCEtLSBjb250YWlucyBkaWZmZXJlbnQgdmlld3MgYXMgZGl2cywgd2hpY2ggdGhlIHJvdXRp
 bmcgc3lzdGVtCiAgICAgICBkaXNwbGF5cyBvciBoaWRlcyB3aGVuIHRoZSBVUkwgY2hhbmdlcyAt
-LT4KICA8bWFpbj4KCiAgICA8ZGl2IGlkPSJob21lIj4KICAgICAgPHA+CiAgICAgICAgTmFtZTo8
-YnI+CiAgICAgICAgPGlucHV0IHR5cGU9InRleHQiIGlkPSJuYW1lIiBwbGFjZWhvbGRlcj0iVHlw
-ZSB5b3VyIG5hbWUuLi4iPgogICAgICA8L3A+CgogICAgICA8cD4KICAgICAgICBSZXZlcnNlZDo8
-YnI+CiAgICAgICAgPG91dHB1dCBpZD0ib3V0Ij48L291dHB1dD4KICAgICAgPC9wPgogICAgPC9k
-aXY+CgogICAgPGRpdiBpZD0iYWJvdXQiIHN0eWxlPSJkaXNwbGF5Om5vbmUiPgogICAgICA8cD4K
-ICAgICAgICBUaGlzIGlzIGEgYmFzaWMgZGVtbyBIVE1MIGFwcCBidWlsdCB3aXRoIERhcnQuIEZv
-ciBkZXZlbG9wZXJzIHRoYXQgZG8KICAgICAgICBub3Qgd2FudCB0bywgb3IgY2Fubm90LCB1c2Ug
-cG9seW1lci5kYXJ0LCB0aGlzIGlzIGFuIG9wdGlvbmFsIHN0YXJ0aW5nCiAgICAgICAgcG9pbnQu
-CiAgICAgIDwvcD4KICAgICAgPHA+CiAgICAgICAgVGhpcyBhcHAgd2FzIGdlbmVyYXRlZCBieSA8
-YSBocmVmPSJodHRwOi8vc3RhZ2VoYW5kLnB1YiI+U3RhZ2VoYW5kPC9hPi4KICAgICAgPC9wPgog
-ICAgPC9kaXY+CgogICAgPGRpdiBjbGFzcz0ic2Fzcy1oaWRkZW4iPgogICAgICA8cD4KICAgICAg
-ICBOb3RlOiBUbyB1c2UgU2FzcyB3aXRoIHRoaXMgYXBwbGljYXRpb24sIHN3aXRjaCB0aGUgc3R5
-bGVzaGVldAogICAgICAgIHJlZmVyZW5jZXMgaW4gdGhlICZsdDtoZWFkJmd0OyBzZWN0aW9uIGFu
-ZCB1bmNvbW1lbnQgdGhlIHNhc3MKICAgICAgICB0cmFuc2Zvcm1lciBpbiB0aGUgcHVic3BlYy55
-YW1sIGZpbGUuCiAgICAgIDwvcD4KICAgIDwvZGl2PgogIDwvbWFpbj4KPC9ib2R5Pgo8L2h0bWw+
-Cg==""",
+LT4KICA8bWFpbj4KICAgIDxkaXYgaWQ9ImhvbWUiPgogICAgICA8cD4KICAgICAgICBOYW1lOjxi
+cj4KICAgICAgICA8aW5wdXQgdHlwZT0idGV4dCIgaWQ9Im5hbWUiIHBsYWNlaG9sZGVyPSJUeXBl
+IHlvdXIgbmFtZS4uLiI+CiAgICAgIDwvcD4KCiAgICAgIDxwPgogICAgICAgIFJldmVyc2VkOjxi
+cj4KICAgICAgICA8b3V0cHV0IGlkPSJvdXQiPjwvb3V0cHV0PgogICAgICA8L3A+CiAgICA8L2Rp
+dj4KCiAgICA8ZGl2IGlkPSJhYm91dCIgc3R5bGU9ImRpc3BsYXk6bm9uZSI+CiAgICAgIDxwPgog
+ICAgICAgIFRoaXMgaXMgYSBiYXNpYyBkZW1vIEhUTUwgYXBwIGJ1aWx0IHdpdGggRGFydC4gRm9y
+IGRldmVsb3BlcnMgdGhhdCBkbwogICAgICAgIG5vdCB3YW50IHRvLCBvciBjYW5ub3QsIHVzZSBw
+b2x5bWVyLmRhcnQsIHRoaXMgaXMgYW4gb3B0aW9uYWwgc3RhcnRpbmcKICAgICAgICBwb2ludC4K
+ICAgICAgPC9wPgogICAgICA8cD4KICAgICAgICBUaGlzIGFwcCB3YXMgZ2VuZXJhdGVkIGJ5IDxh
+IGhyZWY9Imh0dHA6Ly9zdGFnZWhhbmQucHViIj5TdGFnZWhhbmQ8L2E+LgogICAgICA8L3A+CiAg
+ICA8L2Rpdj4KCiAgICA8ZGl2IGNsYXNzPSJzYXNzLWhpZGRlbiI+CiAgICAgIDxwPgogICAgICAg
+IE5vdGU6IFRvIHVzZSBTYXNzIHdpdGggdGhpcyBhcHBsaWNhdGlvbiwgc3dpdGNoIHRoZSBzdHls
+ZXNoZWV0CiAgICAgICAgcmVmZXJlbmNlcyBpbiB0aGUgJmx0O2hlYWQmZ3Q7IHNlY3Rpb24gYW5k
+IHVuY29tbWVudCB0aGUgc2FzcwogICAgICAgIHRyYW5zZm9ybWVyIGluIHRoZSBwdWJzcGVjLnlh
+bWwgZmlsZS4KICAgICAgPC9wPgogICAgPC9kaXY+CiAgPC9tYWluPgo8L2JvZHk+CjwvaHRtbD4K""",
   "web/main.dart",
   "text",
   """Ly8gQ29weXJpZ2h0IChjKSB7e3llYXJ9fSwge3thdXRob3J9fS4gQWxsIHJpZ2h0cyByZXNlcnZl

diff --git a/lib/generators/web_simple_data.dart b/lib/generators/web_simple_data.dart
@@ -63,8 +63,8 @@ ICAgIDxtZXRhIG5hbWU9InZpZXdwb3J0IiBjb250ZW50PSJ3aWR0aD1kZXZpY2Utd2lkdGgsIGlu
 aXRpYWwtc2NhbGU9MS4wIj4KICAgIDxtZXRhIG5hbWU9InNjYWZmb2xkZWQtYnkiIGNvbnRlbnQ9
 Imh0dHBzOi8vZ2l0aHViLmNvbS9nb29nbGUvc3RhZ2VoYW5kIj4KICAgIDx0aXRsZT57e3Byb2pl
 Y3ROYW1lfX08L3RpdGxlPgogICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJzdHlsZXMu
-Y3NzIj4KICAgIDxzY3JpcHQgYXN5bmMgdHlwZT0iYXBwbGljYXRpb24vZGFydCIgc3JjPSJtYWlu
-LmRhcnQiPjwvc2NyaXB0PgogICAgPHNjcmlwdCBhc3luYyBzcmM9InBhY2thZ2VzL2Jyb3dzZXIv
+Y3NzIj4KICAgIDxzY3JpcHQgYXN5bmMgc3JjPSJtYWluLmRhcnQiIHR5cGU9ImFwcGxpY2F0aW9u
+L2RhcnQiPjwvc2NyaXB0PgogICAgPHNjcmlwdCBhc3luYyBzcmM9InBhY2thZ2VzL2Jyb3dzZXIv
 ZGFydC5qcyI+PC9zY3JpcHQ+CjwvaGVhZD4KCjxib2R5PgoKICA8ZGl2IGlkPSJvdXRwdXQiPjwv
 ZGl2PgoKPC9ib2R5Pgo8L2h0bWw+Cg==""",
   "web/main.dart",

diff --git a/lib/src/cli_app.dart b/lib/src/cli_app.dart
@@ -19,7 +19,7 @@ import 'package:usage/usage_io.dart';
 const String APP_NAME = 'stagehand';
 
 // This version must be updated in tandem with the pubspec version.
-const String APP_VERSION = '0.2.2';
+const String APP_VERSION = '0.2.2+1';
 
 const String APP_PUB_INFO =
     'https://pub.dartlang.org/packages/${APP_NAME}.json';

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -4,7 +4,7 @@
 
 name: stagehand
 # When changing this version, change the lib/src/cli_app.dart version as well.
-version: 0.2.2
+version: 0.2.2+1
 description: >
   A scaffolding generator for your Dart projects. Stagehand helps you get set
   up!

diff --git a/templates/web-full/web/index.html b/templates/web-full/web/index.html
@@ -32,7 +32,7 @@
   <link rel="stylesheet" href="styles/main_gen.css">
   <!-- link rel="stylesheet" href="styles/main.css" -->
 
-  <script async type="application/dart" src="main.dart"></script>
+  <script async src="main.dart" type="application/dart"></script>
   <script async src="packages/browser/dart.js"></script>
 </head>
 
@@ -62,7 +62,6 @@ <h4>Navigation</h4>
   <!-- contains different views as divs, which the routing system
        displays or hides when the URL changes -->
   <main>
-
     <div id="home">
       <p>
         Name:<br>

diff --git a/templates/web-simple/web/index.html b/templates/web-simple/web/index.html
@@ -13,7 +13,7 @@
     <meta name="scaffolded-by" content="https://github.com/google/stagehand">
     <title>{{projectName}}</title>
     <link rel="stylesheet" href="styles.css">
-    <script async type="application/dart" src="main.dart"></script>
+    <script async src="main.dart" type="application/dart"></script>
     <script async src="packages/browser/dart.js"></script>
 </head>