Merge branch 'develop' of https://github.com/w3tecch/aurelia-ts-boilerplate into develop

Gery Hirschfeld · Gery Hirschfeld · commit 1462ce515d68 · 2016-10-09T01:25:58.000+02:00
diff --git a/package.json b/package.json
@@ -117,10 +117,12 @@
     "babel-preset-es2015-loose-native-modules": "1.0.0",
     "babel-preset-stage-1": "6.16.0",
     "babel-register": "6.16.3",
+    "chalk": "^1.1.3",
     "compression-webpack-plugin": "0.3.1",
     "concurrently": "3.1.0",
     "cross-env": "3.1.2",
     "favicons-webpack-plugin": "0.0.7",
+    "fs": "0.0.1-security",
     "http-server": "0.9.0",
     "ignore-loader": "0.1.1",
     "intl": "1.2.5",
@@ -133,7 +135,8 @@
     "karma-remap-istanbul": "0.2.1",
     "karma-sourcemap-loader": "0.3.7",
     "karma-webpack": "1.8.0",
-    "rimraf": "2.5.4",
+    "ncp": "^2.0.0",
+    "rimraf": "^2.5.4",
     "typescript": "2.0.3",
     "wait-on": "1.5.3",
     "webpack": "2.1.0-beta.22",
diff --git a/src/app/app.ts b/src/app/app.ts
@@ -1,34 +1,45 @@
+import { inject } from 'aurelia-framework';
 import { Router, RouterConfiguration } from 'aurelia-router';
+import { I18N } from 'aurelia-i18n';
 
+@inject(I18N, 'AppConfig')
 export class App {
-	public router: Router;
+  public router: Router;
 
-	public configureRouter(config: RouterConfiguration, router: Router): void {
-		config.title = 'Aurelia';
-		config.map([
-			{
-				route: ['', 'welcome'],
-				name: 'welcome',
-				moduleId: './modules/welcome/welcome',
-				nav: true,
-				title: 'Welcome'
-			},
-			{
-				route: 'users',
-				name: 'users',
-				moduleId: './modules/users/users',
-				nav: true,
-				title: 'Github Users'
-			},
-			{
-				route: 'child-router',
-				name: 'child-router',
-				moduleId: './modules/child-router/child-router',
-				nav: true,
-				title: 'Child Router'
-			}
-		]);
+  constructor(
+    private i18n: I18N,
+    private appConfig: AppConfig.IAppConfig
+  ) { }
 
-		this.router = router;
-	}
+  public configureRouter(config: RouterConfiguration, router: Router): void {
+    config.title = this.i18n.tr('TITLE');
+    if (this.appConfig.PLATFORM === 'web') {
+      config.options.pushState = true;
+    }
+    config.map([
+      {
+        route: ['', 'welcome'],
+        name: 'welcome',
+        moduleId: './modules/welcome/welcome',
+        nav: true,
+        title: 'Welcome'
+      },
+      {
+        route: 'users',
+        name: 'users',
+        moduleId: './modules/users/users',
+        nav: true,
+        title: 'Github Users'
+      },
+      {
+        route: 'child-router',
+        name: 'child-router',
+        moduleId: './modules/child-router/child-router',
+        nav: true,
+        title: 'Child Router'
+      }
+    ]);
+
+    this.router = router;
+  }
 }
diff --git a/src/index.ejs b/src/index.ejs
@@ -9,8 +9,14 @@
   <meta name="description" content="<%= htmlWebpackPlugin.options.description %>">
   <meta name="version" content="<%= htmlWebpackPlugin.options.version %>">
   <meta name="author" content="<%= htmlWebpackPlugin.options.author %>">
+
+  <% if (htmlWebpackPlugin.options.platform === 'mobile') { %>
+  <!-- Cordova -->
+  <script src="cordova.js"></script>
+  <% } %>
+  <% if (htmlWebpackPlugin.options.platform === 'web') { %>
   <base href="<%= htmlWebpackPlugin.options.baseUrl %>">
-  <!-- imported CSS are concatenated and added automatically -->
+  <% } %>
 </head>
 
 <body aurelia-app="main">
@@ -25,4 +31,4 @@
     <% } %>
 </body>
 
-</html>
+</html>
diff --git a/webpack.config.js b/webpack.config.js
