Merge branch 'sfaizanh-2.0' into 2.0

Author: arielfaur

.gitignore

@@ -11,6 +11,9 @@ log.txt
 *.sublime-workspace
 .vscode/
 npm-debug.log*
+dist/*.js.map
+dist/*.d.ts
+dist/*.js
 
 .idea/
 .sass-cache/

demo/package.json

@@ -20,16 +20,16 @@
     "@angular/platform-browser-dynamic": "2.2.1",
     "@angular/platform-server": "2.2.1",
     "@ionic/storage": "1.1.7",
-    "ionic-angular": "2.0.1",
+    "ionic-angular": "2.1.0",
     "ionic-native": "2.4.1",
     "ionicons": "3.0.0",
     "rxjs": "5.0.0-beta.12",
     "sw-toolbox": "3.4.0",
     "zone.js": "0.6.26",
-    "ionic-audio": "2.3.0"
+    "ionic-audio": "git+https://github.com/sfaizanh/ionic-audio.git#2.0"
   },
   "devDependencies": {
-    "@ionic/app-scripts": "1.0.0",
+    "@ionic/app-scripts": "1.1.4",
     "typescript": "2.0.9"
   },
   "cordovaPlugins": [

demo/src/app/app.module.ts

@@ -6,7 +6,7 @@ import { ContactPage } from '../pages/contact/contact';
 import { HomePage } from '../pages/home/home';
 import { TabsPage } from '../pages/tabs/tabs';
 
-import { IonicAudioModule, AudioProvider, WebAudioProvider, audioProviderFactory } from 'ionic-audio/dist';
+import { IonicAudioModule, AudioProvider, WebAudioProvider, audioProviderFactory } from 'ionic-audio';
 
 /**
  * Sample custom factory function to use with ionic-audio

demo/src/pages/home/home.ts

@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 
 import { NavController } from 'ionic-angular';
 
-import { AudioProvider } from 'ionic-audio/dist';
+import { AudioProvider } from 'ionic-audio';
 
 @Component({
   selector: 'page-home',

demo/tsconfig.json

@@ -13,9 +13,6 @@
     "sourceMap": true,
     "target": "es5"
   },
-  "files": [
-    "node_modules/ionic-audio/dist/index.ts"
-  ],
   "include": [
     "src/**/*.ts"
   ],

package.json

@@ -2,10 +2,29 @@
   "name": "ionic-audio",
   "version": "2.3.1",
   "description": "An audio player for Ionic 2 and Angular 2",
-  "main": "dist/ionic-audio/ionic-audio.module.ts",
+  "main": "./dist/index.js",
+  "typings": "./dist/index.d.ts",
   "scripts": {
+    "prepublish": "tsc -p ./",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
+  "dependencies": {
+    "@angular/common": "2.2.1",
+    "@angular/compiler": "2.2.1",
+    "@angular/compiler-cli": "2.2.1",
+    "@angular/core": "2.2.1",
+    "@angular/forms": "2.2.1",
+    "@angular/http": "2.2.1",
+    "@angular/platform-browser": "2.2.1",
+    "@angular/platform-browser-dynamic": "2.2.1",
+    "@angular/platform-server": "2.2.1",
+    "ionic-angular": "2.1.0",
+    "rxjs": "5.0.0-beta.12",
+    "zone.js": "0.6.26"
+  },
+  "devDependencies": {
+    "typescript": "2.0.9"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/arielfaur/ionic-audio.git"
@@ -23,4 +42,4 @@
     "url": "https://github.com/arielfaur/ionic-audio/issues"
   },
   "homepage": "https://github.com/arielfaur/ionic-audio#readme"
-}
+}

tsconfig.json

@@ -0,0 +1,40 @@
+{
+  "compilerOptions": {
+    "allowSyntheticDefaultImports": true,
+    "declaration": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "sourceMap": true,
+    "lib": [
+      "dom",
+      "es2015"
+    ],
+    "module": "es2015",
+    "moduleResolution": "node",
+    "target": "es5",
+    "outDir": "./dist"
+  },
+  "exclude": [
+    "node_modules"
+  ],
+  "compileOnSave": false,
+  "atom": {
+    "rewriteTsconfig": false
+  },
+  "files": [
+    "dist/index.ts",
+    "dist/ionic-audio.module.ts",
+    "dist/ionic-audio-web-track.ts",
+    "dist/ionic-audio-track-progress-component.ts",
+    "dist/ionic-audio-track-play-component.ts",
+    "dist/ionic-audio-track-component.ts",
+    "dist/ionic-audio-time-pipe.ts",
+    "dist/ionic-audio-providers.ts",
+    "dist/ionic-audio-interfaces.ts",
+    "dist/ionic-audio-cordova-track.ts"
+  ],
+  "angularCompilerOptions": {
+    "strictMetadataEmit": true,
+    "skipTemplateCodegen": true
+  }
+}