Update sample 07 to Angular 2 rc6

07-Authorization/app/app.component.ts

@@ -1,10 +1,8 @@
 import { Component }         from '@angular/core';
-import { ROUTER_DIRECTIVES } from '@angular/router';
 import { Auth }              from './auth.service';
 
 @Component({
     selector: 'my-app',
-    directives: [ ROUTER_DIRECTIVES ],
     templateUrl: 'app/app.template.html'
 })
 

07-Authorization/app/app.module.ts

@@ -0,0 +1,38 @@
+import { NgModule }                from '@angular/core';
+import { BrowserModule  }          from '@angular/platform-browser';
+import { FormsModule }             from '@angular/forms';
+import { HttpModule, JsonpModule } from '@angular/http';
+
+import { AUTH_PROVIDERS }          from 'angular2-jwt';
+
+import { AppComponent }            from './app.component';
+import { HomeComponent }           from './home.component';
+import { AdminComponent }          from './admin.component';
+import { UnauthorizedComponent }   from './unauthorized.component';
+import { routing,
+         appRoutingProviders }     from './app.routes';
+
+import { Auth } from './auth.service'
+
+@NgModule({
+    declarations: [
+                        AppComponent,
+                        HomeComponent,
+                        AdminComponent,
+                        UnauthorizedComponent
+                  ],
+    providers:    [
+                        appRoutingProviders,
+                        AUTH_PROVIDERS,
+                        Auth
+                  ],
+    imports:      [
+                        BrowserModule,
+                        routing,
+                        FormsModule,
+                        HttpModule,
+                        JsonpModule
+                  ],
+    bootstrap:    [AppComponent],
+})
+export class AppModule {}

07-Authorization/app/app.routes.ts

@@ -1,17 +1,20 @@
-import { provideRouter, RouterConfig } from '@angular/router';
+import { ModuleWithProviders }         from '@angular/core';
+import { Routes, RouterModule }        from '@angular/router';
+
 import { HomeComponent }               from './home.component';
 import { AdminComponent }              from './admin.component';
 import { UnauthorizedComponent }       from './unauthorized.component';
 import { AuthGuard }                   from './auth.guard';
 
-export const routes: RouterConfig = [
+const appRoutes: Routes = [
   { path: '', component: HomeComponent },
   { path: 'admin', component: AdminComponent, canActivate: [AuthGuard] },
   { path: 'unauthorized', component: UnauthorizedComponent },
   { path: '**', redirectTo: '' }
 ];
 
-export const APP_ROUTER_PROVIDERS = [
-  provideRouter(routes),
-  AuthGuard
+export const appRoutingProviders: any[] = [
+       AuthGuard
 ];
+
+export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes);

07-Authorization/app/main.ts

@@ -1,14 +1,4 @@
-import { bootstrap }                              from '@angular/platform-browser-dynamic';
-import { provide }                                from '@angular/core';
-import { APP_ROUTER_PROVIDERS }                   from './app.routes';
-import { HTTP_PROVIDERS }                         from '@angular/http';
-import { AUTH_PROVIDERS }                         from 'angular2-jwt';
-import { AppComponent }                           from './app.component';
-import { Auth }                                   from './auth.service';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import { AppModule }              from './app.module';
 
-bootstrap(AppComponent, [
-  HTTP_PROVIDERS,
-  APP_ROUTER_PROVIDERS,
-  AUTH_PROVIDERS,
-  Auth
-]);
+platformBrowserDynamic().bootstrapModule(AppModule);

07-Authorization/package.json

@@ -21,26 +21,24 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@angular/common":  "2.0.0-rc.4",
-    "@angular/compiler":  "2.0.0-rc.4",
-    "@angular/core":  "2.0.0-rc.4",
-    "@angular/forms": "0.2.0",
-    "@angular/http":  "2.0.0-rc.4",
-    "@angular/platform-browser":  "2.0.0-rc.4",
-    "@angular/platform-browser-dynamic":  "2.0.0-rc.4",
-    "@angular/router":  "3.0.0-beta.2",
-    "@angular/router-deprecated":  "2.0.0-rc.2",
-    "@angular/upgrade":  "2.0.0-rc.4",
-
-    "systemjs": "0.19.27",
+    "@angular/common": "2.0.0-rc.6",
+    "@angular/compiler": "2.0.0-rc.6",
+    "@angular/core": "2.0.0-rc.6",
+    "@angular/forms": "2.0.0-rc.6",
+    "@angular/http": "2.0.0-rc.6",
+    "@angular/platform-browser": "2.0.0-rc.6",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.6",
+    "@angular/router": "3.0.0-rc.2",
+    "@angular/router-deprecated": "2.0.0-rc.2",
+    "@angular/upgrade": "2.0.0-rc.6",
+    "angular2-in-memory-web-api": "0.0.14",
+    "angular2-jwt": "^0.1.16",
+    "bootstrap": "^3.3.6",
     "core-js": "^2.4.0",
     "reflect-metadata": "^0.1.3",
-    "rxjs": "5.0.0-beta.6",
-    "zone.js": "^0.6.12",
-    "angular2-jwt": "^0.1.16",
-
-    "angular2-in-memory-web-api": "0.0.14",
-    "bootstrap": "^3.3.6"
+    "rxjs": "5.0.0-beta.11",
+    "systemjs": "0.19.27",
+    "zone.js": "^0.6.21"
   },
   "devDependencies": {
     "concurrently": "^2.0.0",

07-Authorization/systemjs.config.js

@@ -2,63 +2,57 @@
  * System configuration for Angular 2 samples
  * Adjust as necessary for your application needs.
  */
-(function(global) {
-
-  // map tells the System loader where to look for things
-  var map = {
-    'app':                        'app', // 'dist',
-
-    '@angular':                   'node_modules/@angular',
-    'angular2-in-memory-web-api': 'node_modules/angular2-in-memory-web-api',
-    'angular2-jwt':               'node_modules/angular2-jwt/angular2-jwt.js',
-    'rxjs':                       'node_modules/rxjs'
-  };
-
-  // packages tells the System loader how to load when no filename and/or no extension
-  var packages = {
-    'app':                        { main: 'main.js',  defaultExtension: 'js' },
-    'rxjs':                       { defaultExtension: 'js' },
-    'angular2-jwt':               { defaultExtension: 'js' },
-    'angular2-in-memory-web-api': { main: 'index.js', defaultExtension: 'js' },
-  };
-
-  var ngPackageNames = [
-    'common',
-    'compiler',
-    'core',
-    'forms',
-    'http',
-    'platform-browser',
-    'platform-browser-dynamic',
-    'router',
-    'router-deprecated',
-    'upgrade',
-  ];
-
-  // Individual files (~300 requests):
-  function packIndex(pkgName) {
-    packages['@angular/'+pkgName] = { main: 'index.js', defaultExtension: 'js' };
-  }
-
-  // Bundled (~40 requests):
-  function packUmd(pkgName) {
-    packages['@angular/'+pkgName] = { main: '/bundles/' + pkgName + '.umd.js', defaultExtension: 'js' };
-  }
-
-  // Most environments should use UMD; some (Karma) need the individual index files
-  var setPackageConfig = System.packageWithIndex ? packIndex : packUmd;
-
-  // Add package entries for angular packages
-  ngPackageNames.forEach(setPackageConfig);
-
-  // No umd for router yet
-  packages['@angular/router'] = { main: 'index.js', defaultExtension: 'js' };
-
-  var config = {
-    map: map,
-    packages: packages
-  };
-
-  System.config(config);
-
+(function (global) {
+  System.config({
+    paths: {
+      // paths serve as alias
+      'npm:': 'node_modules/'
+    },
+    // map tells the System loader where to look for things
+    map: {
+      // our app is within the app folder
+      app: 'app',
+
+      // angular bundles
+      '@angular/core': 'npm:@angular/core/bundles/core.umd.js',
+      '@angular/common': 'npm:@angular/common/bundles/common.umd.js',
+      '@angular/compiler': 'npm:@angular/compiler/bundles/compiler.umd.js',
+      '@angular/platform-browser': 'npm:@angular/platform-browser/bundles/platform-browser.umd.js',
+      '@angular/platform-browser-dynamic': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
+      '@angular/http': 'npm:@angular/http/bundles/http.umd.js',
+      '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
+      '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
+
+      // angular testing umd bundles
+      '@angular/core/testing': 'npm:@angular/core/bundles/core-testing.umd.js',
+      '@angular/common/testing': 'npm:@angular/common/bundles/common-testing.umd.js',
+      '@angular/compiler/testing': 'npm:@angular/compiler/bundles/compiler-testing.umd.js',
+      '@angular/platform-browser/testing': 'npm:@angular/platform-browser/bundles/platform-browser-testing.umd.js',
+      '@angular/platform-browser-dynamic/testing': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic-testing.umd.js',
+      '@angular/http/testing': 'npm:@angular/http/bundles/http-testing.umd.js',
+      '@angular/router/testing': 'npm:@angular/router/bundles/router-testing.umd.js',
+      '@angular/forms/testing': 'npm:@angular/forms/bundles/forms-testing.umd.js',
+
+      // other libraries
+      'rxjs': 'npm:rxjs',
+      'angular2-in-memory-web-api': 'npm:angular2-in-memory-web-api',
+      'angular2-jwt': 'npm:angular2-jwt/angular2-jwt.js'
+    },
+    // packages tells the System loader how to load when no filename and/or no extension
+    packages: {
+      app: {
+        main: './main.js',
+        defaultExtension: 'js'
+      },
+      rxjs: {
+        defaultExtension: 'js'
+      },
+      'angular2-in-memory-web-api': {
+        defaultExtension: 'js'
+      },
+      'angular2-jwt': {
+          defaultExtension: 'js'
+      }
+    }
+  });
 })(this);