chore: merge latest upstream parent

NathanWalker · Nov 13, 2016 · d327004 · d327004
2 parents 51638e0 + 0551611
commit d327004
Show file tree

Hide file tree

Showing 22 changed files with 262 additions and 179 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.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` =
diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,9 @@ lib-cov
 coverage
 coverage_js
 
+# ignore documentation
+documentation
+
 # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
 

diff --git a/.vscode/angulardoc.json b/.vscode/angulardoc.json
@@ -0,0 +1,4 @@
+{
+  "repoId": "2339e2d6-6e1c-4d1f-b347-83ce349f4802",
+  "lastSync": 0
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,32 +1,55 @@
 {
 	"version": "0.2.0",
 	"configurations": [
-	{
-		"name": "Launch localhost with sourcemaps",
-		"type": "chrome",
-		"request": "launch",
-		"url": "http://localhost:5555/",
-		"sourceMaps": true,
-		"webRoot": "${workspaceRoot}/dist/dev",
-		"runtimeArgs": [
-			"--remote-debugging-port=9222", //Open in port 9222 (standard chrome debug port)
-			"--user-data-dir=${workspaceRoot}\\ChromeDebugger-UserData\\", //Can be any directory. Makes chrome load in a different directory so that it opens in a new instance.
-			//"--user-data-dir=${env.LOCALAPPDATA}\\Google\\Chrome\\User Data\\", //CHROME DEFAULT
-			"--new-window" //Open in new window
-		]
-	},
-        {
-            "name": "Launch Electron App",
-            "type": "node",
-            "program": "${workspaceRoot}/dist/dev/main.desktop.js", // important
-            "stopOnEntry": false,
-            "args": [],
-            "cwd": "${workspaceRoot}/dist/dev/",
-            // next line is very important
-            "runtimeExecutable": "${env.APPDATA}/npm/node_modules/electron-prebuilt/dist/electron.exe",
-            "runtimeArgs": [],
-            "env": { }, 
-            "sourceMaps": true
-        }
-	]
+    {
+      "name": "Launch localhost with sourcemaps",
+      "type": "chrome",
+      "request": "launch",
+      "url": "http://localhost:5555/",
+      "sourceMaps": true,
+      "webRoot": "${workspaceRoot}/dist/dev",
+      "runtimeArgs": [
+        "--remote-debugging-port=9222", //Open in port 9222 (standard chrome debug port)
+        "--user-data-dir=${workspaceRoot}\\ChromeDebugger-UserData\\", //Can be any directory. Makes chrome load in a different directory so that it opens in a new instance.
+        //"--user-data-dir=${env.LOCALAPPDATA}\\Google\\Chrome\\User Data\\", //CHROME DEFAULT
+        "--new-window" //Open in new window
+      ]
+    },
+    {
+      "name": "Launch Electron App",
+      "type": "node",
+      "program": "${workspaceRoot}/dist/dev/main.desktop.js", // important
+      "stopOnEntry": false,
+      "args": [],
+      "cwd": "${workspaceRoot}/dist/dev/",
+      // next line is very important
+      "runtimeExecutable": "${env.APPDATA}/npm/node_modules/electron-prebuilt/dist/electron.exe",
+      "runtimeArgs": [],
+      "env": { },
+      "sourceMaps": true
+    },
+    {
+      "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/*"
+      }
+    }
+  ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -11,5 +11,6 @@
     "src/client/**/*.js": true,
     "nativescript/app/**/*.js": true,
     "ChromeDebugger-UserData/**/*": true
-  }
+  },
+  "typescript.tsdk": "node_modules/typescript/lib"
 }
diff --git a/README.md b/README.md
@@ -39,11 +39,11 @@ This is an **advanced** seed project for Angular 2 apps based on [Minko Gechev's
 - [Enhanced development workflow](#enhanced-development-workflow)
 - [Enhanced testing support options](#enhanced-testing-support-options)
 - [Prerequisites](#prerequisites)
-- [Usage](#usage)
-- [Special note about AoT](https://github.com/NathanWalker/angular-seed-advanced#special-note-about-aot)
+- [How to start](#how-to-start)
+- [How to start with AoT compilation](#how-to-start-with-aot-compilation)
 - [NativeScript App](#nativescript-app)
 - [Electron App](#electron-app)
-- [Testing](#testing)
+- [Running tests](#running-tests)
 - [Framework How-Tos](#framework-how-tos)
 - [Web Configuration Options](#web-configuration-options)
 - [Change Detection OnPush Note](#change-detection-onpush-note)
@@ -97,7 +97,7 @@ npm install -g nativescript
 npm install -g typescript
 ```
 
-## Usage
+## How to start
 
 
 ```bash
@@ -112,7 +112,7 @@ $ yarn install  # or yarn
 # watches your files and uses livereload by default
 $ npm start
 # api document for the app
-npm run serve.docs
+# npm run build.docs
 
 # to start deving with livereload site and coverage as well as continuous testing
 $ npm run start.deving
@@ -121,13 +121,20 @@ $ npm run start.deving
 $ npm run build.dev
 # prod build
 $ npm run build.prod
-# prod build with AoT compilation
-npm run build.prod.exp
 ```
 
-## Special Note About AoT
+## How to start with AoT compilation
+
+**Note** that AoT compilation requires **node v6.5.0 or higher** and **npm 3.10.3 or higher**.
+
+In order to start the seed with AoT use:
+
+```bash
+# prod build with AoT compilation
+$ npm run build.prod.exp
+```
 
-When using `npm run build.prod.exp` for AoT builds, please consider the following:
+When using AoT compilation, please consider the following:
 
 Currently you cannot use custom component decorators with AoT compilation. This may change in the future but for now you can use this pattern for when you need to create AoT builds for the web:
 
@@ -241,7 +248,7 @@ Windows:  npm run build.desktop.windows
 Linux:    npm run build.desktop.linux
 ```
 
-## Testing
+## Running tests
 
 ```bash
 $ npm test
@@ -504,4 +511,4 @@ Please see the [CONTRIBUTING](https://github.com/NathanWalker/angular-seed-advan
 
 ## License
 
-MIT
+MIT
diff --git a/karma.conf.js b/karma.conf.js
@@ -3,6 +3,8 @@
 'use strict';
 
 var argv = require('yargs').argv;
+var minimatch = require("minimatch");
+
 
 module.exports = function (config) {
   config.set({
@@ -121,7 +123,7 @@ module.exports = function (config) {
 
     // Passing command line arguments to tests
     client: {
-      files: argv.files
+      files:  argv.files ? minimatch.makeRe(argv.files).source : null
     }
   });
 

diff --git a/nativescript/package.json b/nativescript/package.json
@@ -5,7 +5,7 @@
   "nativescript": {
     "id": "com.yourdomain.appname",
     "tns-ios": {
-      "version": "2.3.0"
+      "version": "2.5.0-2016-11-3-2"
     },
     "tns-android": {
       "version": "2.3.0"
@@ -26,7 +26,7 @@
     "@ngrx/core": "^1.2.0",
     "@ngrx/effects": "^2.0.0",
     "@ngrx/store": "^2.2.1",
-    "angulartics2": "^1.4.0",
+    "angulartics2": "^1.4.2",
     "es6-promise": "^3.0.2",
     "es6-shim": "^0.35.0",
     "lodash": "^4.16.4",
@@ -38,7 +38,7 @@
     "querystring": "0.2.0",
     "reflect-metadata": "^0.1.8",
     "rxjs": "5.0.0-beta.12",
-    "tns-core-modules": "^2.3.0",
+    "tns-core-modules": "next",
     "url": "0.10.3"
   },
   "devDependencies": {
@@ -50,7 +50,7 @@
     "lazy": "1.0.11",
     "nativescript-dev-typescript": "^0.3.2",
     "shelljs": "^0.7.0",
-    "typescript": "^2.0.2",
+    "typescript": "^2.0.9",
     "zone.js": "^0.6.21"
   }
-}
+}
diff --git a/package.json b/package.json
@@ -35,9 +35,8 @@
     "karma.start": "karma start",
     "postinstall": "gulp check.versions && gulp build.bundle.rxjs && npm prune && gulp webdriver && node tools/install.js",
     "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.coverage": "gulp serve.coverage --color",
     "serve.dev": "gulp serve.dev --color --env-config dev",
-    "serve.docs": "npm run gulp -- build.docs --color && npm run gulp -- serve.docs --color",
     "serve.e2e": "gulp serve.e2e --color",
     "serve.prod": "gulp serve.prod --color --env-config prod",
     "serve.prod.exp": "gulp serve.prod.exp --color --env-config prod",
@@ -57,8 +56,10 @@
     "test": "gulp test --color",
     "e2e.ci": "gulp build.prod --color && gulp build.js.e2e --color && gulp e2e --color",
     "tests.all": "npm test && npm run e2e.ci",
-    "webdriver-start": "node_modules/protractor/bin/webdriver-manager start",
-    "webdriver-update": "node_modules/protractor/bin/webdriver-manager update"
+    "webdriver-start": "webdriver-manager start",
+    "webdriver-update": "webdriver-manager update",
+    "compodoc": "node_modules/.bin/compodoc -p src/client/tsconfig.json",
+    "serve.compodoc": "node_modules/.bin/compodoc -s"
   },
   "author": "Minko Gechev <mgechev>",
   "contributors": [
@@ -76,6 +77,7 @@
     "@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",
@@ -88,12 +90,13 @@
     "@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",
     "browser-sync": "^2.17.3",
     "codelyzer": "~1.0.0-beta.2",
+    "compodoc": "0.0.8",
     "connect-history-api-fallback": "^1.3.0",
     "cssnano": "^3.7.7",
     "deep-extend": "^0.4.1",
@@ -110,7 +113,7 @@
     "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-newer": "^1.3.0",
     "gulp-plumber": "~1.1.0",
@@ -119,7 +122,7 @@
     "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-typedoc": "^2.0.0",
@@ -146,7 +149,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",
@@ -168,15 +172,16 @@
     "@ngrx/core": "^1.2.0",
     "@ngrx/effects": "^2.0.0",
     "@ngrx/store": "^2.2.1",
-    "angulartics2": "^1.4.0",
+    "angulartics2": "^1.4.2",
     "core-js": "^2.4.1",
     "es-module-loader": "^1.0.0",
     "intl": "^1.2.5",
     "lodash": "^4.16.4",
+    "minimatch": "^3.0.3",
     "ng2-translate": "^4.0.0",
     "reflect-metadata": "^0.1.8",
     "rxjs": "5.0.0-beta.12",
-    "systemjs": "0.19.39",
+    "systemjs": "0.19.40",
     "zone.js": "0.6.25"
   }
 }
diff --git a/src/client/index.html b/src/client/index.html
@@ -56,8 +56,8 @@
   <script>
   System.import('<%= BOOTSTRAP_MODULE %>')
     .catch(function (e) {
-      console.error(e,
-        'Report this error at https://github.com/NathanWalker/angular-seed-advanced/issues');
+      console.error(e.stack || e,
+        'Not expecting this error? Report it at https://github.com/NathanWalker/angular-seed-advanced/issues');
     });
   </script>
   <% } %>

diff --git a/tools/config/project.config.ts b/tools/config/project.config.ts
@@ -1,5 +1,6 @@
 import { join } from 'path';
 import { SeedAdvancedConfig } from './seed-advanced.config';
+// import { ExtendPackages } from './seed.config.interfaces';
 
 /**
  * This class extends the basic seed configuration, allowing for project specific overrides. A few examples can be found
@@ -29,6 +30,31 @@ export class ProjectConfig extends SeedAdvancedConfig {
       // {src: `${this.CSS_SRC}/path-to-lib/test-lib.css`, inject: true, vendor: false},
     ];
 
+    // Add packages (e.g. lodash)
+    // let additionalPackages: ExtendPackages[] = [{
+    //   name: 'lodash',
+    //   path: `${this.APP_BASE}node_modules/lodash/lodash.js`,
+    //   packageMeta: {
+    //     main: 'index.js',
+    //     defaultExtension: 'js'
+    //   }
+    // }];
+    //
+    // or
+    //
+    // let additionalPackages: ExtendPackages[] = [];
+    //
+    // additionalPackages.push({
+    //   name: 'lodash',
+    //   path: `${this.APP_BASE}node_modules/lodash/lodash.js`,
+    //   packageMeta: {
+    //     main: 'index.js',
+    //     defaultExtension: 'js'
+    //   }
+    // });
+    //
+    // this.addPackagesBundles(additionalPackages);
+
     /* Add to or override NPM module configurations: */
     // this.mergeObject(this.PLUGIN_CONFIGS['browser-sync'], { ghostMode: false });
   }