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

Commit

Permalink
Merge pull request #315 from google/angular
Browse files Browse the repository at this point in the history
Update web-angular template & dart_to_js_script_rewriter version
  • Loading branch information
kwalrath committed Mar 28, 2016
2 parents 75fb2b0 + 3be64a9 commit 1bb1973
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 20 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# CHANGELOG

## unreleased
- Updated `web-angular` to `2.0.0-beta.12`. Also changed imports:
- `angular2.dart` -> `core.dart`
- `bootstrap.dart` -> `platform/browser.dart`
- Updated dart_to_js_script_rewriter dependencies to ^1.0.1.

## 1.0.3
- Fixed the `web-polymer` template, which was broken in 1.0.2.

Expand Down
24 changes: 12 additions & 12 deletions lib/generators/web_angular_data.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@ LmlkZWEvCiouaW1sCiouaXByCiouaXdzCg==""",
"""Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKaW1wb3J0ICdw
YWNrYWdlOmFuZ3VsYXIyL2FuZ3VsYXIyLmRhcnQnOwoKQENvbXBvbmVudChzZWxlY3RvcjogJ215
LWFwcCcsIHRlbXBsYXRlVXJsOiAnYXBwX2NvbXBvbmVudC5odG1sJykKY2xhc3MgQXBwQ29tcG9u
ZW50IHt9Cg==""",
YWNrYWdlOmFuZ3VsYXIyL2NvcmUuZGFydCc7CgpAQ29tcG9uZW50KHNlbGVjdG9yOiAnbXktYXBw
JywgdGVtcGxhdGVVcmw6ICdhcHBfY29tcG9uZW50Lmh0bWwnKQpjbGFzcyBBcHBDb21wb25lbnQg
e30K""",
"lib/app_component.html",
"text",
"PGgxPk15IEZpcnN0IEFuZ3VsYXIgMiBBcHA8L2gxPgo=",
"pubspec.yaml",
"text",
"""bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIERhcnQgYXBwIHRoYXQgdXNlcyBB
bmd1bGFyIDIKdmVyc2lvbjogMC4wLjEKZW52aXJvbm1lbnQ6CiAgc2RrOiAnPj0xLjEzLjAgPDIu
MC4wJwpkZXBlbmRlbmNpZXM6CiAgYW5ndWxhcjI6IDIuMC4wLWJldGEuOQogIGJyb3dzZXI6IF4w
LjEwLjAKICBkYXJ0X3RvX2pzX3NjcmlwdF9yZXdyaXRlcjogXjAuMS4wCnRyYW5zZm9ybWVyczoK
LSBhbmd1bGFyMjoKICAgIHBsYXRmb3JtX2RpcmVjdGl2ZXM6CiAgICAtICdwYWNrYWdlOmFuZ3Vs
YXIyL2NvbW1vbi5kYXJ0I0NPTU1PTl9ESVJFQ1RJVkVTJwogICAgcGxhdGZvcm1fcGlwZXM6CiAg
ICAtICdwYWNrYWdlOmFuZ3VsYXIyL2NvbW1vbi5kYXJ0I0NPTU1PTl9QSVBFUycKICAgIGVudHJ5
X3BvaW50czogd2ViL21haW4uZGFydAotIGRhcnRfdG9fanNfc2NyaXB0X3Jld3JpdGVyCg==""",
MC4wJwpkZXBlbmRlbmNpZXM6CiAgYW5ndWxhcjI6IDIuMC4wLWJldGEuMTIKICBicm93c2VyOiBe
MC4xMC4wCiAgZGFydF90b19qc19zY3JpcHRfcmV3cml0ZXI6IF4xLjAuMQp0cmFuc2Zvcm1lcnM6
Ci0gYW5ndWxhcjI6CiAgICBwbGF0Zm9ybV9kaXJlY3RpdmVzOgogICAgLSAncGFja2FnZTphbmd1
bGFyMi9jb21tb24uZGFydCNDT01NT05fRElSRUNUSVZFUycKICAgIHBsYXRmb3JtX3BpcGVzOgog
ICAgLSAncGFja2FnZTphbmd1bGFyMi9jb21tb24uZGFydCNDT01NT05fUElQRVMnCiAgICBlbnRy
eV9wb2ludHM6IHdlYi9tYWluLmRhcnQKLSBkYXJ0X3RvX2pzX3NjcmlwdF9yZXdyaXRlcgo=""",
"web/index.html",
"text",
"""PCFET0NUWVBFIGh0bWw+CjxodG1sPgogIDxoZWFkPgogICAgPHRpdGxlPl9fcHJvamVjdE5hbWVf
Expand All @@ -44,7 +44,7 @@ YWRpbmcuLi48L215LWFwcD4KICA8L2JvZHk+CjwvaHRtbD4K""",
"""Ly8gQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3JfXy4gQWxsIHJpZ2h0cyByZXNlcnZl
ZC4gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUKLy8gaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg
bGljZW5zZSB0aGF0IGNhbiBiZSBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgoKaW1wb3J0ICdw
YWNrYWdlOmFuZ3VsYXIyL2Jvb3RzdHJhcC5kYXJ0JzsKCmltcG9ydCAncGFja2FnZTpfX3Byb2pl
Y3ROYW1lX18vYXBwX2NvbXBvbmVudC5kYXJ0JzsKCm1haW4oKSB7CiAgYm9vdHN0cmFwKEFwcENv
bXBvbmVudCk7Cn0K"""
YWNrYWdlOmFuZ3VsYXIyL3BsYXRmb3JtL2Jyb3dzZXIuZGFydCc7CgppbXBvcnQgJ3BhY2thZ2U6
X19wcm9qZWN0TmFtZV9fL2FwcF9jb21wb25lbnQuZGFydCc7CgptYWluKCkgewogIGJvb3RzdHJh
cChBcHBDb21wb25lbnQpOwp9Cg=="""
];
4 changes: 2 additions & 2 deletions lib/generators/web_simple_data.dart
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ ZW5lcmF0ZWQgYnkgU3RhZ2VoYW5kLiBTZWUgTElDRU5TRS4K""",
c29sdXRlIGJhcmUtYm9uZXMgd2ViIGFwcC4KI2F1dGhvcjogX19hdXRob3JfXyA8ZW1haWxAZXhh
bXBsZS5jb20+CiNob21lcGFnZTogaHR0cHM6Ly93d3cuZXhhbXBsZS5jb20KCmVudmlyb25tZW50
OgogIHNkazogJz49MS4wLjAgPDIuMC4wJwoKZGVwZW5kZW5jaWVzOgogIGJyb3dzZXI6ICc+PTAu
MTAuMCA8MC4xMS4wJwogIGRhcnRfdG9fanNfc2NyaXB0X3Jld3JpdGVyOiAnXjAuMS4wJwoKdHJh
bnNmb3JtZXJzOgotIGRhcnRfdG9fanNfc2NyaXB0X3Jld3JpdGVy""",
MTAuMCA8MC4xMS4wJwogIGRhcnRfdG9fanNfc2NyaXB0X3Jld3JpdGVyOiAnXjEuMC4xJwoKdHJh
bnNmb3JtZXJzOgotIGRhcnRfdG9fanNfc2NyaXB0X3Jld3JpdGVyCg==""",
"web/index.html",
"text",
"""PCFET0NUWVBFIGh0bWw+Cgo8IS0tCiAgQ29weXJpZ2h0IChjKSBfX3llYXJfXywgX19hdXRob3Jf
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:angular2/core.dart';

@Component(selector: 'my-app', templateUrl: 'app_component.html')
class AppComponent {}
4 changes: 2 additions & 2 deletions templates/web-angular/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ version: 0.0.1
environment:
sdk: '>=1.13.0 <2.0.0'
dependencies:
angular2: 2.0.0-beta.9
angular2: 2.0.0-beta.12
browser: ^0.10.0
dart_to_js_script_rewriter: ^0.1.0
dart_to_js_script_rewriter: ^1.0.1
transformers:
- angular2:
platform_directives:
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/bootstrap.dart';
import 'package:angular2/platform/browser.dart';

import 'package:__projectName__/app_component.dart';

Expand Down
4 changes: 2 additions & 2 deletions templates/web-simple/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ environment:

dependencies:
browser: '>=0.10.0 <0.11.0'
dart_to_js_script_rewriter: '^0.1.0'
dart_to_js_script_rewriter: '^1.0.1'

transformers:
- dart_to_js_script_rewriter
- dart_to_js_script_rewriter

0 comments on commit 1bb1973

Please sign in to comment.