Merge branch 'master' into searchbar-fix

# Conflicts:
#	ionic/components/searchbar/searchbar.ts

scripts/build/config.js

@@ -17,6 +17,7 @@ module.exports = {
     'node_modules/angular2/bundles/angular2.dev.js',
     'node_modules/angular2/bundles/router.dev.js',
     'node_modules/angular2/bundles/http.dev.js',
+    'node_modules/es6-shim/es6-shim.min.js',
     'dist/js/ionic.js',
     'scripts/resources/web-animations-js/web-animations.min.js'
   ],

scripts/e2e/e2e.template.html

@@ -5,8 +5,12 @@
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
 
-  <link ios-href="../../../css/ionic.ios.css" rel="stylesheet">
-  <link md-href="../../../css/ionic.md.css" rel="stylesheet">
+  <link ios-href="/dist/bundles/ionic.ios.css" rel="stylesheet">
+  <link md-href="/dist/bundles/ionic.md.css" rel="stylesheet">
+
+  <script src="/node_modules/systemjs/node_modules/es6-module-loader/dist/es6-module-loader.src.js"></script>
+  <script src="/node_modules/systemjs/dist/system.src.js"></script>
+  <script src="/node_modules/angular2/bundles/angular2-polyfills.js"></script>
 
   <script>
     if (!console.time) {
@@ -78,19 +82,15 @@
     <ion-loading-icon></ion-loading-icon>
   </ion-app>
 
-  <script src="../../../js/ionic.bundle.js"></script>
-
   <script>
     System.config({
-      "paths": {
-        "*": "*.js",
-        "ionic/*": "ionic/*",
-        "angular2/*": "angular2/*",
-        "rxjs/*": "rxjs/*"
+      map: {
+        'rxjs': '/node_modules/rxjs',
+        'angular2': '/node_modules/angular2/bundles/angular2.umd.dev.js',
+        'ionic/ionic': '/dist/bundles/ionic.js'
       }
     })
-    System.import("index").then(function(m) {}, console.error.bind(console));
-
+    System.import('bundle.js').then(function(m) {}, console.error.bind(console));
     console.timeEnd('script init');
   </script>
 

scripts/e2e/webpack.config.js

@@ -0,0 +1,37 @@
+module.exports = {
+  entry: [
+    "web-animations.min"
+  ],
+  externals: [
+    {
+      'ionic/ionic': {
+        commonjs2: 'ionic/ionic'
+      },
+      'angular2/core': {
+        commonjs2: ['angular2', 'core']
+      },
+      'angular2/common': {
+        commonjs2: ['angular2', 'common']
+      },
+      'angular2/router' : {
+        commonjs2: ['angular2', 'router']
+      },
+      'angular2/http': {
+        commonjs2: ['angular2', 'http']
+      },
+      'angular2/platform/browser': {
+        commonjs2: ['angular2', 'platform', 'browser']
+      },
+      'angular2/instrumentation': {
+        commonjs2: ['angular2', 'instrumentation']
+      },
+    }
+  ],
+  module: {
+    loaders: [{ test: /\.ts$/, loader: "awesome-typescript-loader" }]
+  },
+  resolve: {
+    alias: {'web-animations.min': './dist/js/web-animations.min'},
+    extensions: ["", ".js", ".ts"]
+  }
+};

scripts/npm/ionic.webpack.config.js

@@ -0,0 +1,32 @@
+module.exports = {
+  entry: [
+    "./dist/ionic.js"
+  ],
+  output: {
+    path: 'dist/bundles',
+    filename: 'ionic.js',
+    libraryTarget: 'commonjs2'
+  },
+  externals: [
+    {
+      'angular2/core': {
+        commonjs2: ['angular2', 'core']
+      },
+      'angular2/common': {
+        commonjs2: ['angular2', 'common']
+      },
+      'angular2/router' : {
+        commonjs2: ['angular2', 'router']
+      },
+      'angular2/http': {
+        commonjs2: ['angular2', 'http']
+      },
+      'angular2/platform/browser': {
+        commonjs2: ['angular2', 'platform', 'browser']
+      },
+      'angular2/instrumentation': {
+        commonjs2: ['angular2', 'instrumentation']
+      },
+    }
+  ]
+};