Merge pull request #258 from google/add-rewriter-to-web-simple

use dart_to_js_script_rewriter in web-simple
dart-archive · Jul 8, 2015 · bfa32d4 · bfa32d4
2 parents 39190df + 53e6e3f
commit bfa32d4
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 18 deletions.
diff --git a/lib/generators/web_full_data.dart b/lib/generators/web_full_data.dart
@@ -121,10 +121,10 @@ IG1vYmlsZS1mcmllbmRseSB3ZWIgYXBwIHdpdGggcm91dGluZywgcmVzcG9uc2l2ZSBDU1MsIGFu
 ZCAob3B0aW9uYWwpIFNhc3MKICBzdXBwb3J0LgojYXV0aG9yOiB7e2F1dGhvcn19IDxlbWFpbEBl
 eGFtcGxlLmNvbT4KI2hvbWVwYWdlOiBodHRwczovL3d3dy5leGFtcGxlLmNvbQoKZW52aXJvbm1l
 bnQ6CiAgc2RrOiAnPj0xLjAuMCA8Mi4wLjAnCgpkZXBlbmRlbmNpZXM6CiAgYnJvd3NlcjogJz49
-MC4xMC4wIDwwLjExLjAnCiAgc2FzczogJz49MC40LjAgPDAuNS4wJwogIHNjcmlwdF9pbmxpbmVy
-OiAnPj0xLjAuMCA8Mi4wLjAnCiAgcm91dGVfaGllcmFyY2hpY2FsOiAnPj0wLjUuMCA8MC43LjAn
-Cgp0cmFuc2Zvcm1lcnM6Ci0gc2NyaXB0X2lubGluZXIKIy0gc2FzczoKIyAgICBzdHlsZTogY29t
-cHJlc3NlZAo=""",
+MC4xMC4wIDwwLjExLjAnCiAgc2FzczogJz49MC40LjAgPDAuNS4wJwogIGRhcnRfdG9fanNfc2Ny
+aXB0X3Jld3JpdGVyOiAnXjAuMS4wJwogIHJvdXRlX2hpZXJhcmNoaWNhbDogJz49MC41LjAgPDAu
+Ny4wJwoKdHJhbnNmb3JtZXJzOgotIGRhcnRfdG9fanNfc2NyaXB0X3Jld3JpdGVyCiMtIHNhc3M6
+CiMgICAgc3R5bGU6IGNvbXByZXNzZWQK""",
   "web/apple-touch-icon-precomposed.png",
   "binary",
   """iVBORw0KGgoAAAANSUhEUgAAAJgAAACYCAMAAAAvHNATAAAAYFBMVEX///+0y/MaYdxik+crbd4g
@@ -362,10 +362,10 @@ ICA8L2Rpdj4KCiAgICA8ZGl2IGNsYXNzPSJzYXNzLWhpZGRlbiI+CiAgICAgIDxwPgogICAgICAg
 IE5vdGU6IHRvIHVzZSBTYXNzIHdpdGggdGhpcyBhcHBsaWNhdGlvbiwgc3dpdGNoIHRoZSBzdHls
 ZXNoZWV0CiAgICAgICAgcmVmZXJlbmNlcyBpbiB0aGUgJmx0O2hlYWQmZ3Q7IHNlY3Rpb24gYW5k
 IHVuY29tbWVudCB0aGUgc2FzcwogICAgICAgIHRyYW5zZm9ybWVyIGluIHRoZSBwdWJzcGVjLnlh
-bWwgZmlsZS4KICAgICAgPC9wPgogICAgPC9kaXY+CiAgPC9tYWluPgoKICA8c2NyaXB0IHR5cGU9
-ImFwcGxpY2F0aW9uL2RhcnQiIHNyYz0ibWFpbi5kYXJ0Ij48L3NjcmlwdD4KICA8c2NyaXB0IGRh
-dGEtcHViLWlubGluZSBzcmM9InBhY2thZ2VzL2Jyb3dzZXIvZGFydC5qcyI+PC9zY3JpcHQ+Cjwv
-Ym9keT4KPC9odG1sPgo=""",
+bWwgZmlsZS4KICAgICAgPC9wPgogICAgPC9kaXY+CiAgPC9tYWluPgoKICA8c2NyaXB0IGFzeW5j
+IHR5cGU9ImFwcGxpY2F0aW9uL2RhcnQiIHNyYz0ibWFpbi5kYXJ0Ij48L3NjcmlwdD4KICA8c2Ny
+aXB0IGFzeW5jIHNyYz0icGFja2FnZXMvYnJvd3Nlci9kYXJ0LmpzIj48L3NjcmlwdD4KPC9ib2R5
+Pgo8L2h0bWw+Cg==""",
   "web/main.dart",
   "text",
   """Ly8gQ29weXJpZ2h0IChjKSB7e3llYXJ9fSwge3thdXRob3J9fS4gQWxsIHJpZ2h0cyByZXNlcnZl

diff --git a/lib/generators/web_simple_data.dart b/lib/generators/web_simple_data.dart
@@ -50,7 +50,8 @@ ZW5lcmF0ZWQgYnkgU3RhZ2VoYW5kLiBTZWUgTElDRU5TRS4K""",
 c29sdXRlIGJhcmUtYm9uZXMgd2ViIGFwcC4KI2F1dGhvcjoge3thdXRob3J9fSA8ZW1haWxAZXhh
 bXBsZS5jb20+CiNob21lcGFnZTogaHR0cHM6Ly93d3cuZXhhbXBsZS5jb20KCmVudmlyb25tZW50
 OgogIHNkazogJz49MS4wLjAgPDIuMC4wJwoKZGVwZW5kZW5jaWVzOgogIGJyb3dzZXI6ICc+PTAu
-MTAuMCA8MC4xMS4wJwo=""",
+MTAuMCA8MC4xMS4wJwogIGRhcnRfdG9fanNfc2NyaXB0X3Jld3JpdGVyOiAnXjAuMS4wJwoKdHJh
+bnNmb3JtZXJzOgotIGRhcnRfdG9fanNfc2NyaXB0X3Jld3JpdGVy""",
   "web/index.html",
   "text",
   """PCFET0NUWVBFIGh0bWw+Cgo8IS0tCiAgQ29weXJpZ2h0IChjKSB7e3llYXJ9fSwge3thdXRob3J9
@@ -63,9 +64,9 @@ aXRpYWwtc2NhbGU9MS4wIj4KICAgIDxtZXRhIG5hbWU9InNjYWZmb2xkZWQtYnkiIGNvbnRlbnQ9
 Imh0dHBzOi8vZ2l0aHViLmNvbS9nb29nbGUvc3RhZ2VoYW5kIj4KICAgIDx0aXRsZT57e3Byb2pl
 Y3ROYW1lfX08L3RpdGxlPgoKICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0ic3R5bGVz
 L21haW4uY3NzIj4KPC9oZWFkPgoKPGJvZHk+CgogIDxkaXYgaWQ9Im91dHB1dCI+PC9kaXY+Cgo8
-c2NyaXB0IHR5cGU9ImFwcGxpY2F0aW9uL2RhcnQiIHNyYz0ibWFpbi5kYXJ0Ij48L3NjcmlwdD4K
-PHNjcmlwdCBkYXRhLXB1Yi1pbmxpbmUgc3JjPSJwYWNrYWdlcy9icm93c2VyL2RhcnQuanMiPjwv
-c2NyaXB0Pgo8L2JvZHk+CjwvaHRtbD4K""",
+c2NyaXB0IGFzeW5jIHR5cGU9ImFwcGxpY2F0aW9uL2RhcnQiIHNyYz0ibWFpbi5kYXJ0Ij48L3Nj
+cmlwdD4KPHNjcmlwdCBhc3luYyBzcmM9InBhY2thZ2VzL2Jyb3dzZXIvZGFydC5qcyI+PC9zY3Jp
+cHQ+CjwvYm9keT4KPC9odG1sPgo=""",
   "web/main.dart",
   "text",
   """Ly8gQ29weXJpZ2h0IChjKSB7e3llYXJ9fSwge3thdXRob3J9fS4gQWxsIHJpZ2h0cyByZXNlcnZl

diff --git a/templates/web-full/pubspec.yaml b/templates/web-full/pubspec.yaml
@@ -12,10 +12,10 @@ environment:
 dependencies:
   browser: '>=0.10.0 <0.11.0'
   sass: '>=0.4.0 <0.5.0'
-  script_inliner: '>=1.0.0 <2.0.0'
+  dart_to_js_script_rewriter: '^0.1.0'
   route_hierarchical: '>=0.5.0 <0.7.0'
 
 transformers:
-- script_inliner
+- dart_to_js_script_rewriter
 #- sass:
 #    style: compressed
diff --git a/templates/web-full/web/index.html b/templates/web-full/web/index.html
@@ -92,7 +92,7 @@ <h4>Navigation</h4>
     </div>
   </main>
 
-  <script type="application/dart" src="main.dart"></script>
-  <script data-pub-inline src="packages/browser/dart.js"></script>
+  <script async type="application/dart" src="main.dart"></script>
+  <script async src="packages/browser/dart.js"></script>
 </body>
 </html>
diff --git a/templates/web-simple/pubspec.yaml b/templates/web-simple/pubspec.yaml
@@ -9,3 +9,7 @@ environment:
 
 dependencies:
   browser: '>=0.10.0 <0.11.0'
+  dart_to_js_script_rewriter: '^0.1.0'
+
+transformers:
+- dart_to_js_script_rewriter
diff --git a/templates/web-simple/web/index.html b/templates/web-simple/web/index.html
@@ -20,7 +20,7 @@
 
   <div id="output"></div>
 
-<script type="application/dart" src="main.dart"></script>
-<script data-pub-inline src="packages/browser/dart.js"></script>
+<script async type="application/dart" src="main.dart"></script>
+<script async src="packages/browser/dart.js"></script>
 </body>
 </html>