fix(rtl): use multi direction in order to override the default ltr

When `Tabs` are nested within each other, the highlight can get
misaligned. This prevents that by ensuring the affected
`.tab-highlight` is a direct child of the targeted `Tabs`.

.github/CONTRIBUTING.md

@@ -5,7 +5,7 @@ Thanks for your interest in contributing to the Ionic Framework! :tada:
 
 ## Contributing Etiquette
 
-Please see our [Contributor Code of Conduct](https://github.com/driftyco/ionic/blob/master/CODE_OF_CONDUCT.md) for information on our rules of conduct.
+Please see our [Contributor Code of Conduct](https://github.com/ionic-team/ionic/blob/master/CODE_OF_CONDUCT.md) for information on our rules of conduct.
 
 
 ## Creating an Issue
@@ -14,20 +14,20 @@ Please see our [Contributor Code of Conduct](https://github.com/driftyco/ionic/b
 
 * It is required that you clearly describe the steps necessary to reproduce the issue you are running into. Although we would love to help our users as much as possible, diagnosing issues without clear reproduction steps is extremely time-consuming and simply not sustainable.
 
-* The issue list of this repo is exclusively for bug reports and feature requests. Non-conforming issues will be closed immediately.
+* The issue list of this repository is exclusively for bug reports and feature requests. Non-conforming issues will be closed immediately.
 
-* Issues with no clear repro steps will not be triaged. If an issue labeled "need reply" receives no further input from the issue author for more than 5 days, it will be closed.
+* Issues with no clear steps to reproduce will not be triaged. If an issue is labeled with "needs reply" and receives no further replies from the author of the issue for more than 5 days, it will be closed.
 
-* If you think you have found a bug, or have a new feature idea, please start by making sure it hasn't already been [reported](https://github.com/driftyco/ionic/issues?utf8=%E2%9C%93&q=is%3Aissue). You can search through existing issues to see if there is a similar one reported. Include closed issues as it may have been closed with a solution.
+* If you think you have found a bug, or have a new feature idea, please start by making sure it hasn't already been [reported](https://github.com/ionic-team/ionic/issues?utf8=%E2%9C%93&q=is%3Aissue). You can search through existing issues to see if there is a similar one reported. Include closed issues as it may have been closed with a solution.
 
-* Next, [create a new issue](https://github.com/driftyco/ionic/issues/new) that thoroughly explains the problem. Please fill out the populated issue form before submitting the issue.
+* Next, [create a new issue](https://github.com/ionic-team/ionic/issues/new) that thoroughly explains the problem. Please fill out the populated issue form before submitting the issue.
 
 
 ## Creating a Pull Request
 
 * We appreciate you taking the time to contribute! Before submitting a pull request, we ask that you please [create an issue](#creating-an-issue) that explains the bug or feature request and let us know that you plan on creating a pull request for it. If an issue already exists, please comment on that issue letting us know you would like to submit a pull request for it. This helps us to keep track of the pull request and make sure there isn't duplicated effort.
 
-* Looking for an issue to fix? Make sure to look through our issues with the [help wanted](https://github.com/driftyco/ionic/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) label!
+* Looking for an issue to fix? Make sure to look through our issues with the [help wanted](https://github.com/ionic-team/ionic/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) label!
 
 ### Setup
 
@@ -85,9 +85,9 @@ Please see our [Contributor Code of Conduct](https://github.com/driftyco/ionic/b
   ```
 
   where `@name` is the Class name, `@description` is the description displayed on the documentation page, `@see` links to any related pages, and `@demo` links to the API demo located in the `demos` folder.
-2. In order to run API documentation locally, you will need to clone the `ionic-site` repo as a sibling to the `ionic` repo and then run it: https://github.com/driftyco/ionic-site#local-build
+2. In order to run API documentation locally, you will need to clone the `ionic-site` repo as a sibling to the `ionic` repo and then run it: https://github.com/ionic-team/ionic-site#local-build
 3. Then, run `gulp docs` in the `ionic` repo every time you make a change and the site will update.
-4. If the change affects the component documentation, create an issue on the `ionic-site` repo: https://github.com/driftyco/ionic-site/issues
+4. If the change affects the component documentation, create an issue on the `ionic-site` repo: https://github.com/ionic-team/ionic-site/issues
 
 
 #### Adding Demos
@@ -106,12 +106,12 @@ Please see our [Contributor Code of Conduct](https://github.com/driftyco/ionic/b
   ```
 3. Run `gulp watch.demos` to watch for changes to the demo
 4. Navigate to `http://localhost:8000/dist/demos/` and then to your component's demo to view it.
-5. If the change affects the component demos, create an issue on the `ionic-site` repo: https://github.com/driftyco/ionic-site/issues
+5. If the change affects the component demos, create an issue on the `ionic-site` repo: https://github.com/ionic-team/ionic-site/issues
 
 
 ## Commit Message Format
 
-We have very precise rules over how our git commit messages should be formatted. This leads to readable messages that are easy to follow when looking through the project history. We also use the git commit messages to generate our [changelog](https://github.com/driftyco/ionic/blob/master/CHANGELOG.md). (Ok you got us, it's basically Angular's commit message format).
+We have very precise rules over how our git commit messages should be formatted. This leads to readable messages that are easy to follow when looking through the project history. We also use the git commit messages to generate our [changelog](https://github.com/ionic-team/ionic/blob/master/CHANGELOG.md). (Ok you got us, it's basically Angular's commit message format).
 
 `type(scope): subject`
 
@@ -143,4 +143,4 @@ The subject contains succinct description of the change:
 
 ## License
 
-By contributing your code to the driftyco/ionic GitHub Repository, you agree to license your contribution under the MIT license.
+By contributing your code to the ionic-team/ionic GitHub Repository, you agree to license your contribution under the MIT license.

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,7 @@
 **Ionic version:**  (check one with "x")
-[ ] **1.x**
+[ ] **1.x** (For Ionic 1.x issues, please use https://github.com/ionic-team/ionic-v1)
 [ ] **2.x**
+[ ] **3.x**
 
 **I'm submitting a ...**  (check one with "x")
 [ ] bug report
@@ -16,9 +17,9 @@
 **Steps to reproduce:**
 <!-- If you are able to illustrate the bug or feature request with an example, please provide steps to reproduce and if possible a demo using one of the following templates:
 
-For Ionic 1 issues - http://plnkr.co/edit/Xo1QyAUx35ny1Xf9ODHx?p=preview
+For Ionic V1 issues - http://plnkr.co/edit/Xo1QyAUx35ny1Xf9ODHx?p=preview
 
-For Ionic 2 issues - http://plnkr.co/edit/z0DzVL?p=preview
+For Ionic issues - http://plnkr.co/edit/cpeRJs?p=preview
 -->
 
 **Related code:**

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,6 +7,6 @@
 -
 -
 
-**Ionic Version**: 1.x / 2.x
+**Ionic Version**: 1.x / 2.x / 3.x
 
 **Fixes**: #

.gitignore

@@ -22,6 +22,7 @@ $RECYCLE.BIN/
 .DS_Store
 Thumbs.db
 UserInterfaceState.xcuserstate
+.env
 
 .package.tmp.json
 

.scss-lint.yml

@@ -2,12 +2,9 @@
 
 # See config at https://github.com/brigade/scss-lint/blob/master/config/default.yml
 
+plugin_directories: ['.scss-linters']
+
 exclude:
-  - 'src/components/item/item.ios.scss'
-  - 'src/components/item/item.md.scss'
-  - 'src/components/list/list.ios.scss'
-  - 'src/components/show-hide-when/**'
-  - 'src/components/slides/**'
   - 'src/themes/ionic.mixins.scss'
   - 'src/themes/license.scss'
   - 'src/themes/util.scss'
@@ -19,6 +16,9 @@ linters:
   ColorVariable:
     enabled: false
 
+  DefaultRule:
+    enabled: true
+
   DuplicateProperty:
     enabled: false
 
@@ -37,13 +37,10 @@ linters:
 
       - position
       - top
-      - right
       - bottom
-      - left
       - z-index
       - display
       - overflow
-      - float
       - clear
       -
       - flex
@@ -59,17 +56,6 @@ linters:
       - justify-content
       - order
       -
-      - margin
-      - margin-top
-      - margin-right
-      - margin-bottom
-      - margin-left
-      - padding
-      - padding-top
-      - padding-right
-      - padding-bottom
-      - padding-left
-      -
       - width
       - min-width
       - max-width
@@ -104,12 +90,6 @@ linters:
       - border-bottom-style
       - border-left-style
 
-      - border-radius
-      - border-top-left-radius
-      - border-top-right-radius
-      - border-bottom-left-radius
-      - border-bottom-right-radius
-
       - border-color
       - border-top-color
       - border-right-color
@@ -135,7 +115,6 @@ linters:
       - letter-spacing
       - line-height
       - list-style
-      - text-align
       - text-decoration
       - text-indent
       - text-overflow
@@ -156,7 +135,6 @@ linters:
       - background-color
       - background-image
       - background-repeat
-      - background-position
       - background-size
 
       # Other
@@ -179,7 +157,6 @@ linters:
 
       - transform
       - transform-box
-      - transform-origin
       - transform-style
 
       - transition
@@ -204,6 +181,33 @@ linters:
     enabled: true
     style: double_quotes
 
+  SelectorDepth:
+    enabled: true
+    max_depth: 5
+
   PropertySpelling:
     extra_properties:
       - contain
+    disabled_properties:
+      - background-position
+      - direction
+      - right
+      - left
+      - float
+      - padding
+      - padding-left
+      - padding-right
+      - padding-top
+      - padding-bottom
+      - margin
+      - margin-left
+      - margin-right
+      - margin-top
+      - margin-bottom
+      - border-radius
+      - border-top-left-radius
+      - border-top-right-radius
+      - border-bottom-right-radius
+      - border-bottom-left-radius
+      - text-align
+      - transform-origin

.scss-linters/default_rule.rb

@@ -0,0 +1,18 @@
+module SCSSLint
+  # Reports the use of !default at the end of variable declarations.
+  class Linter::DefaultRule < Linter
+    include LinterRegistry
+
+    def visit_function(node)
+      return true
+    end
+
+    def visit_variable(node)
+      return if source_from_range(node.source_range).include?('!default')
+
+      return unless node_ancestor(node, 2).nil?
+
+      add_lint(node, '!default should be used')
+    end
+  end
+end

README.md

@@ -1,37 +1,37 @@
 [![npm version](https://badge.fury.io/js/ionic-angular.svg)](https://badge.fury.io/js/ionic-angular)
-[![Circle CI](https://circleci.com/gh/driftyco/ionic.svg?style=shield&circle-token=:circle-token)](https://circleci.com/gh/driftyco/ionic)
+[![Circle CI](https://circleci.com/gh/ionic-team/ionic.svg?style=shield&circle-token=:circle-token)](https://circleci.com/gh/ionic-team/ionic)
 
 # Ionic
 
-[Ionic](http://ionicframework.com/) is the open-source mobile app development framework that makes it easy to
+[Ionic](https://ionicframework.com/) is the open-source mobile app development framework that makes it easy to
 build top quality native and progressive web apps with web technologies.
 
 Ionic is based on [Angular](https://angular.io/) and comes with many significant performance, usability, and
 feature improvements over the past versions.
 
-See the [Building Apps with Ionic 2](http://adamdbradley.github.io/building-with-ionic2) slides for a quick
+See the [Building Apps with Ionic](https://adamdbradley.github.io/building-with-ionic2) slides for a quick
 overview or watch our [Crash Course](https://youtu.be/O2WiI9QrS5s) video for a quick walkthrough on how to get
 started using Ionic.
 
 ### Getting Started
 
-Start a new project by following our quick [Getting Started guide](http://ionicframework.com/getting-started/).
+Start a new project by following our quick [Getting Started guide](https://ionicframework.com/getting-started/).
 We would love to hear from you! If you have any feedback or run into issues using our framework, please file
-an [issue](https://github.com/driftyco/ionic/issues/new) on this repository.
+an [issue](https://github.com/ionic-team/ionic/issues/new) on this repository.
 
 ### Contributing
 
 Thanks for your interest in contributing! Read up on our guidelines for
-[contributing](https://github.com/driftyco/ionic/blob/master/.github/CONTRIBUTING.md)
-and then look through our issues with a [help wanted](https://github.com/driftyco/ionic/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)
+[contributing](https://github.com/ionic-team/ionic/blob/master/.github/CONTRIBUTING.md)
+and then look through our issues with a [help wanted](https://github.com/ionic-team/ionic/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)
 label.
 
 ### Examples
 
-The [Ionic Conference App](https://github.com/driftyco/ionic-conference-app) is a full featured Ionic app.
+The [Ionic Conference App](https://github.com/ionic-team/ionic-conference-app) is a full featured Ionic app.
 It is the perfect starting point for learning and building your own app.
 
-### Ionic 1.x
+### Ionic V1
 
-The source code for Ionic 1.x has been moved to [driftyco/ionic-v1](https://github.com/driftyco/ionic-v1).
-Please open any issues and pull requests related to Ionic 1.x on that repository.
+The source code for Ionic V1 has been moved to [ionic-team/ionic-v1](https://github.com/ionic-team/ionic-v1).
+Please open any issues and pull requests related to Ionic V1 on that repository.

circle.yml

@@ -1,22 +1,44 @@
-general:
-  branches:
-    ignore:
-      - ins_n_outs
-machine:
-  node:
-    version: 4.1.0
-  post:
-    - npm install -g npm@3.x.x
-dependencies:
-  pre:
-    - ./scripts/docs/prepare.sh
-  cache_directories:
-    - "~/ionic-site" # cache ionic-site
-test:
-  override:
-    - gulp lint.ts
-deployment:
- tasks:
-   branch: "master"
-   commands:
-     - ./scripts/ci/deploy.sh
+version: 2
+jobs:
+  build:
+    working_directory: ~/ionic/
+    docker:
+      - image: node:7
+    steps:
+      - checkout
+      - restore_cache:
+         key: ionic-site
+      - run:
+         name: Prepare ionic-site repo
+         command: ./scripts/docs/prepare.sh
+      - save_cache:
+         key: ionic-site
+         paths:
+         - ~/ionic-site/
+      - restore_cache:
+         key: node_modules_{{ checksum "package.json" }}
+      - run:
+         name: Install node modules
+         command: npm i
+      - save_cache:
+         key: node_modules_{{ checksum "package.json" }}
+         paths:
+         - ~/ionic/node_modules/
+      - run:
+          name: Run tslint
+          command: ./node_modules/.bin/gulp lint.ts
+      - run:
+          name: Build Demos
+          command: |
+            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+              ./node_modules/.bin/gulp demos.prod --production=true --batch=$CIRCLE_NODE_INDEX --batches=$CIRCLE_NODE_TOTAL
+            fi
+      - add_ssh_keys
+      - deploy:
+          name: Update docs
+          command: |
+            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+              ./scripts/ci/deploy.sh
+            else
+              echo "We are on ${CIRCLE_BRANCH} branch, not going to update docs."
+            fi

demos/src/action-sheet/app/app.component.ts

@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { PageOne } from '../pages/page-one/page-one';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = PageOne;
+}

demos/src/action-sheet/app/app.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../src';
+
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent),
+    PageOneModule
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}

demos/src/action-sheet/pages/page-one/page-one.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../src';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageOne),
+  ],
+  entryComponents: [
+    PageOne,
+  ]
+})
+export class PageOneModule {}

demos/src/action-sheet/pages/page-one/page-one.ts

@@ -1,11 +1,11 @@
-import { Component, NgModule } from '@angular/core';
-import { ActionSheetController, IonicApp, IonicModule, Platform } from '../../ionic-angular';
+import { Component } from '@angular/core';
+import { ActionSheetController, Platform } from '../../../../../src';
 
 
 @Component({
-  templateUrl: 'page.html'
+  templateUrl: 'page-one.html'
 })
-export class ApiDemoPage {
+export class PageOne {
   constructor(public alertCtrl: ActionSheetController, public platform: Platform) { }
 
   present() {
@@ -55,26 +55,3 @@ export class ApiDemoPage {
     actionSheet.present();
   }
 }
-
-
-@Component({
-  template: '<ion-nav [root]="root"></ion-nav>'
-})
-export class ApiDemoApp {
-  root = ApiDemoPage;
-}
-
-@NgModule({
-  declarations: [
-    ApiDemoApp,
-    ApiDemoPage
-  ],
-  imports: [
-    IonicModule.forRoot(ApiDemoApp)
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    ApiDemoPage
-  ]
-})
-export class AppModule {}

demos/src/alert/app/app.component.ts

@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { PageOne } from '../pages/page-one/page-one';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = PageOne;
+}

demos/src/alert/app/app.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../src';
+
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent),
+    PageOneModule
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}

demos/src/alert/pages/page-one/page-one.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../src';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageOne),
+  ],
+  entryComponents: [
+    PageOne,
+  ]
+})
+export class PageOneModule {}

demos/src/alert/pages/page-one/page-one.ts

@@ -1,11 +1,10 @@
-import { Component, NgModule } from '@angular/core';
-import { AlertController, IonicApp, IonicModule } from '../../ionic-angular';
-
+import { Component } from '@angular/core';
+import { AlertController } from '../../../../../src';
 
 @Component({
-  templateUrl: 'page.html'
+  templateUrl: 'page-one.html'
 })
-export class ApiDemoPage {
+export class PageOne {
   testRadioOpen = false;
   testRadioResult: any;
   testCheckboxOpen = false;
@@ -59,13 +58,13 @@ export class ApiDemoPage {
       buttons: [
         {
           text: 'Cancel',
-          handler: (data: any) => {
+          handler: (data) => {
             console.log('Cancel clicked');
           }
         },
         {
           text: 'Save',
-          handler: (data: any) => {
+          handler: (data) => {
             console.log('Saved clicked');
           }
         }
@@ -208,25 +207,3 @@ export class ApiDemoPage {
   }
 
 }
-
-@Component({
-  template: `<ion-nav [root]="root"></ion-nav>`
-})
-export class ApiDemoApp {
-  root = ApiDemoPage;
-}
-
-@NgModule({
-  declarations: [
-    ApiDemoApp,
-    ApiDemoPage
-  ],
-  imports: [
-    IonicModule.forRoot(ApiDemoApp)
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    ApiDemoPage
-  ]
-})
-export class AppModule {}

demos/src/button/app.module.ts

@@ -1,32 +0,0 @@
-import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../ionic-angular';
-
-
-@Component({
-  templateUrl: 'page.html'
-})
-export class ApiDemoPage {}
-
-
-@Component({
-  template: '<ion-nav [root]="root"></ion-nav>'
-})
-export class ApiDemoApp {
-  root = ApiDemoPage;
-}
-
-
-@NgModule({
-  declarations: [
-    ApiDemoApp,
-    ApiDemoPage
-  ],
-  imports: [
-    IonicModule.forRoot(ApiDemoApp)
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    ApiDemoPage
-  ]
-})
-export class AppModule {}

demos/src/button/app/app.component.ts

@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { PageOne } from '../pages/page-one/page-one';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = PageOne;
+}

demos/src/button/app/app.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../src';
+
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent),
+    PageOneModule
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}

demos/src/button/pages/page-one/page-one.html

@@ -39,12 +39,12 @@
 
   <h4>Icons</h4>
 
-  <button ion-button icon-left color="dark">
+  <button ion-button icon-start color="dark">
     <ion-icon name="star"></ion-icon>
     Left Icon
   </button>
 
-  <button ion-button icon-right color="dark">
+  <button ion-button icon-end color="dark">
     Right Icon
     <ion-icon name="star"></ion-icon>
   </button>

demos/src/button/pages/page-one/page-one.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../src';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageOne),
+  ],
+  entryComponents: [
+    PageOne,
+  ]
+})
+export class PageOneModule {}

demos/src/button/pages/page-one/page-one.ts

@@ -0,0 +1,6 @@
+import { Component } from '@angular/core';
+
+@Component({
+  templateUrl: 'page-one.html'
+})
+export class PageOne {}

demos/src/checkbox/app.module.ts

@@ -1,49 +0,0 @@
-import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../ionic-angular';
-
-
-@Component({
-  templateUrl: 'page.html'
-})
-export class ApiDemoPage {
-
-  data = {
-    jon: true,
-    daenerys: true,
-    arya: false,
-    tyroin: false,
-    sansa: true,
-    khal: false,
-    cersei: true,
-    stannis: true,
-    petyr: false,
-    hodor: true,
-    catelyn: true,
-    bronn: false
-  };
-
-}
-
-
-@Component({
-  template: '<ion-nav [root]="root"></ion-nav>'
-})
-export class ApiDemoApp {
-  root = ApiDemoPage;
-}
-
-
-@NgModule({
-  declarations: [
-    ApiDemoApp,
-    ApiDemoPage
-  ],
-  imports: [
-    IonicModule.forRoot(ApiDemoApp)
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    ApiDemoPage
-  ]
-})
-export class AppModule {}

demos/src/checkbox/app/app.component.ts

@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { PageOne } from '../pages/page-one/page-one';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = PageOne;
+}

demos/src/checkbox/app/app.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../src';
+
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent),
+    PageOneModule
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}

demos/src/checkbox/app/main.ts

@@ -0,0 +1,5 @@
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app.module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);

demos/src/checkbox/pages/page-one/page-one.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../src';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageOne),
+  ],
+  entryComponents: [
+    PageOne,
+  ]
+})
+export class PageOneModule {}

demos/src/checkbox/pages/page-one/page-one.ts

@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+
+@Component({
+  templateUrl: 'page-one.html'
+})
+export class PageOne {
+
+  data = {
+    jon: true,
+    daenerys: true,
+    arya: false,
+    tyroin: false,
+    sansa: true,
+    khal: false,
+    cersei: true,
+    stannis: true,
+    petyr: false,
+    hodor: true,
+    catelyn: true,
+    bronn: false
+  };
+}

demos/src/chip/app.module.ts

@@ -1,35 +0,0 @@
-import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../ionic-angular';
-
-
-@Component({
-  templateUrl: 'page.html'
-})
-export class ApiDemoPage {
-  delete(chip: Element) {
-    chip.remove();
-  }
-}
-
-@Component({
-  template: '<ion-nav [root]="root"></ion-nav>'
-})
-export class ApiDemoApp {
-  root = ApiDemoPage;
-}
-
-
-@NgModule({
-  declarations: [
-    ApiDemoApp,
-    ApiDemoPage
-  ],
-  imports: [
-    IonicModule.forRoot(ApiDemoApp)
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    ApiDemoPage
-  ]
-})
-export class AppModule {}

demos/src/chip/app/app.component.ts

@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { PageOne } from '../pages/page-one/page-one';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = PageOne;
+}

demos/src/chip/app/app.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../src';
+
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent),
+    PageOneModule
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}

demos/src/chip/app/main.ts

@@ -0,0 +1,5 @@
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app.module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);

demos/src/chip/pages/page-one/page-one.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../src';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageOne),
+  ],
+  entryComponents: [
+    PageOne,
+  ]
+})
+export class PageOneModule {}

demos/src/chip/pages/page-one/page-one.ts

@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  templateUrl: 'page-one.html'
+})
+export class PageOne {
+  delete(chip: Element) {
+    chip.remove();
+  }
+}

demos/src/config/app/app.component.ts

@@ -0,0 +1,39 @@
+import { Component } from '@angular/core';
+import { Config, Platform } from '../../../../src';
+import { PageOne } from '../pages/page-one/page-one';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  config: any;
+  root = PageOne;
+  constructor(public _config: Config, public platform: Platform) {
+
+    if (window.localStorage.getItem('configDemo') !== null) {
+      this.config = JSON.parse(window.localStorage.getItem('configDemo'));
+    } else if (platform.is('ios')) {
+      this.config = {
+        'backButtonIcon': 'ios-arrow-back',
+        'iconMode': 'ios',
+        'tabsPlacement': 'bottom'
+      };
+    } else if (platform.is('windows')) {
+      this.config = {
+        'backButtonIcon': 'ios-arrow-back',
+        'iconMode': 'ios',
+        'tabsPlacement': 'top'
+      };
+    } else {
+      this.config = {
+        'backButtonIcon': 'md-arrow-back',
+        'iconMode': 'md',
+        'tabsPlacement': 'bottom'
+      };
+    }
+
+    this._config.set('tabsPlacement', this.config.tabsPlacement);
+    this._config.set('iconMode', this.config.iconMode);
+    this._config.set('backButtonIcon', this.config.backButtonIcon);
+  }
+}

demos/src/config/app/app.module.ts

@@ -1,5 +1,26 @@
-import { Component, NgModule } from '@angular/core';
-import { Config, IonicApp, IonicModule, Platform, NavController } from '../../ionic-angular';
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../src';
+
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
+import { PageTwoModule } from '../pages/page-two/page-two.module';
+import { PageThreeModule } from '../pages/page-three/page-three.module';
+
+@NgModule({
+  declarations: [
+    AppComponent,
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent, CONFIG_DEMO),
+    PageOneModule,
+    PageTwoModule,
+    PageThreeModule
+  ],
+  bootstrap: [IonicApp],
+})
+export class AppModule {}
 
 if (!window.localStorage) {
   Object.defineProperty(window, 'localStorage', new (function () {
@@ -19,7 +40,7 @@ if (!window.localStorage) {
     Object.defineProperty(oStorage, 'setItem', {
       value: function (sKey: string, sValue: string) {
         if (!sKey) { return; }
-        document.cookie = encodeURI(sKey) + '=' + encodeURI(sValue) + '; expires=Tue, 19 Jan 2038 03:14:07 GMT; path=/';
+        document.cookie = encodeURI(sKey) + '=' + encodeURI(sValue) + '; expires=Tue, 19 Jan 2038 03:14:07 GMT; path=';
       },
       writable: false,
       configurable: false,
@@ -33,7 +54,7 @@ if (!window.localStorage) {
     Object.defineProperty(oStorage, 'removeItem', {
       value: function (sKey: string) {
         if (!sKey) { return; }
-        document.cookie = encodeURI(sKey) + '=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/';
+        document.cookie = encodeURI(sKey) + '=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=';
       },
       writable: false,
       configurable: false,
@@ -70,102 +91,3 @@ var CONFIG_DEMO: any = null;
 if (window.localStorage.getItem('configDemo')) {
   CONFIG_DEMO = JSON.parse(window.localStorage.getItem('configDemo'));
 }
-
-
-@Component({
-  templateUrl: 'tabs.html'
-})
-export class TabPage {
-  tabOne = ApiDemoPage;
-}
-
-
-@Component({
-  templateUrl: 'page.html'
-})
-export class ApiDemoPage {
-  config: any;
-  initialConfig: any;
-  constructor(_config: Config,  public navCtrl: NavController) {
-    this.config = _config.settings();
-    this.initialConfig = this.config;
-  }
-
-
-  load() {
-    window.localStorage.setItem('configDemo', JSON.stringify(this.config));
-    window.location.reload();
-  }
-
-  push() {
-    this.navCtrl.push(PushPage);
-  }
-}
-
-@Component({
-  templateUrl: 'push-page.html'
-})
-export class PushPage {
-  constructor(public navCtrl: NavController) {}
-
-  pop() {
-    this.navCtrl.pop();
-  }
-}
-
-
-@Component({
-  template: '<ion-nav [root]="root" #content></ion-nav>'
-})
-export class ApiDemoApp {
-  config: any;
-  root = TabPage;
-  constructor(public _config: Config, public platform: Platform) {
-
-    if (window.localStorage.getItem('configDemo') !== null) {
-      this.config = JSON.parse(window.localStorage.getItem('configDemo'));
-    } else if (platform.is('ios')) {
-      this.config = {
-        'backButtonIcon': 'ios-arrow-back',
-        'iconMode': 'ios',
-        'tabsPlacement': 'bottom'
-      };
-    } else if (platform.is('windows')) {
-      this.config = {
-        'backButtonIcon': 'ios-arrow-back',
-        'iconMode': 'ios',
-        'tabsPlacement': 'top'
-      };
-    } else {
-      this.config = {
-        'backButtonIcon': 'md-arrow-back',
-        'iconMode': 'md',
-        'tabsPlacement': 'bottom'
-      };
-    }
-
-    this._config.set('tabsPlacement', this.config.tabsPlacement);
-    this._config.set('iconMode', this.config.iconMode);
-    this._config.set('backButtonIcon', this.config.backButtonIcon);
-  }
-}
-
-
-@NgModule({
-  declarations: [
-    ApiDemoApp,
-    ApiDemoPage,
-    PushPage,
-    TabPage
-  ],
-  imports: [
-    IonicModule.forRoot(ApiDemoApp, CONFIG_DEMO)
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    ApiDemoPage,
-    PushPage,
-    TabPage
-  ]
-})
-export class AppModule {}

demos/src/config/app/main.ts

@@ -0,0 +1,5 @@
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app.module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);

demos/src/config/pages/page-one/page-one.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../src';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageOne),
+  ],
+  entryComponents: [
+    PageOne,
+  ]
+})
+export class PageOneModule {}

demos/src/config/pages/page-one/page-one.ts

@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { PageTwo } from '../page-two/page-two';
+
+@Component({
+  templateUrl: 'page-one.html'
+})
+export class PageOne {
+  tabOne = PageTwo;
+}

demos/src/config/pages/page-three/page-three.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../src';
+
+import { PageThree } from './page-three';
+
+@NgModule({
+  declarations: [
+    PageThree,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageThree),
+  ],
+  entryComponents: [
+    PageThree,
+  ]
+})
+export class PageThreeModule {}

demos/src/config/pages/page-three/page-three.ts

@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+import { NavController } from '../../../../../src';
+
+@Component({
+  templateUrl: 'page-three.html'
+})
+export class PageThree {
+  constructor(public navCtrl: NavController) {}
+
+  pop() {
+    this.navCtrl.pop();
+  }
+}

demos/src/config/pages/page-two/page-two.html

@@ -52,6 +52,7 @@
   <pre margin>
 &#64;NgModule(&#123;
   imports: [
+  BrowserModule,
     IonicModule.forRoot(MyApp, &#123;
       backButtonIcon: "{{initialConfig?.backButtonIcon}}"
       iconMode: "{{initialConfig?.iconMode}}"

demos/src/config/pages/page-two/page-two.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../src';
+
+import { PageTwo } from './page-two';
+
+@NgModule({
+  declarations: [
+    PageTwo,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageTwo),
+  ],
+  entryComponents: [
+    PageTwo,
+  ]
+})
+export class PageTwoModule {}

demos/src/config/pages/page-two/page-two.ts

@@ -0,0 +1,24 @@
+import { Component } from '@angular/core';
+import { Config, NavController } from '../../../../../src';
+import { PageThree } from '../page-three/page-three';
+
+@Component({
+  templateUrl: 'page-two.html'
+})
+export class PageTwo {
+  config: any;
+  initialConfig: any;
+  constructor(_config: Config,  public navCtrl: NavController) {
+    this.config = _config.settings();
+    this.initialConfig = this.config;
+  }
+
+  load() {
+    window.localStorage.setItem('configDemo', JSON.stringify(this.config));
+    window.location.reload();
+  }
+
+  push() {
+    this.navCtrl.push(PageThree);
+  }
+}

demos/src/config/pages/push-page.html

@@ -0,0 +1,11 @@
+<ion-header>
+  <ion-navbar>
+    <ion-title>Page</ion-title>
+  </ion-navbar>
+</ion-header>
+
+<ion-content>
+  <div padding>
+    <button ion-button block (click)="pop()">Go Back to Config</button>
+  </div>
+</ion-content>

demos/src/datetime/app/app.component.ts

@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { PageOne } from '../pages/page-one/page-one';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = PageOne;
+}

demos/src/datetime/app/app.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../src';
+
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent),
+    PageOneModule
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}

demos/src/datetime/app/main.ts

@@ -0,0 +1,5 @@
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app.module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);

demos/src/datetime/pages/page-one/page-one.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../src';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageOne),
+  ],
+  entryComponents: [
+    PageOne,
+  ]
+})
+export class PageOneModule {}

demos/src/datetime/pages/page-one/page-one.ts

@@ -1,11 +1,9 @@
-import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../ionic-angular';
-
+import { Component } from '@angular/core';
 
 @Component({
-  templateUrl: 'page.html'
+  templateUrl: 'page-one.html'
 })
-export class ApiDemoPage {
+export class PageOne {
   wwwReleased = '1991';
   netscapeReleased = '1994-12-15T13:47:20.789';
   operaReleased = '1995-04-15';
@@ -40,7 +38,7 @@ export class ApiDemoPage {
     }
   }
 
-  calculateTime(offset) {
+  calculateTime(offset: any) {
     // create Date object for current location
     let d = new Date();
 
@@ -52,37 +50,13 @@ export class ApiDemoPage {
   }
 
   // Determine if the client uses DST
-  stdTimezoneOffset(today) {
+  stdTimezoneOffset(today: any) {
     let jan = new Date(today.getFullYear(), 0, 1);
     let jul = new Date(today.getFullYear(), 6, 1);
     return Math.max(jan.getTimezoneOffset(), jul.getTimezoneOffset());
   }
 
-  dst(today) {
+  dst(today: any) {
     return today.getTimezoneOffset() < this.stdTimezoneOffset(today);
   }
 }
-
-
-@Component({
-  template: '<ion-nav [root]="root"></ion-nav>'
-})
-export class ApiDemoApp {
-  root = ApiDemoPage;
-}
-
-
-@NgModule({
-  declarations: [
-    ApiDemoApp,
-    ApiDemoPage
-  ],
-  imports: [
-    IonicModule.forRoot(ApiDemoApp)
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    ApiDemoPage
-  ]
-})
-export class AppModule {}

demos/src/events/app.module.ts

@@ -1,89 +0,0 @@
-import { Component, NgModule, ViewChild } from '@angular/core';
-import { Events, IonicApp, IonicModule, Nav } from '../../ionic-angular';
-
-
-@Component({
-  templateUrl: 'login.html'
-})
-export class Login {
-  user = {
-    name: 'Administrator',
-    username: 'admin'
-  };
-
-  constructor(private events: Events) {}
-
-  login() {
-    this.events.publish('user:login');
-  }
-
-}
-
-@Component({
-  templateUrl: 'logout.html'
-})
-export class Logout {
-  constructor(private events: Events) {}
-
-  logout() {
-    this.events.publish('user:logout');
-  }
-}
-
-
-@Component({
-  templateUrl: 'app.html'
-})
-export class ApiDemoApp {
-  @ViewChild(Nav) nav: Nav;
-
-  root = Login;
-  loggedIn = false;
-
-  loggedInPages = [
-    { title: 'Logout', component: Logout }
-  ];
-
-  loggedOutPages = [
-    { title: 'Login', component: Login }
-  ];
-
-  constructor(private events: Events) {
-    this.listenToLoginEvents();
-  }
-
-  openPage(menu, page) {
-    // find the nav component and set what the root page should be
-    // reset the nav to remove previous pages and only have this page
-    // we wouldn't want the back button to show in this scenario
-    this.nav.setRoot(page.component);
-  }
-
-  listenToLoginEvents() {
-    this.events.subscribe('user:login', () => {
-      this.loggedIn = true;
-    });
-
-    this.events.subscribe('user:logout', () => {
-      this.loggedIn = false;
-    });
-  }
-}
-
-
-@NgModule({
-  declarations: [
-    ApiDemoApp,
-    Login,
-    Logout
-  ],
-  imports: [
-    IonicModule.forRoot(ApiDemoApp)
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    Login,
-    Logout
-  ]
-})
-export class AppModule {}

demos/src/events/app/app.component.ts

@@ -0,0 +1,45 @@
+import { Component, ViewChild } from '@angular/core';
+import { Events, Nav } from '../../../../src';
+
+import { PageOne } from '../pages/page-one/page-one';
+import { PageTwo } from '../pages/page-two/page-two';
+
+@Component({
+  templateUrl: 'app.component.html'
+})
+export class AppComponent {
+
+  @ViewChild(Nav) nav: Nav;
+
+  root = PageOne;
+  loggedIn = false;
+
+  loggedInPages = [
+    { title: 'Logout', component: PageTwo }
+  ];
+
+  loggedOutPages = [
+    { title: 'Login', component: PageOne }
+  ];
+
+  constructor(private events: Events) {
+    this.listenToLoginEvents();
+  }
+
+  openPage(menu: any, page: any) {
+    // find the nav component and set what the root page should be
+    // reset the nav to remove previous pages and only have this page
+    // we wouldn't want the back button to show in this scenario
+    this.nav.setRoot(page.component);
+  }
+
+  listenToLoginEvents() {
+    this.events.subscribe('user:login', () => {
+      this.loggedIn = true;
+    });
+
+    this.events.subscribe('user:logout', () => {
+      this.loggedIn = false;
+    });
+  }
+}

demos/src/events/app/app.module.ts

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../src';
+
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
+import { PageTwoModule } from '../pages/page-two/page-two.module';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent),
+    PageOneModule,
+    PageTwoModule
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}

demos/src/events/app/main.ts

@@ -0,0 +1,5 @@
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app.module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);

demos/src/events/pages/page-one/page-one.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../src';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageOne),
+  ],
+  entryComponents: [
+    PageOne,
+  ]
+})
+export class PageOneModule {}

demos/src/events/pages/page-one/page-one.ts

@@ -0,0 +1,18 @@
+import { Component } from '@angular/core';
+import { Events } from '../../../../../src';
+
+@Component({
+  templateUrl: 'page-one.html'
+})
+export class PageOne {
+  user = {
+    name: 'Administrator',
+    username: 'admin'
+  };
+
+  constructor(private events: Events) {}
+
+  login() {
+    this.events.publish('user:login');
+  }
+}

demos/src/events/pages/page-two/page-two.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../src';
+
+import { PageTwo } from './page-two';
+
+@NgModule({
+  declarations: [
+    PageTwo,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageTwo),
+  ],
+  entryComponents: [
+    PageTwo,
+  ]
+})
+export class PageTwoModule {}

demos/src/events/pages/page-two/page-two.ts

@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+import { Events } from '../../../../../src';
+
+@Component({
+  templateUrl: 'page-two.html'
+})
+export class PageTwo {
+  constructor(private events: Events) {}
+
+  logout() {
+    this.events.publish('user:logout');
+  }
+}

demos/src/fab/app.module.ts

@@ -1,48 +0,0 @@
-import { Component, NgModule } from '@angular/core';
-import { FabContainer, IonicApp, IonicModule } from '../../ionic-angular';
-
-
-@Component({
-  templateUrl: 'page.html'
-})
-export class ApiDemoPage {
-  array: number[] = [];
-
-  add() {
-    this.array.push(1);
-  }
-
-  clickMainFAB() {
-    console.log('Clicked open social menu');
-  }
-
-  openSocial(network: string, fab: FabContainer) {
-    console.log('Share in ' + network);
-    fab.close();
-  }
-}
-
-
-@Component({
-  template: '<ion-nav [root]="root"></ion-nav>'
-})
-export class ApiDemoApp {
-  root = ApiDemoPage;
-}
-
-
-@NgModule({
-  declarations: [
-    ApiDemoApp,
-    ApiDemoPage
-  ],
-  imports: [
-    IonicModule.forRoot(ApiDemoApp)
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    ApiDemoPage
-  ]
-})
-export class AppModule {}
-

demos/src/fab/app/app.component.ts

@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { PageOne } from '../pages/page-one/page-one';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = PageOne;
+}

demos/src/fab/app/app.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../src';
+
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent),
+    PageOneModule
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}

demos/src/fab/app/main.ts

@@ -0,0 +1,5 @@
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app.module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);

demos/src/fab/pages/page-one/page-one.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../src';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageOne),
+  ],
+  entryComponents: [
+    PageOne,
+  ]
+})
+export class PageOneModule {}

demos/src/fab/pages/page-one/page-one.ts

@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+import { FabContainer } from '../../../../../src';
+
+@Component({
+  templateUrl: 'page-one.html'
+})
+export class PageOne {
+  array: number[] = [];
+
+  add() {
+    this.array.push(1);
+  }
+
+  clickMainFAB() {
+    console.log('Clicked open social menu');
+  }
+
+  openSocial(network: string, fab: FabContainer) {
+    console.log('Share in ' + network);
+    fab.close();
+  }
+}

demos/src/hide-when/app.module.ts

@@ -1,32 +0,0 @@
-import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../ionic-angular';
-
-
-@Component({
-  templateUrl: 'page.html'
-})
-export class ApiDemoPage {}
-
-
-@Component({
-  template: '<ion-nav [root]="root"></ion-nav>'
-})
-export class ApiDemoApp {
-  root = ApiDemoPage;
-}
-
-
-@NgModule({
-  declarations: [
-    ApiDemoApp,
-    ApiDemoPage
-  ],
-  imports: [
-    IonicModule.forRoot(ApiDemoApp)
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    ApiDemoPage
-  ]
-})
-export class AppModule {}

demos/src/hide-when/app/app.component.ts

@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { PageOne } from '../pages/page-one/page-one';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = PageOne;
+}

demos/src/hide-when/app/app.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../src';
+
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent),
+    PageOneModule
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}

demos/src/hide-when/app/main.ts

@@ -0,0 +1,5 @@
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app.module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);

demos/src/hide-when/pages/page-one/page-one.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../src';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageOne),
+  ],
+  entryComponents: [
+    PageOne,
+  ]
+})
+export class PageOneModule {}

demos/src/hide-when/pages/page-one/page-one.ts

@@ -0,0 +1,6 @@
+import { Component } from '@angular/core';
+
+@Component({
+  templateUrl: 'page-one.html'
+})
+export class PageOne {}

demos/src/icon/app.module.ts

@@ -1,32 +0,0 @@
-import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../ionic-angular';
-
-
-@Component({
-  templateUrl: 'page.html'
-})
-export class ApiDemoPage {}
-
-
-@Component({
-  template: '<ion-nav [root]="root"></ion-nav>'
-})
-export class ApiDemoApp {
-  root = ApiDemoPage;
-}
-
-
-@NgModule({
-  declarations: [
-    ApiDemoApp,
-    ApiDemoPage
-  ],
-  imports: [
-    IonicModule.forRoot(ApiDemoApp)
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    ApiDemoPage
-  ]
-})
-export class AppModule {}

demos/src/icon/app/app.component.ts

@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { PageOne } from '../pages/page-one/page-one';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = PageOne;
+}

demos/src/icon/app/app.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../src';
+
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent),
+    PageOneModule
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}

demos/src/icon/app/main.ts

@@ -0,0 +1,5 @@
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app.module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);

demos/src/icon/pages/page-one/page-one.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../src';
+
+import { PageOne } from './page-one';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageOne),
+  ],
+  entryComponents: [
+    PageOne,
+  ]
+})
+export class PageOneModule {}

demos/src/icon/pages/page-one/page-one.ts

@@ -0,0 +1,6 @@
+import { Component } from '@angular/core';
+
+@Component({
+  templateUrl: 'page-one.html'
+})
+export class PageOne {}

demos/src/infinite-scroll/app.module.ts

@@ -1,117 +0,0 @@
-import { Component, Injectable, NgModule } from '@angular/core';
-import { InfiniteScroll, IonicApp, IonicModule } from '../../ionic-angular';
-
-
-/**
- * Mock Data Access Object
- **/
-@Injectable()
-export class MockProvider {
-
-  getData(): any[] {
-    // return mock data synchronously
-    let data = [];
-    for (var i = 0; i < 20; i++) {
-      data.push( this._getRandomData() );
-    }
-    return data;
-  }
-
-  getAsyncData(): Promise<any[]> {
-    // async receive mock data
-    return new Promise(resolve => {
-
-      setTimeout(() => {
-        resolve(this.getData());
-      }, 1000);
-
-    });
-  }
-
-  private _getRandomData() {
-    let i = Math.floor( Math.random() * this._data.length );
-    return this._data[i];
-  }
-
-  private _data = [
-    'Fast Times at Ridgemont High',
-    'Peggy Sue Got Married',
-    'Raising Arizona',
-    'Moonstruck',
-    'Fire Birds',
-    'Honeymoon in Vegas',
-    'Amos & Andrew',
-    'It Could Happen to You',
-    'Trapped in Paradise',
-    'Leaving Las Vegas',
-    'The Rock',
-    'Con Air',
-    'Face/Off',
-    'City of Angels',
-    'Gone in Sixty Seconds',
-    'The Family Man',
-    'Windtalkers',
-    'Matchstick Men',
-    'National Treasure',
-    'Ghost Rider',
-    'Grindhouse',
-    'Next',
-    'Kick-Ass',
-    'Drive Angry',
-  ];
-
-}
-
-
-@Component({
-  templateUrl: 'page.html'
-})
-export class ApiDemoPage {
-  items: string[];
-
-  constructor(private mockProvider: MockProvider) {
-    this.items = mockProvider.getData();
-  }
-
-  doInfinite(infiniteScroll: InfiniteScroll) {
-    this.mockProvider.getAsyncData().then((newData) => {
-      for (var i = 0; i < newData.length; i++) {
-        this.items.push( newData[i] );
-      }
-
-      infiniteScroll.complete();
-
-      if (this.items.length > 90) {
-        infiniteScroll.enable(false);
-      }
-    });
-  }
-
-}
-
-@Component({
-  template: '<ion-nav [root]="rootPage"></ion-nav>'
-})
-export class ApiDemoApp {
-  rootPage = ApiDemoPage;
-}
-
-
-@NgModule({
-  declarations: [
-    ApiDemoApp,
-    ApiDemoPage
-  ],
-  imports: [
-    IonicModule.forRoot(ApiDemoApp)
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    ApiDemoApp,
-    ApiDemoPage
-  ],
-  providers: [
-    MockProvider
-  ]
-})
-export class AppModule {}

demos/src/infinite-scroll/app/app.component.ts

@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { PageOne } from '../pages/page-one/page-one';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = PageOne;
+}

demos/src/infinite-scroll/app/app.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../src';
+
+import { AppComponent } from './app.component';
+import { PageOneModule } from '../pages/page-one/page-one.module';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent),
+    PageOneModule
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}

demos/src/infinite-scroll/app/main.ts

@@ -0,0 +1,5 @@
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app.module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);

demos/src/infinite-scroll/pages/page-one/page-one.module.ts

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../src';
+
+import { PageOne } from './page-one';
+import { MockProvider } from './provider';
+
+@NgModule({
+  declarations: [
+    PageOne,
+  ],
+  imports: [
+    IonicPageModule.forChild(PageOne),
+  ],
+  entryComponents: [
+    PageOne,
+  ],
+  providers: [
+    MockProvider
+  ]
+})
+export class PageOneModule {}

demos/src/infinite-scroll/pages/page-one/page-one.ts

@@ -0,0 +1,28 @@
+import { Component } from '@angular/core';
+import { MockProvider} from './provider';
+import { InfiniteScroll } from '../../../../../src';
+
+@Component({
+  templateUrl: 'page-one.html'
+})
+export class PageOne {
+  items: string[];
+
+  constructor(private mockProvider: MockProvider) {
+    this.items = mockProvider.getData();
+  }
+
+  doInfinite(infiniteScroll: InfiniteScroll) {
+    this.mockProvider.getAsyncData().then((newData) => {
+      for (var i = 0; i < newData.length; i++) {
+        this.items.push( newData[i] );
+      }
+
+      infiniteScroll.complete();
+
+      if (this.items.length > 90) {
+        infiniteScroll.enable(false);
+      }
+    });
+  }
+}