diff --git a/CHANGELOG.md b/CHANGELOG.md index 650314e2..e2c79048 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## 1.1.4 +- Update `web-angular` to use `lib/src` for everything but the main app + component. - Added Enter key support to the `web-angular` template. - Added commented-out pubspec settings to the `web-angular` and `web-simple` templates, demonstrating how to make `pub serve` diff --git a/lib/generators/web_angular_data.dart b/lib/generators/web_angular_data.dart index dd661792..12b3526d 100644 --- a/lib/generators/web_angular_data.dart +++ b/lib/generators/web_angular_data.dart @@ -67,27 +67,27 @@ b2YgYSBwYWdlLiAqLwp9Cg==""", ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKaW1wb3J0ICdw YWNrYWdlOmFuZ3VsYXIyL2FuZ3VsYXIyLmRhcnQnOwppbXBvcnQgJ3BhY2thZ2U6YW5ndWxhcl9j -b21wb25lbnRzL2FuZ3VsYXJfY29tcG9uZW50cy5kYXJ0JzsKCmltcG9ydCAndG9kb19saXN0L3Rv -ZG9fbGlzdF9jb21wb25lbnQuZGFydCc7CgovLyBBbmd1bGFyRGFydCBpbmZvOiBodHRwczovL3dl -YmRldi5kYXJ0bGFuZy5vcmcvYW5ndWxhcgovLyBDb21wb25lbnRzIGluZm86IGh0dHBzOi8vd2Vi -ZGV2LmRhcnRsYW5nLm9yZy9jb21wb25lbnRzCgpAQ29tcG9uZW50KAogIHNlbGVjdG9yOiAnbXkt -YXBwJywKICBzdHlsZVVybHM6IGNvbnN0IFsnYXBwX2NvbXBvbmVudC5jc3MnXSwKICB0ZW1wbGF0 -ZVVybDogJ2FwcF9jb21wb25lbnQuaHRtbCcsCiAgZGlyZWN0aXZlczogY29uc3QgW21hdGVyaWFs -RGlyZWN0aXZlcywgVG9kb0xpc3RDb21wb25lbnRdLAogIHByb3ZpZGVyczogY29uc3QgW21hdGVy -aWFsUHJvdmlkZXJzXSwKKQpjbGFzcyBBcHBDb21wb25lbnQgewogIC8vIE5vdGhpbmcgaGVyZSB5 -ZXQuIEFsbCBsb2dpYyBpcyBpbiBUb2RvTGlzdENvbXBvbmVudC4KfQo=""", +b21wb25lbnRzL2FuZ3VsYXJfY29tcG9uZW50cy5kYXJ0JzsKCmltcG9ydCAnc3JjL3RvZG9fbGlz +dC90b2RvX2xpc3RfY29tcG9uZW50LmRhcnQnOwoKLy8gQW5ndWxhckRhcnQgaW5mbzogaHR0cHM6 +Ly93ZWJkZXYuZGFydGxhbmcub3JnL2FuZ3VsYXIKLy8gQ29tcG9uZW50cyBpbmZvOiBodHRwczov +L3dlYmRldi5kYXJ0bGFuZy5vcmcvY29tcG9uZW50cwoKQENvbXBvbmVudCgKICBzZWxlY3Rvcjog +J215LWFwcCcsCiAgc3R5bGVVcmxzOiBjb25zdCBbJ2FwcF9jb21wb25lbnQuY3NzJ10sCiAgdGVt +cGxhdGVVcmw6ICdhcHBfY29tcG9uZW50Lmh0bWwnLAogIGRpcmVjdGl2ZXM6IGNvbnN0IFttYXRl +cmlhbERpcmVjdGl2ZXMsIFRvZG9MaXN0Q29tcG9uZW50XSwKICBwcm92aWRlcnM6IGNvbnN0IFtt +YXRlcmlhbFByb3ZpZGVyc10sCikKY2xhc3MgQXBwQ29tcG9uZW50IHsKICAvLyBOb3RoaW5nIGhl +cmUgeWV0LiBBbGwgbG9naWMgaXMgaW4gVG9kb0xpc3RDb21wb25lbnQuCn0K""", "lib/app_component.html", "text", """PGgxPk15IEZpcnN0IEFuZ3VsYXJEYXJ0IEFwcDwvaDE+Cgo8dG9kby1saXN0PjwvdG9kby1saXN0 Pgo=""", - "lib/todo_list/todo_list_component.css", + "lib/src/todo_list/todo_list_component.css", "text", """dWwgewogIGxpc3Qtc3R5bGU6IG5vbmU7CiAgcGFkZGluZy1sZWZ0OiAwOwp9CgpsaSB7CiAgbGlu ZS1oZWlnaHQ6IDNlbTsKfQoKbGk6aG92ZXIgewogIGJhY2tncm91bmQtY29sb3I6ICNFRUVFRUU7 Cn0KCmxpIG1hdGVyaWFsLWNoZWNrYm94IHsKICB2ZXJ0aWNhbC1hbGlnbjogbWlkZGxlOwp9Cgps aSBtYXRlcmlhbC1mYWIgewogIGZsb2F0OiByaWdodDsKICB2ZXJ0aWNhbC1hbGlnbjogbWlkZGxl Owp9CgouZG9uZSB7CiAgdGV4dC1kZWNvcmF0aW9uOiBsaW5lLXRocm91Z2g7Cn0K""", - "lib/todo_list/todo_list_component.dart", + "lib/src/todo_list/todo_list_component.dart", "text", """Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg @@ -108,7 +108,7 @@ ewogICAgaXRlbXMuYWRkKG5ld1RvZG8pOwogICAgbmV3VG9kbyA9ICcnOwogIH0KICBTdHJpbmcg cmVtb3ZlKGludCBpbmRleCkgPT4gaXRlbXMucmVtb3ZlQXQoaW5kZXgpOwogIHZvaWQgb25SZW9y ZGVyKFJlb3JkZXJFdmVudCBlKSA9PgogICAgICBpdGVtcy5pbnNlcnQoZS5kZXN0SW5kZXgsIGl0 ZW1zLnJlbW92ZUF0KGUuc291cmNlSW5kZXgpKTsKfQo=""", - "lib/todo_list/todo_list_component.html", + "lib/src/todo_list/todo_list_component.html", "text", """PCEtLSBDb21wb25lbnRzIGluZm86IGh0dHBzOi8vd2ViZGV2LmRhcnRsYW5nLm9yZy9jb21wb25l bnRzIC0tPgo8ZGl2PgogIDxtYXRlcmlhbC1pbnB1dCBsYWJlbD0iV2hhdCBkbyB5b3UgbmVlZCB0 @@ -126,7 +126,7 @@ YXRlcmlhbC1jaGVja2JveD4KICAgICAgICA8c3BhbiBbY2xhc3MuZG9uZV09ImRvbmUuY2hlY2tl ZCI+e3tpdGVtfX08L3NwYW4+CiAgICAgICAgPG1hdGVyaWFsLWZhYiBtaW5pICh0cmlnZ2VyKT0i cmVtb3ZlKGkpIj4KICAgICAgICAgIDxnbHlwaCBpY29uPSJkZWxldGUiPjwvZ2x5cGg+CiAgICAg ICAgPC9tYXRlcmlhbC1mYWI+CiAgICAgIDwvbGk+CiAgPC91bD4KPC9kaXY+Cg==""", - "lib/todo_list/todo_list_service.dart", + "lib/src/todo_list/todo_list_service.dart", "text", """aW1wb3J0ICdkYXJ0OmFzeW5jJzsKCmltcG9ydCAncGFja2FnZTphbmd1bGFyMi9jb3JlLmRhcnQn OwoKLy8vIE1vY2sgc2VydmljZSBlbXVsYXRpbmcgYWNjZXNzIHRvIGEgdG8tZG8gbGlzdCBzdG9y diff --git a/lib/src/cli_app.dart b/lib/src/cli_app.dart index 450b3cc4..21fd01bc 100644 --- a/lib/src/cli_app.dart +++ b/lib/src/cli_app.dart @@ -17,7 +17,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 = '1.1.3'; +const String APP_VERSION = '1.1.4'; const String APP_PUB_INFO = 'https://pub.dartlang.org/packages/${APP_NAME}.json'; diff --git a/templates/web-angular/lib/app_component.dart b/templates/web-angular/lib/app_component.dart index b8659348..96bab314 100644 --- a/templates/web-angular/lib/app_component.dart +++ b/templates/web-angular/lib/app_component.dart @@ -4,7 +4,7 @@ import 'package:angular2/angular2.dart'; import 'package:angular_components/angular_components.dart'; -import 'todo_list/todo_list_component.dart'; +import 'src/todo_list/todo_list_component.dart'; // AngularDart info: https://webdev.dartlang.org/angular // Components info: https://webdev.dartlang.org/components diff --git a/templates/web-angular/lib/todo_list/todo_list_component.css b/templates/web-angular/lib/src/todo_list/todo_list_component.css similarity index 100% rename from templates/web-angular/lib/todo_list/todo_list_component.css rename to templates/web-angular/lib/src/todo_list/todo_list_component.css diff --git a/templates/web-angular/lib/todo_list/todo_list_component.dart b/templates/web-angular/lib/src/todo_list/todo_list_component.dart similarity index 100% rename from templates/web-angular/lib/todo_list/todo_list_component.dart rename to templates/web-angular/lib/src/todo_list/todo_list_component.dart diff --git a/templates/web-angular/lib/todo_list/todo_list_component.html b/templates/web-angular/lib/src/todo_list/todo_list_component.html similarity index 100% rename from templates/web-angular/lib/todo_list/todo_list_component.html rename to templates/web-angular/lib/src/todo_list/todo_list_component.html diff --git a/templates/web-angular/lib/todo_list/todo_list_service.dart b/templates/web-angular/lib/src/todo_list/todo_list_service.dart similarity index 100% rename from templates/web-angular/lib/todo_list/todo_list_service.dart rename to templates/web-angular/lib/src/todo_list/todo_list_service.dart