Merge branch 'rel/2.0.0-templates' into dev

Author: SteveSandersonMS

templates/AngularSpa/ClientApp/boot.browser.ts

@@ -5,13 +5,13 @@ import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { AppModule } from './app/app.module.browser';
 
-if (module['hot']) {
-    module['hot'].accept();
-    module['hot'].dispose(() => {
+if (module.hot) {
+    module.hot.accept();
+    module.hot.dispose(() => {
         // Before restarting the app, we create a new root element and dispose the old one
         const oldRootElem = document.querySelector('app');
         const newRootElem = document.createElement('app');
-        oldRootElem.parentNode.insertBefore(newRootElem, oldRootElem);
+        oldRootElem!.parentNode!.insertBefore(newRootElem, oldRootElem);
         modulePromise.then(appModule => appModule.destroy());
     });
 } else {

templates/AngularSpa/ClientApp/boot.server.ts

@@ -17,12 +17,12 @@ export default createServerRenderer(params => {
     ];
 
     return platformDynamicServer(providers).bootstrapModule(AppModule).then(moduleRef => {
-        const appRef = moduleRef.injector.get(ApplicationRef);
+        const appRef: ApplicationRef = moduleRef.injector.get(ApplicationRef);
         const state = moduleRef.injector.get(PlatformState);
         const zone = moduleRef.injector.get(NgZone);
 
         return new Promise<RenderResult>((resolve, reject) => {
-            zone.onError.subscribe(errorInfo => reject(errorInfo));
+            zone.onError.subscribe((errorInfo: any) => reject(errorInfo));
             appRef.isStable.first(isStable => isStable).subscribe(() => {
                 // Because 'onStable' fires before 'onError', we have to delay slightly before
                 // completing the request in case there's an error to report

templates/AngularSpa/npm-shrinkwrap.json

@@ -18,7 +18,7 @@
     "@angular/platform-server": "4.2.5",
     "@angular/router": "4.2.5",
     "@ngtools/webpack": "1.5.0",
-    "@types/node": "8.0.8",
+    "@types/webpack-env": "1.13.0",
     "angular2-template-loader": "0.6.2",
     "aspnet-prerendering": "^3.0.1",
     "aspnet-webpack": "^2.0.1",

templates/AngularSpa/package.json

@@ -1,13 +1,16 @@
 {
   "compilerOptions": {
+    "module": "es2015",
     "moduleResolution": "node",
     "target": "es5",
     "sourceMap": true,
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
     "skipDefaultLibCheck": true,
+    "skipLibCheck": true, // Workaround for https://github.com/angular/angular/issues/17863. Remove this if you upgrade to a fixed version of Angular.
+    "strict": true,
     "lib": [ "es6", "dom" ],
-    "types": [ "node" ]
+    "types": [ "webpack-env" ]
   },
   "exclude": [ "bin", "node_modules" ],
   "atom": { "rewriteTsconfig": false }

templates/AngularSpa/tsconfig.json

@@ -14,7 +14,7 @@
     "jquery": "^3.2.1"
   },
   "devDependencies": {
-    "@types/node": "^7.0.12",
+    "@types/webpack-env": "^1.13.0",
     "aspnet-webpack": "^2.0.1",
     "aurelia-webpack-plugin": "^2.0.0-rc.2",
     "css-loader": "^0.28.0",

templates/AureliaSpa/npm-shrinkwrap.json

@@ -1,13 +1,15 @@
 {
   "compilerOptions": {
+    "module": "es2015",
     "moduleResolution": "node",
     "target": "es5",
     "sourceMap": true,
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
     "skipDefaultLibCheck": true,
+    "strict": true,
     "lib": [ "es2015", "dom" ],
-    "types": [ "node" ]
+    "types": [ "webpack-env" ]
   },
   "exclude": [ "bin", "node_modules" ],
   "atom": { "rewriteTsconfig": false }

templates/AureliaSpa/package.json

@@ -1,21 +1,20 @@
 import './css/site.css';
 import 'bootstrap';
 import * as ko from 'knockout';
+import { createBrowserHistory } from 'history';
 import './webpack-component-loader';
 import AppRootComponent from './components/app-root/app-root';
-const createHistory = require('history').createBrowserHistory;
-const baseUrl = document.getElementsByTagName('base')[0].getAttribute('href');
+const baseUrl = document.getElementsByTagName('base')[0].getAttribute('href')!;
 const basename = baseUrl.substring(0, baseUrl.length - 1); // History component needs no trailing slash
 
 // Load and register the <app-root> component
 ko.components.register('app-root', AppRootComponent);
 
 // Tell Knockout to start up an instance of your application
-ko.applyBindings({ history: createHistory({ basename }), basename });
+ko.applyBindings({ history: createBrowserHistory({ basename }), basename });
 
 // Basic hot reloading support. Automatically reloads and restarts the Knockout app each time
 // you modify source files. This will not preserve any application state other than the URL.
-declare var module: any;
 if (module.hot) {
     module.hot.accept();
     module.hot.dispose(() => ko.cleanNode(document.body));

templates/AureliaSpa/tsconfig.json

@@ -1,7 +1,7 @@
 import * as ko from 'knockout';
 import * as $ from 'jquery';
 import * as History from 'history';
-import crossroads = require('crossroads');
+import * as crossroads from 'crossroads';
 
 // This module configures crossroads.js, a routing library. If you prefer, you
 // can use any other routing library (or none at all) as Knockout is designed to
@@ -20,9 +20,9 @@ export class Router {
         // Reset and configure Crossroads so it matches routes and updates this.currentRoute
         crossroads.removeAllRoutes();
         crossroads.resetState();
-        crossroads.normalizeFn = crossroads.NORM_AS_OBJECT;
+        (crossroads as any).normalizeFn = crossroads.NORM_AS_OBJECT;
         routes.forEach(route => {
-            crossroads.addRoute(route.url, (requestParams) => {
+            crossroads.addRoute(route.url, (requestParams: any) => {
                 this.currentRoute(ko.utils.extend(requestParams, route.params));
             });
         });