Skip to content

Commit d52c375

Browse files
chalinkwalrath
authored andcommitted
web-angular-*: update to angular 3.0.0, etc (flutter#391)
* web-angular-*: update to angular 3.0.0, etc * Renamed `angular2_components` to `angular_components` * web-angular-*: update <base href> init script
1 parent bfd2980 commit d52c375

File tree

9 files changed

+76
-79
lines changed

9 files changed

+76
-79
lines changed

CHANGELOG.md

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
## 1.1.1
22

33
- Added `angular_test` based tests to web-angular-simple.
4-
- Updated angular, angular components and SDK version constraints in the
5-
web-angular-* templates.
4+
- Updated `web-angular-*` templates:
5+
- Renamed `angular2_components` to `angular_components`.
6+
- Package version updates in `pubspec.yaml`:
7+
- `angular` to 3.0.0
8+
- `angular_components` to 0.5.0
9+
- Minimal SDK to 1.23
10+
- Adjusted `index.html` `<base href>` initialization script.
611

712
## 1.1.0
813

lib/generators/web_angular_data.dart

+38-40
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@ b2xvcjogd2hpdGU7Cn0=""",
6565
"""Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
6666
ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
6767
bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKaW1wb3J0ICdw
68-
YWNrYWdlOmFuZ3VsYXIyL2NvcmUuZGFydCc7CmltcG9ydCAncGFja2FnZTphbmd1bGFyMl9jb21w
69-
b25lbnRzL2FuZ3VsYXIyX2NvbXBvbmVudHMuZGFydCc7CgppbXBvcnQgJ2hlbGxvX2RpYWxvZy9o
70-
ZWxsb19kaWFsb2cuZGFydCc7CgpAQ29tcG9uZW50KAogIHNlbGVjdG9yOiAnbXktYXBwJywKICBz
71-
dHlsZVVybHM6IGNvbnN0IFsnYXBwX2NvbXBvbmVudC5jc3MnXSwKICB0ZW1wbGF0ZVVybDogJ2Fw
72-
cF9jb21wb25lbnQuaHRtbCcsCiAgZGlyZWN0aXZlczogY29uc3QgW21hdGVyaWFsRGlyZWN0aXZl
73-
cywgSGVsbG9EaWFsb2ddLAogIHByb3ZpZGVyczogY29uc3QgW21hdGVyaWFsUHJvdmlkZXJzXSwK
74-
KQpjbGFzcyBBcHBDb21wb25lbnQgewogIC8vIE5vdGhpbmcgaGVyZSB5ZXQuIEFsbCBsb2dpYyBp
75-
cyBpbiBIZWxsb0RpYWxvZy4KfQo=""",
68+
YWNrYWdlOmFuZ3VsYXIyL2NvcmUuZGFydCc7CmltcG9ydCAncGFja2FnZTphbmd1bGFyX2NvbXBv
69+
bmVudHMvYW5ndWxhcl9jb21wb25lbnRzLmRhcnQnOwoKaW1wb3J0ICdoZWxsb19kaWFsb2cvaGVs
70+
bG9fZGlhbG9nLmRhcnQnOwoKQENvbXBvbmVudCgKICBzZWxlY3RvcjogJ215LWFwcCcsCiAgc3R5
71+
bGVVcmxzOiBjb25zdCBbJ2FwcF9jb21wb25lbnQuY3NzJ10sCiAgdGVtcGxhdGVVcmw6ICdhcHBf
72+
Y29tcG9uZW50Lmh0bWwnLAogIGRpcmVjdGl2ZXM6IGNvbnN0IFttYXRlcmlhbERpcmVjdGl2ZXMs
73+
IEhlbGxvRGlhbG9nXSwKICBwcm92aWRlcnM6IGNvbnN0IFttYXRlcmlhbFByb3ZpZGVyc10sCikK
74+
Y2xhc3MgQXBwQ29tcG9uZW50IHsKICAvLyBOb3RoaW5nIGhlcmUgeWV0LiBBbGwgbG9naWMgaXMg
75+
aW4gSGVsbG9EaWFsb2cuCn0K""",
7676
"lib/app_component.html",
7777
"text",
7878
"""PGgxPk15IEZpcnN0IEFuZ3VsYXJEYXJ0IEFwcDwvaDE+Cgo8bWF0ZXJpYWwtaW5wdXQgI215SW5w
@@ -90,18 +90,18 @@ W25hbWVdPSJteUlucHV0LmlucHV0VGV4dCI+CjwvaGVsbG8tZGlhbG9nPg==""",
9090
"""Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
9191
ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
9292
bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKaW1wb3J0ICdw
93-
YWNrYWdlOmFuZ3VsYXIyL2NvcmUuZGFydCc7CmltcG9ydCAncGFja2FnZTphbmd1bGFyMl9jb21w
94-
b25lbnRzL2FuZ3VsYXIyX2NvbXBvbmVudHMuZGFydCc7CgpAQ29tcG9uZW50KAogIHNlbGVjdG9y
95-
OiAnaGVsbG8tZGlhbG9nJywKICBzdHlsZVVybHM6IGNvbnN0IFsnaGVsbG9fZGlhbG9nLmNzcydd
96-
LAogIHRlbXBsYXRlVXJsOiAnaGVsbG9fZGlhbG9nLmh0bWwnLAogIGRpcmVjdGl2ZXM6IGNvbnN0
97-
IFttYXRlcmlhbERpcmVjdGl2ZXNdLAogIHByb3ZpZGVyczogY29uc3QgW21hdGVyaWFsUHJvdmlk
98-
ZXJzXSwKKQpjbGFzcyBIZWxsb0RpYWxvZyB7CiAgLy8vIE1vZGFsIGNvbXBvbmVudCB0aGF0IGhv
99-
c3RzIHRoZSBpbm5lciBNYXRlcmlhbERpYWxvZyBpbiBhIGNlbnRlcmVkIG92ZXJsYXkuCiAgQFZp
100-
ZXdDaGlsZCgnd3JhcHBpbmdNb2RhbCcpCiAgTW9kYWxDb21wb25lbnQgd3JhcHBpbmdNb2RhbDsK
101-
CiAgLy8vIE5hbWUgb2YgdXNlci4KICBASW5wdXQoKQogIFN0cmluZyBuYW1lID0gIiI7CgogIC8v
102-
LyBPcGVucyB0aGUgZGlhbG9nLgogIHZvaWQgb3BlbihbU3RyaW5nIG5hbWVdKSB7CiAgICBpZiAo
103-
bmFtZSAhPSBudWxsKSB0aGlzLm5hbWUgPSBuYW1lOwogICAgd3JhcHBpbmdNb2RhbC5vcGVuKCk7
104-
CiAgfQp9Cg==""",
93+
YWNrYWdlOmFuZ3VsYXIyL2NvcmUuZGFydCc7CmltcG9ydCAncGFja2FnZTphbmd1bGFyX2NvbXBv
94+
bmVudHMvYW5ndWxhcl9jb21wb25lbnRzLmRhcnQnOwoKQENvbXBvbmVudCgKICBzZWxlY3Rvcjog
95+
J2hlbGxvLWRpYWxvZycsCiAgc3R5bGVVcmxzOiBjb25zdCBbJ2hlbGxvX2RpYWxvZy5jc3MnXSwK
96+
ICB0ZW1wbGF0ZVVybDogJ2hlbGxvX2RpYWxvZy5odG1sJywKICBkaXJlY3RpdmVzOiBjb25zdCBb
97+
bWF0ZXJpYWxEaXJlY3RpdmVzXSwKICBwcm92aWRlcnM6IGNvbnN0IFttYXRlcmlhbFByb3ZpZGVy
98+
c10sCikKY2xhc3MgSGVsbG9EaWFsb2cgewogIC8vLyBNb2RhbCBjb21wb25lbnQgdGhhdCBob3N0
99+
cyB0aGUgaW5uZXIgTWF0ZXJpYWxEaWFsb2cgaW4gYSBjZW50ZXJlZCBvdmVybGF5LgogIEBWaWV3
100+
Q2hpbGQoJ3dyYXBwaW5nTW9kYWwnKQogIE1vZGFsQ29tcG9uZW50IHdyYXBwaW5nTW9kYWw7Cgog
101+
IC8vLyBOYW1lIG9mIHVzZXIuCiAgQElucHV0KCkKICBTdHJpbmcgbmFtZSA9ICIiOwoKICAvLy8g
102+
T3BlbnMgdGhlIGRpYWxvZy4KICB2b2lkIG9wZW4oW1N0cmluZyBuYW1lXSkgewogICAgaWYgKG5h
103+
bWUgIT0gbnVsbCkgdGhpcy5uYW1lID0gbmFtZTsKICAgIHdyYXBwaW5nTW9kYWwub3BlbigpOwog
104+
IH0KfQo=""",
105105
"lib/hello_dialog/hello_dialog.html",
106106
"text",
107107
"""PG1vZGFsICN3cmFwcGluZ01vZGFsPgogIDxtYXRlcmlhbC1kaWFsb2c+CgogICAgPGgzIGhlYWRl
@@ -119,31 +119,29 @@ ZGl2PgogIDwvbWF0ZXJpYWwtZGlhbG9nPgo8L21vZGFsPg==""",
119119
Z3VsYXJEYXJ0IENvbXBvbmVudHMKdmVyc2lvbjogMC4wLjEKI2hvbWVwYWdlOiBodHRwczovL3d3
120120
dy5leGFtcGxlLmNvbQojYXV0aG9yOiBfX2F1dGhvcl9fIDxlbWFpbEBleGFtcGxlLmNvbT4KCmVu
121121
dmlyb25tZW50OgogIHNkazogJz49MS4yMy4wIDwyLjAuMCcKCmRlcGVuZGVuY2llczoKICBhbmd1
122-
bGFyMjogXjMuMC4wLWJldGErMQogIGFuZ3VsYXIyX2NvbXBvbmVudHM6IF4wLjQuMS1iZXRhCgpk
123-
ZXZfZGVwZW5kZW5jaWVzOgogIGJyb3dzZXI6IF4wLjEwLjAKICBkYXJ0X3RvX2pzX3NjcmlwdF9y
124-
ZXdyaXRlcjogXjEuMC4xCgp0cmFuc2Zvcm1lcnM6Ci0gYW5ndWxhcjI6CiAgICBwbGF0Zm9ybV9k
125-
aXJlY3RpdmVzOgogICAgLSAncGFja2FnZTphbmd1bGFyMi9jb21tb24uZGFydCNDT01NT05fRElS
126-
RUNUSVZFUycKICAgIHBsYXRmb3JtX3BpcGVzOgogICAgLSAncGFja2FnZTphbmd1bGFyMi9jb21t
127-
b24uZGFydCNDT01NT05fUElQRVMnCiAgICBlbnRyeV9wb2ludHM6IHdlYi9tYWluLmRhcnQKLSBk
128-
YXJ0X3RvX2pzX3NjcmlwdF9yZXdyaXRlcgo=""",
122+
bGFyMjogXjMuMC4wCiAgYW5ndWxhcl9jb21wb25lbnRzOiBeMC41LjAKCmRldl9kZXBlbmRlbmNp
123+
ZXM6CiAgYnJvd3NlcjogXjAuMTAuMAogIGRhcnRfdG9fanNfc2NyaXB0X3Jld3JpdGVyOiBeMS4w
124+
LjEKCnRyYW5zZm9ybWVyczoKLSBhbmd1bGFyMjoKICAgIHBsYXRmb3JtX2RpcmVjdGl2ZXM6CiAg
125+
ICAtICdwYWNrYWdlOmFuZ3VsYXIyL2NvbW1vbi5kYXJ0I0NPTU1PTl9ESVJFQ1RJVkVTJwogICAg
126+
cGxhdGZvcm1fcGlwZXM6CiAgICAtICdwYWNrYWdlOmFuZ3VsYXIyL2NvbW1vbi5kYXJ0I0NPTU1P
127+
Tl9QSVBFUycKICAgIGVudHJ5X3BvaW50czogd2ViL21haW4uZGFydAotIGRhcnRfdG9fanNfc2Ny
128+
aXB0X3Jld3JpdGVyCg==""",
129129
"web/index.html",
130130
"text",
131131
"""PCFET0NUWVBFIGh0bWw+CjxodG1sPgogIDxoZWFkPgogICAgPHNjcmlwdD4KICAgICAgICAvLyBX
132132
QVJOSU5HOiBETyBOT1Qgc2V0IHRoZSA8YmFzZSBocmVmPiBsaWtlIHRoaXMgaW4gcHJvZHVjdGlv
133133
biEKICAgICAgICAvLyBEZXRhaWxzOiBodHRwczovL3dlYmRldi5kYXJ0bGFuZy5vcmcvYW5ndWxh
134-
ci9ndWlkZS9yb3V0ZXIKICAgICAgICAoZnVuY3Rpb24gKCkgewogICAgICAgICAgICAvLyBBcHAg
135-
YmVpbmcgc2VydmVkIG91dCBvZiB3ZWIgZm9sZGVyIChsaWtlIFdlYlN0b3JtIGRvZXMpPwogICAg
136-
ICAgICAgICB2YXIgbWF0Y2ggPSBkb2N1bWVudC5sb2NhdGlvbi5wYXRobmFtZS5tYXRjaCgvXlwv
137-
Wy1cd10rXC93ZWJcLy8pOwogICAgICAgICAgICB2YXIgaHJlZiA9IG1hdGNoID8gbWF0Y2hbMF0g
138-
OiAnLyc7CiAgICAgICAgICAgIGRvY3VtZW50LndyaXRlKCc8YmFzZSBocmVmPSInICsgaHJlZiAr
139-
ICciIC8+Jyk7CiAgICAgICAgfSgpKTsKICAgIDwvc2NyaXB0PgoKICAgIDx0aXRsZT5fX3Byb2pl
140-
Y3ROYW1lX188L3RpdGxlPgogICAgPG1ldGEgY2hhcnNldD0idXRmLTgiPgogICAgPG1ldGEgbmFt
141-
ZT0idmlld3BvcnQiIGNvbnRlbnQ9IndpZHRoPWRldmljZS13aWR0aCwgaW5pdGlhbC1zY2FsZT0x
142-
Ij4KCiAgICA8c2NyaXB0IGRlZmVyIHNyYz0ibWFpbi5kYXJ0IiB0eXBlPSJhcHBsaWNhdGlvbi9k
143-
YXJ0Ij48L3NjcmlwdD4KICAgIDxzY3JpcHQgZGVmZXIgc3JjPSJwYWNrYWdlcy9icm93c2VyL2Rh
144-
cnQuanMiPjwvc2NyaXB0PgogICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJzdHlsZXMu
145-
Y3NzIj4KICA8L2hlYWQ+CiAgPGJvZHk+CiAgICA8bXktYXBwPkxvYWRpbmcuLi48L215LWFwcD4K
146-
ICA8L2JvZHk+CjwvaHRtbD4K""",
134+
ci9ndWlkZS9yb3V0ZXIKICAgICAgICAoZnVuY3Rpb24gKCkgewogICAgICAgICAgICB2YXIgbSA9
135+
IGRvY3VtZW50LmxvY2F0aW9uLnBhdGhuYW1lLm1hdGNoKC9eKFwvWy1cd10rKStcL3dlYigkfFwv
136+
KS8pOwogICAgICAgICAgICBkb2N1bWVudC53cml0ZSgnPGJhc2UgaHJlZj0iJyArIChtID8gbVsw
137+
XSA6ICcvJykgKyAnIiAvPicpOwogICAgICAgIH0oKSk7CiAgICA8L3NjcmlwdD4KCiAgICA8dGl0
138+
bGU+X19wcm9qZWN0TmFtZV9fPC90aXRsZT4KICAgIDxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KICAg
139+
IDxtZXRhIG5hbWU9InZpZXdwb3J0IiBjb250ZW50PSJ3aWR0aD1kZXZpY2Utd2lkdGgsIGluaXRp
140+
YWwtc2NhbGU9MSI+CgogICAgPHNjcmlwdCBkZWZlciBzcmM9Im1haW4uZGFydCIgdHlwZT0iYXBw
141+
bGljYXRpb24vZGFydCI+PC9zY3JpcHQ+CiAgICA8c2NyaXB0IGRlZmVyIHNyYz0icGFja2FnZXMv
142+
YnJvd3Nlci9kYXJ0LmpzIj48L3NjcmlwdD4KICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJl
143+
Zj0ic3R5bGVzLmNzcyI+CiAgPC9oZWFkPgogIDxib2R5PgogICAgPG15LWFwcD5Mb2FkaW5nLi4u
144+
PC9teS1hcHA+CiAgPC9ib2R5Pgo8L2h0bWw+Cg==""",
147145
"web/main.dart",
148146
"text",
149147
"""Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl

lib/generators/web_angular_simple_data.dart

+21-23
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,16 @@ dCB7CiAgdmFyIG5hbWUgPSAnQW5ndWxhcic7Cn0K""",
6868
"""bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNpbXBsZSBBbmd1bGFyRGFydCBh
6969
cHAKdmVyc2lvbjogMC4wLjEKI2hvbWVwYWdlOiBodHRwczovL3d3dy5leGFtcGxlLmNvbQojYXV0
7070
aG9yOiBfX2F1dGhvcl9fIDxlbWFpbEBleGFtcGxlLmNvbT4KCmVudmlyb25tZW50OgogIHNkazog
71-
Jz49MS4yMy4wIDwyLjAuMCcKCmRlcGVuZGVuY2llczoKICBhbmd1bGFyMjogXjMuMC4wLWJldGEr
72-
MQoKZGV2X2RlcGVuZGVuY2llczoKICBhbmd1bGFyX3Rlc3Q6IF4xLjAuMC1iZXRhCiAgYnJvd3Nl
73-
cjogXjAuMTAuMAogIGRhcnRfdG9fanNfc2NyaXB0X3Jld3JpdGVyOiBeMS4wLjEKICB0ZXN0OiBe
74-
MC4xMi4wCgp0cmFuc2Zvcm1lcnM6Ci0gYW5ndWxhcjI6CiAgICBwbGF0Zm9ybV9kaXJlY3RpdmVz
75-
OgogICAgLSAncGFja2FnZTphbmd1bGFyMi9jb21tb24uZGFydCNDT01NT05fRElSRUNUSVZFUycK
76-
ICAgIHBsYXRmb3JtX3BpcGVzOgogICAgLSAncGFja2FnZTphbmd1bGFyMi9jb21tb24uZGFydCND
77-
T01NT05fUElQRVMnCiAgICBlbnRyeV9wb2ludHM6IHdlYi9tYWluLmRhcnQKLSBhbmd1bGFyMi90
78-
cmFuc2Zvcm0vcmVmbGVjdGlvbl9yZW1vdmVyOgogICAgJGluY2x1ZGU6IHRlc3QvKipfdGVzdC5k
79-
YXJ0Ci0gdGVzdC9wdWJfc2VydmU6CiAgICAkaW5jbHVkZTogdGVzdC8qKl90ZXN0LmRhcnQKLSBk
80-
YXJ0X3RvX2pzX3NjcmlwdF9yZXdyaXRlcgo=""",
71+
Jz49MS4yMy4wIDwyLjAuMCcKCmRlcGVuZGVuY2llczoKICBhbmd1bGFyMjogXjMuMC4wCgpkZXZf
72+
ZGVwZW5kZW5jaWVzOgogIGFuZ3VsYXJfdGVzdDogXjEuMC4wLWJldGErMgogIGJyb3dzZXI6IF4w
73+
LjEwLjAKICBkYXJ0X3RvX2pzX3NjcmlwdF9yZXdyaXRlcjogXjEuMC4xCiAgdGVzdDogXjAuMTIu
74+
MAoKdHJhbnNmb3JtZXJzOgotIGFuZ3VsYXIyOgogICAgcGxhdGZvcm1fZGlyZWN0aXZlczoKICAg
75+
IC0gJ3BhY2thZ2U6YW5ndWxhcjIvY29tbW9uLmRhcnQjQ09NTU9OX0RJUkVDVElWRVMnCiAgICBw
76+
bGF0Zm9ybV9waXBlczoKICAgIC0gJ3BhY2thZ2U6YW5ndWxhcjIvY29tbW9uLmRhcnQjQ09NTU9O
77+
X1BJUEVTJwogICAgZW50cnlfcG9pbnRzOiB3ZWIvbWFpbi5kYXJ0Ci0gYW5ndWxhcjIvdHJhbnNm
78+
b3JtL3JlZmxlY3Rpb25fcmVtb3ZlcjoKICAgICRpbmNsdWRlOiB0ZXN0LyoqX3Rlc3QuZGFydAot
79+
IHRlc3QvcHViX3NlcnZlOgogICAgJGluY2x1ZGU6IHRlc3QvKipfdGVzdC5kYXJ0Ci0gZGFydF90
80+
b19qc19zY3JpcHRfcmV3cml0ZXIK""",
8181
"test/app_test.dart",
8282
"text",
8383
"""QFRhZ3MoY29uc3QgWydhb3QnXSkKQFRlc3RPbignYnJvd3NlcicpCgppbXBvcnQgJ3BhY2thZ2U6
@@ -99,19 +99,17 @@ ZXhwZWN0KGh0bWwsICc8aDE+SGVsbG8gQW5ndWxhcjwvaDE+Jyk7CiAgfSk7Cn0K""",
9999
"""PCFET0NUWVBFIGh0bWw+CjxodG1sPgogIDxoZWFkPgogICAgPHNjcmlwdD4KICAgICAgICAvLyBX
100100
QVJOSU5HOiBETyBOT1Qgc2V0IHRoZSA8YmFzZSBocmVmPiBsaWtlIHRoaXMgaW4gcHJvZHVjdGlv
101101
biEKICAgICAgICAvLyBEZXRhaWxzOiBodHRwczovL3dlYmRldi5kYXJ0bGFuZy5vcmcvYW5ndWxh
102-
ci9ndWlkZS9yb3V0ZXIKICAgICAgICAoZnVuY3Rpb24gKCkgewogICAgICAgICAgICAvLyBBcHAg
103-
YmVpbmcgc2VydmVkIG91dCBvZiB3ZWIgZm9sZGVyIChsaWtlIFdlYlN0b3JtIGRvZXMpPwogICAg
104-
ICAgICAgICB2YXIgbWF0Y2ggPSBkb2N1bWVudC5sb2NhdGlvbi5wYXRobmFtZS5tYXRjaCgvXlwv
105-
Wy1cd10rXC93ZWJcLy8pOwogICAgICAgICAgICB2YXIgaHJlZiA9IG1hdGNoID8gbWF0Y2hbMF0g
106-
OiAnLyc7CiAgICAgICAgICAgIGRvY3VtZW50LndyaXRlKCc8YmFzZSBocmVmPSInICsgaHJlZiAr
107-
ICciIC8+Jyk7CiAgICAgICAgfSgpKTsKICAgIDwvc2NyaXB0PgoKICAgIDx0aXRsZT5IZWxsbyBB
108-
bmd1bGFyPC90aXRsZT4KICAgIDxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KICAgIDxtZXRhIG5hbWU9
109-
InZpZXdwb3J0IiBjb250ZW50PSJ3aWR0aD1kZXZpY2Utd2lkdGgsIGluaXRpYWwtc2NhbGU9MSI+
110-
CiAgICA8bGluayByZWw9InN0eWxlc2hlZXQiIHR5cGU9InRleHQvY3NzIiBocmVmPSJzdHlsZXMu
111-
Y3NzIj4KCiAgICA8c2NyaXB0IGRlZmVyIHNyYz0ibWFpbi5kYXJ0IiB0eXBlPSJhcHBsaWNhdGlv
112-
bi9kYXJ0Ij48L3NjcmlwdD4KICAgIDxzY3JpcHQgZGVmZXIgc3JjPSJwYWNrYWdlcy9icm93c2Vy
113-
L2RhcnQuanMiPjwvc2NyaXB0PgogIDwvaGVhZD4KICA8Ym9keT4KICAgIDxteS1hcHA+TG9hZGlu
114-
Zy4uLjwvbXktYXBwPgogIDwvYm9keT4KPC9odG1sPgo=""",
102+
ci9ndWlkZS9yb3V0ZXIKICAgICAgICAoZnVuY3Rpb24gKCkgewogICAgICAgICAgICB2YXIgbSA9
103+
IGRvY3VtZW50LmxvY2F0aW9uLnBhdGhuYW1lLm1hdGNoKC9eKFwvWy1cd10rKStcL3dlYigkfFwv
104+
KS8pOwogICAgICAgICAgICBkb2N1bWVudC53cml0ZSgnPGJhc2UgaHJlZj0iJyArIChtID8gbVsw
105+
XSA6ICcvJykgKyAnIiAvPicpOwogICAgICAgIH0oKSk7CiAgICA8L3NjcmlwdD4KCiAgICA8dGl0
106+
bGU+SGVsbG8gQW5ndWxhcjwvdGl0bGU+CiAgICA8bWV0YSBjaGFyc2V0PSJ1dGYtOCI+CiAgICA8
107+
bWV0YSBuYW1lPSJ2aWV3cG9ydCIgY29udGVudD0id2lkdGg9ZGV2aWNlLXdpZHRoLCBpbml0aWFs
108+
LXNjYWxlPTEiPgogICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiB0eXBlPSJ0ZXh0L2NzcyIgaHJl
109+
Zj0ic3R5bGVzLmNzcyI+CgogICAgPHNjcmlwdCBkZWZlciBzcmM9Im1haW4uZGFydCIgdHlwZT0i
110+
YXBwbGljYXRpb24vZGFydCI+PC9zY3JpcHQ+CiAgICA8c2NyaXB0IGRlZmVyIHNyYz0icGFja2Fn
111+
ZXMvYnJvd3Nlci9kYXJ0LmpzIj48L3NjcmlwdD4KICA8L2hlYWQ+CiAgPGJvZHk+CiAgICA8bXkt
112+
YXBwPkxvYWRpbmcuLi48L215LWFwcD4KICA8L2JvZHk+CjwvaHRtbD4K""",
115113
"web/main.dart",
116114
"text",
117115
"""Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl

templates/web-angular-simple/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ environment:
88
sdk: '>=1.23.0 <2.0.0'
99

1010
dependencies:
11-
angular2: ^3.0.0-beta+1
11+
angular2: ^3.0.0
1212

1313
dev_dependencies:
14-
angular_test: ^1.0.0-beta
14+
angular_test: ^1.0.0-beta+2
1515
browser: ^0.10.0
1616
dart_to_js_script_rewriter: ^1.0.1
1717
test: ^0.12.0

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

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

templates/web-angular/lib/app_component.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// is governed by a BSD-style license that can be found in the LICENSE file.
33

44
import 'package:angular2/core.dart';
5-
import 'package:angular2_components/angular2_components.dart';
5+
import 'package:angular_components/angular_components.dart';
66

77
import 'hello_dialog/hello_dialog.dart';
88

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// is governed by a BSD-style license that can be found in the LICENSE file.
33

44
import 'package:angular2/core.dart';
5-
import 'package:angular2_components/angular2_components.dart';
5+
import 'package:angular_components/angular_components.dart';
66

77
@Component(
88
selector: 'hello-dialog',

templates/web-angular/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ environment:
88
sdk: '>=1.23.0 <2.0.0'
99

1010
dependencies:
11-
angular2: ^3.0.0-beta+1
12-
angular2_components: ^0.4.1-beta
11+
angular2: ^3.0.0
12+
angular_components: ^0.5.0
1313

1414
dev_dependencies:
1515
browser: ^0.10.0

templates/web-angular/web/index.html

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

0 commit comments

Comments
 (0)