Upgrading to latest, closes #25

lathonez · Mar 1, 2016 · 67bad59 · 67bad59
1 parent 003dcb2
commit 67bad59
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 28 deletions.
diff --git a/app/app.spec.ts b/app/app.spec.ts
@@ -1,6 +1,6 @@
 import { TEST_BROWSER_PLATFORM_PROVIDERS, TEST_BROWSER_APPLICATION_PROVIDERS} from 'angular2/platform/testing/browser';
 import { setBaseTestProviders } from 'angular2/testing';
-import { IonicApp, Platform }   from 'ionic-framework/ionic';
+import { IonicApp, Platform }   from 'ionic-angular/index';
 import { ClickerApp }           from './app';
 
 // this needs doing _once_ for the entire test suite, hence it's here

diff --git a/app/app.ts b/app/app.ts
@@ -1,9 +1,9 @@
 'use strict';
 
-import { App, IonicApp, Platform } from 'ionic-framework/ionic';
-import { ClickerList } from './pages/clickerList/clickerList';
-import { Page2 } from './pages/page2/page2';
-import {Type} from 'angular2/core';
+import { Type }                    from 'angular2/core';
+import { App, IonicApp, Platform } from 'ionic-angular/index';
+import { ClickerList }             from './pages/clickerList/clickerList';
+import { Page2 }                   from './pages/page2/page2';
 
 @App({
   templateUrl: 'build/app.html',

diff --git a/app/components/clickerButton/clickerButton.spec.ts b/app/components/clickerButton/clickerButton.spec.ts
@@ -9,7 +9,7 @@ import {
   TestComponentBuilder,
 }                        from 'angular2/testing';
 import { provide }       from 'angular2/core';
-import { Config }        from 'ionic-framework/ionic';
+import { Config }        from 'ionic-angular/index';
 import { ClickerButton } from './clickerButton';
 import { Clickers }      from '../../services/clickers';
 import { TestUtils }     from '../../../test/testUtils';

diff --git a/app/components/clickerButton/clickerButton.ts b/app/components/clickerButton/clickerButton.ts
@@ -1,8 +1,8 @@
 'use strict';
 
 import { Component, View } from 'angular2/core';
-import { Clickers } from '../../services/clickers';
-import { Button } from 'ionic-framework/ionic';
+import { Button }          from 'ionic-angular/index';
+import { Clickers }        from '../../services/clickers';
 
 @Component({
   selector: 'clicker-button',

diff --git a/app/components/clickerForm/clickerForm.spec.ts b/app/components/clickerForm/clickerForm.spec.ts
@@ -64,7 +64,7 @@ export function main(): void {
 //   Form,
 //   IonicApp,
 //   Platform,
-// }                        from 'ionic-framework/ionic';
+// }                        from 'ionic-angular/index';
 // import { ClickerForm }   from '../../../app/components/clickerForm/clickerForm';
 // import { Clickers }      from '../../../app/services/clickers';
 // import { TestUtils }     from '../../testUtils';

diff --git a/app/components/clickerForm/clickerForm.ts b/app/components/clickerForm/clickerForm.ts
@@ -1,10 +1,10 @@
 'use strict';
 
-import { Component, View } from 'angular2/core';
 import { AbstractControl, ControlGroup, FormBuilder, Validators } from 'angular2/common';
-import { Clickers } from '../../services/clickers';
-import { Button, Icon, Item, Label, TextInput } from 'ionic-framework/ionic';
-import { Utils } from '../../services/utils';
+import { Component, View }                                        from 'angular2/core';
+import { Button, Icon, Item, Label, TextInput }                   from 'ionic-angular/index';
+import { Clickers }                                               from '../../services/clickers';
+import { Utils }                                                  from '../../services/utils';
 
 @Component({
   selector: 'clicker-form',

diff --git a/app/pages/clickerList/clickerList.ts b/app/pages/clickerList/clickerList.ts
@@ -1,9 +1,9 @@
 'use strict';
 
-import { Page, NavController } from 'ionic-framework/ionic';
-import { Clickers } from '../../services/clickers';
-import { ClickerButton } from '../../components/clickerButton/clickerButton';
-import { ClickerForm } from '../../components/clickerForm/clickerForm';
+import { Page, NavController } from 'ionic-angular/index';
+import { Clickers }            from '../../services/clickers';
+import { ClickerButton }       from '../../components/clickerButton/clickerButton';
+import { ClickerForm }         from '../../components/clickerForm/clickerForm';
 
 @Page({
   templateUrl: 'build/pages/clickerList/clickerList.html',

diff --git a/app/pages/page2/page2.ts b/app/pages/page2/page2.ts
@@ -1,6 +1,6 @@
 'use strict';
 
-import { Page } from 'ionic-framework/ionic';
+import { Page } from 'ionic-angular/index';
 
 @Page({
   templateUrl: 'build/pages/page2/page2.html',

diff --git a/app/services/clickers.ts b/app/services/clickers.ts
@@ -1,9 +1,9 @@
 'use strict';
 
-import { Clicker } from '../models/clicker';
-import { Click } from '../models/click';
 import { Injectable } from 'angular2/core';
-import { SqlStorage } from 'ionic-framework/ionic';
+import { SqlStorage } from 'ionic-angular/index';
+import { Clicker }    from '../models/clicker';
+import { Click }      from '../models/click';
 
 @Injectable()
 export class Clickers {

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
     "angular2": "2.0.0-beta.6",
     "es6-promise": "3.0.2",
     "es6-shim": "0.33.13",
-    "ionic-framework": "2.0.0-beta.1",
+    "ionic-angular": "2.0.0-beta.2",
     "ionicons": "3.0.0-alpha.3",
     "reflect-metadata": "0.1.2",
     "rxjs": "5.0.0-beta.0",

diff --git a/test/karma.config.js b/test/karma.config.js
@@ -23,7 +23,7 @@ module.exports = function(config) {
       'node_modules/reflect-metadata/Reflect.js',
 
       { pattern: 'node_modules/angular2/**/*.js', included: false, watched: false },
-      { pattern: 'node_modules/ionic-framework/**/*.js', included: false, watched: false },
+      { pattern: 'node_modules/ionic-angular/**/*.js', included: false, watched: false },
       { pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false },
       { pattern: 'www/build/test/**/*.js', included: false, watched: true },
       { pattern: 'www/build/test/**/*.html', included: false, served: true},
@@ -34,8 +34,8 @@ module.exports = function(config) {
     // list of files to exclude
     exclude: [
       'node_modules/angular2/**/*_spec.js',
-      'node_modules/ionic-framework/**/*spec*',
-      'node_modules/ionic-framework/decorators/app.js'
+      'node_modules/ionic-angular/**/*spec*',
+      'node_modules/ionic-angular/decorators/app.js'
     ],
 
     // preprocess matching files before serving them to the browser
@@ -67,7 +67,7 @@ module.exports = function(config) {
     //           Also any files you want to serve need to be in the files array above with serverd: true
     proxies: {
       // allows us to keep test code separate from app code and still have the references work
-      '/base/node_modules/ionic-framework/decorators/app.js': '/base/www/build/test/app.stub.js', // stub out Ionic's @App decorator
+      '/base/node_modules/ionic-angular/decorators/app.js': '/base/www/build/test/app.stub.js', // stub out Ionic's @App decorator
       '/base/www/build/app': '/base/www/build/test',
       '/build': '/base/www/build/test'
     },

diff --git a/test/test-main.js b/test/test-main.js
@@ -11,8 +11,8 @@ System.config({
   baseURL: '/base/',
   defaultJSExtensions: true,
   paths: {
-    'ionic/*': 'node_modules/ionic-framework/*.js',
-    'ionic-framework/*': 'node_modules/ionic-framework/*.js',
+    'ionic/*': 'node_modules/ionic-angular/*.js',
+    'ionic-angular/*': 'node_modules/ionic-angular/*.js',
     'angular2/*': 'node_modules/angular2/*.js',
     'rxjs/*': 'node_modules/rxjs/*.js'
   }