web-angular-*: update to angular 3.0.0, etc (#391)

* web-angular-*: update to angular 3.0.0, etc

* Renamed `angular2_components` to `angular_components`

* web-angular-*: update <base href> init script

CHANGELOG.md

@@ -1,8 +1,13 @@
 ## 1.1.1
 
 - Added `angular_test` based tests to web-angular-simple.
-- Updated angular, angular components and SDK version constraints in the
-  web-angular-* templates.
+- Updated `web-angular-*` templates:
+  - Renamed `angular2_components` to `angular_components`.
+  - Package version updates in `pubspec.yaml`:
+    - `angular` to 3.0.0
+    - `angular_components` to 0.5.0
+    - Minimal SDK to 1.23
+  - Adjusted `index.html` `<base href>` initialization script.
 
 ## 1.1.0
 

lib/generators/web_angular_data.dart

@@ -65,14 +65,14 @@ b2xvcjogd2hpdGU7Cn0=""",
   """Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
 ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
 bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKaW1wb3J0ICdw
-YWNrYWdlOmFuZ3VsYXIyL2NvcmUuZGFydCc7CmltcG9ydCAncGFja2FnZTphbmd1bGFyMl9jb21w
-b25lbnRzL2FuZ3VsYXIyX2NvbXBvbmVudHMuZGFydCc7CgppbXBvcnQgJ2hlbGxvX2RpYWxvZy9o
-ZWxsb19kaWFsb2cuZGFydCc7CgpAQ29tcG9uZW50KAogIHNlbGVjdG9yOiAnbXktYXBwJywKICBz
-dHlsZVVybHM6IGNvbnN0IFsnYXBwX2NvbXBvbmVudC5jc3MnXSwKICB0ZW1wbGF0ZVVybDogJ2Fw
-cF9jb21wb25lbnQuaHRtbCcsCiAgZGlyZWN0aXZlczogY29uc3QgW21hdGVyaWFsRGlyZWN0aXZl
-cywgSGVsbG9EaWFsb2ddLAogIHByb3ZpZGVyczogY29uc3QgW21hdGVyaWFsUHJvdmlkZXJzXSwK
-KQpjbGFzcyBBcHBDb21wb25lbnQgewogIC8vIE5vdGhpbmcgaGVyZSB5ZXQuIEFsbCBsb2dpYyBp
-cyBpbiBIZWxsb0RpYWxvZy4KfQo=""",
+YWNrYWdlOmFuZ3VsYXIyL2NvcmUuZGFydCc7CmltcG9ydCAncGFja2FnZTphbmd1bGFyX2NvbXBv
+bmVudHMvYW5ndWxhcl9jb21wb25lbnRzLmRhcnQnOwoKaW1wb3J0ICdoZWxsb19kaWFsb2cvaGVs
+bG9fZGlhbG9nLmRhcnQnOwoKQENvbXBvbmVudCgKICBzZWxlY3RvcjogJ215LWFwcCcsCiAgc3R5
+bGVVcmxzOiBjb25zdCBbJ2FwcF9jb21wb25lbnQuY3NzJ10sCiAgdGVtcGxhdGVVcmw6ICdhcHBf
+Y29tcG9uZW50Lmh0bWwnLAogIGRpcmVjdGl2ZXM6IGNvbnN0IFttYXRlcmlhbERpcmVjdGl2ZXMs
+IEhlbGxvRGlhbG9nXSwKICBwcm92aWRlcnM6IGNvbnN0IFttYXRlcmlhbFByb3ZpZGVyc10sCikK
+Y2xhc3MgQXBwQ29tcG9uZW50IHsKICAvLyBOb3RoaW5nIGhlcmUgeWV0LiBBbGwgbG9naWMgaXMg
+aW4gSGVsbG9EaWFsb2cuCn0K""",
   "lib/app_component.html",
   "text",
   """PGgxPk15IEZpcnN0IEFuZ3VsYXJEYXJ0IEFwcDwvaDE+Cgo8bWF0ZXJpYWwtaW5wdXQgI215SW5w
@@ -90,18 +90,18 @@ W25hbWVdPSJteUlucHV0LmlucHV0VGV4dCI+CjwvaGVsbG8tZGlhbG9nPg==""",
   """Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
 ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
 bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKaW1wb3J0ICdw
-YWNrYWdlOmFuZ3VsYXIyL2NvcmUuZGFydCc7CmltcG9ydCAncGFja2FnZTphbmd1bGFyMl9jb21w
-b25lbnRzL2FuZ3VsYXIyX2NvbXBvbmVudHMuZGFydCc7CgpAQ29tcG9uZW50KAogIHNlbGVjdG9y
-OiAnaGVsbG8tZGlhbG9nJywKICBzdHlsZVVybHM6IGNvbnN0IFsnaGVsbG9fZGlhbG9nLmNzcydd
-LAogIHRlbXBsYXRlVXJsOiAnaGVsbG9fZGlhbG9nLmh0bWwnLAogIGRpcmVjdGl2ZXM6IGNvbnN0
-IFttYXRlcmlhbERpcmVjdGl2ZXNdLAogIHByb3ZpZGVyczogY29uc3QgW21hdGVyaWFsUHJvdmlk
-ZXJzXSwKKQpjbGFzcyBIZWxsb0RpYWxvZyB7CiAgLy8vIE1vZGFsIGNvbXBvbmVudCB0aGF0IGhv
-c3RzIHRoZSBpbm5lciBNYXRlcmlhbERpYWxvZyBpbiBhIGNlbnRlcmVkIG92ZXJsYXkuCiAgQFZp
-ZXdDaGlsZCgnd3JhcHBpbmdNb2RhbCcpCiAgTW9kYWxDb21wb25lbnQgd3JhcHBpbmdNb2RhbDsK
-CiAgLy8vIE5hbWUgb2YgdXNlci4KICBASW5wdXQoKQogIFN0cmluZyBuYW1lID0gIiI7CgogIC8v
-LyBPcGVucyB0aGUgZGlhbG9nLgogIHZvaWQgb3BlbihbU3RyaW5nIG5hbWVdKSB7CiAgICBpZiAo
-bmFtZSAhPSBudWxsKSB0aGlzLm5hbWUgPSBuYW1lOwogICAgd3JhcHBpbmdNb2RhbC5vcGVuKCk7
-CiAgfQp9Cg==""",
+YWNrYWdlOmFuZ3VsYXIyL2NvcmUuZGFydCc7CmltcG9ydCAncGFja2FnZTphbmd1bGFyX2NvbXBv
+bmVudHMvYW5ndWxhcl9jb21wb25lbnRzLmRhcnQnOwoKQENvbXBvbmVudCgKICBzZWxlY3Rvcjog
+J2hlbGxvLWRpYWxvZycsCiAgc3R5bGVVcmxzOiBjb25zdCBbJ2hlbGxvX2RpYWxvZy5jc3MnXSwK
+ICB0ZW1wbGF0ZVVybDogJ2hlbGxvX2RpYWxvZy5odG1sJywKICBkaXJlY3RpdmVzOiBjb25zdCBb
+bWF0ZXJpYWxEaXJlY3RpdmVzXSwKICBwcm92aWRlcnM6IGNvbnN0IFttYXRlcmlhbFByb3ZpZGVy
+c10sCikKY2xhc3MgSGVsbG9EaWFsb2cgewogIC8vLyBNb2RhbCBjb21wb25lbnQgdGhhdCBob3N0
+cyB0aGUgaW5uZXIgTWF0ZXJpYWxEaWFsb2cgaW4gYSBjZW50ZXJlZCBvdmVybGF5LgogIEBWaWV3
+Q2hpbGQoJ3dyYXBwaW5nTW9kYWwnKQogIE1vZGFsQ29tcG9uZW50IHdyYXBwaW5nTW9kYWw7Cgog
+IC8vLyBOYW1lIG9mIHVzZXIuCiAgQElucHV0KCkKICBTdHJpbmcgbmFtZSA9ICIiOwoKICAvLy8g
+T3BlbnMgdGhlIGRpYWxvZy4KICB2b2lkIG9wZW4oW1N0cmluZyBuYW1lXSkgewogICAgaWYgKG5h
+bWUgIT0gbnVsbCkgdGhpcy5uYW1lID0gbmFtZTsKICAgIHdyYXBwaW5nTW9kYWwub3BlbigpOwog
+IH0KfQo=""",
   "lib/hello_dialog/hello_dialog.html",
   "text",
   """PG1vZGFsICN3cmFwcGluZ01vZGFsPgogIDxtYXRlcmlhbC1kaWFsb2c+CgogICAgPGgzIGhlYWRl
@@ -119,31 +119,29 @@ ZGl2PgogIDwvbWF0ZXJpYWwtZGlhbG9nPgo8L21vZGFsPg==""",
 Z3VsYXJEYXJ0IENvbXBvbmVudHMKdmVyc2lvbjogMC4wLjEKI2hvbWVwYWdlOiBodHRwczovL3d3
 dy5leGFtcGxlLmNvbQojYXV0aG9yOiBfX2F1dGhvcl9fIDxlbWFpbEBleGFtcGxlLmNvbT4KCmVu
 dmlyb25tZW50OgogIHNkazogJz49MS4yMy4wIDwyLjAuMCcKCmRlcGVuZGVuY2llczoKICBhbmd1
-bGFyMjogXjMuMC4wLWJldGErMQogIGFuZ3VsYXIyX2NvbXBvbmVudHM6IF4wLjQuMS1iZXRhCgpk
-ZXZfZGVwZW5kZW5jaWVzOgogIGJyb3dzZXI6IF4wLjEwLjAKICBkYXJ0X3RvX2pzX3NjcmlwdF9y
-ZXdyaXRlcjogXjEuMC4xCgp0cmFuc2Zvcm1lcnM6Ci0gYW5ndWxhcjI6CiAgICBwbGF0Zm9ybV9k
-aXJlY3RpdmVzOgogICAgLSAncGFja2FnZTphbmd1bGFyMi9jb21tb24uZGFydCNDT01NT05fRElS
-RUNUSVZFUycKICAgIHBsYXRmb3JtX3BpcGVzOgogICAgLSAncGFja2FnZTphbmd1bGFyMi9jb21t
-b24uZGFydCNDT01NT05fUElQRVMnCiAgICBlbnRyeV9wb2ludHM6IHdlYi9tYWluLmRhcnQKLSBk
-YXJ0X3RvX2pzX3NjcmlwdF9yZXdyaXRlcgo=""",
+bGFyMjogXjMuMC4wCiAgYW5ndWxhcl9jb21wb25lbnRzOiBeMC41LjAKCmRldl9kZXBlbmRlbmNp
+ZXM6CiAgYnJvd3NlcjogXjAuMTAuMAogIGRhcnRfdG9fanNfc2NyaXB0X3Jld3JpdGVyOiBeMS4w
+LjEKCnRyYW5zZm9ybWVyczoKLSBhbmd1bGFyMjoKICAgIHBsYXRmb3JtX2RpcmVjdGl2ZXM6CiAg
+ICAtICdwYWNrYWdlOmFuZ3VsYXIyL2NvbW1vbi5kYXJ0I0NPTU1PTl9ESVJFQ1RJVkVTJwogICAg
+cGxhdGZvcm1fcGlwZXM6CiAgICAtICdwYWNrYWdlOmFuZ3VsYXIyL2NvbW1vbi5kYXJ0I0NPTU1P
+Tl9QSVBFUycKICAgIGVudHJ5X3BvaW50czogd2ViL21haW4uZGFydAotIGRhcnRfdG9fanNfc2Ny
+aXB0X3Jld3JpdGVyCg==""",
   "web/index.html",
   "text",
   """PCFET0NUWVBFIGh0bWw+CjxodG1sPgogIDxoZWFkPgogICAgPHNjcmlwdD4KICAgICAgICAvLyBX
 QVJOSU5HOiBETyBOT1Qgc2V0IHRoZSA8YmFzZSBocmVmPiBsaWtlIHRoaXMgaW4gcHJvZHVjdGlv
 biEKICAgICAgICAvLyBEZXRhaWxzOiBodHRwczovL3dlYmRldi5kYXJ0bGFuZy5vcmcvYW5ndWxh
-ci9ndWlkZS9yb3V0ZXIKICAgICAgICAoZnVuY3Rpb24gKCkgewogICAgICAgICAgICAvLyBBcHAg
-YmVpbmcgc2VydmVkIG91dCBvZiB3ZWIgZm9sZGVyIChsaWtlIFdlYlN0b3JtIGRvZXMpPwogICAg
-ICAgICAgICB2YXIgbWF0Y2ggPSBkb2N1bWVudC5sb2NhdGlvbi5wYXRobmFtZS5tYXRjaCgvXlwv
-Wy1cd10rXC93ZWJcLy8pOwogICAgICAgICAgICB2YXIgaHJlZiA9IG1hdGNoID8gbWF0Y2hbMF0g
-OiAnLyc7CiAgICAgICAgICAgIGRvY3VtZW50LndyaXRlKCc8YmFzZSBocmVmPSInICsgaHJlZiAr
-ICciIC8+Jyk7CiAgICAgICAgfSgpKTsKICAgIDwvc2NyaXB0PgoKICAgIDx0aXRsZT5fX3Byb2pl
-Y3ROYW1lX188L3RpdGxlPgogICAgPG1ldGEgY2hhcnNldD0idXRmLTgiPgogICAgPG1ldGEgbmFt
-ZT0idmlld3BvcnQiIGNvbnRlbnQ9IndpZHRoPWRldmljZS13aWR0aCwgaW5pdGlhbC1zY2FsZT0x
-Ij4KCiAgICA8c2NyaXB0IGRlZmVyIHNyYz0ibWFpbi5kYXJ0IiB0eXBlPSJhcHBsaWNhdGlvbi9k
-YXJ0Ij48L3NjcmlwdD4KICAgIDxzY3JpcHQgZGVmZXIgc3JjPSJwYWNrYWdlcy9icm93c2VyL2Rh
-cnQuanMiPjwvc2NyaXB0PgogICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJzdHlsZXMu
-Y3NzIj4KICA8L2hlYWQ+CiAgPGJvZHk+CiAgICA8bXktYXBwPkxvYWRpbmcuLi48L215LWFwcD4K
-ICA8L2JvZHk+CjwvaHRtbD4K""",
+ci9ndWlkZS9yb3V0ZXIKICAgICAgICAoZnVuY3Rpb24gKCkgewogICAgICAgICAgICB2YXIgbSA9
+IGRvY3VtZW50LmxvY2F0aW9uLnBhdGhuYW1lLm1hdGNoKC9eKFwvWy1cd10rKStcL3dlYigkfFwv
+KS8pOwogICAgICAgICAgICBkb2N1bWVudC53cml0ZSgnPGJhc2UgaHJlZj0iJyArIChtID8gbVsw
+XSA6ICcvJykgKyAnIiAvPicpOwogICAgICAgIH0oKSk7CiAgICA8L3NjcmlwdD4KCiAgICA8dGl0
+bGU+X19wcm9qZWN0TmFtZV9fPC90aXRsZT4KICAgIDxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KICAg
+IDxtZXRhIG5hbWU9InZpZXdwb3J0IiBjb250ZW50PSJ3aWR0aD1kZXZpY2Utd2lkdGgsIGluaXRp
+YWwtc2NhbGU9MSI+CgogICAgPHNjcmlwdCBkZWZlciBzcmM9Im1haW4uZGFydCIgdHlwZT0iYXBw
+bGljYXRpb24vZGFydCI+PC9zY3JpcHQ+CiAgICA8c2NyaXB0IGRlZmVyIHNyYz0icGFja2FnZXMv
+YnJvd3Nlci9kYXJ0LmpzIj48L3NjcmlwdD4KICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJl
+Zj0ic3R5bGVzLmNzcyI+CiAgPC9oZWFkPgogIDxib2R5PgogICAgPG15LWFwcD5Mb2FkaW5nLi4u
+PC9teS1hcHA+CiAgPC9ib2R5Pgo8L2h0bWw+Cg==""",
   "web/main.dart",
   "text",
   """Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl

lib/generators/web_angular_simple_data.dart

@@ -68,16 +68,16 @@ dCB7CiAgdmFyIG5hbWUgPSAnQW5ndWxhcic7Cn0K""",
   """bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNpbXBsZSBBbmd1bGFyRGFydCBh
 cHAKdmVyc2lvbjogMC4wLjEKI2hvbWVwYWdlOiBodHRwczovL3d3dy5leGFtcGxlLmNvbQojYXV0
 aG9yOiBfX2F1dGhvcl9fIDxlbWFpbEBleGFtcGxlLmNvbT4KCmVudmlyb25tZW50OgogIHNkazog
-Jz49MS4yMy4wIDwyLjAuMCcKCmRlcGVuZGVuY2llczoKICBhbmd1bGFyMjogXjMuMC4wLWJldGEr
-MQoKZGV2X2RlcGVuZGVuY2llczoKICBhbmd1bGFyX3Rlc3Q6IF4xLjAuMC1iZXRhCiAgYnJvd3Nl
-cjogXjAuMTAuMAogIGRhcnRfdG9fanNfc2NyaXB0X3Jld3JpdGVyOiBeMS4wLjEKICB0ZXN0OiBe
-MC4xMi4wCgp0cmFuc2Zvcm1lcnM6Ci0gYW5ndWxhcjI6CiAgICBwbGF0Zm9ybV9kaXJlY3RpdmVz
-OgogICAgLSAncGFja2FnZTphbmd1bGFyMi9jb21tb24uZGFydCNDT01NT05fRElSRUNUSVZFUycK
-ICAgIHBsYXRmb3JtX3BpcGVzOgogICAgLSAncGFja2FnZTphbmd1bGFyMi9jb21tb24uZGFydCND
-T01NT05fUElQRVMnCiAgICBlbnRyeV9wb2ludHM6IHdlYi9tYWluLmRhcnQKLSBhbmd1bGFyMi90
-cmFuc2Zvcm0vcmVmbGVjdGlvbl9yZW1vdmVyOgogICAgJGluY2x1ZGU6IHRlc3QvKipfdGVzdC5k
-YXJ0Ci0gdGVzdC9wdWJfc2VydmU6CiAgICAkaW5jbHVkZTogdGVzdC8qKl90ZXN0LmRhcnQKLSBk
-YXJ0X3RvX2pzX3NjcmlwdF9yZXdyaXRlcgo=""",
+Jz49MS4yMy4wIDwyLjAuMCcKCmRlcGVuZGVuY2llczoKICBhbmd1bGFyMjogXjMuMC4wCgpkZXZf
+ZGVwZW5kZW5jaWVzOgogIGFuZ3VsYXJfdGVzdDogXjEuMC4wLWJldGErMgogIGJyb3dzZXI6IF4w
+LjEwLjAKICBkYXJ0X3RvX2pzX3NjcmlwdF9yZXdyaXRlcjogXjEuMC4xCiAgdGVzdDogXjAuMTIu
+MAoKdHJhbnNmb3JtZXJzOgotIGFuZ3VsYXIyOgogICAgcGxhdGZvcm1fZGlyZWN0aXZlczoKICAg
+IC0gJ3BhY2thZ2U6YW5ndWxhcjIvY29tbW9uLmRhcnQjQ09NTU9OX0RJUkVDVElWRVMnCiAgICBw
+bGF0Zm9ybV9waXBlczoKICAgIC0gJ3BhY2thZ2U6YW5ndWxhcjIvY29tbW9uLmRhcnQjQ09NTU9O
+X1BJUEVTJwogICAgZW50cnlfcG9pbnRzOiB3ZWIvbWFpbi5kYXJ0Ci0gYW5ndWxhcjIvdHJhbnNm
+b3JtL3JlZmxlY3Rpb25fcmVtb3ZlcjoKICAgICRpbmNsdWRlOiB0ZXN0LyoqX3Rlc3QuZGFydAot
+IHRlc3QvcHViX3NlcnZlOgogICAgJGluY2x1ZGU6IHRlc3QvKipfdGVzdC5kYXJ0Ci0gZGFydF90
+b19qc19zY3JpcHRfcmV3cml0ZXIK""",
   "test/app_test.dart",
   "text",
   """QFRhZ3MoY29uc3QgWydhb3QnXSkKQFRlc3RPbignYnJvd3NlcicpCgppbXBvcnQgJ3BhY2thZ2U6
@@ -99,19 +99,17 @@ ZXhwZWN0KGh0bWwsICc8aDE+SGVsbG8gQW5ndWxhcjwvaDE+Jyk7CiAgfSk7Cn0K""",
   """PCFET0NUWVBFIGh0bWw+CjxodG1sPgogIDxoZWFkPgogICAgPHNjcmlwdD4KICAgICAgICAvLyBX
 QVJOSU5HOiBETyBOT1Qgc2V0IHRoZSA8YmFzZSBocmVmPiBsaWtlIHRoaXMgaW4gcHJvZHVjdGlv
 biEKICAgICAgICAvLyBEZXRhaWxzOiBodHRwczovL3dlYmRldi5kYXJ0bGFuZy5vcmcvYW5ndWxh
-ci9ndWlkZS9yb3V0ZXIKICAgICAgICAoZnVuY3Rpb24gKCkgewogICAgICAgICAgICAvLyBBcHAg
-YmVpbmcgc2VydmVkIG91dCBvZiB3ZWIgZm9sZGVyIChsaWtlIFdlYlN0b3JtIGRvZXMpPwogICAg
-ICAgICAgICB2YXIgbWF0Y2ggPSBkb2N1bWVudC5sb2NhdGlvbi5wYXRobmFtZS5tYXRjaCgvXlwv
-Wy1cd10rXC93ZWJcLy8pOwogICAgICAgICAgICB2YXIgaHJlZiA9IG1hdGNoID8gbWF0Y2hbMF0g
-OiAnLyc7CiAgICAgICAgICAgIGRvY3VtZW50LndyaXRlKCc8YmFzZSBocmVmPSInICsgaHJlZiAr
-ICciIC8+Jyk7CiAgICAgICAgfSgpKTsKICAgIDwvc2NyaXB0PgoKICAgIDx0aXRsZT5IZWxsbyBB
-bmd1bGFyPC90aXRsZT4KICAgIDxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KICAgIDxtZXRhIG5hbWU9
-InZpZXdwb3J0IiBjb250ZW50PSJ3aWR0aD1kZXZpY2Utd2lkdGgsIGluaXRpYWwtc2NhbGU9MSI+
-CiAgICA8bGluayByZWw9InN0eWxlc2hlZXQiIHR5cGU9InRleHQvY3NzIiBocmVmPSJzdHlsZXMu
-Y3NzIj4KCiAgICA8c2NyaXB0IGRlZmVyIHNyYz0ibWFpbi5kYXJ0IiB0eXBlPSJhcHBsaWNhdGlv
-bi9kYXJ0Ij48L3NjcmlwdD4KICAgIDxzY3JpcHQgZGVmZXIgc3JjPSJwYWNrYWdlcy9icm93c2Vy
-L2RhcnQuanMiPjwvc2NyaXB0PgogIDwvaGVhZD4KICA8Ym9keT4KICAgIDxteS1hcHA+TG9hZGlu
-Zy4uLjwvbXktYXBwPgogIDwvYm9keT4KPC9odG1sPgo=""",
+ci9ndWlkZS9yb3V0ZXIKICAgICAgICAoZnVuY3Rpb24gKCkgewogICAgICAgICAgICB2YXIgbSA9
+IGRvY3VtZW50LmxvY2F0aW9uLnBhdGhuYW1lLm1hdGNoKC9eKFwvWy1cd10rKStcL3dlYigkfFwv
+KS8pOwogICAgICAgICAgICBkb2N1bWVudC53cml0ZSgnPGJhc2UgaHJlZj0iJyArIChtID8gbVsw
+XSA6ICcvJykgKyAnIiAvPicpOwogICAgICAgIH0oKSk7CiAgICA8L3NjcmlwdD4KCiAgICA8dGl0
+bGU+SGVsbG8gQW5ndWxhcjwvdGl0bGU+CiAgICA8bWV0YSBjaGFyc2V0PSJ1dGYtOCI+CiAgICA8
+bWV0YSBuYW1lPSJ2aWV3cG9ydCIgY29udGVudD0id2lkdGg9ZGV2aWNlLXdpZHRoLCBpbml0aWFs
+LXNjYWxlPTEiPgogICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiB0eXBlPSJ0ZXh0L2NzcyIgaHJl
+Zj0ic3R5bGVzLmNzcyI+CgogICAgPHNjcmlwdCBkZWZlciBzcmM9Im1haW4uZGFydCIgdHlwZT0i
+YXBwbGljYXRpb24vZGFydCI+PC9zY3JpcHQ+CiAgICA8c2NyaXB0IGRlZmVyIHNyYz0icGFja2Fn
+ZXMvYnJvd3Nlci9kYXJ0LmpzIj48L3NjcmlwdD4KICA8L2hlYWQ+CiAgPGJvZHk+CiAgICA8bXkt
+YXBwPkxvYWRpbmcuLi48L215LWFwcD4KICA8L2JvZHk+CjwvaHRtbD4K""",
   "web/main.dart",
   "text",
   """Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl

templates/web-angular-simple/pubspec.yaml

@@ -8,10 +8,10 @@ environment:
   sdk: '>=1.23.0 <2.0.0'
 
 dependencies:
-  angular2: ^3.0.0-beta+1
+  angular2: ^3.0.0
 
 dev_dependencies:
-  angular_test: ^1.0.0-beta
+  angular_test: ^1.0.0-beta+2
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
   test: ^0.12.0

templates/web-angular-simple/web/index.html

@@ -5,10 +5,8 @@
         // WARNING: DO NOT set the <base href> like this in production!
         // Details: https://webdev.dartlang.org/angular/guide/router
         (function () {
-            // App being served out of web folder (like WebStorm does)?
-            var match = document.location.pathname.match(/^\/[-\w]+\/web\//);
-            var href = match ? match[0] : '/';
-            document.write('<base href="' + href + '" />');
+            var m = document.location.pathname.match(/^(\/[-\w]+)+\/web($|\/)/);
+            document.write('<base href="' + (m ? m[0] : '/') + '" />');
         }());
     </script>
 

templates/web-angular/lib/app_component.dart

@@ -2,7 +2,7 @@
 // is governed by a BSD-style license that can be found in the LICENSE file.
 
 import 'package:angular2/core.dart';
-import 'package:angular2_components/angular2_components.dart';
+import 'package:angular_components/angular_components.dart';
 
 import 'hello_dialog/hello_dialog.dart';
 

templates/web-angular/lib/hello_dialog/hello_dialog.dart

@@ -2,7 +2,7 @@
 // is governed by a BSD-style license that can be found in the LICENSE file.
 
 import 'package:angular2/core.dart';
-import 'package:angular2_components/angular2_components.dart';
+import 'package:angular_components/angular_components.dart';
 
 @Component(
   selector: 'hello-dialog',

templates/web-angular/pubspec.yaml

@@ -8,8 +8,8 @@ environment:
   sdk: '>=1.23.0 <2.0.0'
 
 dependencies:
-  angular2: ^3.0.0-beta+1
-  angular2_components: ^0.4.1-beta
+  angular2: ^3.0.0
+  angular_components: ^0.5.0
 
 dev_dependencies:
   browser: ^0.10.0

templates/web-angular/web/index.html

@@ -5,10 +5,8 @@
         // WARNING: DO NOT set the <base href> like this in production!
         // Details: https://webdev.dartlang.org/angular/guide/router
         (function () {
-            // App being served out of web folder (like WebStorm does)?
-            var match = document.location.pathname.match(/^\/[-\w]+\/web\//);
-            var href = match ? match[0] : '/';
-            document.write('<base href="' + href + '" />');
+            var m = document.location.pathname.match(/^(\/[-\w]+)+\/web($|\/)/);
+            document.write('<base href="' + (m ? m[0] : '/') + '" />');
         }());
     </script>