Skip to content
This repository has been archived by the owner on May 31, 2021. It is now read-only.

Commit

Permalink
Upgrade web-angular to 4.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kevmoo committed Sep 1, 2017
1 parent a76692c commit bd13986
Show file tree
Hide file tree
Showing 9 changed files with 74 additions and 74 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
- Added a missing copyright to a web-angular template file.
- Removed the `close_sinks` lint from all analysis options files.
- Moved to `dart-lang` GitHub org.
- Update `web-angular` to `angular` v4 and `angular_components` v0.6.0

## 1.1.5

Expand Down
117 changes: 58 additions & 59 deletions lib/generators/web_angular_data.dart
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,16 @@ b2YgYSBwYWdlLiAqLwp9Cg==""",
"""Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKaW1wb3J0ICdw
YWNrYWdlOmFuZ3VsYXIyL2FuZ3VsYXIyLmRhcnQnOwppbXBvcnQgJ3BhY2thZ2U6YW5ndWxhcl9j
b21wb25lbnRzL2FuZ3VsYXJfY29tcG9uZW50cy5kYXJ0JzsKCmltcG9ydCAnc3JjL3RvZG9fbGlz
dC90b2RvX2xpc3RfY29tcG9uZW50LmRhcnQnOwoKLy8gQW5ndWxhckRhcnQgaW5mbzogaHR0cHM6
Ly93ZWJkZXYuZGFydGxhbmcub3JnL2FuZ3VsYXIKLy8gQ29tcG9uZW50cyBpbmZvOiBodHRwczov
L3dlYmRldi5kYXJ0bGFuZy5vcmcvY29tcG9uZW50cwoKQENvbXBvbmVudCgKICBzZWxlY3Rvcjog
J215LWFwcCcsCiAgc3R5bGVVcmxzOiBjb25zdCBbJ2FwcF9jb21wb25lbnQuY3NzJ10sCiAgdGVt
cGxhdGVVcmw6ICdhcHBfY29tcG9uZW50Lmh0bWwnLAogIGRpcmVjdGl2ZXM6IGNvbnN0IFttYXRl
cmlhbERpcmVjdGl2ZXMsIFRvZG9MaXN0Q29tcG9uZW50XSwKICBwcm92aWRlcnM6IGNvbnN0IFtt
YXRlcmlhbFByb3ZpZGVyc10sCikKY2xhc3MgQXBwQ29tcG9uZW50IHsKICAvLyBOb3RoaW5nIGhl
cmUgeWV0LiBBbGwgbG9naWMgaXMgaW4gVG9kb0xpc3RDb21wb25lbnQuCn0K""",
YWNrYWdlOmFuZ3VsYXIvYW5ndWxhci5kYXJ0JzsKaW1wb3J0ICdwYWNrYWdlOmFuZ3VsYXJfY29t
cG9uZW50cy9hbmd1bGFyX2NvbXBvbmVudHMuZGFydCc7CgppbXBvcnQgJ3NyYy90b2RvX2xpc3Qv
dG9kb19saXN0X2NvbXBvbmVudC5kYXJ0JzsKCi8vIEFuZ3VsYXJEYXJ0IGluZm86IGh0dHBzOi8v
d2ViZGV2LmRhcnRsYW5nLm9yZy9hbmd1bGFyCi8vIENvbXBvbmVudHMgaW5mbzogaHR0cHM6Ly93
ZWJkZXYuZGFydGxhbmcub3JnL2NvbXBvbmVudHMKCkBDb21wb25lbnQoCiAgc2VsZWN0b3I6ICdt
eS1hcHAnLAogIHN0eWxlVXJsczogY29uc3QgWydhcHBfY29tcG9uZW50LmNzcyddLAogIHRlbXBs
YXRlVXJsOiAnYXBwX2NvbXBvbmVudC5odG1sJywKICBkaXJlY3RpdmVzOiBjb25zdCBbbWF0ZXJp
YWxEaXJlY3RpdmVzLCBUb2RvTGlzdENvbXBvbmVudF0sCiAgcHJvdmlkZXJzOiBjb25zdCBbbWF0
ZXJpYWxQcm92aWRlcnNdLAopCmNsYXNzIEFwcENvbXBvbmVudCB7CiAgLy8gTm90aGluZyBoZXJl
IHlldC4gQWxsIGxvZ2ljIGlzIGluIFRvZG9MaXN0Q29tcG9uZW50Lgp9Cg==""",
"lib/app_component.html",
"text",
"""PGgxPk15IEZpcnN0IEFuZ3VsYXJEYXJ0IEFwcDwvaDE+Cgo8dG9kby1saXN0PjwvdG9kby1saXN0
Expand All @@ -92,22 +92,22 @@ Owp9CgouZG9uZSB7CiAgdGV4dC1kZWNvcmF0aW9uOiBsaW5lLXRocm91Z2g7Cn0K""",
"""Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKaW1wb3J0ICdk
YXJ0OmFzeW5jJzsKCmltcG9ydCAncGFja2FnZTphbmd1bGFyMi9hbmd1bGFyMi5kYXJ0JzsKaW1w
b3J0ICdwYWNrYWdlOmFuZ3VsYXJfY29tcG9uZW50cy9hbmd1bGFyX2NvbXBvbmVudHMuZGFydCc7
CgppbXBvcnQgJ3RvZG9fbGlzdF9zZXJ2aWNlLmRhcnQnOwoKQENvbXBvbmVudCgKICBzZWxlY3Rv
cjogJ3RvZG8tbGlzdCcsCiAgc3R5bGVVcmxzOiBjb25zdCBbJ3RvZG9fbGlzdF9jb21wb25lbnQu
Y3NzJ10sCiAgdGVtcGxhdGVVcmw6ICd0b2RvX2xpc3RfY29tcG9uZW50Lmh0bWwnLAogIGRpcmVj
dGl2ZXM6IGNvbnN0IFsKICAgIENPUkVfRElSRUNUSVZFUywKICAgIG1hdGVyaWFsRGlyZWN0aXZl
cywKICBdLAogIHByb3ZpZGVyczogY29uc3QgW1RvZG9MaXN0U2VydmljZV0sCikKY2xhc3MgVG9k
b0xpc3RDb21wb25lbnQgaW1wbGVtZW50cyBPbkluaXQgewogIGZpbmFsIFRvZG9MaXN0U2Vydmlj
ZSB0b2RvTGlzdFNlcnZpY2U7CgogIExpc3Q8U3RyaW5nPiBpdGVtcyA9IFtdOwogIFN0cmluZyBu
ZXdUb2RvID0gJyc7CgogIFRvZG9MaXN0Q29tcG9uZW50KHRoaXMudG9kb0xpc3RTZXJ2aWNlKTsK
CiAgQG92ZXJyaWRlCiAgRnV0dXJlPE51bGw+IG5nT25Jbml0KCkgYXN5bmMgewogICAgaXRlbXMg
PSBhd2FpdCB0b2RvTGlzdFNlcnZpY2UuZ2V0VG9kb0xpc3QoKTsKICB9CgogIHZvaWQgYWRkKCkg
ewogICAgaXRlbXMuYWRkKG5ld1RvZG8pOwogICAgbmV3VG9kbyA9ICcnOwogIH0KCiAgU3RyaW5n
IHJlbW92ZShpbnQgaW5kZXgpID0+IGl0ZW1zLnJlbW92ZUF0KGluZGV4KTsKICB2b2lkIG9uUmVv
cmRlcihSZW9yZGVyRXZlbnQgZSkgPT4KICAgICAgaXRlbXMuaW5zZXJ0KGUuZGVzdEluZGV4LCBp
dGVtcy5yZW1vdmVBdChlLnNvdXJjZUluZGV4KSk7Cn0K""",
YXJ0OmFzeW5jJzsKCmltcG9ydCAncGFja2FnZTphbmd1bGFyL2FuZ3VsYXIuZGFydCc7CmltcG9y
dCAncGFja2FnZTphbmd1bGFyX2NvbXBvbmVudHMvYW5ndWxhcl9jb21wb25lbnRzLmRhcnQnOwoK
aW1wb3J0ICd0b2RvX2xpc3Rfc2VydmljZS5kYXJ0JzsKCkBDb21wb25lbnQoCiAgc2VsZWN0b3I6
ICd0b2RvLWxpc3QnLAogIHN0eWxlVXJsczogY29uc3QgWyd0b2RvX2xpc3RfY29tcG9uZW50LmNz
cyddLAogIHRlbXBsYXRlVXJsOiAndG9kb19saXN0X2NvbXBvbmVudC5odG1sJywKICBkaXJlY3Rp
dmVzOiBjb25zdCBbCiAgICBDT1JFX0RJUkVDVElWRVMsCiAgICBtYXRlcmlhbERpcmVjdGl2ZXMs
CiAgXSwKICBwcm92aWRlcnM6IGNvbnN0IFtUb2RvTGlzdFNlcnZpY2VdLAopCmNsYXNzIFRvZG9M
aXN0Q29tcG9uZW50IGltcGxlbWVudHMgT25Jbml0IHsKICBmaW5hbCBUb2RvTGlzdFNlcnZpY2Ug
dG9kb0xpc3RTZXJ2aWNlOwoKICBMaXN0PFN0cmluZz4gaXRlbXMgPSBbXTsKICBTdHJpbmcgbmV3
VG9kbyA9ICcnOwoKICBUb2RvTGlzdENvbXBvbmVudCh0aGlzLnRvZG9MaXN0U2VydmljZSk7Cgog
IEBvdmVycmlkZQogIEZ1dHVyZTxOdWxsPiBuZ09uSW5pdCgpIGFzeW5jIHsKICAgIGl0ZW1zID0g
YXdhaXQgdG9kb0xpc3RTZXJ2aWNlLmdldFRvZG9MaXN0KCk7CiAgfQoKICB2b2lkIGFkZCgpIHsK
ICAgIGl0ZW1zLmFkZChuZXdUb2RvKTsKICAgIG5ld1RvZG8gPSAnJzsKICB9CgogIFN0cmluZyBy
ZW1vdmUoaW50IGluZGV4KSA9PiBpdGVtcy5yZW1vdmVBdChpbmRleCk7CiAgdm9pZCBvblJlb3Jk
ZXIoUmVvcmRlckV2ZW50IGUpID0+CiAgICAgIGl0ZW1zLmluc2VydChlLmRlc3RJbmRleCwgaXRl
bXMucmVtb3ZlQXQoZS5zb3VyY2VJbmRleCkpOwp9Cg==""",
"lib/src/todo_list/todo_list_component.html",
"text",
"""PCEtLSBDb21wb25lbnRzIGluZm86IGh0dHBzOi8vd2ViZGV2LmRhcnRsYW5nLm9yZy9jb21wb25l
Expand All @@ -131,44 +131,43 @@ ICAgPC9tYXRlcmlhbC1mYWI+CiAgICAgIDwvbGk+CiAgPC91bD4KPC9kaXY+Cg==""",
"""Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKaW1wb3J0ICdk
YXJ0OmFzeW5jJzsKCmltcG9ydCAncGFja2FnZTphbmd1bGFyMi9jb3JlLmRhcnQnOwoKLy8vIE1v
Y2sgc2VydmljZSBlbXVsYXRpbmcgYWNjZXNzIHRvIGEgdG8tZG8gbGlzdCBzdG9yZWQgb24gYSBz
ZXJ2ZXIuCkBJbmplY3RhYmxlKCkKY2xhc3MgVG9kb0xpc3RTZXJ2aWNlIHsKICBMaXN0PFN0cmlu
Zz4gbW9ja1RvZG9MaXN0ID0gPFN0cmluZz5bXTsKCiAgRnV0dXJlPExpc3Q8U3RyaW5nPj4gZ2V0
VG9kb0xpc3QoKSBhc3luYyA9PiBtb2NrVG9kb0xpc3Q7Cn0K""",
YXJ0OmFzeW5jJzsKCmltcG9ydCAncGFja2FnZTphbmd1bGFyL2NvcmUuZGFydCc7CgovLy8gTW9j
ayBzZXJ2aWNlIGVtdWxhdGluZyBhY2Nlc3MgdG8gYSB0by1kbyBsaXN0IHN0b3JlZCBvbiBhIHNl
cnZlci4KQEluamVjdGFibGUoKQpjbGFzcyBUb2RvTGlzdFNlcnZpY2UgewogIExpc3Q8U3RyaW5n
PiBtb2NrVG9kb0xpc3QgPSA8U3RyaW5nPltdOwoKICBGdXR1cmU8TGlzdDxTdHJpbmc+PiBnZXRU
b2RvTGlzdCgpIGFzeW5jID0+IG1vY2tUb2RvTGlzdDsKfQo=""",
"pubspec.yaml",
"text",
"""bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHdlYiBhcHAgdGhhdCB1c2VzIEFu
Z3VsYXJEYXJ0IENvbXBvbmVudHMKdmVyc2lvbjogMC4wLjEKI2hvbWVwYWdlOiBodHRwczovL3d3
dy5leGFtcGxlLmNvbQojYXV0aG9yOiBfX2F1dGhvcl9fIDxlbWFpbEBleGFtcGxlLmNvbT4KCmVu
dmlyb25tZW50OgogIHNkazogJz49MS4yMy4wIDwyLjAuMCcKCmRlcGVuZGVuY2llczoKICBhbmd1
bGFyMjogXjMuMC4wCiAgYW5ndWxhcl9jb21wb25lbnRzOiBeMC41LjEKCmRldl9kZXBlbmRlbmNp
ZXM6CiAgYW5ndWxhcl90ZXN0OiBeMS4wLjAtYmV0YSsyCiAgYnJvd3NlcjogXjAuMTAuMAogIGRh
cnRfdG9fanNfc2NyaXB0X3Jld3JpdGVyOiBeMS4wLjEKICB0ZXN0OiBeMC4xMi4wCgp0cmFuc2Zv
cm1lcnM6Ci0gYW5ndWxhcjI6CiAgICBlbnRyeV9wb2ludHM6IHdlYi9tYWluLmRhcnQKLSBhbmd1
bGFyMi90cmFuc2Zvcm0vcmVmbGVjdGlvbl9yZW1vdmVyOgogICAgJGluY2x1ZGU6IHRlc3QvKipf
dGVzdC5kYXJ0Ci0gdGVzdC9wdWJfc2VydmU6CiAgICAkaW5jbHVkZTogdGVzdC8qKl90ZXN0LmRh
cnQKLSBkYXJ0X3RvX2pzX3NjcmlwdF9yZXdyaXRlcgoKIyBVbmNvbW1lbnQgdGhlIGZvbGxvd2lu
ZyBpbiBzZGsgMS4yNCsgdG8gbWFrZSBwdWIgc2VydmUKIyB1c2UgZGFydGRldmMgKHdlYmRldi5k
YXJ0bGFuZy5vcmcvdG9vbHMvZGFydGRldmMpLgojd2ViOgojICBjb21waWxlcjoKIyAgICBkZWJ1
ZzogZGFydGRldmMK""",
dmlyb25tZW50OgogIHNkazogJz49MS4yNC4wIDwyLjAuMCcKCmRlcGVuZGVuY2llczoKICBhbmd1
bGFyOiBeNC4wLjAKICBhbmd1bGFyX2NvbXBvbmVudHM6IF4wLjYuMAoKZGV2X2RlcGVuZGVuY2ll
czoKICBhbmd1bGFyX3Rlc3Q6IF4xLjAuMAogIGJyb3dzZXI6IF4wLjEwLjAKICBkYXJ0X3RvX2pz
X3NjcmlwdF9yZXdyaXRlcjogXjEuMC4xCiAgdGVzdDogXjAuMTIuMAoKdHJhbnNmb3JtZXJzOgot
IGFuZ3VsYXI6CiAgICBlbnRyeV9wb2ludHM6CiAgICAgIC0gd2ViL21haW4uZGFydAogICAgICAt
IHRlc3QvKipfdGVzdC5kYXJ0Ci0gdGVzdC9wdWJfc2VydmU6CiAgICAkaW5jbHVkZTogdGVzdC8q
Kl90ZXN0LmRhcnQKLSBkYXJ0X3RvX2pzX3NjcmlwdF9yZXdyaXRlcgoKIyBVbmNvbW1lbnQgdGhl
IGZvbGxvd2luZyBpbiBzZGsgMS4yNCsgdG8gbWFrZSBwdWIgc2VydmUKIyB1c2UgZGFydGRldmMg
KHdlYmRldi5kYXJ0bGFuZy5vcmcvdG9vbHMvZGFydGRldmMpLgojd2ViOgojICBjb21waWxlcjoK
IyAgICBkZWJ1ZzogZGFydGRldmMK""",
"test/app_test.dart",
"text",
"""QFRhZ3MoY29uc3QgWydhb3QnXSkKQFRlc3RPbignYnJvd3NlcicpCmltcG9ydCAnZGFydDphc3lu
Yyc7CgppbXBvcnQgJ3BhY2thZ2U6YW5ndWxhcjIvYW5ndWxhcjIuZGFydCc7CmltcG9ydCAncGFj
a2FnZTphbmd1bGFyX3Rlc3QvYW5ndWxhcl90ZXN0LmRhcnQnOwppbXBvcnQgJ3BhY2thZ2U6cGFn
ZWxvYWRlci9vYmplY3RzLmRhcnQnOwppbXBvcnQgJ3BhY2thZ2U6dGVzdC90ZXN0LmRhcnQnOwoK
aW1wb3J0ICdwYWNrYWdlOl9fcHJvamVjdE5hbWVfXy9hcHBfY29tcG9uZW50LmRhcnQnOwoKTmdU
ZXN0Rml4dHVyZTxBcHBDb21wb25lbnQ+IGZpeHR1cmU7CkFwcFBPIGFwcFBPOwoKQEFuZ3VsYXJF
bnRyeXBvaW50KCkKdm9pZCBtYWluKCkgewogIGZpbmFsIHRlc3RCZWQgPSBuZXcgTmdUZXN0QmVk
PEFwcENvbXBvbmVudD4oKTsKCiAgc2V0VXAoKCkgYXN5bmMgewogICAgZml4dHVyZSA9IGF3YWl0
IHRlc3RCZWQuY3JlYXRlKCk7CiAgICBhcHBQTyA9IGF3YWl0IGZpeHR1cmUucmVzb2x2ZVBhZ2VP
YmplY3QoQXBwUE8pOwogIH0pOwoKICB0ZWFyRG93bihkaXNwb3NlQW55UnVubmluZ1Rlc3QpOwoK
ICB0ZXN0KCd0aXRsZScsICgpIGFzeW5jIHsKICAgIGV4cGVjdChhd2FpdCBhcHBQTy50aXRsZSwg
J015IEZpcnN0IEFuZ3VsYXJEYXJ0IEFwcCcpOwogIH0pOwoKICAvLyBUZXN0aW5nIGluZm86IGh0
dHBzOi8vd2ViZGV2LmRhcnRsYW5nLm9yZy9hbmd1bGFyL2d1aWRlL3Rlc3RpbmcKfQoKY2xhc3Mg
QXBwUE8gewogIEBCeVRhZ05hbWUoJ2gxJykKICBQYWdlTG9hZGVyRWxlbWVudCBfdGl0bGU7Cgog
IEZ1dHVyZTxTdHJpbmc+IGdldCB0aXRsZSA9PiBfdGl0bGUudmlzaWJsZVRleHQ7Cn0K""",
Yyc7CgppbXBvcnQgJ3BhY2thZ2U6YW5ndWxhci9hbmd1bGFyLmRhcnQnOwppbXBvcnQgJ3BhY2th
Z2U6YW5ndWxhcl90ZXN0L2FuZ3VsYXJfdGVzdC5kYXJ0JzsKaW1wb3J0ICdwYWNrYWdlOnBhZ2Vs
b2FkZXIvb2JqZWN0cy5kYXJ0JzsKaW1wb3J0ICdwYWNrYWdlOnRlc3QvdGVzdC5kYXJ0JzsKCmlt
cG9ydCAncGFja2FnZTpfX3Byb2plY3ROYW1lX18vYXBwX2NvbXBvbmVudC5kYXJ0JzsKCk5nVGVz
dEZpeHR1cmU8QXBwQ29tcG9uZW50PiBmaXh0dXJlOwpBcHBQTyBhcHBQTzsKCkBBbmd1bGFyRW50
cnlwb2ludCgpCnZvaWQgbWFpbigpIHsKICBmaW5hbCB0ZXN0QmVkID0gbmV3IE5nVGVzdEJlZDxB
cHBDb21wb25lbnQ+KCk7CgogIHNldFVwKCgpIGFzeW5jIHsKICAgIGZpeHR1cmUgPSBhd2FpdCB0
ZXN0QmVkLmNyZWF0ZSgpOwogICAgYXBwUE8gPSBhd2FpdCBmaXh0dXJlLnJlc29sdmVQYWdlT2Jq
ZWN0KEFwcFBPKTsKICB9KTsKCiAgdGVhckRvd24oZGlzcG9zZUFueVJ1bm5pbmdUZXN0KTsKCiAg
dGVzdCgndGl0bGUnLCAoKSBhc3luYyB7CiAgICBleHBlY3QoYXdhaXQgYXBwUE8udGl0bGUsICdN
eSBGaXJzdCBBbmd1bGFyRGFydCBBcHAnKTsKICB9KTsKCiAgLy8gVGVzdGluZyBpbmZvOiBodHRw
czovL3dlYmRldi5kYXJ0bGFuZy5vcmcvYW5ndWxhci9ndWlkZS90ZXN0aW5nCn0KCmNsYXNzIEFw
cFBPIHsKICBAQnlUYWdOYW1lKCdoMScpCiAgUGFnZUxvYWRlckVsZW1lbnQgX3RpdGxlOwoKICBG
dXR1cmU8U3RyaW5nPiBnZXQgdGl0bGUgPT4gX3RpdGxlLnZpc2libGVUZXh0Owp9Cg==""",
"web/favicon.png",
"binary",
"""iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAKLElEQVR4AeVbA3yj2xOd4tm2bdu2
Expand Down Expand Up @@ -234,9 +233,9 @@ eT4KPC9odG1sPgo=""",
"""Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKaW1wb3J0ICdw
YWNrYWdlOmFuZ3VsYXIyL3BsYXRmb3JtL2Jyb3dzZXIuZGFydCc7CgppbXBvcnQgJ3BhY2thZ2U6
X19wcm9qZWN0TmFtZV9fL2FwcF9jb21wb25lbnQuZGFydCc7Cgp2b2lkIG1haW4oKSB7CiAgYm9v
dHN0cmFwKEFwcENvbXBvbmVudCk7Cn0K""",
YWNrYWdlOmFuZ3VsYXIvYW5ndWxhci5kYXJ0JzsKCmltcG9ydCAncGFja2FnZTpfX3Byb2plY3RO
YW1lX18vYXBwX2NvbXBvbmVudC5kYXJ0JzsKCnZvaWQgbWFpbigpIHsKICBib290c3RyYXAoQXBw
Q29tcG9uZW50KTsKfQo=""",
"web/styles.css",
"text",
"""LyogQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
Expand Down
2 changes: 1 addition & 1 deletion templates/web-angular/lib/app_component.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// 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.

import 'package:angular2/angular2.dart';
import 'package:angular/angular.dart';
import 'package:angular_components/angular_components.dart';

import 'src/todo_list/todo_list_component.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import 'dart:async';

import 'package:angular2/angular2.dart';
import 'package:angular/angular.dart';
import 'package:angular_components/angular_components.dart';

import 'todo_list_service.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import 'dart:async';

import 'package:angular2/core.dart';
import 'package:angular/core.dart';

/// Mock service emulating access to a to-do list stored on a server.
@Injectable()
Expand Down
16 changes: 8 additions & 8 deletions templates/web-angular/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ version: 0.0.1
#author: __author__ <email@example.com>

environment:
sdk: '>=1.23.0 <2.0.0'
sdk: '>=1.24.0 <2.0.0'

dependencies:
angular2: ^3.0.0
angular_components: ^0.5.1
angular: ^4.0.0
angular_components: ^0.6.0

dev_dependencies:
angular_test: ^1.0.0-beta+2
angular_test: ^1.0.0
browser: ^0.10.0
dart_to_js_script_rewriter: ^1.0.1
test: ^0.12.0

transformers:
- angular2:
entry_points: web/main.dart
- angular2/transform/reflection_remover:
$include: test/**_test.dart
- angular:
entry_points:
- web/main.dart
- test/**_test.dart
- test/pub_serve:
$include: test/**_test.dart
- dart_to_js_script_rewriter
Expand Down
2 changes: 1 addition & 1 deletion templates/web-angular/test/app_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@TestOn('browser')
import 'dart:async';

import 'package:angular2/angular2.dart';
import 'package:angular/angular.dart';
import 'package:angular_test/angular_test.dart';
import 'package:pageloader/objects.dart';
import 'package:test/test.dart';
Expand Down
2 changes: 1 addition & 1 deletion templates/web-angular/web/main.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// 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.

import 'package:angular2/platform/browser.dart';
import 'package:angular/angular.dart';

import 'package:__projectName__/app_component.dart';

Expand Down
4 changes: 2 additions & 2 deletions test/validate_templates.dart
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ void _testGenerator(stagehand.Generator generator, Directory tempDir) {
expect(pubspecContent, containsPair('version', '0.0.1'));

final usesAngular =
pubspecContent['dependencies']?.containsKey('angular2') ?? false;
final minSDK = usesAngular ? '1.23.0' : '1.20.1';
pubspecContent['dependencies']?.containsKey('angular') ?? false;
final minSDK = usesAngular ? '1.24.0' : '1.20.1';
final env = {'sdk': '>=${minSDK} <2.0.0'};
expect(pubspecContent, containsPair('environment', env));

Expand Down

0 comments on commit bd13986

Please sign in to comment.