Merge pull request #226 from videogular/rc6

Rc6
videogular · Sep 5, 2016 · 9eb7545 · 9eb7545
2 parents f906fc7 + 4406a94
commit 9eb7545
Show file tree

Hide file tree

Showing 13 changed files with 117 additions and 114 deletions.
diff --git a/examples/audio-player/package.json b/examples/audio-player/package.json
@@ -18,14 +18,14 @@
     "typings": "1.3.3"
   },
   "dependencies": {
-    "@angular/common": "2.0.0-rc.5",
-    "@angular/compiler": "2.0.0-rc.5",
-    "@angular/core": "2.0.0-rc.5",
-    "@angular/platform-browser": "2.0.0-rc.5",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.5",
-    "reflect-metadata": "0.1.3",
-    "rxjs": "5.0.0-beta.6",
-    "systemjs": "^0.19.31",
-    "zone.js": "0.6.12"
+    "@angular/common": "2.0.0-rc.6",
+    "@angular/compiler": "2.0.0-rc.6",
+    "@angular/core": "2.0.0-rc.6",
+    "@angular/platform-browser": "2.0.0-rc.6",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.6",
+    "reflect-metadata": "0.1.8",
+    "rxjs": "5.0.0-beta.11",
+    "systemjs": "^0.19.37",
+    "zone.js": "0.6.17"
   }
 }
diff --git a/examples/bound-player/package.json b/examples/bound-player/package.json
@@ -18,15 +18,15 @@
     "typings": "1.3.3"
   },
   "dependencies": {
-    "@angular/common": "2.0.0-rc.5",
-    "@angular/compiler": "2.0.0-rc.5",
-    "@angular/core": "2.0.0-rc.5",
+    "@angular/common": "2.0.0-rc.6",
+    "@angular/compiler": "2.0.0-rc.6",
+    "@angular/core": "2.0.0-rc.6",
     "@angular/forms": "0.3.0",
-    "@angular/platform-browser": "2.0.0-rc.5",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.5",
-    "reflect-metadata": "0.1.3",
-    "rxjs": "5.0.0-beta.6",
-    "systemjs": "^0.19.31",
-    "zone.js": "0.6.12"
+    "@angular/platform-browser": "2.0.0-rc.6",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.6",
+    "reflect-metadata": "0.1.8",
+    "rxjs": "5.0.0-beta.11",
+    "systemjs": "^0.19.37",
+    "zone.js": "0.6.17"
   }
 }
diff --git a/examples/cue-points-player/package.json b/examples/cue-points-player/package.json
@@ -18,14 +18,14 @@
     "typings": "1.3.3"
   },
   "dependencies": {
-    "@angular/common": "2.0.0-rc.5",
-    "@angular/compiler": "2.0.0-rc.5",
-    "@angular/core": "2.0.0-rc.5",
-    "@angular/platform-browser": "2.0.0-rc.5",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.5",
-    "reflect-metadata": "0.1.3",
-    "rxjs": "5.0.0-beta.6",
-    "systemjs": "^0.19.31",
-    "zone.js": "0.6.12"
+    "@angular/common": "2.0.0-rc.6",
+    "@angular/compiler": "2.0.0-rc.6",
+    "@angular/core": "2.0.0-rc.6",
+    "@angular/platform-browser": "2.0.0-rc.6",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.6",
+    "reflect-metadata": "0.1.8",
+    "rxjs": "5.0.0-beta.11",
+    "systemjs": "^0.19.37",
+    "zone.js": "0.6.17"
   }
 }
diff --git a/examples/master-player/package.json b/examples/master-player/package.json
@@ -18,14 +18,14 @@
     "typings": "1.3.3"
   },
   "dependencies": {
-    "@angular/common": "2.0.0-rc.5",
-    "@angular/compiler": "2.0.0-rc.5",
-    "@angular/core": "2.0.0-rc.5",
-    "@angular/platform-browser": "2.0.0-rc.5",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.5",
-    "reflect-metadata": "0.1.3",
-    "rxjs": "5.0.0-beta.6",
-    "systemjs": "^0.19.31",
-    "zone.js": "0.6.12"
+    "@angular/common": "2.0.0-rc.6",
+    "@angular/compiler": "2.0.0-rc.6",
+    "@angular/core": "2.0.0-rc.6",
+    "@angular/platform-browser": "2.0.0-rc.6",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.6",
+    "reflect-metadata": "0.1.8",
+    "rxjs": "5.0.0-beta.11",
+    "systemjs": "^0.19.37",
+    "zone.js": "0.6.17"
   }
 }
diff --git a/examples/simple-player/package.json b/examples/simple-player/package.json
@@ -18,14 +18,14 @@
     "typings": "1.3.3"
   },
   "dependencies": {
-    "@angular/common": "2.0.0-rc.5",
-    "@angular/compiler": "2.0.0-rc.5",
-    "@angular/core": "2.0.0-rc.5",
-    "@angular/platform-browser": "2.0.0-rc.5",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.5",
-    "reflect-metadata": "0.1.3",
-    "rxjs": "5.0.0-beta.6",
-    "systemjs": "^0.19.31",
-    "zone.js": "0.6.12"
+    "@angular/common": "2.0.0-rc.6",
+    "@angular/compiler": "2.0.0-rc.6",
+    "@angular/core": "2.0.0-rc.6",
+    "@angular/platform-browser": "2.0.0-rc.6",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.6",
+    "reflect-metadata": "0.1.8",
+    "rxjs": "5.0.0-beta.11",
+    "systemjs": "^0.19.37",
+    "zone.js": "0.6.17"
   }
 }
diff --git a/examples/single-media-player/package.json b/examples/single-media-player/package.json
@@ -18,14 +18,14 @@
     "typings": "1.3.3"
   },
   "dependencies": {
-    "@angular/common": "2.0.0-rc.5",
-    "@angular/compiler": "2.0.0-rc.5",
-    "@angular/core": "2.0.0-rc.5",
-    "@angular/platform-browser": "2.0.0-rc.5",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.5",
-    "reflect-metadata": "0.1.3",
-    "rxjs": "5.0.0-beta.6",
-    "systemjs": "^0.19.31",
-    "zone.js": "0.6.12"
+    "@angular/common": "2.0.0-rc.6",
+    "@angular/compiler": "2.0.0-rc.6",
+    "@angular/core": "2.0.0-rc.6",
+    "@angular/platform-browser": "2.0.0-rc.6",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.6",
+    "reflect-metadata": "0.1.8",
+    "rxjs": "5.0.0-beta.11",
+    "systemjs": "^0.19.37",
+    "zone.js": "0.6.17"
   }
 }
diff --git a/examples/slides-player/package.json b/examples/slides-player/package.json
@@ -18,14 +18,14 @@
     "typings": "1.3.3"
   },
   "dependencies": {
-    "@angular/common": "2.0.0-rc.5",
-    "@angular/compiler": "2.0.0-rc.5",
-    "@angular/core": "2.0.0-rc.5",
-    "@angular/platform-browser": "2.0.0-rc.5",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.5",
-    "reflect-metadata": "0.1.3",
-    "rxjs": "5.0.0-beta.6",
-    "systemjs": "^0.19.31",
-    "zone.js": "0.6.12"
+    "@angular/common": "2.0.0-rc.6",
+    "@angular/compiler": "2.0.0-rc.6",
+    "@angular/core": "2.0.0-rc.6",
+    "@angular/platform-browser": "2.0.0-rc.6",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.6",
+    "reflect-metadata": "0.1.8",
+    "rxjs": "5.0.0-beta.11",
+    "systemjs": "^0.19.37",
+    "zone.js": "0.6.17"
   }
 }
diff --git a/examples/vr-player/package.json b/examples/vr-player/package.json
@@ -19,16 +19,16 @@
     "typings": "1.3.3"
   },
   "dependencies": {
-    "@angular/common": "2.0.0-rc.5",
-    "@angular/compiler": "2.0.0-rc.5",
-    "@angular/core": "2.0.0-rc.5",
-    "@angular/platform-browser": "2.0.0-rc.5",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.5",
+    "@angular/common": "2.0.0-rc.6",
+    "@angular/compiler": "2.0.0-rc.6",
+    "@angular/core": "2.0.0-rc.6",
+    "@angular/platform-browser": "2.0.0-rc.6",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.6",
     "aframe": "0.3.1",
     "aframe-animation-component": "3.0.1",
-    "reflect-metadata": "0.1.3",
-    "rxjs": "5.0.0-beta.6",
-    "systemjs": "^0.19.31",
-    "zone.js": "0.6.12"
+    "reflect-metadata": "0.1.8",
+    "rxjs": "5.0.0-beta.11",
+    "systemjs": "^0.19.37",
+    "zone.js": "0.6.17"
   }
 }
diff --git a/karma-test-shim.js b/karma-test-shim.js
@@ -27,35 +27,37 @@ var allSpecFiles = Object.keys(window.__karma__.files)
 // Load our SystemJS configuration.
 System.config(
     {
-        baseURL: '/base',
+        paths: {
+            // paths serve as alias
+            'npm:': 'base/node_modules/'
+        },
         map: {
-            'rxjs': 'node_modules/rxjs',
-            '@angular': 'node_modules/@angular',
-            'app': 'src'
+            'rxjs': 'npm:rxjs',
+
+            // 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',
+
+            'app': 'base/src'
         },
         packages: {
             'app': {
-                main: 'vg-player/vg-player.js',
-                defaultExtension: 'js'
-            },
-            '@angular/core': {
-                main: 'index.js',
-                defaultExtension: 'js'
-            },
-            '@angular/compiler': {
-                main: 'index.js',
-                defaultExtension: 'js'
-            },
-            '@angular/common': {
-                main: 'index.js',
-                defaultExtension: 'js'
-            },
-            '@angular/platform-browser': {
-                main: 'index.js',
-                defaultExtension: 'js'
-            },
-            '@angular/platform-browser-dynamic': {
-                main: 'index.js',
                 defaultExtension: 'js'
             },
             'rxjs': {

diff --git a/karma.conf.js b/karma.conf.js
@@ -25,21 +25,25 @@ module.exports = function(config) {
 
             // Zone.js dependencies
             'node_modules/zone.js/dist/zone.js',
+            'node_modules/zone.js/dist/long-stack-trace-zone.js',
+            'node_modules/zone.js/dist/proxy.js',
+            'node_modules/zone.js/dist/sync-test.js',
             'node_modules/zone.js/dist/jasmine-patch.js',
             'node_modules/zone.js/dist/async-test.js',
+            'node_modules/zone.js/dist/fake-async-test.js',
 
             // RxJs.
             { pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false },
             { pattern: 'node_modules/rxjs/**/*.js.map', included: false, watched: false },
 
 
-            {pattern: 'karma-test-shim.js', included: true, watched: true},
-
             // paths loaded via module imports
             // Angular itself
             {pattern: 'node_modules/@angular/**/*.js', included: false, watched: true},
             {pattern: 'node_modules/@angular/**/*.js.map', included: false, watched: true},
 
+            {pattern: 'karma-test-shim.js', included: true, watched: true},
+
             // Our built application code
             {pattern: 'src/**/*.js', included: false, watched: true},
 
@@ -49,8 +53,7 @@ module.exports = function(config) {
             // {pattern: 'dist/**/*.css', included: false, watched: true},
 
             // paths to support debugging with source maps in dev tools
-            {pattern: 'src/**/*.ts', included: false, watched: false},
-            {pattern: 'src/**/*.js.map', included: false, watched: false}
+            {pattern: 'src/**/*.ts', included: false, watched: false}
         ],
 
         // proxied base paths

diff --git a/package.json b/package.json
@@ -9,15 +9,15 @@
     "url": "https://github.com/videogular/videogular2"
   },
   "dependencies": {
-    "@angular/common": "2.0.0-rc.5",
-    "@angular/compiler": "2.0.0-rc.5",
-    "@angular/core": "2.0.0-rc.5",
-    "@angular/platform-browser": "2.0.0-rc.5",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.5",
+    "@angular/common": "2.0.0-rc.6",
+    "@angular/compiler": "2.0.0-rc.6",
+    "@angular/core": "2.0.0-rc.6",
+    "@angular/platform-browser": "2.0.0-rc.6",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.6",
     "es6-shim": "0.35.1",
     "reflect-metadata": "0.1.8",
-    "rxjs": "5.0.0-beta.6",
-    "zone.js": "0.6.13",
+    "rxjs": "5.0.0-beta.11",
+    "zone.js": "0.6.17",
     "systemjs": "0.19.37"
   },
   "devDependencies": {
@@ -49,7 +49,7 @@
     "prebuild:travis": "npm run typings install",
     "build:travis": "tsc",
     "postbuild:travis": "node make.js && npm run test",
-    "clean": "rm -rf dist",
+    "clean": "rm -rf dist && rm -rf ./src/**/*.js && rm -rf ./src/**/*.d.ts",
     "precommit": "npm test",
     "commit": "git-cz",
     "coverage": "http-server -c-1 -o -s -p 9875 ./coverage",

diff --git a/src/vg-player/vg-player.spec.ts b/src/vg-player/vg-player.spec.ts
@@ -1,5 +1,5 @@
 import {async, inject, TestBed} from "@angular/core/testing";
-import {Component, provide} from "@angular/core";
+import {Component} from "@angular/core";
 import {VgPlayer} from "./vg-player";
 import {VgMedia} from "../vg-media/vg-media";
 import {VgAPI} from "../services/vg-api";
@@ -56,7 +56,7 @@ describe('Videogular Player', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            declarations: [VgPlayerTest]
+            declarations: [VgPlayerTest, VgPlayer]
         });
     });
 
@@ -86,7 +86,6 @@ describe('Videogular Player', () => {
             </video>
         </vg-player>
     `,
-    providers: [VgAPI],
-    directives: [VgPlayer, VgMedia]
+    providers: [VgAPI]
 })
 class VgPlayerTest {}
diff --git a/src/vg-player/vg-player.ts b/src/vg-player/vg-player.ts
@@ -15,7 +15,6 @@ import {VgMedia} from "../vg-media/vg-media";
 
 @Component({
     selector: 'vg-player',
-    directives: [VgMedia],
     template: `<ng-content></ng-content>`,
     styles: [`
         :host {