Merge master

Author: mgechev

.github/ISSUE_TEMPLATE.md

@@ -27,7 +27,7 @@ please provide the *STEPS TO REPRODUCE* and if possible a *MINIMAL DEMO* of the
 **Please tell us about your environment:**
 <!-- Operating system, IDE, package manager, HTTP server, ... -->
 
-* **Angular Seed Version:** 2.0.X
+* **Angular Seed Version:** `aaaaf75`
 <!-- Check which is the hash of the last commit from angular-seed that you have locally -->
 
 * **Node:** `node --version` =

.gitignore

@@ -34,7 +34,6 @@ ts-node
 
 #IDE configuration files
 .idea
-.vscode
 *.iml
 
 /tools/**/*.js

.vscode/launch.json

@@ -0,0 +1,28 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Launch Chrome against localhost, with sourcemaps",
+      "type": "chrome",
+      "preLaunchTask": "start",
+      "request": "launch",
+      "url": "http://localhost:5555",
+      "sourceMaps": true,
+      "webRoot": "${workspaceRoot}/src/client",
+      "sourceMapPathOverrides": {
+        "app/*": "${webRoot}/app/*"
+      }
+    },
+    {
+      "name": "Attach to Chrome, with sourcemaps",
+      "type": "chrome",
+      "request": "attach",
+      "port": 9222,
+      "sourceMaps": true,
+      "webRoot": "${workspaceRoot}/src/client",
+      "sourceMapPathOverrides": {
+        "app/*": "${webRoot}/app/*"
+      }
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,4 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+  "typescript.tsdk": "node_modules/typescript/lib"
+}

README.md

@@ -19,7 +19,7 @@ init:
 
 install:
   - ps: Install-Product node $env:nodejs_version
-  - npm install -g npm
+  - npm install -g npm@3.10.8
   - ps: $env:path = $env:appdata + "\npm;" + $env:path
   - npm install && npm install karma-ie-launcher
 
@@ -38,4 +38,4 @@ notifications:
     on_build_failure: true
     on_build_status_changed: true
 
-cache: node_modules
+cache: node_modules -> package.json

appveyor.yml

@@ -124,6 +124,13 @@ gulp.task('serve.prod', (done: any) =>
               done));
 
 
+// --------------
+// Serve prod exp
+gulp.task('serve.prod.exp', (done: any) =>
+  runSequence('build.prod.exp',
+              'server.prod',
+              done));
+
 // --------------
 // Test.
 gulp.task('test', (done: any) =>

gulpfile.ts

@@ -3,6 +3,8 @@
 'use strict';
 
 var argv = require('yargs').argv;
+var minimatch = require("minimatch");
+
 
 module.exports = function (config) {
   config.set({
@@ -20,6 +22,7 @@ module.exports = function (config) {
     files: [
       // Polyfills.
       'node_modules/core-js/client/shim.min.js',
+      'node_modules/intl/dist/Intl.min.js',
 
       'node_modules/traceur/bin/traceur.js',
 
@@ -114,7 +117,7 @@ module.exports = function (config) {
 
     // Passing command line arguments to tests
     client: {
-      files: argv.files
+      files:  argv.files ? minimatch.makeRe(argv.files).source : null
     }
   });
 

karma.conf.js

@@ -6,11 +6,11 @@
     "url": "https://github.com/mgechev/angular-seed"
   },
   "scripts": {
-    "build.dev": "gulp build.dev --color --env-config dev --config-env dev",
+    "build.dev": "gulp build.dev --color --env-config dev",
     "build.dev.watch": "gulp build.dev.watch --color",
     "build.e2e": "gulp build.e2e --color",
-    "build.prod": "gulp build.prod --color --env-config prod --config-env prod --build-type prod",
-    "build.prod.exp": "gulp build.prod.exp --color --env-config prod --config-env prod --build-type prod",
+    "build.prod": "gulp build.prod --color --env-config prod --build-type prod",
+    "build.prod.exp": "gulp build.prod.exp --color --env-config prod --build-type prod",
     "build.test": "gulp build.test --color",
     "test.watch": "gulp test.watch --color",
     "generate.manifest": "gulp generate.manifest --color",
@@ -23,10 +23,11 @@
     "karma.start": "karma start",
     "postinstall": "gulp check.versions && gulp build.bundle.rxjs && npm prune && gulp webdriver && gulp print.banner",
     "reinstall": "npm cache clean && npm install",
-    "serve.coverage": "remap-istanbul -b src/ -i coverage/coverage-final.json -o coverage -t html && npm run gulp -- serve.coverage --color",
-    "serve.dev": "gulp serve.dev --color --env-config dev --config-env dev",
+    "serve.coverage": "gulp serve.coverage --color",
+    "serve.dev": "gulp serve.dev --color --env-config dev",
     "serve.e2e": "gulp serve.e2e --color",
-    "serve.prod": "gulp serve.prod --color --env-config prod --config-env prod",
+    "serve.prod": "gulp serve.prod --color --env-config prod",
+    "serve.prod.exp": "gulp serve.prod.exp --color --env-config prod",
     "start": "gulp serve.dev --color",
     "start.deving": "gulp start.deving --color",
     "tasks.list": "gulp --tasks-simple --color",
@@ -39,14 +40,15 @@
   "author": "Minko Gechev <mgechev>",
   "license": "MIT",
   "devDependencies": {
-    "@angular/compiler-cli": "^2.1.0",
-    "@angular/platform-server": "^2.1.0",
-    "@angular/tsc-wrapped": "^0.3.0",
+    "@angular/compiler-cli": "~2.1.2",
+    "@angular/platform-server": "~2.1.2",
+    "@angular/tsc-wrapped": "0.3.0",
     "@types/async": "^2.0.32",
     "@types/browser-sync": "^0.0.34",
     "@types/core-js": "^0.9.34",
     "@types/express": "^4.0.33",
     "@types/gulp": "^3.8.32",
+    "@types/gulp-filter": "^3.0.29",
     "@types/gulp-load-plugins": "^0.0.28",
     "@types/gulp-protractor": "^1.0.29",
     "@types/gulp-sass": "^0.0.29",
@@ -58,7 +60,7 @@
     "@types/run-sequence": "^0.0.28",
     "@types/selenium-webdriver": "2.44.*",
     "@types/systemjs": "^0.19.31",
-    "@types/yargs": "^0.0.33",
+    "@types/yargs": "^0.0.34",
     "@types/zone.js": "^0.0.27",
     "async": "^2.1.1",
     "autoprefixer": "^6.5.1",
@@ -76,15 +78,15 @@
     "gulp-concat-css": "^2.3.0",
     "gulp-filter": "^4.0.0",
     "gulp-inject": "^4.1.0",
-    "gulp-inline-ng2-template": "^3.0.1",
+    "gulp-inline-ng2-template": "^4.0.0",
     "gulp-load-plugins": "^1.3.0",
     "gulp-plumber": "~1.1.0",
     "gulp-postcss": "^6.2.0",
     "gulp-progeny": "^0.3.1",
     "gulp-protractor": "^3.0.0",
     "gulp-replace": "^0.5.4",
     "gulp-sass": "^2.3.2",
-    "gulp-sourcemaps": "2.1.1",
+    "gulp-sourcemaps": "2.2.0",
     "gulp-template": "^4.0.0",
     "gulp-tslint": "^6.1.2",
     "gulp-typescript": "^3.0.2",
@@ -110,7 +112,8 @@
     "semver": "^5.3.0",
     "serve-static": "^1.11.1",
     "slash": "~1.0.0",
-    "systemjs-builder": "0.15.32",
+    "supports-color": "^3.1.2",
+    "systemjs-builder": "0.15.33",
     "tildify": "^1.2.0",
     "traceur": "^0.0.111",
     "ts-node": "^1.4.3",
@@ -120,18 +123,20 @@
     "yargs": "^6.0.0"
   },
   "dependencies": {
-    "@angular/common": "^2.1.0",
-    "@angular/compiler": "^2.1.0",
-    "@angular/core": "^2.1.0",
-    "@angular/forms": "^2.1.0",
-    "@angular/http": "^2.1.0",
-    "@angular/platform-browser": "^2.1.0",
-    "@angular/platform-browser-dynamic": "^2.1.0",
-    "@angular/router": "^3.1.0",
+    "@angular/common": "~2.1.2",
+    "@angular/compiler": "~2.1.2",
+    "@angular/core": "~2.1.2",
+    "@angular/forms": "~2.1.2",
+    "@angular/http": "~2.1.2",
+    "@angular/platform-browser": "~2.1.2",
+    "@angular/platform-browser-dynamic": "~2.1.2",
+    "@angular/router": "~3.1.2",
     "core-js": "^2.4.1",
+    "intl": "^1.2.5",
+    "minimatch": "^3.0.3",
     "reflect-metadata": "^0.1.8",
     "rxjs": "5.0.0-beta.12",
-    "systemjs": "0.19.39",
+    "systemjs": "0.19.40",
     "zone.js": "0.6.25"
   }
 }

package.json

@@ -36,8 +36,8 @@
   <script>
   System.import('<%= BOOTSTRAP_MODULE %>')
     .catch(function (e) {
-      console.error(e,
-        'Report this error at https://github.com/mgechev/angular2-seed/issues');
+      console.error(e.stack || e,
+        'Not expecting this error? Report it at https://github.com/mgechev/angular2-seed/issues');
     });
   </script>
   <% } %>