alpha 27

config.js

@@ -15,21 +15,261 @@ System.config({
 
 System.config({
   "map": {
+    "angular2": "npm:angular2@2.0.0-alpha.27",
     "babel": "npm:babel-core@5.4.7",
     "babel-core": "npm:babel-core@5.4.7",
     "babel-runtime": "npm:babel-runtime@5.4.7",
     "core-js": "npm:core-js@0.9.14",
     "rx": "npm:rx@2.5.3",
+    "github:jspm/nodelibs-assert@0.1.0": {
+      "assert": "npm:assert@1.3.0"
+    },
+    "github:jspm/nodelibs-buffer@0.1.0": {
+      "buffer": "npm:buffer@3.2.2"
+    },
+    "github:jspm/nodelibs-constants@0.1.0": {
+      "constants-browserify": "npm:constants-browserify@0.0.1"
+    },
+    "github:jspm/nodelibs-crypto@0.1.0": {
+      "crypto-browserify": "npm:crypto-browserify@3.9.14"
+    },
+    "github:jspm/nodelibs-events@0.1.1": {
+      "events": "npm:events@1.0.2"
+    },
+    "github:jspm/nodelibs-path@0.1.0": {
+      "path-browserify": "npm:path-browserify@0.0.0"
+    },
     "github:jspm/nodelibs-process@0.1.1": {
       "process": "npm:process@0.10.1"
     },
+    "github:jspm/nodelibs-stream@0.1.0": {
+      "stream-browserify": "npm:stream-browserify@1.0.0"
+    },
+    "github:jspm/nodelibs-url@0.1.0": {
+      "url": "npm:url@0.10.3"
+    },
+    "github:jspm/nodelibs-util@0.1.0": {
+      "util": "npm:util@0.10.3"
+    },
+    "github:jspm/nodelibs-vm@0.1.0": {
+      "vm-browserify": "npm:vm-browserify@0.0.4"
+    },
+    "npm:angular2@2.0.0-alpha.27": {
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
+      "path": "github:jspm/nodelibs-path@0.1.0",
+      "process": "github:jspm/nodelibs-process@0.1.1",
+      "reflect-metadata": "npm:reflect-metadata@0.1.0",
+      "rx": "npm:rx@2.5.1",
+      "url": "github:jspm/nodelibs-url@0.1.0",
+      "zone.js": "npm:zone.js@0.5.1"
+    },
+    "npm:asn1.js@2.0.4": {
+      "assert": "github:jspm/nodelibs-assert@0.1.0",
+      "bn.js": "npm:bn.js@2.0.5",
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "inherits": "npm:inherits@2.0.1",
+      "minimalistic-assert": "npm:minimalistic-assert@1.0.0",
+      "vm": "github:jspm/nodelibs-vm@0.1.0"
+    },
+    "npm:assert@1.3.0": {
+      "util": "npm:util@0.10.3"
+    },
+    "npm:browserify-aes@1.0.1": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "create-hash": "npm:create-hash@1.1.1",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
+      "inherits": "npm:inherits@2.0.1",
+      "stream": "github:jspm/nodelibs-stream@0.1.0",
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0"
+    },
+    "npm:browserify-rsa@2.0.1": {
+      "bn.js": "npm:bn.js@2.0.5",
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "constants": "github:jspm/nodelibs-constants@0.1.0",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "randombytes": "npm:randombytes@2.0.1"
+    },
+    "npm:browserify-sign@3.0.2": {
+      "bn.js": "npm:bn.js@2.0.5",
+      "browserify-rsa": "npm:browserify-rsa@2.0.1",
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "create-hash": "npm:create-hash@1.1.1",
+      "create-hmac": "npm:create-hmac@1.1.3",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "elliptic": "npm:elliptic@3.1.0",
+      "inherits": "npm:inherits@2.0.1",
+      "parse-asn1": "npm:parse-asn1@3.0.1",
+      "stream": "github:jspm/nodelibs-stream@0.1.0",
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0"
+    },
+    "npm:buffer@3.2.2": {
+      "base64-js": "npm:base64-js@0.0.8",
+      "ieee754": "npm:ieee754@1.1.6",
+      "is-array": "npm:is-array@1.0.1"
+    },
+    "npm:constants-browserify@0.0.1": {
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0"
+    },
     "npm:core-js@0.9.14": {
       "fs": "github:jspm/nodelibs-fs@0.1.2",
       "process": "github:jspm/nodelibs-process@0.1.1",
       "systemjs-json": "github:systemjs/plugin-json@0.1.0"
     },
+    "npm:core-util-is@1.0.1": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0"
+    },
+    "npm:create-ecdh@2.0.1": {
+      "bn.js": "npm:bn.js@2.0.5",
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "elliptic": "npm:elliptic@3.1.0"
+    },
+    "npm:create-hash@1.1.1": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
+      "inherits": "npm:inherits@2.0.1",
+      "ripemd160": "npm:ripemd160@1.0.1",
+      "sha.js": "npm:sha.js@2.4.2",
+      "stream": "github:jspm/nodelibs-stream@0.1.0"
+    },
+    "npm:create-hmac@1.1.3": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "create-hash": "npm:create-hash@1.1.1",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "inherits": "npm:inherits@2.0.1",
+      "stream": "github:jspm/nodelibs-stream@0.1.0"
+    },
+    "npm:crypto-browserify@3.9.14": {
+      "browserify-aes": "npm:browserify-aes@1.0.1",
+      "browserify-sign": "npm:browserify-sign@3.0.2",
+      "create-ecdh": "npm:create-ecdh@2.0.1",
+      "create-hash": "npm:create-hash@1.1.1",
+      "create-hmac": "npm:create-hmac@1.1.3",
+      "diffie-hellman": "npm:diffie-hellman@3.0.2",
+      "inherits": "npm:inherits@2.0.1",
+      "pbkdf2": "npm:pbkdf2@3.0.4",
+      "public-encrypt": "npm:public-encrypt@2.0.1",
+      "randombytes": "npm:randombytes@2.0.1"
+    },
+    "npm:diffie-hellman@3.0.2": {
+      "bn.js": "npm:bn.js@2.0.5",
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "miller-rabin": "npm:miller-rabin@2.0.1",
+      "randombytes": "npm:randombytes@2.0.1",
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0"
+    },
+    "npm:elliptic@3.1.0": {
+      "bn.js": "npm:bn.js@2.0.5",
+      "brorand": "npm:brorand@1.0.5",
+      "hash.js": "npm:hash.js@1.0.3",
+      "inherits": "npm:inherits@2.0.1",
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0"
+    },
+    "npm:hash.js@1.0.3": {
+      "inherits": "npm:inherits@2.0.1"
+    },
+    "npm:inherits@2.0.1": {
+      "util": "github:jspm/nodelibs-util@0.1.0"
+    },
+    "npm:miller-rabin@2.0.1": {
+      "bn.js": "npm:bn.js@2.0.5",
+      "brorand": "npm:brorand@1.0.5"
+    },
+    "npm:parse-asn1@3.0.1": {
+      "asn1.js": "npm:asn1.js@2.0.4",
+      "browserify-aes": "npm:browserify-aes@1.0.1",
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "create-hash": "npm:create-hash@1.1.1",
+      "pbkdf2": "npm:pbkdf2@3.0.4",
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0"
+    },
+    "npm:path-browserify@0.0.0": {
+      "process": "github:jspm/nodelibs-process@0.1.1"
+    },
+    "npm:pbkdf2@3.0.4": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "child_process": "github:jspm/nodelibs-child_process@0.1.0",
+      "create-hmac": "npm:create-hmac@1.1.3",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "path": "github:jspm/nodelibs-path@0.1.0",
+      "process": "github:jspm/nodelibs-process@0.1.1",
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0"
+    },
+    "npm:public-encrypt@2.0.1": {
+      "bn.js": "npm:bn.js@2.0.5",
+      "browserify-rsa": "npm:browserify-rsa@2.0.1",
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "create-hash": "npm:create-hash@1.1.1",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "parse-asn1": "npm:parse-asn1@3.0.1",
+      "randombytes": "npm:randombytes@2.0.1"
+    },
+    "npm:punycode@1.3.2": {
+      "process": "github:jspm/nodelibs-process@0.1.1"
+    },
+    "npm:randombytes@2.0.1": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "process": "github:jspm/nodelibs-process@0.1.1"
+    },
+    "npm:readable-stream@1.1.13": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "core-util-is": "npm:core-util-is@1.0.1",
+      "events": "github:jspm/nodelibs-events@0.1.1",
+      "inherits": "npm:inherits@2.0.1",
+      "isarray": "npm:isarray@0.0.1",
+      "process": "github:jspm/nodelibs-process@0.1.1",
+      "stream": "github:jspm/nodelibs-stream@0.1.0",
+      "stream-browserify": "npm:stream-browserify@1.0.0",
+      "string_decoder": "npm:string_decoder@0.10.31",
+      "util": "github:jspm/nodelibs-util@0.1.0"
+    },
+    "npm:reflect-metadata@0.1.0": {
+      "assert": "github:jspm/nodelibs-assert@0.1.0",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0"
+    },
+    "npm:ripemd160@1.0.1": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "process": "github:jspm/nodelibs-process@0.1.1"
+    },
+    "npm:rx@2.5.1": {
+      "process": "github:jspm/nodelibs-process@0.1.1"
+    },
     "npm:rx@2.5.3": {
       "process": "github:jspm/nodelibs-process@0.1.1"
+    },
+    "npm:sha.js@2.4.2": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
+      "inherits": "npm:inherits@2.0.1",
+      "process": "github:jspm/nodelibs-process@0.1.1"
+    },
+    "npm:stream-browserify@1.0.0": {
+      "events": "github:jspm/nodelibs-events@0.1.1",
+      "inherits": "npm:inherits@2.0.1",
+      "readable-stream": "npm:readable-stream@1.1.13"
+    },
+    "npm:string_decoder@0.10.31": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0"
+    },
+    "npm:url@0.10.3": {
+      "assert": "github:jspm/nodelibs-assert@0.1.0",
+      "punycode": "npm:punycode@1.3.2",
+      "querystring": "npm:querystring@0.2.0",
+      "util": "github:jspm/nodelibs-util@0.1.0"
+    },
+    "npm:util@0.10.3": {
+      "inherits": "npm:inherits@2.0.1",
+      "process": "github:jspm/nodelibs-process@0.1.1"
+    },
+    "npm:vm-browserify@0.0.4": {
+      "indexof": "npm:indexof@0.0.1"
+    },
+    "npm:zone.js@0.5.1": {
+      "process": "github:jspm/nodelibs-process@0.1.1"
     }
   }
 });

gulpfile.js

@@ -140,8 +140,7 @@ gulp.task('bundle.deps', function() {
     builder.config({
       baseURL: 'file:' + process.cwd(),
       paths : {
-        "ionic/*": "dist/js/es6/ionic/*.js",
+        "ionic/*": "dist/js/es6/ionic/*.js"
-        "angular2/*": "angular2/dist/js/dev/es6/angular2/*.es6",
       }
     });
     return builder.build('dist/js/es6/ionic/**/* - [dist/js/es6/ionic/**/*]', 'dist/js/dependencies.js');
@@ -220,72 +219,8 @@ gulp.task('vendor', function() {
     .pipe(gulp.dest('dist/vendor'));
 });
 
-
-gulp.task('link.angular', function() {
-  if (!fs.existsSync('../angular-ionic')) {
-    throw new Error("../angular-ionic doesn't exist. Run gulp update.angular first");
-  }
-  linkAngular();
-});
-
-gulp.task('update.angular', function(done) {
-
-  if (!fs.existsSync('../angular-ionic')) {
-    console.log('cloning angular master...');
-    exec('git clone git@github.com:angular/angular ../angular-ionic', function() {
-      linkAngular();
-      npmInstall();
-    });
-
-  } else {
-    console.log('angular master: cleaning modules');
-    del(['../angular-ionic/modules'], { force: true }, function() {
-
-      console.log('angular master: reset --hard...');
-      exec('git reset --hard origin/master', {cwd: '../angular-ionic'}, function () {
-
-        console.log('angular master: git pull origin master...');
-        exec('git pull origin master', function () {
-          npmInstall();
-        });
-      });
-
-    })
-  }
-
-  function npmInstall() {
-    console.log('angular master: npm install (may take a while, chill out)...');
-    exec('npm install', {cwd: '../angular-ionic'}, function () {
-      done();
-    });
-  }
-
-});
-
-function linkAngular() {
- if (!fs.existsSync('angular2')) {
-    console.log("Symlinking ../angular-ionic to angular2");
-    fs.symlinkSync('../angular-ionic', 'angular2');
-  }
-}
-
-
-
 require('./scripts/snapshot/snapshot.task')(gulp, argv, buildConfig);
 
-
-// gulp.task('watch', ['default'], function() {
-//   gulp.watch(buildConfig.src.scss, ['sass'])
-//   gulp.watch([].concat(
-//     buildConfig.src.js, buildConfig.src.html,
-//     'scripts/e2e/index.template.html'
-//   ), ['e2e'])
-//   gulp.watch([].concat(
-//     buildConfig.src.e2e, buildConfig.src.html,
-//     'scripts/e2e/index.template.html'
-//   ), ['ionic-js'])
-// });
-
 gulp.task('karma', function() {
   return karma.start({ configFile: __dirname + '/scripts/test/karma.conf.js' })
 });
@@ -515,20 +450,6 @@ gulp.task('old.update.angular', function(done) {
 
 });
 
-
-
-// gulp.task('watch', ['default'], function() {
-//   gulp.watch(buildConfig.src.scss, ['sass'])
-//   gulp.watch([].concat(
-//     buildConfig.src.js, buildConfig.src.html,
-//     'scripts/e2e/index.template.html'
-//   ), ['e2e'])
-//   gulp.watch([].concat(
-//     buildConfig.src.e2e, buildConfig.src.html,
-//     'scripts/e2e/index.template.html'
-//   ), ['ionic-js'])
-// });
-
 gulp.task('old.karma', function() {
   return karma.start({ configFile: __dirname + '/scripts/test/karma.conf.js' })
 });

ionic/config/component.js

@@ -1,9 +1,6 @@
-import {NgFor, NgIf} from 'angular2/angular2';
 import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations';
-import {View} from 'angular2/src/core/annotations_impl/view';
 
 import * as util from 'ionic/util';
-import {dom} from 'ionic/util';
 import {Platform} from 'ionic/platform/platform';
 
 const platformMode = Platform.getMode();

ionic/config/view.js

@@ -1,6 +1,4 @@
-import {NgFor, NgIf} from 'angular2/angular2';
+import {coreDirectives} from 'angular2/angular2';
-import {NgSwitch, NgSwitchWhen} from 'angular2/angular2'
-import {formDirectives} from 'angular2/forms';
 
 import {View} from 'angular2/src/core/annotations_impl/view';
 
@@ -22,8 +20,7 @@ export class IonicView extends View {
     let directives = [
 
       // Angular
-      NgFor, NgIf, formDirectives,
+      coreDirectives,
-      NgSwitch, NgSwitchWhen,
 
       // Content
       Aside, Content, Refresher,
@@ -38,8 +35,8 @@ export class IonicView extends View {
       Icon,
 
       // Form elements
-      Checkbox, Switch, Label, Input, Segment, SegmentButton,
+      //Checkbox, Switch, Label, Input, Segment, SegmentButton,
-      RadioGroup, RadioButton, SearchBar,
+      //RadioGroup, RadioButton, SearchBar,
 
       // Nav
       Nav, NavbarTemplate, Navbar, NavPush, NavPop

package.json

@@ -41,6 +41,7 @@
   "jspm": {
     "directories": {},
     "dependencies": {
+      "angular2": "npm:angular2@^2.0.0-alpha.27",
       "babel-core": "npm:babel-core@^5.4.7",
       "rx": "npm:rx@^2.5.3"
     },