chore(changelog): update

closes #1250

CHANGELOG.md

@@ -1,3 +1,54 @@
+<a name="3.2.3"></a>
+## [3.2.3](https://github.com/driftyco/ionic-native/compare/v3.2.2...v3.2.3) (2017-03-24)
+
+
+### Bug Fixes
+
+* **contacts:** fix crash if plugin is unavailable ([a9a511d](https://github.com/driftyco/ionic-native/commit/a9a511d)), closes [#1250](https://github.com/driftyco/ionic-native/issues/1250)
+* **core:** make properties enumerable ([a151295](https://github.com/driftyco/ionic-native/commit/a151295))
+
+
+
+<a name="3.2.2"></a>
+## [3.2.2](https://github.com/driftyco/ionic-native/compare/v3.2.1...v3.2.2) (2017-03-23)
+
+
+
+<a name="3.2.1"></a>
+## [3.2.1](https://github.com/driftyco/ionic-native/compare/v3.2.0...v3.2.1) (2017-03-23)
+
+
+### Bug Fixes
+
+* **secure-storage:** update the pluginRef (#1228) ([baff7b3](https://github.com/driftyco/ionic-native/commit/baff7b3))
+
+
+
+<a name="3.2.0"></a>
+# [3.2.0](https://github.com/driftyco/ionic-native/compare/v3.1.1...v3.2.0) (2017-03-22)
+
+
+### Bug Fixes
+
+* **media-plugin:** MediaPlugin.create promise never fires (#1220) ([82d2ae8](https://github.com/driftyco/ionic-native/commit/82d2ae8))
+
+
+### Features
+
+* **jins-meme:** add support for jins meme smart glasses (#1212) ([9c88cfb](https://github.com/driftyco/ionic-native/commit/9c88cfb))
+
+
+
+<a name="3.1.1"></a>
+## [3.1.1](https://github.com/driftyco/ionic-native/compare/v3.1.0...v3.1.1) (2017-03-21)
+
+
+### Bug Fixes
+
+* **media-plugin:** export MediaPlugin class ([cb0a366](https://github.com/driftyco/ionic-native/commit/cb0a366)), closes [#1207](https://github.com/driftyco/ionic-native/issues/1207)
+
+
+
 <a name="3.1.0"></a>
 # [3.1.0](https://github.com/driftyco/ionic-native/compare/v2.9.0...v3.1.0) (2017-03-20)
 

README.md

@@ -1,13 +1,12 @@
-[![Circle CI](https://circleci.com/gh/driftyco/ionic-native.svg?style=shield)](https://circleci.com/gh/driftyco/ionic-native) [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
-[![npm](https://img.shields.io/npm/l/express.svg)](https://www.npmjs.com/package/ionic-native)
+[![Circle CI](https://circleci.com/gh/driftyco/ionic-native.svg?style=shield)](https://circleci.com/gh/driftyco/ionic-native) [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/) ![](https://img.shields.io/npm/v/@ionic-native/core.svg)
 
-[![NPM](https://nodei.co/npm/ionic-native.png?stars&downloads)](https://nodei.co/npm/ionic-native/)
-[![NPM](https://nodei.co/npm-dl/ionic-native.png?months=6&height=2)](https://nodei.co/npm/ionic-native/)
 
 # Ionic Native
 
 Ionic Native is a curated set of wrappers for Cordova plugins that make adding any native functionality you need to your [Ionic 2](http://ionicframework.com/) mobile app easy.
 
+Ionic Native wraps plugin callbacks in a Promise or Observable, providing a common interface for all plugins and making it easy to use plugins with Angular change detection.
+
 ## Installation
 
 Run following command to install Ionic Native in your project.
@@ -15,52 +14,151 @@ Run following command to install Ionic Native in your project.
 npm install @ionic-native/core --save
 ```
 
-You also need to install the Ionic Native package for each plugin you want to add. Please see the Ionic Native documentation for complete instructions on how to add and use the plugins.
+You also need to install the Ionic Native package for each plugin you want to add. Please see the [Ionic Native documentation](http://ionicframework.com/docs/v2/native/) for complete instructions on how to add and use the plugins.
 
 ## Documentation
 
 For the full Ionic Native documentation, please visit [http://ionicframework.com/docs/v2/native/](http://ionicframework.com/docs/v2/native/).
 
-### Promises and Observables
+### Basic Usage
 
-Ionic Native wraps plugin callbacks in a Promise or [Observable](https://gist.github.com/staltz/868e7e9bc2a7b8c1f754), providing a common interface for all plugins and ensuring that native events trigger change detection in Angular 2.
+To use a plugin, import and add the plugin provider to your `@NgModule`, and then inject it where you wish to use it.
+
+```typescript
+// app.module.ts
+import { Camera } from '@ionic-native/camera';
+
+...
+
+@NgModule({
+  ...
+
+  providers: [
+    ...
+    Camera
+    ...
+  ]
+  ...
+})
+export class AppModule { }
+```
 
 ```typescript
 import { Geolocation } from '@ionic-native/geolocation';
 import { Platform } from 'ionic-angular';
 
+import { NgZone } from '@angular/core';
+
 @Component({ ... })
 export class MyComponent {
 
-  constructor(private geolocation: Geolocation, private platform: Platform) {
-  
+  constructor(private geolocation: Geolocation, private platform: Platform, private ngZone: NgZone) {
+
     platform.ready().then(() => {
-    
+
       // get position
       geolocation.getCurrentPosition().then(pos => {
-        
+
         console.log(`lat: ${pos.coords.latitude}, lon: ${pos.coords.longitude}`)
-        
+
       });
-        
-        
+
+
       // watch position
       const watch = geolocation.watchPosition().subscribe(pos => {
-      
+
         console.log(`lat: ${pos.coords.latitude}, lon: ${pos.coords.longitude}`)
-      
+
+        // Currently, observables from Ionic Native plugins
+        // need to run inside of zone to trigger change detection
+        ngZone.run(() => {
+          this.position = pos;
+        })
+
       });
-      
+
       // to stop watching
       watch.unsubscribe();
-    
+
     });
-  
+
   }
 
 }
 ```
 
+### Mocking and Browser Development
+
+Ionic Native 3.x makes it possible to mock plugins and develop nearly the entirety of your app in the browser or in `ionic serve`.
+
+To do this, you need to provide a mock implementation of the plugins you wish to use. Here's an example of mocking the `Camera` plugin to return a stock image while in development:
+
+First import the `Camera` class in your `src/app/app.module.ts` file:
+
+```ts
+import { Camera } from '@ionic-native/camera';
+```
+
+Then create a new class that extends the `Camera` class with a mock implementation:
+
+```ts
+class CameraMock extends Camera {
+  getPicture(options) {
+    return new Promise((resolve, reject) => {
+      resolve("BASE_64_ENCODED_DATA_GOES_HERE");
+    })
+  }
+}
+```
+
+Finally, override the previous `Camera` class in your `providers` for this module:
+
+```ts
+providers: [
+  { provide: Camera, useClass: CameraMock }
+]
+```
+
+Here's the full example:
+
+```ts
+import { NgModule, ErrorHandler } from '@angular/core';
+import { IonicApp, IonicModule, IonicErrorHandler } from 'ionic-angular';
+import { MyApp } from './app.component';
+import { HomePage } from '../pages/home/home';
+
+import { Camera } from '@ionic-native/camera';
+
+class CameraMock extends Camera {
+  getPicture(options) {
+    return new Promise((resolve, reject) => {
+      resolve("BASE_64_ENCODED_DATA_GOES_HERE");
+    })
+  }
+}
+
+@NgModule({
+  declarations: [
+    MyApp,
+    HomePage
+  ],
+  imports: [
+    IonicModule.forRoot(MyApp)
+  ],
+  bootstrap: [IonicApp],
+  entryComponents: [
+    MyApp,
+    HomePage
+  ],
+  providers: [
+    {provide: ErrorHandler, useClass: IonicErrorHandler},
+    { provide: Camera, useClass: CameraMock }
+  ]
+})
+export class AppModule {}
+```
+
+
 ### Runtime Diagnostics
 
 Spent way too long diagnosing an issue only to realize a plugin wasn't firing or installed? Ionic Native lets you know what the issue is and how you can resolve it.
@@ -71,6 +169,9 @@ Spent way too long diagnosing an issue only to realize a plugin wasn't firing or
 ## Plugin Missing?
 Let us know or submit a PR! Take a look at [the Developer Guide](https://github.com/driftyco/ionic-native/blob/master/DEVELOPER.md) for more on how to contribute. :heart:
 
+## Ionic 1/Angular 1 support
+
+Ionic Native 3.x supports Ionic 2.x and above. For Ionic/Angular 1 support, please use version 2 of Ionic Native. See the [2.x README](https://github.com/driftyco/ionic-native/blob/8cd648db5cddd7bdbe2bd78839b19c620cc8c04c/README.md) for usage information.
 
 # Credits
 
@@ -78,6 +179,8 @@ Ibby Hadeed - [@ihadeed](http://github.com/ihadeed)
 
 Tim Lancina - [@timlancina](http://twitter.com/timlancina)
 
+Mike Hartington - [@mhartington](https://twitter.com/mhartington)
+
 Max Lynch - [@maxlynch](http://twitter.com/maxlynch)
 
 Rob Wormald - [@robwormald](https://twitter.com/robwormald)

gulpfile.js

@@ -1,32 +1,35 @@
-var gulp = require('gulp');
-var minimist = require('minimist');
-var rename = require("gulp-rename");
-var tslint = require('gulp-tslint');
-var decamelize = require('decamelize');
-var replace = require('gulp-replace');
+"use strict";
 
-var flagConfig = {
-  string: ['port', 'version', 'ngVersion', 'animations'],
-  boolean: ['dry-run'],
-  alias: {'p': 'port', 'v': 'version', 'a': 'ngVersion'},
-  default: { port: 8000 }
-};
-var flags = minimist(process.argv.slice(2), flagConfig);
+const gulp = require('gulp'),
+  minimist = require('minimist'),
+  rename = require("gulp-rename"),
+  tslint = require('gulp-tslint'),
+  decamelize = require('decamelize'),
+  replace = require('gulp-replace');
+
+const flagConfig = {
+    string: ['port', 'version', 'ngVersion', 'animations'],
+    boolean: ['dry-run'],
+    alias: {'p': 'port', 'v': 'version', 'a': 'ngVersion'},
+    default: { port: 8000 }
+  },
+
+  flags = minimist(process.argv.slice(2), flagConfig);
 
 /* Docs tasks */
 require('./scripts/docs/gulp-tasks')(gulp, flags);
 
-gulp.task('lint', function() {
-  gulp.src('src/**/*.ts')
+gulp.task('lint', () => {
+  return gulp.src('src/**/*.ts')
     .pipe(tslint({
       formatter: "verbose",
       configuration: 'tslint.json'
     }))
-    .pipe(tslint.report())
+    .pipe(tslint.report());
 });
 
-gulp.task('plugin:create', function(){
-  if(flags.n && flags.n !== ''){
+gulp.task('plugin:create', () => {
+  if (flags.n && flags.n !== ''){
 
     const src = flags.m?'./scripts/templates/wrap-min.tmpl':'./scripts/templates/wrap.tmpl',
       pluginName = flags.n,
@@ -40,8 +43,6 @@ gulp.task('plugin:create', function(){
       .pipe(gulp.dest('./src/@ionic-native/plugins/' + pluginPackageName));
 
   } else {
-
     console.log("Usage is: gulp plugin:create -n PluginName");
-
   }
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ionic-native",
-  "version": "3.1.0",
+  "version": "3.2.3",
   "description": "Native plugin wrappers for Cordova and Ionic with TypeScript, ES6+, Promise and Observable support",
   "license": "MIT",
   "devDependencies": {
@@ -40,7 +40,7 @@
     "build": "npm run clean && npm run lint && npm run build:core && npm run build:modules",
     "build:core": "ngc -p scripts/build/tsconfig-core.json",
     "build:modules": "node scripts/build/build.js",
-    "clean": "rimraf dist",
+    "clean": "rimraf dist .tmp",
     "shipit": "npm run build && gulp readmes && npm run npmpub",
     "npmpub": "node scripts/build/publish.js",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0"

scripts/build/build.js

@@ -12,14 +12,14 @@ const ROOT = path.resolve(path.join(__dirname, '../../')), // root ionic-native
   PLUGIN_PACKAGE_JSON = require(path.resolve(__dirname, 'plugin-package.json')), // plugin package.json template
   PLUGIN_TS_CONFIG = require(path.resolve(__dirname, 'tsconfig-plugin.json')), // plugin tsconfig template
   BUILD_TMP = path.resolve(ROOT, '.tmp'), // tmp directory path
-  BUILD_DIST_ROOT = path.resolve(ROOT, 'dist/packages-dist/@ionic-native'), // dist directory root path
-  BUILD_PLUGINS_DIST = path.resolve(BUILD_DIST_ROOT, 'plugins'), // plugins dist directory path
+  BUILD_DIST_ROOT = path.resolve(ROOT, 'dist/@ionic-native'), // dist directory root path
   BUILD_CORE_DIST = path.resolve(BUILD_DIST_ROOT, 'core'); // core dist directory path
 
 
 // dependency versions
-const ANGULAR_VERSION = '2.4.8',
-  RXJS_VERSION = '5.0.1',
+const ANGULAR_VERSION = '*',
+  RXJS_VERSION = '^5.0.1',
+  MIN_CORE_VERSION = '^3.1.0',
   IONIC_NATIVE_VERSION = require(path.resolve(ROOT, 'package.json')).version;
 
 // package dependencies
@@ -28,7 +28,7 @@ const CORE_PEER_DEPS = {
 };
 
 const PLUGIN_PEER_DEPS = {
-  '@ionic-native/core': IONIC_NATIVE_VERSION,
+  '@ionic-native/core': MIN_CORE_VERSION,
   '@angular/core': ANGULAR_VERSION,
   'rxjs': RXJS_VERSION
 };
@@ -36,13 +36,6 @@ const PLUGIN_PEER_DEPS = {
 // set peer dependencies for all plugins
 PLUGIN_PACKAGE_JSON.peerDependencies = PLUGIN_PEER_DEPS;
 
-
-// Delete dist directory and any temporary files
-console.log('Removing old TMP directory');
-fs.removeSync(BUILD_TMP);
-fs.removeSync(BUILD_PLUGINS_DIST);
-
-
 // Create tmp/dist directories
 console.log('Making new TMP directory');
 fs.mkdirpSync(BUILD_TMP);
@@ -78,7 +71,7 @@ const addPluginToQueue = pluginName => {
     let tsConfigPath;
 
     fs.mkdirpAsync(PLUGIN_BUILD_DIR) // create tmp build dir
-      .then(() => fs.mkdirpAsync(path.resolve(BUILD_PLUGINS_DIST, pluginName))) // create dist dir
+      .then(() => fs.mkdirpAsync(path.resolve(BUILD_DIST_ROOT, pluginName))) // create dist dir
       .then(() => {
 
         // Write tsconfig.json
@@ -97,7 +90,7 @@ const addPluginToQueue = pluginName => {
         packageJson.name = `@ionic-native/${pluginName}`;
         packageJson.version = IONIC_NATIVE_VERSION;
 
-        return fs.writeJsonAsync(path.resolve(BUILD_PLUGINS_DIST, pluginName, 'package.json'), packageJson);
+        return fs.writeJsonAsync(path.resolve(BUILD_DIST_ROOT, pluginName, 'package.json'), packageJson);
       })
       .then(() => {
 

scripts/build/publish.js

@@ -7,51 +7,38 @@ const fs = require('fs-extra-promise').useFs(require('fs-extra')),
 
 
 const ROOT = path.resolve(path.join(__dirname, '../../')),
-  DIST = path.resolve(ROOT, 'dist', 'packages-dist', '@ionic-native'),
-  PLUGINS_ROOT = path.resolve(DIST, 'plugins'),
-  CORE = path.resolve(DIST, 'core');
+  DIST = path.resolve(ROOT, 'dist', '@ionic-native');
 
 const FLAGS = '--access public'; // add any flags here if you want... (example: --tag alpha)
 
-console.log('Publishing @ionic-native/core');
-exec(`npm publish ${CORE} ${FLAGS}`)
-  .then(() => {
+const PACKAGES = fs.readdirSync(DIST);
 
-    const PLUGINS = fs.readdirSync(PLUGINS_ROOT);
 
-    const QUEUE = queue({
-      concurrency: 10
-    });
+const QUEUE = queue({
+  concurrency: 10
+});
 
-    PLUGINS.forEach(pluginName => {
+PACKAGES.forEach(packageName => {
 
-      QUEUE.push(done => {
+  QUEUE.push(done => {
 
-        console.log(`Publishing plugin ${pluginName}`);
-        const pluginPath = path.resolve(PLUGINS_ROOT, pluginName);
-
-        exec(`npm publish ${pluginPath} ${FLAGS}`)
-          .then(() => done())
-          .catch(done);
-
-      });
-
-    });
-
-    QUEUE.start((err) => {
-
-      if (err) {
-        console.log('Error publishing ionic-native. ', err);
-      } else {
-        console.log('Done publishing ionic-native!');
-      }
-
-    });
-
-  })
-  .catch(e => {
-
-    console.log('Publish failed');
-    console.log(e);
+    console.log(`Publishing @ionic-native/${packageName}`);
+    const packagePath = path.resolve(DIST, packageName);
+    exec(`npm publish ${packagePath} ${FLAGS}`)
+      .then(() => done())
+      .catch(done);
 
   });
+
+});
+
+QUEUE.start((err) => {
+
+  if (err) {
+    console.log('Error publishing ionic-native. ', err);
+  } else {
+    console.log('Done publishing ionic-native!');
+  }
+
+});
+

scripts/build/tsconfig-core.json

@@ -7,7 +7,7 @@
     "emitDecoratorMetadata": true,
     "module": "es2015",
     "moduleResolution": "node",
-    "outDir": "../../dist/packages-dist/",
+    "outDir": "../../dist/",
     "rootDir": "../../src/",
     "target": "es5",
     "skipLibCheck": true,

scripts/build/tsconfig-plugin.json

@@ -7,16 +7,14 @@
     "emitDecoratorMetadata": true,
     "module": "es2015",
     "moduleResolution": "node",
-    "outDir": "../../../dist/packages-dist/",
+    "outDir": "../../../dist/@ionic-native/",
     "paths": {
-      "@ionic-native/core": ["../../../dist/packages-dist/@ionic-native/core"]
+      "@ionic-native/core": ["../../../dist/@ionic-native/core"]
     },
-    "rootDir": "../../../src/",
+    "rootDir": "../../../src/@ionic-native/plugins/",
     "target": "es5",
     "skipLibCheck": true,
     "lib": ["es2015", "dom"]
   },
-  "files": [
-    "../../../src/@ionic-native/plugins/{{PLUGIN}}/index.ts"
-  ]
+  "files": []
 }

scripts/config.json

@@ -2,5 +2,5 @@
   "sitePath": "../ionic-site",
   "v2DocsDir": "docs/v2/native",
   "docsDest": "../ionic-site/content/docs/v2/native",
-  "pluginDir": "dist/packages-dist/@ionic-native/plugins"
+  "pluginDir": "dist/@ionic-native"
 }

scripts/docs/configs/links.js

@@ -0,0 +1,3 @@
+module.exports = function(getLinkInfo) {
+  getLinkInfo.useFirstAmbiguousLink = false;
+};

scripts/docs/configs/log.js

@@ -0,0 +1,3 @@
+module.exports = function(log) {
+  log.level = 'error'; //'silly', 'debug', 'info', 'warn', 'error'
+};

scripts/docs/configs/tag-defs.js

@@ -0,0 +1,4 @@
+module.exports = function(parseTagsProcessor) {
+  parseTagsProcessor.tagDefinitions = parseTagsProcessor.tagDefinitions
+    .concat(require('../tag-defs/tag-defs'));
+};

scripts/docs/configs/template-filters.js

@@ -0,0 +1,12 @@
+module.exports = function(templateEngine) {
+  // Nunjucks and Angular conflict in their template bindings so change the Nunjucks
+  // Also conflict with Jekyll
+  templateEngine.config.tags = {
+    variableStart: '<$',
+    variableEnd: '$>',
+    blockStart: '<@',
+    blockEnd: '@>',
+    commentStart: '<#',
+    commentEnd: '#>'
+  };
+};

scripts/docs/configs/template-tags.js

@@ -0,0 +1,9 @@
+module.exports = function(templateEngine) {
+  // add custom filters to nunjucks
+  templateEngine.filters.push(
+    require('../filters/capital'),
+    require('../filters/code'),
+    require('../filters/dump'),
+    require('../filters/dashify')
+  );
+};

scripts/docs/dgeni-config.js

@@ -1,181 +1,79 @@
-var Package = require('dgeni').Package;
-var jsdocPackage = require('dgeni-packages/jsdoc');
-var nunjucksPackage = require('dgeni-packages/nunjucks');
-var typescriptPackage = require('dgeni-packages/typescript');
-var linksPackage = require('dgeni-packages/links');
-var path = require('path');
-var semver = require('semver');
-var fs = require('fs');
-var _ = require('lodash');
-var config = require('../config.json');
-var projectPackage = require('../../package.json');
+"use strict";
+const Package = require('dgeni').Package,
+  jsdocPackage = require('dgeni-packages/jsdoc'),
+  nunjucksPackage = require('dgeni-packages/nunjucks'),
+  typescriptPackage = require('dgeni-packages/typescript'),
+  linksPackage = require('dgeni-packages/links'),
+  path = require('path'),
+  config = require('../config.json');
 
-// Define the dgeni package for generating the docs
-module.exports = function(currentVersion) {
+module.exports = currentVersion => {
 
-  return new Package('ionic-v2-docs', [jsdocPackage, nunjucksPackage, typescriptPackage, linksPackage])
+  return new Package('ionic-native-docs', [jsdocPackage, nunjucksPackage, typescriptPackage, linksPackage])
 
-// .processor(require('./processors/latest-version'))
-.processor(require('./processors/jekyll'))
-.processor(require('./processors/remove-private-members'))
-.processor(require('./processors/hide-private-api'))
-.processor(require('./processors/collect-inputs-outputs'))
+    .processor(require('./processors/remove-private-members'))
+    .processor(require('./processors/hide-private-api'))
+    .processor(require('./processors/parse-optional'))
+    .processor(require('./processors/mark-properties'))
+    .processor(require('./processors/npm-id'))
+    .processor(require('./processors/jekyll'))
 
-// for debugging docs
-// .processor(function test(){
-//   return {
-//
-//     $runBefore: ['rendering-docs'],
-//     $process: function(docs){
-//       docs.forEach(function(doc){
-//         if (doc.name == "Camera"){
-//
-//           // console.log(doc.tags);
-//           // doc.tags.forEach(function(tag){
-//           //   if(tag.tagName == 'classes'){
-//           //
-//           //   }
-//           // });
-//
-//           // doc.moduleDoc.exports.forEach(function(d,i){
-//           //   if(d.name === 'CameraOptions') {
-//           //     console.log('Name: ' + d.name);
-//           //     console.log('Type: ' + d.docType);
-//           //     console.log('First member: ', d.members[0]);
-//           //   }
-//           // });
-//
-//
-//           // var exports = doc.exportSymbol.parent.exports;
-//           // for(var p in exports) {
-//           //   if(p == 'CameraOptions')
-//           //   {
-//           //     var x = exports[p];
-//           //     console.log(x.members.quality);
-//           //   }
-//           // }
-//           // doc.members.forEach(function(method){
-//           //   if (method.name === "getPicture") {
-//           //     console.log(method);
-//           //   }
-//           // })
-//         }
-//       })
-//     }
-//   }
-// })
+    .config(require('./configs/log'))
+    .config(require('./configs/template-filters'))
+    .config(require('./configs/template-tags'))
+    .config(require('./configs/tag-defs'))
+    .config(require('./configs/links'))
 
-.config(function(log) {
-  log.level = 'error'; //'silly', 'debug', 'info', 'warn', 'error'
-})
+    .config(function(renderDocsProcessor, computePathsProcessor) {
 
-.config(function(renderDocsProcessor, computePathsProcessor) {
+      currentVersion = {
+        href: '/' + config.v2DocsDir.replace('content/', ''),
+        folder: '',
+        name: currentVersion
+      };
 
-  versions = [];
-  // new version, add it to the versions list
-  if (currentVersion != 'nightly' && !_.includes(versions, currentVersion)) {
-    versions.unshift(currentVersion);
-  }
-  //First semver valid version is latest
-  var latestVersion = _.find(versions, semver.valid);
-  versions = versions.map(function(version) {
-    // We don't separate by versions so always put the docs in the root
-    var folder = '';
-    return {
-      href: '/' + config.v2DocsDir.replace('content/',''),
-      folder: folder,
-      name: version
-    };
-  });
+      renderDocsProcessor.extraData.version = {
+        list: [currentVersion],
+        current: currentVersion,
+        latest: currentVersion
+      };
 
-  var versionData = {
-    list: versions,
-    current: _.find(versions, {name: currentVersion}),
-    latest: _.find(versions, {name: latestVersion}) || _.first(versions)
-  };
+      computePathsProcessor.pathTemplates = [{
+        docTypes: ['class'],
+        getOutputPath: doc => 'content/' + config.v2DocsDir + '/' +  doc.name + '/index.md'
+      }];
 
-  renderDocsProcessor.extraData.version = versionData;
-  computePathsProcessor.pathTemplates = [{
-    docTypes: ['class', 'var', 'function', 'let'],
-    getOutputPath: function(doc) {
-      var docPath = doc.name + '/index.md';
-      var path = 'content/' + config.v2DocsDir + '/' +  docPath;
+    })
 
-      return path;
-    }
-  }];
-})
+    //configure file reading
+    .config(function(readFilesProcessor, readTypeScriptModules) {
 
-//configure file reading
-.config(function(readFilesProcessor, readTypeScriptModules) {
+      // Don't run unwanted processors since we are not using the normal file reading processor
+      readFilesProcessor.$enabled = false;
+      readFilesProcessor.basePath = path.resolve(__dirname, '../..');
 
-  // Don't run unwanted processors since we are not using the normal file reading processor
-  readFilesProcessor.$enabled = false;
-  readFilesProcessor.basePath = path.resolve(__dirname, '../..');
+      readTypeScriptModules.basePath = path.resolve(__dirname, '../..');
+      readTypeScriptModules.sourceFiles = [
+        './src/@ionic-native/plugins/**/*.ts'
+      ];
+    })
 
-  readTypeScriptModules.basePath = path.resolve(__dirname, '../..');
-  readTypeScriptModules.sourceFiles = [
-    './src/@ionic-native/plugins/**/*.ts'
-  ];
-})
+    // Configure file writing
+    .config(function(writeFilesProcessor) {
+      writeFilesProcessor.outputFolder  = '../ionic-site/';
+    })
 
-.config(function(parseTagsProcessor) {
-  parseTagsProcessor.tagDefinitions = parseTagsProcessor.tagDefinitions
-                                        .concat(require('./tag-defs/tag-defs'));
-})
+    // Configure rendering
+    .config(function(templateFinder) {
 
-// .config(function(parseTagsProcessor) {
-//   // We actually don't want to parse param docs in this package as we are
-//   // getting the data out using TS
-//   parseTagsProcessor.tagDefinitions.forEach(function(tagDef) {
-//     console.log(tagDef);
-//     if (tagDef.name === 'param') {
-//       tagDef.docProperty = 'paramData';
-//       tagDef.transforms = [];
-//     }
-//   });
-// })
+      templateFinder.templateFolders.unshift(path.resolve(__dirname, 'templates'));
 
-// Configure links
-.config(function(getLinkInfo) {
-  getLinkInfo.useFirstAmbiguousLink = false;
-})
-
-// Configure file writing
-.config(function(writeFilesProcessor) {
-  writeFilesProcessor.outputFolder  = '../ionic-site/';
-})
-
-// Configure rendering
-.config(function(templateFinder, templateEngine) {
-
-  // Nunjucks and Angular conflict in their template bindings so change the Nunjucks
-  // Also conflict with Jekyll
-  templateEngine.config.tags = {
-    variableStart: '<$',
-    variableEnd: '$>',
-    blockStart: '<@',
-    blockEnd: '@>',
-    commentStart: '<#',
-    commentEnd: '#>'
-  };
-
-  // add custom filters to nunjucks
-  templateEngine.filters.push(
-    require('./filters/capital'),
-    require('./filters/code'),
-    require('./filters/dump'),
-    require('./filters/dashify')
-  );
-
-  templateFinder.templateFolders.unshift(path.resolve(__dirname, 'templates'));
-
-  // Specify how to match docs to templates.
-  templateFinder.templatePatterns = [
-    '${ doc.template }',
-    '${ doc.docType }.template.html',
-    'common.template.html'
-  ];
-});
+      // Specify how to match docs to templates.
+      templateFinder.templatePatterns = [
+        '${ doc.template }',
+        '${ doc.docType }.template.html',
+        'common.template.html'
+      ];
+    });
 
 };

scripts/docs/dgeni-readmes-config.js

@@ -1,177 +1,76 @@
-var Package = require('dgeni').Package;
-var jsdocPackage = require('dgeni-packages/jsdoc');
-var nunjucksPackage = require('dgeni-packages/nunjucks');
-var typescriptPackage = require('dgeni-packages/typescript');
-var linksPackage = require('dgeni-packages/links');
-var path = require('path');
-var semver = require('semver');
-var fs = require('fs');
-var _ = require('lodash');
-var config = require('../config.json');
-var projectPackage = require('../../package.json');
+"use strict";
+const Package = require('dgeni').Package,
+  jsdocPackage = require('dgeni-packages/jsdoc'),
+  nunjucksPackage = require('dgeni-packages/nunjucks'),
+  typescriptPackage = require('dgeni-packages/typescript'),
+  linksPackage = require('dgeni-packages/links'),
+  path = require('path'),
+  config = require('../config.json');
 
-// jscs:disable validateIndentation
+module.exports = currentVersion => {
 
-// Define the dgeni package for generating the docs
-module.exports = function(currentVersion) {
+  return new Package('ionic-native-readmes', [jsdocPackage, nunjucksPackage, typescriptPackage, linksPackage])
 
-  return new Package('ionic-v2-docs', [jsdocPackage, nunjucksPackage, typescriptPackage, linksPackage])
+    .processor(require('./processors/readmes'))
+    .processor(require('./processors/remove-private-members'))
+    .processor(require('./processors/hide-private-api'))
+    .processor(require('./processors/npm-id'))
 
-// .processor(require('./processors/latest-version'))
-.processor(require('./processors/readmes'))
-.processor(require('./processors/remove-private-members'))
-.processor(require('./processors/hide-private-api'))
-// .processor(require('./processors/collect-inputs-outputs'))
+    .config(require('./configs/log'))
+    .config(require('./configs/template-filters'))
+    .config(require('./configs/template-tags'))
+    .config(require('./configs/tag-defs'))
+    .config(require('./configs/links'))
 
-// for debugging docs
-// .processor(function test(){
-//   return {
-//
-//     $runBefore: ['rendering-docs'],
-//     $process: function(docs){
-//       docs.forEach(function(doc){
-//         if (doc.name == "Camera"){
-//
-//           // console.log(doc.tags);
-//           // doc.tags.forEach(function(tag){
-//           //   if(tag.tagName == 'classes'){
-//           //
-//           //   }
-//           // });
-//
-//           // doc.moduleDoc.exports.forEach(function(d,i){
-//           //   if(d.name === 'CameraOptions') {
-//           //     console.log('Name: ' + d.name);
-//           //     console.log('Type: ' + d.docType);
-//           //     console.log('First member: ', d.members[0]);
-//           //   }
-//           // });
-//
-//
-//           // var exports = doc.exportSymbol.parent.exports;
-//           // for(var p in exports) {
-//           //   if(p == 'CameraOptions')
-//           //   {
-//           //     var x = exports[p];
-//           //     console.log(x.members.quality);
-//           //   }
-//           // }
-//           // doc.members.forEach(function(method){
-//           //   if (method.name === "getPicture") {
-//           //     console.log(method);
-//           //   }
-//           // })
-//         }
-//       })
-//     }
-//   }
-// })
-.config(function(log) {
-  log.level = 'error'; //'silly', 'debug', 'info', 'warn', 'error'
-})
 
-.config(function(renderDocsProcessor, computePathsProcessor) {
+    .config(function(renderDocsProcessor, computePathsProcessor) {
 
-  versions = [];
-  // new version, add it to the versions list
-  if (currentVersion != 'nightly' && !_.includes(versions, currentVersion)) {
-    versions.unshift(currentVersion);
-  }
-  //First semver valid version is latest
-  var latestVersion = _.find(versions, semver.valid);
-  versions = versions.map(function(version) {
-    // We don't separate by versions so always put the docs in the root
-    var folder = '';
-    return {
-      href: '/' + config.v2DocsDir.replace('content/', ''),
-      folder: folder,
-      name: version
-    };
-  });
+      currentVersion = {
+        href: '/' + config.v2DocsDir.replace('content/', ''),
+        folder: '',
+        name: currentVersion
+      };
 
-  var versionData = {
-    list: versions,
-    current: _.find(versions, {name: currentVersion}),
-    latest: _.find(versions, {name: latestVersion}) || _.first(versions)
-  };
+      renderDocsProcessor.extraData.version = {
+        list: [currentVersion],
+        current: currentVersion,
+        latest: currentVersion
+      };
 
-  renderDocsProcessor.extraData.version = versionData;
-  computePathsProcessor.pathTemplates = [{
-    docTypes: ['class'],
-    getOutputPath: function(doc) {
-      return doc.originalModule.replace(config.pluginDir + '/', '')
-        .replace('/index', '') + '/README.md';
-    }
-  }];
-})
+      computePathsProcessor.pathTemplates = [{
+        docTypes: ['class'],
+        getOutputPath: doc => doc.originalModule.replace(config.pluginDir + '/', '')
+          .replace('/plugins', '')
+          .replace('/index', '/README.md')
+      }];
 
-//configure file reading
-.config(function(readFilesProcessor, readTypeScriptModules) {
+    })
 
-  // Don't run unwanted processors since we are not using the normal file reading processor
-  readFilesProcessor.$enabled = false;
-  readFilesProcessor.basePath = path.resolve(__dirname, '../..');
+    //configure file reading
+    .config(function(readFilesProcessor, readTypeScriptModules) {
+      // Don't run unwanted processors since we are not using the normal file reading processor
+      readFilesProcessor.$enabled = false;
+      readFilesProcessor.basePath = path.resolve(__dirname, '../..');
 
-  readTypeScriptModules.basePath = path.resolve(path.resolve(__dirname, '../..'));
-  readTypeScriptModules.sourceFiles = ['./src/@ionic-native/plugins/**/*.ts'];
-})
+      readTypeScriptModules.basePath = path.resolve(path.resolve(__dirname, '../..'));
+      readTypeScriptModules.sourceFiles = ['./src/@ionic-native/plugins/**/*.ts'];
+    })
 
-.config(function(parseTagsProcessor) {
-  parseTagsProcessor.tagDefinitions = parseTagsProcessor.tagDefinitions
-                                        .concat(require('./tag-defs/tag-defs'));
-})
+    // Configure file writing
+    .config(function(writeFilesProcessor) {
+      writeFilesProcessor.outputFolder  = './dist/';
+    })
 
-// .config(function(parseTagsProcessor) {
-//   // We actually don't want to parse param docs in this package as we are
-//   // getting the data out using TS
-//   parseTagsProcessor.tagDefinitions.forEach(function(tagDef) {
-//     console.log(tagDef);
-//     if (tagDef.name === 'param') {
-//       tagDef.docProperty = 'paramData';
-//       tagDef.transforms = [];
-//     }
-//   });
-// })
+    // Configure rendering
+    .config(function(templateFinder) {
+      templateFinder.templateFolders.unshift(path.resolve(__dirname, 'templates'));
 
-// Configure links
-.config(function(getLinkInfo) {
-  getLinkInfo.useFirstAmbiguousLink = false;
-})
-
-// Configure file writing
-.config(function(writeFilesProcessor) {
-  writeFilesProcessor.outputFolder  = './dist/packages-dist/';
-})
-
-// Configure rendering
-.config(function(templateFinder, templateEngine) {
-
-  // Nunjucks and Angular conflict in their template bindings so change the Nunjucks
-  // Also conflict with Jekyll
-  templateEngine.config.tags = {
-    variableStart: '<$',
-    variableEnd: '$>',
-    blockStart: '<@',
-    blockEnd: '@>',
-    commentStart: '<#',
-    commentEnd: '#>'
-  };
-
-  // add custom filters to nunjucks
-  templateEngine.filters.push(
-    require('./filters/capital'),
-    require('./filters/code'),
-    require('./filters/dump')
-  );
-
-  templateFinder.templateFolders.unshift(path.resolve(__dirname, 'templates'));
-
-  // Specify how to match docs to templates.
-  templateFinder.templatePatterns = [
-    '${ doc.template }',
-    '${ doc.docType }.template.md',
-    'readme.template.md'
-  ];
-});
+      // Specify how to match docs to templates.
+      templateFinder.templatePatterns = [
+        '${ doc.template }',
+        '${ doc.docType }.template.md',
+        'readme.template.md'
+      ];
+    });
 
 };

scripts/docs/filters/capital.js

@@ -1,7 +1,5 @@
+"use strict";
 module.exports = {
   name: 'capital',
-  process: function(str) {
-    str || (str = '');
-    return str.charAt(0).toUpperCase() + str.substring(1);
-  }
+  process: str => str? str.charAt(0).toUpperCase() + str.substring(1) : ''
 };

scripts/docs/filters/code.js

@@ -1,4 +1,5 @@
-var encoder = new require('node-html-encoder').Encoder();
+"use strict";
+const encoder = new require('node-html-encoder').Encoder();
 
 function code(str, inline, lang) {
   // Encode any HTML entities in the code string
@@ -10,16 +11,14 @@ function code(str, inline, lang) {
   str = '<code' + lang + '>' + str + '</code>';
 
   // If not inline then wrap the code element in a pre element
-  if ( !inline ) {
+  if (!inline) {
     str = '<pre>' + str + '</pre>';
   }
 
   return str;
-};
+}
 
 module.exports = {
   name: 'code',
-  process: function(str, lang) {
-    return code(str, true, lang);
-  }
+  process: (str, lang) => code(str, true, lang)
 };

scripts/docs/filters/dashify.js

@@ -1,7 +1,5 @@
+"use strict";
 module.exports = {
   name: 'dashify',
-  process: function(str) {
-    str || (str = '');
-    return str.replace(/\s/g, '-');
-  }
+  process: str => str? str.replace(/\s/g, '-') : ''
 };

scripts/docs/filters/dump.js

@@ -1,6 +1,5 @@
+"use strict";
 module.exports = {
   name: 'dump',
-  process: function(obj) {
-    console.log(obj);
-  }
-};
+  process: obj => console.log(obj)
+};

scripts/docs/gulp-tasks.js

@@ -1,31 +1,39 @@
-var config = require('../config.json');
-var projectPackage = require('../../package.json');
-module.exports = function(gulp) {
-  gulp.task('docs', [], function() {
-    var Dgeni = require('dgeni');
-    var semver = require('semver');
+"use strict";
+const config = require('../config.json'),
+  projectPackage = require('../../package.json'),
+  path = require('path'),
+  fs = require('fs-extra-promise').useFs(require('fs-extra')),
+  Dgeni = require('dgeni');
+
+module.exports = gulp => {
+  gulp.task('docs', [], () => {
+
     try {
-      var ionicPackage = require('./dgeni-config')(projectPackage.version);
-      var dgeni = new Dgeni([ionicPackage]);
-      return dgeni.generate().then(function(docs) {
-        console.log(docs.length + ' docs generated');
-      });
+
+      const ionicPackage = require('./dgeni-config')(projectPackage.version),
+        dgeni = new Dgeni([ionicPackage]);
+
+      return dgeni.generate().then(docs => console.log(docs.length + ' docs generated'));
+
     } catch (err) {
       console.log(err.stack);
     }
+
   });
 
   gulp.task('readmes', [], function() {
-    var Dgeni = require('dgeni');
-    var semver = require('semver');
+
+    fs.copySync(path.resolve(__dirname, '..', '..', 'README.md'), path.resolve(__dirname, '..', '..', config.pluginDir, 'core', 'README.md'));
+
     try {
-      var ionicPackage = require('./dgeni-readmes-config')(projectPackage.version);
-      var dgeni = new Dgeni([ionicPackage]);
-      return dgeni.generate().then(function(docs) {
-        console.log(docs.length + ' README files generated');
-      });
+
+      const ionicPackage = require('./dgeni-readmes-config')(projectPackage.version),
+        dgeni = new Dgeni([ionicPackage]);
+      return dgeni.generate().then(docs => console.log(docs.length + ' README files generated'));
+
     } catch (err) {
       console.log(err.stack);
     }
+
   });
-}
+};

scripts/docs/processors/collect-inputs-outputs.js

@@ -1,71 +0,0 @@
-module.exports = function collectInputsOutputs() {
-  return {
-
-    $runBefore: ['rendering-docs'],
-    $process: function(docs) {
-      docs.forEach(function(doc) {
-
-        if (doc.statics && doc.statics.length) {
-          for (var i in doc.statics) {
-            // identify properties to differentiate from methods
-            if (typeof doc.statics[i].parameters == 'undefined') {
-              doc.statics[i].isProperty = true;
-            }
-          }
-        }
-
-        if (doc.members && doc.members.length) {
-          var members = [];
-          var inputs = [];
-          var outputs = [];
-
-          memberLoop:
-          for (var i in doc.members) {
-
-            // identify properties to differentiate from methods
-            if (typeof doc.members[i].parameters == 'undefined') {
-              doc.members[i].isProperty = true;
-            }
-
-            if (doc.members[i].decorators && doc.members[i].decorators.length) {
-
-              decoratorLoop:
-              for (var ii in doc.members[i].decorators) {
-
-                if (doc.members[i].decorators[ii].name == 'Input') {
-                  inputs.push(parseMember(doc.members[i]));
-                  continue memberLoop;
-                }
-                if (doc.members[i].decorators[ii].name == 'Output') {
-                  outputs.push(parseMember(doc.members[i]));
-                  continue memberLoop;
-                }
-              }
-              // not an input or output, must be a plain member
-              members.push(doc.members[i]);
-            } else {
-              members.push(doc.members[i]);
-            };
-          }
-
-          // update doc with pruned members list and add inputs and outputs
-          doc.members = members;
-          doc.inputs = inputs;
-          doc.outputs = outputs;
-        }
-
-        function parseMember(member) {
-          member.type = member.content.substring(
-            member.content.indexOf('{') + 1,
-            member.content.indexOf('}')
-          );
-          member.description = member.content.substring(
-            member.content.indexOf('}') + 1,
-            member.content.length
-          );
-          return member;
-        }
-      });
-    }
-  };
-};

scripts/docs/processors/debug.js

@@ -0,0 +1,43 @@
+"use strict";
+module.exports = function test(){
+  return {
+    name: 'debug',
+    $runBefore: ['rendering-docs'],
+    $process: function(docs){
+      docs.forEach(function(doc){
+        if (doc.name == "Camera"){
+
+          console.log(doc.tags);
+          doc.tags.forEach(function(tag){
+            if(tag.tagName == 'classes'){
+
+            }
+          });
+
+          doc.moduleDoc.exports.forEach(function(d,i){
+            if(d.name === 'CameraOptions') {
+              console.log('Name: ' + d.name);
+              console.log('Type: ' + d.docType);
+              console.log('First member: ', d.members[0]);
+            }
+          });
+
+
+          var exports = doc.exportSymbol.parent.exports;
+          for(var p in exports) {
+            if(p == 'CameraOptions')
+            {
+              var x = exports[p];
+              console.log(x.members.quality);
+            }
+          }
+          doc.members.forEach(function(method){
+            if (method.name === "getPicture") {
+              console.log(method);
+            }
+          })
+        }
+      })
+    }
+  }
+}

scripts/docs/processors/hide-private-api.js

@@ -1,18 +1,9 @@
+"use strict";
 module.exports = function removePrivateApi() {
   return {
     name: 'remove-private-api',
     description: 'Prevent the private apis from being rendered',
     $runBefore: ['rendering-docs'],
-    $process: function(docs) {
-      var publicDocs = [];
-      docs.forEach(function(doc){
-        if (!doc.private && (!doc.tags || !doc.tags.tagsByName.get('hidden'))){
-          publicDocs.push(doc);
-          return doc
-        }
-      });
-      docs = publicDocs;
-      return docs;
-    }
-  }
+    $process: docs => docs.filter(doc => !doc.private && (!doc.tags || !doc.tags.tagsByName.get('hidden')))
+  };
 };

scripts/docs/processors/jekyll.js

@@ -1,38 +1,37 @@
+"use strict";
 module.exports = function jekyll(renderDocsProcessor) {
   return {
     name: 'jekyll',
     description: 'Create jekyll includes',
     $runAfter: ['paths-computed'],
     $runBefore: ['rendering-docs'],
-    $process: function(docs) {
-      var currentVersion = renderDocsProcessor.extraData.version.current.name;
+    $process: docs => {
 
       // pretty up and sort the docs object for menu generation
-      docs = docs.filter(function(doc) {
-        return (!!doc.name && !!doc.outputPath) || doc.docType === 'index-page';
-      });
-      docs.sort(function(a, b) {
-        textA = a.name ? a.name.toUpperCase() : '';
-        textB = b.name ? b.name.toUpperCase() : '';
+      docs = docs.filter(doc => (!!doc.name && !!doc.outputPath) || doc.docType === 'index-page');
+
+      docs.sort((a, b) => {
+        const textA = a.name ? a.name.toUpperCase() : '',
+          textB = b.name ? b.name.toUpperCase() : '';
+
         return (textA < textB) ? -1 : (textA > textB) ? 1 : 0;
       });
-      docs.forEach(function(doc, i) {
-        doc.outputPath = doc.outputPath.toLowerCase().replace(/\s/g, '-');
-        docs[i].URL = doc.outputPath.replace('docs/v2//', 'docs/v2/')
-                                    .replace('/index.md', '')
-                                    .replace('content/', '');
 
-        docs[i].demo = !!docs[i].demo;
+      docs.forEach(doc => {
+        doc.outputPath = doc.outputPath.toLowerCase().replace(/\s/g, '-');
+        doc.URL = doc.outputPath.replace('docs/v2//', 'docs/v2/')
+          .replace('/index.md', '')
+          .replace('content/', '');
       });
 
+      // add side menu
       docs.push({
-        docType: 'native_menu-menu',
-        id: 'native_menu-menu',
+        docType: 'nativeMenu',
+        id: 'native_menu',
         template: 'native_menu.template.html',
         outputPath: 'content/_includes/v2_fluid/native_menu.html'
       });
 
-      // returning docs will replace docs object in the next process
       return docs;
     }
   };

scripts/docs/processors/latest-version.js

@@ -1,33 +0,0 @@
-var copy = require('cpr').cpr;
-var mkdirp = require('mkdirp');
-var path = require('canonical-path');
-var q = require('q');
-var fs = require('fs');
-
-module.exports = function latestVersion(renderDocsProcessor) {
-  return {
-    name: 'latest-version',
-    $runAfter: ['files-written'],
-    description: 'Copy the latest version (that was compiled to docs/) into docs/versionName',
-    $process: function(docs) {
-      var versionData = renderDocsProcessor.extraData.version;
-
-      var docsBase = 'dist/ionic-site/content/docs/v2/';
-      var versionDir = path.resolve(docsBase, versionData.latest.name);
-      var latestDir = path.resolve(docsBase, 'api');
-
-      var deferred = q.defer();
-
-      mkdirp(versionDir, function() {
-        copy(latestDir, path.join(versionDir, 'api'), {
-          deleteFirst: true,
-          overwrite: true
-        }, function(err, files) {
-          deferred.resolve(docs);
-        });
-      });
-
-      return deferred.promise;
-    }
-  }
-};

scripts/docs/processors/mark-properties.js

@@ -0,0 +1,15 @@
+"use strict";
+module.exports = function markProperties() {
+  return {
+    name: 'mark-properties',
+    $runBefore: ['rendering-docs'],
+    $process: docs => docs.map(doc => {
+      for (let i in doc.members) {
+        if (doc.members.hasOwnProperty(i) && typeof doc.members[i].parameters === 'undefined') {
+          doc.members[i].isProperty = true;
+        }
+      }
+      return doc;
+    })
+  }
+};

scripts/docs/processors/npm-id.js

@@ -0,0 +1,20 @@
+"use strict";
+module.exports = function npmId(renderDocsProcessor) {
+  return {
+    name: 'npm-id',
+    $runAfter: ['paths-computed'],
+    $runBefore: ['rendering-docs'],
+    $process: docs => {
+      // pretty up and sort the docs object for menu generation
+      docs = docs.filter(function(doc) {
+        return (!!doc.name && !!doc.outputPath) || doc.docType === 'index-page';
+      });
+
+      docs.forEach(doc => {
+        doc.npmId = doc.id.match(/plugins\/(.*)\/index/)[1];
+      });
+
+      return docs;
+    }
+  };
+};

scripts/docs/processors/parse-optional.js

@@ -0,0 +1,22 @@
+"use strict";
+module.exports = function parseOptional() {
+  return {
+    $runBefore: ['rendering-docs'],
+    $process: docs => {
+      docs.forEach(doc => {
+        if (doc.members && doc.members.length) {
+          for (let i in doc.members) {
+            if (doc.members[i].params && doc.members[i].params.length) {
+              for (let ii in doc.members[i].params) {
+                if (doc.members[i].params[ii].optional) {
+                  doc.members[i].params[ii].description += '<strong class="tag">Optional</strong>';
+                }
+              }
+            }
+          }
+        }
+      });
+      return docs;
+    }
+  }
+};

scripts/docs/processors/readmes.js

@@ -1,24 +1,18 @@
-module.exports = function jekyll(renderDocsProcessor) {
+"use strict";
+module.exports = function readmes(renderDocsProcessor) {
   return {
     name: 'readmes',
     description: 'Create jekyll includes',
     $runAfter: ['paths-computed'],
     $runBefore: ['rendering-docs'],
-    $process: function(docs) {
-      var currentVersion = renderDocsProcessor.extraData.version.current.name;
-
+    $process: docs => {
       // pretty up and sort the docs object for menu generation
-      docs = docs.filter(function(doc) {
-        return (!!doc.name && !!doc.outputPath) || doc.docType === 'index-page';
-      });
+      docs = docs.filter(doc => (!!doc.name && !!doc.outputPath) || doc.docType === 'index-page');
 
-      docs.forEach(function(doc, i) {
-        doc.npmId = doc.outputPath.replace('/README.md', '')
-          .replace('src/@ionic-native/plugins/','');
+      docs.forEach(doc => {
         doc.outputPath = doc.outputPath.replace('src/', '');
       });
 
-      // returning docs will replace docs object in the next process
       return docs;
     }
   };

scripts/docs/processors/remove-private-members.js

@@ -1,22 +1,19 @@
+"use strict";
 module.exports = function removePrivateMembers() {
   return {
     name: 'remove-private-members',
     description: 'Remove member docs with @private tags',
     $runAfter: ['tags-parsed'],
     $runBefore: ['rendering-docs'],
-    $process: function(docs) {
-      docs.forEach(function(doc) {
+    $process: docs => {
+      docs.forEach(doc => {
 
         if (doc.members) {
-          doc.members = doc.members.filter(function(member) {
-            return !member.tags.tagsByName.get('hidden');
-          });
+          doc.members = doc.members.filter(member => !member.tags.tagsByName.get('hidden'));
         }
 
         if (doc.statics) {
-          doc.statics = doc.statics.filter(function(staticMethod) {
-            return !staticMethod.tags.tagsByName.get('hidden');
-          });
+          doc.statics = doc.statics.filter(staticMethod => !staticMethod.tags.tagsByName.get('hidden'));
         }
 
       });

scripts/docs/tag-defs/tag-defs.js

@@ -1,10 +1,8 @@
+"use strict";
 module.exports = [
   {'name': 'advanced'},
   {'name': 'demo'},
-  {'name': 'beta', transforms: function(doc, tag, value) {
-    // make the value true or undefined instead of '' or undefined
-    return typeof value !== 'undefined';
-  }},
+  {'name': 'beta', transforms: (doc, tag, value) => typeof value !== 'undefined'}, // make the value true or undefined instead of '' or undefined
   {'name': 'usage'},
   {'name': 'hidden'}, // hide from docs
   {'name': 'classes'}, // related classes

scripts/docs/templates/common.template.html

@@ -11,7 +11,7 @@ doc: "<$ doc.name $>"
 docType: "<$ doc.docType $>"
 ---
 
-<@ macro interfaceTable(interface) @>
+<@- macro interfaceTable(interface) -@>
 <@ for export in doc.moduleDoc.exports -@>
 <@ if export.name == interface @>
 <table class="table param-table" style="margin:0;">
@@ -27,36 +27,27 @@ docType: "<$ doc.docType $>"
   <tr>
     <td>
       <$ param.name $>
-      <@ if param.optional @><div><em>(optional)</em></div><@ endif @>
     </td>
     <td>
       <code><$ param.returnType | escape $></code>
     </td>
     <td>
       <$ param.description | marked $>
+      <@ if param.optional @><em>(optional)</em><@ endif @>
     </td>
   </tr>
   <@ endfor @>
   </tbody>
 </table>
-
 <@ endif @>
 <@- endfor @>
-<@ endmacro @>
-
-<@ macro paramList(paramData) -@>
-<@- if paramData -@><span class="params">(
-    <@- for param in paramData -@>
-      <span class="param"><$ param | escape $><@ if not loop.last @>, <@ endif @></span>
-    <@- endfor @>)</span>
-<@- endif @>
 <@- endmacro -@>
 
-<@ macro githubViewLink(doc) -@>
+<@- macro githubViewLink(doc) -@>
 <a href="https://github.com/driftyco/ionic-native/tree/master/<$ doc.fileInfo.relativePath $>#L<$ doc.location.start.line+1 $>-L<$ doc.location.end.line+1 $>"><$ doc.fileInfo.relativePath $> (line <$ doc.location.start.line+1 $>)</a>
 <@- endmacro -@>
 
-<@ macro paramTable(params, isDirective) -@>
+<@- macro paramTable(params, isDirective) -@>
 <table class="table param-table" style="margin:0;">
   <thead>
   <tr>
@@ -66,140 +57,93 @@ docType: "<$ doc.docType $>"
   </tr>
   </thead>
   <tbody>
-  <@ for param in params @>
+  <@- for param in params @>
   <tr>
     <td>
       <$ param.name $>
-      <@ if param.alias @>| <$ param.alias $><@ endif @>
-      <@ if param.type.optional @><div><em>(optional)</em></div><@ endif @>
+      <@- if param.alias @>| <$ param.alias $><@ endif -@>
     </td>
     <td>
       <$ typeList(param.typeList) $>
     </td>
     <td>
       <$ param.description | marked $>
-      <@ if param.default @><p><em>(default: <$ param.default $>)</em></p><@ endif @>
+      <@- if param.defaultValue @><p><em>(default: <$ param.defaultValue $>)</em></p><@ endif -@>
     </td>
   </tr>
-  <@ endfor @>
+  <@ endfor -@>
   </tbody>
 </table>
 <@- endmacro -@>
 
-
 <@- macro functionSyntax(fn) @>
   <@- set sep = joiner(',&nbsp;') -@>
   <code><$ fn.name $><@- if not fn.isProperty @>(<@ endif -@><@- for param in fn.params @><$ sep() $>
-  <@- if param.type.optional @>[<@ endif -@>
+  <@- if param.type.optional @>[<@- endif -@>
   <$ param.name $>
-  <@- if param.type.optional @>]<@ endif -@>
-  <@ endfor @><@- if not fn.isProperty @>)<@ endif -@></code>
-  <@ if fn.alias @><small>(alias: <$ fn.alias $>)</small><@ endif @>
-<@ endmacro -@>
+  <@- if param.type.optional -@>]<@- endif -@>
+  <@- endfor -@><@- if not fn.isProperty @>)<@- endif -@></code>
+<@- endmacro -@>
 
-<@ macro typeList(types) -@>
+<@- macro typeList(types) -@>
 <@ set separator = joiner("|") @>
-<@ for type in types @><$ separator() $><$ type | code $><@ endfor @>
+<@- for type in types @><$ separator() $><$ type | code $><@ endfor -@>
 <@- endmacro -@>
 
 <@- macro typeInfo(fn) -@>
 <$ typeList(fn.typeList) $> <$ fn.description $>
 <@- endmacro -@>
 
-
-
-<@ macro documentClass(doc) @>
-<@- if doc.statics.length -@>
-<h2>Static Members</h2>
-<@ for method in doc.statics -@>
-<@ if not method.internal @>
-<div id="<$ method.name $>"></div>
-<h3><$ functionSyntax(method) $></h3>
+<@- macro documentPlatforms(method) -@>
 <@- if method.decorators @>
 <@ for prop in method.decorators[0].argumentInfo @>
 <@ if prop.platforms @>
 <p>
-  <b>Platforms:</b>
-  <@- for platform in prop.platforms @>
-  <code><$ platform $></code>&nbsp;
-  <@ endfor -@>
+  <strong>Platforms:</strong>
+  <@- for platform in prop.platforms -@>
+  <strong class="tag"><$ platform $></strong>&nbsp;
+  <@- endfor -@>
 </p>
 <@ endif @>
 <@ endfor @>
 <@- endif @>
+<@- endmacro -@>
 
-<$ method.description $>
-
-<@ if method.params @>
-<$ paramTable(method.params) $>
-<@ endif @>
-
-<@ if method.this -@>
-<h4> Method's `this`
-  <$ method.this $>
-</h4>
-<@- endif @>
-
-<@ if method.returns @>
-<div class="return-value" markdown="1">
-  <i class="icon ion-arrow-return-left"></i>
-  <b>Returns:</b> <$ typeInfo(method.returns) $>
-</div>
-<@ endif @>
-<@ endif @>
-<@ endfor -@>
-<@ endif @>
-
-<!-- methods on the class -->
-<@- if doc.members and doc.members.length @>
-
-<h2>Instance Members</h2>
-<@ for method in doc.members -@>
-<div id="<$ method.name $>"></div>
-<h3>
-  <$ functionSyntax(method) $>
-</h3>
+<@ macro documentMethod(method) -@>
+<h3><a class="anchor" name="<$ method.name $>" href="#<$ method.name $>"></a><$ functionSyntax(method) $></h3>
+<$ documentPlatforms(method) $>
 <$ method.description $>
 <@ if method.params -@>
 <$ paramTable(method.params) $>
 <@- endif @>
-<@ if method.this -@>
-<h4> Method's `this`
-  <$ method.this $>
-</h4>
-<@- endif @>
+
 <@ if method.returns -@>
 <div class="return-value" markdown="1">
   <i class="icon ion-arrow-return-left"></i>
   <b>Returns:</b> <$ typeInfo(method.returns) $>
 </div>
 <@- endif @>
+<@- endmacro -@>
+
+<@- macro documentClass(doc) @>
+<@- if doc.statics.length -@>
+<h2>Static Members</h2>
+<@ for method in doc.statics -@>
+<$ documentMethod(method) $>
+<@ endfor -@>
+<@ endif @>
+
+<# --- methods in class --- #>
+<@- if doc.members and doc.members.length @>
+
+<h2>Instance Members</h2>
+<@ for method in doc.members -@>
+<$ documentMethod(method) $>
 <@- endfor @>
 <@- endif -@>
 <@ endmacro @>
-<@ block body @>
-<@ block content @>
-<@ block header @>
-<h1 class="api-title">
-  <@ if doc.docType == "directive" @>
-  <$ doc.name | dashCase $>
-  <@ else @>
-  <$ doc.name $>
-  <@ endif @>
 
-  <@ if doc.parent @>
-  <br />
-  <small>
-    Child of <$ doc.parent $>
-  </small>
-  <@ endif @>
-
-  <@ if doc.delegate @>
-  <br/>
-  <small>
-    Delegate: <$ doc.delegate $>
-  </small>
-  <@ endif @>
+<h1 class="api-title"><$ doc.name $>
   <@- if doc.beta == true -@>
     <span class="beta" title="beta">&beta;</span>
   <@- endif -@>
@@ -209,13 +153,9 @@ docType: "<$ doc.docType $>"
   Improve this doc
 </a>
 
-<@ endblock @>
-
-<!-- decorators -->
+<# --- Decorators --- #>
 <@- if doc.decorators @>
-
 <@ for prop in doc.decorators[0].argumentInfo @>
-
 <@ if doc.beta == true @>
 <p class="beta-notice">
   This plugin is still in beta stage and may not work as expected. Please
@@ -224,9 +164,9 @@ docType: "<$ doc.docType $>"
 </p>
 <@ endif @>
 
-<pre><code>
-  $ <@ if prop.install @><$ prop.install $><@ else @>ionic plugin add <$ prop.plugin $><@ endif @>
-  $ npm install --save @ionic-native/<$ prop.pluginRef $>
+<# --- Install commands --- #>
+<pre><code class="nohighlight">$ <@ if prop.install @><$ prop.install $><@ else @>ionic plugin add <$ prop.plugin $><@ endif @>
+$ npm install --save @ionic-native/<$ doc.npmId $>
 </code></pre>
 <p>Repo:
   <a href="<$ prop.repo $>">
@@ -234,48 +174,34 @@ docType: "<$ doc.docType $>"
   </a>
 </p>
 
-<!-- description -->
-<@ block description @>
+<# --- Plugin description --- #>
 <$ doc.description | marked $>
-<@ endblock @>
-
-
-<@- if doc.directiveInfo @>
-<h2><$ doc.directiveInfo.type $></h2>
-<h3><$ doc.directiveInfo.properties[0].name $>: <code><$ doc.directiveInfo.properties[0].values $></code></h3>
-<@ endif -@>
 
+<# --- Plugin supported platforms --- #>
 <@ if prop.platforms @>
-<!-- @platforms tag -->
 <h2>Supported platforms</h2>
-<@ block platforms @>
 <ul>
   <@ for platform in prop.platforms -@>
   <li><$ platform $></li>
   <@- endfor @>
 </ul>
-<@ endblock @>
-<!-- @platforms tag end -->
 <@ endif @>
 <@ endfor @>
-<@ endif -@><!-- if doc.decorators -->
+<@ endif -@> <# --- end of: if doc.decorators --- #>
 
-<!-- @usage tag -->
+<# --- Plugin usage --- #>
 <@ if doc.usage @>
 <h2>Usage</h2>
-<@ block usage @>
 <$ doc.usage | marked $>
-<@ endblock @>
 <@ endif @>
 
-<!-- @property tags -->
-<@ if doc.properties @>
+<# --- Plugin attributes --- #>
+<@- if doc.properties -@>
 <h2>Attributes:</h2>
 <table class="table" style="margin:0;">
   <thead>
   <tr>
     <th>Attribute</th>
-
     <@ set hasTypes = false @>
     <@ for prop in doc.properties @>
     <@ if prop.type @>
@@ -285,12 +211,11 @@ docType: "<$ doc.docType $>"
     <@ if hasTypes @>
     <th>Type</th>
     <@ endif @>
-
     <th>Description</th>
   </tr>
   </thead>
   <tbody>
-  <@ for prop in doc.properties -@>
+  <@- for prop in doc.properties -@>
   <tr>
     <td>
       <$ prop.name $>
@@ -300,48 +225,44 @@ docType: "<$ doc.docType $>"
       <$ prop.type.name $>
     </td>
     <@ endif @>
-
     <td>
       <$ prop.description $>
     </td>
   </tr>
-  <@- endfor @>
+  <@ endfor -@>
   </tbody>
 </table>
-<@ endif @>
+<@- endif -@>
 
+<# --- Plugin class documentation --- #>
 <$ documentClass(doc) $>
 
-<@ block advanced @>
+<# --- Advanced usage --- #>
 <@- if doc.advanced -@>
 <h2><a class="anchor" name="advanced" href="#advanced"></a>Advanced</h2>
 <$ doc.advanced | marked $>
 <@- endif -@>
-<@ endblock @>
 
-<!-- other classes -->
-<@ for tag in doc.tags.tags -@>
-<@ if tag.tagName == 'classes' -@>
-<!--<h2><a class="anchor" name="related-classes" href="#related-classes"></a>Related Classes</h2>-->
-<@ set classes = tag.description.split('\n') @>
-<@ for item in classes -@>
-<@ if item.length > 1 @>
-<@ for export in doc.moduleDoc.exports -@>
-<@ if export.name == item @>
+<# --- Other classes --- #>
+<@- for tag in doc.tags.tags -@>
+<@- if tag.tagName == 'classes' -@>
+<@- set classes = tag.description.split('\n') -@>
+<@- for item in classes -@>
+<@- if item.length > 1 -@>
+<@- for export in doc.moduleDoc.exports -@>
+<@- if export.name == item -@>
 <h2><a class="anchor" name="<$ item $>" href="#<$ item $>"></a><$ item $></h2>
 <$ documentClass(export) $>
-<@ endif @>
-<@- endfor @>
-<@ endif @>
-<@- endfor @>
-<@- endif @>
-<@- endfor @>
-<!-- end other classes -->
+<@- endif -@>
+<@- endfor -@>
+<@- endif -@>
+<@- endfor -@>
+<@- endif -@>
+<@- endfor -@>
 
-<!-- interfaces -->
+<# --- Other interfaces --- #>
 <@ for tag in doc.tags.tags -@>
 <@ if tag.tagName == 'interfaces' @>
-<!--<h2><a class="anchor" name="interfaces" href="#interfaces"></a>Interfaces</h2>-->
 <@ set interfaces = tag.description.split('\n') @>
 <@ for item in interfaces -@>
 <@ if item.length > 1 @>
@@ -351,21 +272,12 @@ docType: "<$ doc.docType $>"
 <@- endfor @>
 <@ endif @>
 <@- endfor @>
-<!-- end interfaces -->
 
-<!-- related link -->
+
+<# --- Related links --- #>
 <@- if doc.see @>
-
-<h2>Related</h2>
+<h2><a class="anchor" name="related" href="#related"></a>Related</h2>
 <@ for s in doc.see @>
 <$ s | safe $>
 <@- endfor -@>
-
 <@- endif -@>
-
-
-<!-- end content block -->
-<@ endblock @>
-
-<!-- end body block -->
-<@ endblock @>

scripts/docs/templates/native_menu.template.html

@@ -1,9 +1,14 @@
-<@ for doc in docs @><@ if doc.URL and doc.private != true and doc.beta != true @>
+<li class="capitalize {% if page.id == 'overview' %}active{% endif %}">
+  <a href="/docs/v2/native/">Overview</a>
+</li>
+<li class="capitalize {% if page.id == 'mocking' %}active{% endif %}">
+  <a href="/docs/v2/native/browser.html">Browser Usage</a>
+</li>
+<@- for doc in docs @><@ if doc.URL and doc.private != true and doc.beta != true @>
 <li class="capitalize {% if page.id == '<$ doc.name|lower|dashify $>' %}active{% endif %}">
   <a href="/<$ doc.URL $>"><$ doc.name $></a>
 </li><@ endif @><@ endfor @>
-
-<@ for doc in docs @><@ if doc.URL and doc.private != true and doc.beta == true @>
+<@- for doc in docs @><@ if doc.URL and doc.private != true and doc.beta == true @>
 <li class="capitalize {% if page.id == '<$ doc.name|lower|dashify $>' %}active{% endif %}">
   <a href="/<$ doc.URL $>"><$ doc.name $> <span class="beta">&beta;</span></a>
 </li><@ endif @><@ endfor @>

scripts/docs/update_docs.sh

@@ -23,16 +23,18 @@ function run {
   # CD in to the site dir to commit updated docs
   cd $SITE_DIR
 
+  # Add all files to git
+  git add .
+
   # if no changes, don't commit
-  CHANGED=$(git diff-index --name-only HEAD --)
-  if [ -z "$CHANGED" ];
+  CHANGED=$(git diff-index --name-only HEAD 2>/dev/null | wc -l)
+  if [ $CHANGED -eq 0 ];
   then
     echo "-- No changes detected for the following commit, docs not updated."
     echo "https://github.com/driftyco/$CIRCLE_PROJECT_REPONAME/commit/$CIRCLE_SHA1"
   else
     git config --global user.email "hi@ionicframework.com"
     git config --global user.name "Ionitron"
-    git add -A
     git commit -am "Automated build of native docs driftyco/$CIRCLE_PROJECT_REPONAME@$CIRCLE_SHA1"
     # in case a different commit was pushed to ionic-site during doc/demo gen,
     # try to rebase around it before pushing

src/@ionic-native/core/decorators.ts

@@ -259,6 +259,7 @@ export function CordovaInstance(opts: any = {}) {
  */
 export function CordovaProperty(target: any, key: string) {
   Object.defineProperty(target, key, {
+    enumerable: true,
     get: () => {
       if (checkAvailability(target, key) === true) {
         return getPlugin(target.constructor.getPluginRef())[key];
@@ -282,6 +283,7 @@ export function CordovaProperty(target: any, key: string) {
  */
 export function InstanceProperty(target: any, key: string) {
   Object.defineProperty(target, key, {
+    enumerable: true,
     get: function(){
       return this._objectInstance[key];
     },

src/@ionic-native/plugins/background-geolocation/index.ts

@@ -288,7 +288,7 @@ export interface BackgroundGeolocationConfig {
  *     // IMPORTANT:  You must execute the finish method here to inform the native plugin that you're finished,
  *     // and the background-task may be completed.  You must do this regardless if your HTTP request is successful or not.
  *     // IF YOU DON'T, ios will CRASH YOUR APP for spending too much time in the background.
- *     BackgroundGeolocation.finish(); // FOR IOS ONLY
+ *     this.backgroundGeolocation.finish(); // FOR IOS ONLY
  *
  *   });
  *

src/@ionic-native/plugins/base64-to-gallery/index.ts

@@ -33,7 +33,7 @@ export class Base64ToGallery {
   /**
    * Converts a base64 string to an image file in the device gallery
    * @param {string} data The actual base64 string that you want to save
-   * @param {any} options (optional) An object with properties: prefix: string, mediaScanner: boolean. Prefix will be prepended to the filename. If true, mediaScanner runs Media Scanner on Android and saves to Camera Roll on iOS; if false, saves to Library folder on iOS.
+   * @param {any} [options] An object with properties: prefix: string, mediaScanner: boolean. Prefix will be prepended to the filename. If true, mediaScanner runs Media Scanner on Android and saves to Camera Roll on iOS; if false, saves to Library folder on iOS.
    * @returns {Promise<any>} returns a promise that resolves when the image is saved.
    */
   @Cordova({

src/@ionic-native/plugins/browser-tab/index.ts

@@ -17,7 +17,7 @@ import { Injectable } from '@angular/core';
  *
  *       if (isAvailable) {
  *
- *         browserTab.open('https://ionic.io');
+ *         browserTab.openUrl('https://ionic.io');
  *
  *       } else {
  *

src/@ionic-native/plugins/camera-preview/index.ts

@@ -57,7 +57,7 @@ export interface CameraPreviewPictureOptions {
  *
  * @usage
  * ```typescript
- * import { CameraPreview, PictureOptions, CameraPreviewOptions, CameraPreviewDimensions } from 'ionic-native';
+ * import { CameraPreview, PictureOptions, CameraPreviewOptions, CameraPreviewDimensions } from '@ionic-native/camera-preview';
  *
  * constructor(private cameraPreview: CameraPreview) { }
  *
@@ -187,7 +187,7 @@ export class CameraPreview {
 
   /**
    * Take the picture (base64)
-   * @param options {CameraPreviewPictureOptions} optional - size and quality of the picture to take
+   * @param [options] {CameraPreviewPictureOptions} size and quality of the picture to take
    * @return {Promise<any>}
    */
   @Cordova({
@@ -211,7 +211,7 @@ export class CameraPreview {
 
   /**
    * Set the zoom (Android)
-   * @param zoom {number} Zoom value
+   * @param [zoom] {number} Zoom value
    * @return {Promise<any>}
    */
   @Cordova({
@@ -223,7 +223,7 @@ export class CameraPreview {
 
   /**
    * Set the preview Size
-   * @param dimensions {CameraPreviewDimensions}
+   * @param [dimensions] {CameraPreviewDimensions}
    * @return {Promise<any>}
    */
   @Cordova({
@@ -235,7 +235,7 @@ export class CameraPreview {
 
   /**
    * Set the flashmode
-   * @param flashMode {string} 'off' (iOS & Android), 'on' (iOS & Android), 'auto' (iOS & Android), 'torch' (Android)
+   * @param [flashMode] {string} 'off' (iOS & Android), 'on' (iOS & Android), 'auto' (iOS & Android), 'torch' (Android)
    * @return {Promise<any>}
    */
   @Cordova({

src/@ionic-native/plugins/camera/index.ts

@@ -90,7 +90,7 @@ export interface CameraPopoverOptions {
  * @description
  * Take a photo or capture video.
  *
- * Requires {@link module:driftyco/ionic-native} and the Cordova plugin: `cordova-plugin-camera`. For more info, please see the [Cordova Camera Plugin Docs](https://github.com/apache/cordova-plugin-camera).
+ * Requires and the Cordova plugin: `cordova-plugin-camera`. For more info, please see the [Cordova Camera Plugin Docs](https://github.com/apache/cordova-plugin-camera).
  *
  * @usage
  * ```typescript
@@ -101,10 +101,10 @@ export interface CameraPopoverOptions {
  * ...
  *
  *
- * constant options: CameraOptions = {
+ * const options: CameraOptions = {
  *   quality: 100,
  *   destinationType: this.camera.DestinationType.DATA_URL,
- *   enodingType: this.camera.EncodingType.JPEG,
+ *   encodingType: this.camera.EncodingType.JPEG,
  *   mediaType: this.camera.MediaType.PICTURE
  * }
  *
@@ -120,7 +120,6 @@ export interface CameraPopoverOptions {
  * CameraOptions
  * CameraPopoverOptions
  */
-@Injectable()
 @Plugin({
   pluginName: 'Camera',
   plugin: 'cordova-plugin-camera',
@@ -128,6 +127,7 @@ export interface CameraPopoverOptions {
   repo: 'https://github.com/apache/cordova-plugin-camera',
   platforms: ['Android', 'BlackBerry', 'Browser', 'Firefox', 'FireOS', 'iOS', 'Windows', 'Windows Phone 8', 'Ubuntu']
 })
+@Injectable()
 export class Camera {
 
   /**
@@ -201,7 +201,7 @@ export class Camera {
 
   /**
    * Take a picture or video, or load one from the library.
-   * @param {CameraOptions?} options optional. Options that you want to pass to the camera. Encoding type, quality, etc. Platform-specific quirks are described in the [Cordova plugin docs](https://github.com/apache/cordova-plugin-camera#cameraoptions-errata-).
+   * @param {CameraOptions} [options] Options that you want to pass to the camera. Encoding type, quality, etc. Platform-specific quirks are described in the [Cordova plugin docs](https://github.com/apache/cordova-plugin-camera#cameraoptions-errata-).
    * @returns {Promise<any>} Returns a Promise that resolves with Base64 encoding of the image data, or the image file URI, depending on cameraOptions, otherwise rejects with an error.
    */
   @Cordova({

src/@ionic-native/plugins/contacts/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { CordovaInstance, InstanceProperty, Plugin, getPromise } from '@ionic-native/core';
+import { CordovaInstance, InstanceProperty, Plugin, getPromise, InstanceCheck, checkAvailability } from '@ionic-native/core';
 
 declare var window: any,
   navigator: any;
@@ -72,9 +72,12 @@ export class Contact implements IContactProperties {
   @InstanceProperty urls: IContactField[];
 
   constructor() {
-    this._objectInstance = navigator.contacts.create();
+    if (checkAvailability(navigator.contacts, 'create', 'Contacts') === true) {
+      this._objectInstance = navigator.contacts.create();
+    }
   }
 
+  @InstanceCheck()
   clone(): Contact {
     let newContact = new Contact();
     for (let prop in this) {
@@ -87,6 +90,7 @@ export class Contact implements IContactProperties {
   @CordovaInstance()
   remove(): Promise<any> { return; }
 
+  @InstanceCheck()
   save(): Promise<any> {
     return getPromise((resolve, reject) => {
       this._objectInstance.save((contact) => {

src/@ionic-native/plugins/deeplinks/index.ts

@@ -24,7 +24,7 @@ export interface DeeplinkMatch {
 }
 
 /**
- * @name Ionic Deeplinks
+ * @name Deeplinks
  * @description This plugin handles deeplinks on iOS and Android for both custom URL scheme links
  * and Universal App Links.
  *
@@ -32,9 +32,9 @@ export interface DeeplinkMatch {
  * ```typescript
  * import { Deeplinks } from '@ionic-native/deeplinks';
  *
- * constructor(private deepLinks: DeepLinks) { }
+ * constructor(private deeplinks: Deeplinks) { }
  *
- * this.deepLinks.route({
+ * this.deeplinks.route({
  *      '/about-us': AboutPage,
  *      '/universal-links-test': AboutPage,
  *      '/products/:productId': ProductPage
@@ -53,7 +53,7 @@ export interface DeeplinkMatch {
  * the actual navigation for you:
  *
  * ```typescript
- * this.deepLinks.routeWithNavController(this.navController, {
+ * this.deeplinks.routeWithNavController(this.navController, {
  *   '/about-us': AboutPage,
  *   '/products/:productId': ProductPage
  * }).subscribe((match) => {

src/@ionic-native/plugins/diagnostic/index.ts

@@ -234,7 +234,7 @@ export class Diagnostic {
    * Returns the location authorization status for the application.
    * Note for Android: this is intended for Android 6 / API 23 and above. Calling on Android 5 / API 22 and below will always return GRANTED status as permissions are already granted at installation time.
    *
-   * mode - (iOS-only / optional) location authorization mode: "always" or "when_in_use". If not specified, defaults to "when_in_use".
+   * @param {string} [mode] iOS only: location authorization mode: "always" or "when_in_use". If not specified, defaults to "when_in_use".
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'], callbackOrder: 'reverse' })

src/@ionic-native/plugins/email-composer/index.ts

@@ -84,7 +84,7 @@ export class EmailComposer {
   /**
    * Verifies if sending emails is supported on the device.
    *
-   * @param app {string?} An optional app id or uri scheme.
+   * @param [app] {string} App id or uri scheme.
    * @returns {Promise<any>} Resolves if available, rejects if not available
    */
   @CordovaCheck()
@@ -123,7 +123,7 @@ export class EmailComposer {
    * Displays the email composer pre-filled with data.
    *
    * @param options {EmailComposerOptions} Email
-   * @param scope {any?} An optional scope for the promise
+   * @param [scope] {any} Scope for the promise
    * @returns {Promise<any>} Resolves promise when the EmailComposer has been opened
    */
   @Cordova({

src/@ionic-native/plugins/estimote-beacons/index.ts

@@ -381,7 +381,7 @@ export class EstimoteBeacons {
    * @param [notifyEntryStateOnDisplay=false] {boolean} Set to true to detect if you
    * are inside a region when the user turns display on, see
    * {@link https://developer.apple.com/library/prerelease/ios/documentation/CoreLocation/Reference/CLBeaconRegion_class/index.html#//apple_ref/occ/instp/CLBeaconRegion/notifyEntryStateOnDisplay|iOS documentation}
-   * for further details (optional, defaults to false, iOS only).
+   * for further details (iOS only).
    * @returns {Observable<any>} Returns an Observable that notifies of each region state discovered.
    */
   @Cordova({

src/@ionic-native/plugins/facebook/index.ts

@@ -268,9 +268,8 @@ export class Facebook {
    *
    *
    * @param {Object}  options An object containing an [App Link](https://developers.facebook.com/docs/applinks) URL to your app and an optional image URL.
-   *   url: [App Link](https://developers.facebook.com/docs/applinks) to your app
-   *   picture: image to be displayed in the App Invite dialog
-   *
+   * @param {string} options.url [App Link](https://developers.facebook.com/docs/applinks) to your app
+   * @param {string} [options.picture] image to be displayed in the App Invite dialog
    * @returns {Promise<any>} Returns a Promise that resolves with the result data, or rejects with an error
    */
   @Cordova()

src/@ionic-native/plugins/fingerprint-aio/index.ts

@@ -21,7 +21,7 @@ export interface FingerprintOptions {
 
 /**
  * @beta
- * @name FingerprintAIO
+ * @name Fingerprint AIO
  * @description
  * Use simple fingerprint authentication on Android and iOS.
  * Requires Cordova plugin: cordova-plugin-fingerprint-aio. For more info about plugin, vist: https://github.com/NiklasMerz/cordova-plugin-fingerprint-aio

src/@ionic-native/plugins/geofence/index.ts

@@ -82,7 +82,6 @@ declare var window: any;
   repo: 'https://github.com/cowbell/cordova-plugin-geofence/',
   platforms: ['Android', 'iOS', 'Windows Phone 8', 'Windows Phone']
 })
-
 @Injectable()
 export class Geofence {
 

src/@ionic-native/plugins/geolocation/index.ts

@@ -122,15 +122,20 @@ export interface GeolocationOptions {
  * ```typescript
  * import { Geolocation } from '@ionic-native/geolocation';
  *
+ * ...
  *
- * Geolocation.getCurrentPosition().then((resp) => {
+ * constructor(private geolocation: Geolocation) {}
+ *
+ * ...
+ *
+ * this.geolocation.getCurrentPosition().then((resp) => {
  *  // resp.coords.latitude
  *  // resp.coords.longitude
  * }).catch((error) => {
  *   console.log('Error getting location', error);
  * });
  *
- * let watch = Geolocation.watchPosition();
+ * let watch = this.geolocation.watchPosition();
  * watch.subscribe((data) => {
  *  // data can be a set of coordinates, or an error (if an error occurred).
  *  // data.coords.latitude

src/@ionic-native/plugins/gyroscope/index.ts

@@ -85,7 +85,7 @@ export class Gyroscope {
 
   /**
    * Watching for gyroscope sensor changes
-   * @param options {GyroscopeOptions} (optional)
+   * @param {GyroscopeOptions} [options]
    * @return {Observable<GyroscopeOrientation>} Returns an Observable that resolves GyroscopeOrientation
    */
   watch(options?: GyroscopeOptions): Observable<GyroscopeOrientation> {
@@ -99,7 +99,7 @@ export class Gyroscope {
 
   /**
    * Get current data from gyroscope sensor
-   * @param options {GyroscopeOptions} (optional)
+   * @param {GyroscopeOptions} [options]
    * @return {Promise<GyroscopeOrientation>} Returns a promise that resolves GyroscopeOrientation
    */
   @Cordova({

src/@ionic-native/plugins/health/index.ts

@@ -167,13 +167,13 @@ export interface HealthData {
  * HealthStoreOptions
  * HealthData
  */
-@Injectable()
 @Plugin({
   pluginName: 'Health',
   plugin: 'cordova-plugin-health',
   pluginRef: 'navigator.health',
   repo: 'https://github.com/dariosalvi78/cordova-plugin-health'
 })
+@Injectable()
 export class Health {
 
   /**

src/@ionic-native/plugins/in-app-browser/index.ts

@@ -69,9 +69,9 @@ export class InAppBrowserObject {
 
   /**
    * Opens a URL in a new InAppBrowser instance, the current browser instance, or the system browser.
-   * @param  url     The URL to load.
-   * @param  target  The target in which to load the URL, an optional parameter that defaults to _self.
-   * @param  options Options for the InAppBrowser. Optional, defaulting to: location=yes.
+   * @param {string} url     The URL to load.
+   * @param {string} [target="self"]  The target in which to load the URL, an optional parameter that defaults to _self.
+   * @param {string | InAppBrowserOptions} [options] Options for the InAppBrowser. Optional, defaulting to: location=yes.
    *                 The options string must not contain any blank space, and each feature's
    *                 name/value pairs must be separated by a comma. Feature names are case insensitive.
    */

src/@ionic-native/plugins/jins-meme/index.ts

@@ -0,0 +1,158 @@
+import { Injectable } from '@angular/core';
+import { Plugin, Cordova, CordovaCheck } from '@ionic-native/core';
+import { Observable } from 'rxjs/Observable';
+
+declare var cordova: any;
+
+/**
+ * @name Jins Meme
+ * @description
+ * Implementation of the JINS MEME SDK
+ *
+ * @usage
+ * ```
+ * import { JinsMeme } from '@ionic-native/jins-meme';
+ *
+ * constructor(private jinsMeme: JinsMeme) { }
+ *
+ * ...
+ *
+ * this.jinsMeme.setAppClientID(appClientId: string, clientSecret: string)
+ *   .then(this.jinsMeme.startScan())
+ *   .catch(console.log('jinsMeme.setAppClientID authentication error!'));
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'Jins Meme',
+  plugin: 'JinsMemeSDK-Plugin-Cordova',
+  pluginRef: 'cordova.plugins.JinsMemePlugin',
+  repo: 'https://github.com/jins-meme/JinsMemeSDK-Plugin-Cordova.git'
+})
+@Injectable()
+export class JinsMeme {
+  /**
+   * Authentication and authorization of App and SDK.
+   * Must call this method at first.
+   *
+   *@param {string} setAppClientID
+   *@param {string} clientSecret
+   *@returns {Promise<any>}
+   */
+  @Cordova()
+  setAppClientID(appClientId: string, clientSecret: string): Promise<any> { return; }
+  /**
+   * Starts scanning for JINS MEME.
+   * @returns {Observable<any>}
+   */
+  @Cordova({
+    observable: true,
+    clearFunction: 'stopScan',
+    clearWithArgs: true
+  })
+  startScan(): Observable<any> { return; }
+  /**
+   * Stops scanning JINS MEME.
+   * @returns {Promise<any>}
+   */
+  @Cordova()
+  stopScan(): Promise<any> { return; }
+  /**
+   * Establishes connection to JINS MEME.
+   * @param {string} target
+   * @returns {Observable<any>}
+   */
+  @CordovaCheck({
+    observable: true
+  })
+  connect(target: string): Observable<any> {
+     return new Observable<any>((observer: any) => {
+       let data = cordova.plugins.JinsMemePlugin.connect(target, observer.next.bind(observer), observer.complete.bind(observer), observer.error.bind(observer));
+       return () => console.log(data);
+     });
+    }
+  /**
+   * Set auto connection mode.
+   *@param {Boolean} flag
+   *@returns {Promise<any>}
+   */
+  @Cordova()
+  setAutoConnect(flag: boolean): Promise<any> { return; }
+  /**
+   * Returns whether a connection to JINS MEME has been established.
+   *@returns {Promise<any>}
+   */
+  @Cordova()
+  isConnected(): Promise<any> { return; }
+  /**
+   * Disconnects from JINS MEME.
+   *@returns {Promise<any>}
+   */
+  @Cordova()
+  disconnect(): Promise<any> { return; }
+  /**
+   * Starts receiving realtime data.
+   * @returns {Observable<any>}
+   */
+  @Cordova({
+    observable: true,
+    clearFunction: 'stopDataReport',
+    clearWithArgs: true
+  })
+  startDataReport(): Observable<any> { return; }
+   /**
+   * Stops receiving data.
+   *@returns {Promise<any>}
+   */
+  @Cordova()
+  stopDataReport(): Promise<any> { return; }
+  /**
+   * Returns SDK version.
+   *
+   *@returns {Promise<any>}
+   */
+  @Cordova()
+  getSDKVersion(): Promise<any> { return; }
+  /**
+   * Returns JINS MEME connected with other apps.
+   *@returns {Promise<any>}
+   */
+  @Cordova()
+  getConnectedByOthers(): Promise<any> { return; }
+  /**
+   * Returns calibration status
+   *@returns {Promise<any>}
+   */
+  @Cordova()
+  isCalibrated(): Promise<any> { return; }
+  /**
+   * Returns device type.
+   *@returns {Promise<any>}
+   */
+  @Cordova()
+  getConnectedDeviceType(): Promise<any> { return; }
+  /**
+   * Returns hardware version.
+   *@returns {Promise<any>}
+   */
+  @Cordova()
+  getConnectedDeviceSubType(): Promise<any> { return; }
+  /**
+   * Returns FW Version.
+   *@returns {Promise<any>}
+   */
+  @Cordova()
+  getFWVersion(): Promise<any> { return; }
+  /**
+   * Returns HW Version.
+   *@returns {Promise<any>}
+   */
+  @Cordova()
+  getHWVersion(): Promise<any> { return; }
+  /**
+   * Returns response about whether data was received or not.
+   *@returns {Promise<any>}
+   */
+  @Cordova()
+  isDataReceiving(): Promise<any> { return; }
+}

src/@ionic-native/plugins/linkedin/index.ts

@@ -12,7 +12,7 @@ export type LinkedInLoginScopes = 'r_basicprofile' | 'r_emailaddress' | 'rw_comp
  *
  * @usage
  * ```
- * import { LinkedIn } from 'ionic-native';
+ * import { LinkedIn } from '@ionic-native/linkedin';
  *
  * constructor(private linkedin: LinkedIn) { }
  *

src/@ionic-native/plugins/location-accuracy/index.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 
 /**
- * @name LocationAccuracy
+ * @name Location Accuracy
  * @description
  * This Cordova/Phonegap plugin for Android and iOS to request enabling/changing of Location Services by triggering a native dialog from within the app, avoiding the need for the user to leave your app to change location settings manually.
  *

src/@ionic-native/plugins/media/index.ts

@@ -14,7 +14,7 @@ export class MediaObject {
    * @param src {string} A URI containing the audio content.
    * @param onStatusUpdate {Function} A callback function to be invoked when the status of the file changes
    */
-  constructor(private _objectInstnace: any) {}
+  constructor(private _objectInstance: any) {}
 
   /**
    * Get the current amplitude of the current recording.
@@ -127,7 +127,7 @@ export class MediaObject {
 }
 
 /**
- * @name MediaPlugin
+ * @name Media
  * @description
  * @usage
  * ```typescript
@@ -201,7 +201,7 @@ export class MediaObject {
   pluginRef: 'Media'
 })
 @Injectable()
-class MediaPlugin {
+export class MediaPlugin {
 
   // Constants
   /**
@@ -256,7 +256,8 @@ class MediaPlugin {
       // Creates a new media object
       // Resolves with the media object
       // or rejects with the error
-      const instance = new Media(src, () => resolve(new Media(instance)), reject, onStatusUpdate);
+      const instance = new Media(src, resolve, reject, onStatusUpdate);
+      return resolve(new MediaObject(instance));
     });
 
   }

src/@ionic-native/plugins/mixpanel/index.ts

@@ -109,12 +109,12 @@ export class Mixpanel {
 /**
  * @hidden
  */
-@Injectable()
 @Plugin({
   plugin: 'cordova-plugin-mixpanel',
   pluginRef: 'mixpanel.people',
   pluginName: 'Mixpanel'
 })
+@Injectable()
 export class MixpanelPeople {
 
   /**

src/@ionic-native/plugins/network/index.ts

@@ -34,7 +34,7 @@ declare var navigator: any;
  *
   // before we determine the connection type.  Might need to wait

  *   // prior to doing any api requests as well.
  *   setTimeout(() => {
- *     if (Network.type === 'wifi') {
+ *     if (this.network.type === 'wifi') {
  *       console.log('we got a wifi connection, woohoo!');
  *     }
  *   }, 3000);

src/@ionic-native/plugins/nfc/index.ts

@@ -184,12 +184,12 @@ export class NFC {
 /**
  * @hidden
  */
-@Injectable()
 @Plugin({
   pluginName: 'NFC',
   plugin: 'phonegap-nfc',
   pluginRef: 'ndef'
 })
+@Injectable()
 export class Ndef {
 
   @Cordova({ sync: true })

src/@ionic-native/plugins/onesignal/index.ts

@@ -379,6 +379,8 @@ export class OneSignal {
   /**
    * Retrieve a list of tags that have been set on the user from the OneSignal server.
    *
+   * **Quirk**: You must wait for `getTags` to resolve before calling it again, as the plugin will only process the last method call and discard any previous ones.
+   *
    * @returns {Promise<any>} Returns a Promise that resolves when tags are recieved.
    */
   @Cordova()

src/@ionic-native/plugins/push/index.ts

@@ -229,6 +229,8 @@ export type PushEvent = 'registration' | 'error' | 'notification';
  *
  * pushObject.on('notification').subscribe(notification => console.log('Received a notification', notification));
  *
+ * pushObject.on('registration').subscribe(registration => console.log('Device registered', registration));
+ *
  * pushObject.on('error').subscribe(error => console.error('Error with Push plugin', error));
  *
  *

src/@ionic-native/plugins/secure-storage/index.ts

@@ -53,7 +53,7 @@ export class SecureStorageObject {
  * @usage
  *
  * ```typescript
- * import { SecureStorage, SecureStorageOBject } from '@ionic-native/secure-storage';
+ * import { SecureStorage, SecureStorageObject } from '@ionic-native/secure-storage';
  *
  * constructor(private secureStorage: SecureStorage) { }
  *
@@ -90,7 +90,7 @@ export class SecureStorageObject {
 @Plugin({
   pluginName: 'SecureStorage',
   plugin: 'cordova-plugin-secure-storage',
-  pluginRef: 'plugins.securestorage',
+  pluginRef: 'cordova.plugins.SecureStorage',
   repo: 'https://github.com/Crypho/cordova-plugin-secure-storage',
   platforms: ['Android', 'iOS', 'Windows Phone', 'Browser']
 })

src/@ionic-native/plugins/speech-recognition/index.ts

@@ -45,7 +45,7 @@ export interface SpeechRecognitionListeningOptionsAndroid {
 
 /**
  * @beta
- * @name SpeechRecognition
+ * @name Speech Recognition
  * @description
  * This plugin does speech recognition using cloud services
  *

src/@ionic-native/plugins/splash-screen/index.ts

@@ -3,7 +3,7 @@ import { Cordova, Plugin } from '@ionic-native/core';
 
 
 /**
- * @name SplashScreen
+ * @name Splash Screen
  * @description This plugin displays and hides a splash screen during application launch. The methods below allows showing and hiding the splashscreen after the app has loaded.
  * @usage
  * ```typescript

src/@ionic-native/plugins/text-to-speech/index.ts

@@ -11,7 +11,7 @@ export interface TTSOptions {
 }
 
 /**
- * @name TextToSpeech
+ * @name Text To Speech
  * @description
  * Text to Speech plugin
  *

src/@ionic-native/plugins/toast/index.ts

@@ -51,7 +51,7 @@ export interface ToastOptions {
  *
  * ...
  *
- * thisoast.show("I'm a toast", '5000', 'center').subscribe(
+ * this.toast.show("I'm a toast", '5000', 'center').subscribe(
  *   toast => {
  *     console.log(toast);
  *   }

src/@ionic-native/plugins/video-player/index.ts

@@ -18,7 +18,7 @@ export interface VideoOptions {
 }
 
 /**
- * @name VideoPlayer
+ * @name Video Player
  * @description
  * A Codova plugin that simply allows you to immediately play a video in fullscreen mode.
  *

tsconfig.json

@@ -8,7 +8,7 @@
     "module": "es2015",
     "moduleResolution": "node",
     "paths": {
-      "@ionic-native/core": ["./dist/packages-dist/@ionic-native/core"]
+      "@ionic-native/core": ["./dist/@ionic-native/core"]
     },
     "rootDir": ".",
     "target": "es5",