Skip to content

Commit 18a165d

Browse files
SteveSandersonMSSteveSandersonMS
committed
Update Angular 2 Music Store sample to latest Angular 2 and other dependencies. Switch from asp-ng2-prerender-module to the more general asp-prerender-module.
1 parent 532da3d commit 18a165d

File tree

22 files changed

+754
-59
lines changed

22 files changed

+754
-59
lines changed

‎samples/angular/MusicStore/Views/Home/Index.cshtml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,12 @@
33
}
44

55
<cache vary-by="@Context.Request.Path">
6-
<app asp-ng2-prerender-module="wwwroot/ng-app/components/app/app">
7-
Loading...
8-
</app>
9-
</cache>
10-
11-
@section scripts {
6+
<app asp-prerender-module="wwwroot/ng-app/boot-server">Loading...</app>
127
@await Html.PrimeCache(Url.Action("GenreMenuList", "GenresApi"))
138
@await Html.PrimeCache(Url.Action("MostPopular", "AlbumsApi"))
9+
</cache>
1410

11+
@section scripts {
1512
<script src="~/lib/angular2/bundles/angular2-polyfills.js"></script>
1613
<script src="~/lib/traceur/bin/traceur-runtime.js"></script>
1714
<script src="~/lib/es6-module-loader/dist/es6-module-loader-sans-promises.js"></script>
@@ -22,5 +19,5 @@
2219
<script src="~/lib/angular2/bundles/router.dev.js"></script>
2320
<script src="~/lib/angular2/bundles/http.dev.js"></script>
2421
<script src="~/lib/angular2-aspnet/bundles/angular2-aspnet.js"></script>
25-
<script>System.import('./ng-app/components/app/bootstrap');</script>
22+
<script>System.import('./ng-app/boot-client');</script>
2623
}

‎samples/angular/MusicStore/Views/_ViewImports.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
@using MusicStore
22
@using Microsoft.AspNet.AngularServices
33
@addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers"
4-
@addTagHelper "*, Microsoft.AspNet.AngularServices"
4+
@addTagHelper "*, Microsoft.AspNet.SpaServices"

‎samples/angular/MusicStore/gulpfile.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ gulp.task('build.lib', function () {
3838

3939
gulp.task('build', ['build.lib'], function () {
4040
var tsProject = typescript.createProject('./tsconfig.json', { typescript: require('typescript') });
41-
var tsSrcInlined = gulp.src([webroot + '**/*.ts'], { base: webroot })
41+
var tsSrcInlined = gulp.src([webroot + '**/*.ts', 'typings/**/*.d.ts'], { base: webroot })
4242
.pipe(inlineNg2Template({ base: webroot }));
4343
return tsSrcInlined
4444
.pipe(sourcemaps.init())

‎samples/angular/MusicStore/package.json‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,22 @@
22
"name": "MusicStore",
33
"version": "0.0.0",
44
"dependencies": {
5-
"angular2": "2.0.0-beta.1",
6-
"angular2-aspnet": "^0.0.4",
7-
"angular2-universal-preview": "^0.32.2",
5+
"angular2": "2.0.0-beta.13",
6+
"angular2-aspnet": "^0.0.5",
7+
"angular2-universal": "0.90.1",
8+
"aspnet-prerendering": "^1.0.0",
89
"bootstrap": "^3.3.5",
9-
"es6-module-loader": "^0.15.0",
10+
"css": "^2.2.1",
11+
"es6-module-loader": "0.15.0",
12+
"es6-shim": "^0.35.0",
13+
"isomorphic-fetch": "^2.2.1",
1014
"jquery": "^2.1.4",
1115
"less": "^2.5.3",
12-
"lodash": "^3.10.1",
13-
"reflect-metadata": "0.1.2",
14-
"rxjs": "5.0.0-beta.0",
16+
"preboot": "^2.0.5",
17+
"rxjs": "5.0.0-beta.2",
1518
"systemjs": "^0.19.3",
16-
"traceur": "0.0.91"
19+
"traceur": "0.0.106",
20+
"zone.js": "^0.6.10"
1721
},
1822
"devDependencies": {
1923
"del": "^2.0.2",

‎samples/angular/MusicStore/tsd.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": "v4",
3+
"repo": "borisyankov/DefinitelyTyped",
4+
"ref": "master",
5+
"path": "typings",
6+
"bundle": "typings/tsd.d.ts",
7+
"installed": {
8+
"es6-shim/es6-shim.d.ts": {
9+
"commit": "ec9eb4b28c74665a602c22db3457f0a76fa0fa23"
10+
}
11+
}
12+
}

0 commit comments

Comments
 (0)