From c63c55bae962cc69bb009572c98a8f0edeef7f50 Mon Sep 17 00:00:00 2001 From: Manuel Vogel Date: Sat, 14 May 2016 09:53:03 +0200 Subject: [PATCH 01/17] Updated to ionic-conference-app 9d493619. Fixed statusbar overlay on ios. Removed cordova plugins from package.json and added only the necessary ones to the config.xml. Removed as well reflect-metadata and zone.js from package.json and adapted ionic gulp task version. --- .travis.yml | 3 +++ config.xml | 8 ++------ package.json | 22 +++++----------------- 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index 765ef3e..681dfce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,7 @@ branches: before_install: - nvm use 4.1.2 - npm install -g cordova ionic + - ionic state clear install: npm install @@ -58,6 +59,8 @@ before_deploy: - echo "y" | ./android-sdk-linux/tools/android update sdk --no-ui --filter android-23,build-tools-23.0.1 - export ANDROID_HOME=${PWD}/android-sdk-linux # end install android + - ionic state restore + - ionic platform add android - ionic build android # `ionic build android` wraps `cordova build android`, which gives a legit exit code if it fails. Ionic does not; test apk exists. - ls ./platforms/android/build/outputs/apk/android*.apk diff --git a/config.xml b/config.xml index dfe4465..66e198f 100644 --- a/config.xml +++ b/config.xml @@ -26,10 +26,6 @@ - - - - - - + + \ No newline at end of file diff --git a/package.json b/package.json index 1ea3d83..38d5116 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,7 @@ "ionic-angular": "2.0.0-beta.6", "ionic-native": "^1.1.0", "ionicons": "3.0.0-alpha.3", - "reflect-metadata": "0.1.2", - "rxjs": "5.0.0-beta.2", - "zone.js": "0.6.10" + "rxjs": "5.0.0-beta.2" }, "devDependencies": { "browserify-istanbul": "^2.0.0", @@ -17,11 +15,11 @@ "gulp-tslint": "4.3.5", "gulp-typescript": "^2.12.1", "gulp-watch": "4.3.5", - "ionic-gulp-browserify-typescript": "^1.0.1", + "ionic-gulp-browserify-typescript": "^1.1.0", "ionic-gulp-fonts-copy": "^1.0.0", "ionic-gulp-html-copy": "^1.0.0", "ionic-gulp-sass-build": "^1.0.0", - "ionic-gulp-scripts-copy": "^1.0.0", + "ionic-gulp-scripts-copy": "^1.0.1", "isparta": "^4.0.0", "jasmine-core": "^2.4.1", "jasmine-spec-reporter": "^2.4.0", @@ -45,18 +43,8 @@ "name": "clicker", "version": "1.2.0", "description": "clicker: An Ionic project", - "cordovaPlugins": [ - "cordova-sqlite-storage", - "cordova-plugin-device", - "cordova-plugin-console", - "cordova-plugin-whitelist", - "cordova-plugin-splashscreen", - "cordova-plugin-statusbar", - "ionic-plugin-keyboard" - ], - "cordovaPlatforms": [ - "android" - ], + "cordovaPlugins": [], + "cordovaPlatforms": [], "scripts": { "build": "gulp --gulpfile test/gulpfile.ts --cwd ./ build-app", "e2e": "gulp --gulpfile test/gulpfile.ts --cwd ./ build-e2e && protractor test/protractor.conf.js", From 4940beaa216bf5a65e876eaca27efed8067499b4 Mon Sep 17 00:00:00 2001 From: david Date: Sat, 21 May 2016 16:23:47 -0400 Subject: [PATCH 02/17] converted to angular2_rc1 --- app/app.html | 2 +- app/app.spec.ts | 13 +++++++++---- app/app.ts | 2 +- .../clickerButton/clickerButton.spec.ts | 12 +++++++----- app/components/clickerButton/clickerButton.ts | 2 +- app/components/clickerForm/clickerForm.spec.ts | 12 +++++++----- app/components/clickerForm/clickerForm.ts | 4 ++-- app/pages/clickerList/clickerList.html | 2 +- app/pages/clickerList/clickerList.spec.ts | 12 +++++++----- app/pages/page2/page2.spec.ts | 12 +++++++----- app/services/clickers.ts | 2 +- app/services/utils.spec.ts | 8 ++++++-- app/services/utils.ts | 2 +- package.json | 16 ++++++++++++---- test/karma.config.js | 3 ++- www/index.html | 6 +++--- 16 files changed, 68 insertions(+), 42 deletions(-) diff --git a/app/app.html b/app/app.html index 761a41e..77613ff 100644 --- a/app/app.html +++ b/app/app.html @@ -6,7 +6,7 @@ - diff --git a/app/app.spec.ts b/app/app.spec.ts index 0ac4137..e348c03 100644 --- a/app/app.spec.ts +++ b/app/app.spec.ts @@ -1,9 +1,14 @@ -import { TEST_BROWSER_PLATFORM_PROVIDERS, TEST_BROWSER_APPLICATION_PROVIDERS} from 'angular2/platform/testing/browser'; -import { setBaseTestProviders } from 'angular2/testing'; +import { TEST_BROWSER_STATIC_PLATFORM_PROVIDERS, TEST_BROWSER_STATIC_APPLICATION_PROVIDERS} from '@angular/platform-browser/testing'; +import { setBaseTestProviders } from '@angular/core/testing'; import { ClickerApp } from './app'; - +import { + beforeEach, + describe, + expect, + it, +} from '@angular/core/testing'; // this needs doing _once_ for the entire test suite, hence it's here -setBaseTestProviders(TEST_BROWSER_PLATFORM_PROVIDERS, TEST_BROWSER_APPLICATION_PROVIDERS); +setBaseTestProviders(TEST_BROWSER_STATIC_PLATFORM_PROVIDERS, TEST_BROWSER_STATIC_APPLICATION_PROVIDERS); let clickerApp: ClickerApp = null; diff --git a/app/app.ts b/app/app.ts index e970915..6dd6dfb 100644 --- a/app/app.ts +++ b/app/app.ts @@ -1,6 +1,6 @@ 'use strict'; -import { Type } from 'angular2/core'; +import { Type } from '@angular/core'; import { App, IonicApp, Platform } from 'ionic-angular'; import { ClickerList } from './pages/clickerList/clickerList'; import { Page2 } from './pages/page2/page2'; diff --git a/app/components/clickerButton/clickerButton.spec.ts b/app/components/clickerButton/clickerButton.spec.ts index 634dd6c..a4d6901 100644 --- a/app/components/clickerButton/clickerButton.spec.ts +++ b/app/components/clickerButton/clickerButton.spec.ts @@ -1,14 +1,16 @@ import { beforeEach, beforeEachProviders, - ComponentFixture, describe, expect, injectAsync, it, +} from '@angular/core/testing'; +import { + ComponentFixture, TestComponentBuilder, -} from 'angular2/testing'; -import { provide } from 'angular2/core'; +} from '@angular/compiler/testing'; +import { provide } from '@angular/core'; import { Config } from 'ionic-angular'; import { ClickerButton } from './clickerButton'; import { Clickers } from '../../services/clickers'; @@ -16,7 +18,7 @@ import { TestUtils } from '../../../test/testUtils'; import { Utils } from '../../services/utils'; let clickerButton: ClickerButton = null; -let clickerButtonFixture: ComponentFixture = null; +let clickerButtonFixture: ComponentFixture = null; class MockClickers { public doClick(): boolean { @@ -45,7 +47,7 @@ describe('ClickerButton', () => { beforeEach(injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => { return tcb .createAsync(ClickerButton) - .then((componentFixture: ComponentFixture) => { + .then((componentFixture: ComponentFixture) => { clickerButtonFixture = componentFixture; clickerButton = componentFixture.componentInstance; clickerButton['clicker'] = { name: 'TEST CLICKER' }; diff --git a/app/components/clickerButton/clickerButton.ts b/app/components/clickerButton/clickerButton.ts index 5363175..a3bd5dc 100644 --- a/app/components/clickerButton/clickerButton.ts +++ b/app/components/clickerButton/clickerButton.ts @@ -1,6 +1,6 @@ 'use strict'; -import { Component } from 'angular2/core'; +import { Component } from '@angular/core'; import { Button } from 'ionic-angular'; import { Clickers } from '../../services/clickers'; diff --git a/app/components/clickerForm/clickerForm.spec.ts b/app/components/clickerForm/clickerForm.spec.ts index 0460420..c438b5f 100644 --- a/app/components/clickerForm/clickerForm.spec.ts +++ b/app/components/clickerForm/clickerForm.spec.ts @@ -1,14 +1,16 @@ import { beforeEach, beforeEachProviders, - ComponentFixture, describe, expect, injectAsync, it, +} from '@angular/core/testing'; +import { + ComponentFixture, TestComponentBuilder, -} from 'angular2/testing'; -import { provide } from 'angular2/core'; +} from '@angular/compiler/testing'; +import { provide } from '@angular/core'; import { Config, Form, @@ -21,7 +23,7 @@ import { TestUtils } from '../../../test/testUtils'; import { Utils } from '../../services/utils'; let clickerForm: ClickerForm = null; -let clickerFormFixture: ComponentFixture = null; +let clickerFormFixture: ComponentFixture = null; class MockClickers { public newClicker(): boolean { @@ -56,7 +58,7 @@ describe('ClickerForm', () => { beforeEach(injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => { return tcb .createAsync(ClickerForm) - .then((componentFixture: ComponentFixture) => { + .then((componentFixture: ComponentFixture) => { clickerFormFixture = componentFixture; clickerForm = componentFixture.componentInstance; spyOn(clickerForm, 'newClicker').and.callThrough(); diff --git a/app/components/clickerForm/clickerForm.ts b/app/components/clickerForm/clickerForm.ts index 99c755e..f4cc7ed 100644 --- a/app/components/clickerForm/clickerForm.ts +++ b/app/components/clickerForm/clickerForm.ts @@ -1,7 +1,7 @@ 'use strict'; -import { AbstractControl, ControlGroup, FormBuilder, Validators } from 'angular2/common'; -import { Component } from 'angular2/core'; +import { AbstractControl, ControlGroup, FormBuilder, Validators } from '@angular/common'; +import { Component } from '@angular/core'; import { Button, Icon, Item, Label, TextInput } from 'ionic-angular'; import { Clickers } from '../../services/clickers'; import { Utils } from '../../services/utils'; diff --git a/app/pages/clickerList/clickerList.html b/app/pages/clickerList/clickerList.html index edbbfe1..0a4277e 100644 --- a/app/pages/clickerList/clickerList.html +++ b/app/pages/clickerList/clickerList.html @@ -7,7 +7,7 @@ - + diff --git a/app/pages/clickerList/clickerList.spec.ts b/app/pages/clickerList/clickerList.spec.ts index 2ef6dc0..6b27d14 100644 --- a/app/pages/clickerList/clickerList.spec.ts +++ b/app/pages/clickerList/clickerList.spec.ts @@ -1,14 +1,16 @@ import { beforeEach, beforeEachProviders, - ComponentFixture, describe, expect, injectAsync, it, +} from '@angular/core/testing'; +import { + ComponentFixture, TestComponentBuilder, -} from 'angular2/testing'; -import { provide } from 'angular2/core'; +} from '@angular/compiler/testing'; +import { provide } from '@angular/core'; import { ClickerList } from './clickerList'; import { Utils } from '../../services/utils'; import { @@ -35,7 +37,7 @@ class MockClass { } let clickerList: ClickerList = null; -let clickerListFixture: ComponentFixture = null; +let clickerListFixture: ComponentFixture = null; describe('ClickerList', () => { @@ -51,7 +53,7 @@ describe('ClickerList', () => { beforeEach(injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => { return tcb .createAsync(ClickerList) - .then((componentFixture: ComponentFixture) => { + .then((componentFixture: ComponentFixture) => { clickerListFixture = componentFixture; clickerList = componentFixture.componentInstance; clickerListFixture.detectChanges(); diff --git a/app/pages/page2/page2.spec.ts b/app/pages/page2/page2.spec.ts index 80c941b..43a238c 100644 --- a/app/pages/page2/page2.spec.ts +++ b/app/pages/page2/page2.spec.ts @@ -1,14 +1,16 @@ import { beforeEach, beforeEachProviders, - ComponentFixture, describe, expect, injectAsync, it, +} from '@angular/core/testing'; +import { + ComponentFixture, TestComponentBuilder, -} from 'angular2/testing'; -import { provide } from 'angular2/core'; +} from '@angular/compiler/testing'; +import { provide } from '@angular/core'; import { Page2 } from './page2'; import { Utils } from '../../services/utils'; import { @@ -35,7 +37,7 @@ class MockClass { } let page2: Page2 = null; -let page2Fixture: ComponentFixture = null; +let page2Fixture: ComponentFixture = null; describe('Page2', () => { @@ -51,7 +53,7 @@ describe('Page2', () => { beforeEach(injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => { return tcb .createAsync(Page2) - .then((componentFixture: ComponentFixture) => { + .then((componentFixture: ComponentFixture) => { page2Fixture = componentFixture; page2 = componentFixture.componentInstance; page2Fixture.detectChanges(); diff --git a/app/services/clickers.ts b/app/services/clickers.ts index 7fadb9e..b887c8b 100644 --- a/app/services/clickers.ts +++ b/app/services/clickers.ts @@ -1,6 +1,6 @@ 'use strict'; -import { Injectable } from 'angular2/core'; +import { Injectable } from '@angular/core'; import { SqlStorage } from 'ionic-angular'; import { Clicker } from '../models/clicker'; import { Click } from '../models/click'; diff --git a/app/services/utils.spec.ts b/app/services/utils.spec.ts index 092a399..7667a7b 100644 --- a/app/services/utils.spec.ts +++ b/app/services/utils.spec.ts @@ -1,6 +1,10 @@ import { Utils } from './utils'; -import { AbstractControl, Control } from 'angular2/common'; - +import { AbstractControl, Control } from '@angular/common'; +import { + describe, + expect, + it, +} from '@angular/core/testing'; describe('Utils', () => { it('resets a control', () => { diff --git a/app/services/utils.ts b/app/services/utils.ts index a9e6c06..84d80ec 100644 --- a/app/services/utils.ts +++ b/app/services/utils.ts @@ -1,6 +1,6 @@ 'use strict'; -import { AbstractControl } from 'angular2/common'; +import { AbstractControl } from '@angular/common'; export class Utils { diff --git a/package.json b/package.json index 38d5116..e87f134 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,19 @@ { "dependencies": { - "angular2": "2.0.0-beta.15", + "@angular/common": "^2.0.0-rc.1", + "@angular/compiler": "^2.0.0-rc.1", + "@angular/core": "^2.0.0-rc.1", + "@angular/http": "^2.0.0-rc.1", + "@angular/platform-browser": "^2.0.0-rc.1", + "@angular/platform-browser-dynamic": "^2.0.0-rc.1", + "@angular/router": "^2.0.0-rc.1", "es6-shim": "^0.35.0", - "ionic-angular": "2.0.0-beta.6", + "ionic-angular": "^2.0.0-beta.7", "ionic-native": "^1.1.0", "ionicons": "3.0.0-alpha.3", - "rxjs": "5.0.0-beta.2" + "reflect-metadata": "^0.1.3", + "rxjs": "^5.0.0-beta.6", + "zone.js": "^0.6.12" }, "devDependencies": { "browserify-istanbul": "^2.0.0", @@ -19,7 +27,7 @@ "ionic-gulp-fonts-copy": "^1.0.0", "ionic-gulp-html-copy": "^1.0.0", "ionic-gulp-sass-build": "^1.0.0", - "ionic-gulp-scripts-copy": "^1.0.1", + "ionic-gulp-scripts-copy": "^2.0.0", "isparta": "^4.0.0", "jasmine-core": "^2.4.1", "jasmine-spec-reporter": "^2.4.0", diff --git a/test/karma.config.js b/test/karma.config.js index d2149c0..871f863 100644 --- a/test/karma.config.js +++ b/test/karma.config.js @@ -11,7 +11,8 @@ module.exports = function(config) { // list of files / patterns to load in the browser files: [ - 'node_modules/angular2/bundles/angular2-polyfills.js', // 'Uncaught reflect-metadata shim is required when using class decorators' + 'www/build/js/zone.js', + 'node_modules/reflect-metadata/Reflect.js', 'node_modules/traceur/bin/traceur-runtime.js', // TypeError: undefined is not a constructor (evaluating 'new exports.Map()') 'app/**/*.spec.ts', 'typings/browser.d.ts', diff --git a/www/index.html b/www/index.html index a75052a..cf54a3d 100644 --- a/www/index.html +++ b/www/index.html @@ -18,10 +18,10 @@ - - - + + + From 886533186502b38653a93aa9a58a0f1f607e8b97 Mon Sep 17 00:00:00 2001 From: david Date: Sat, 21 May 2016 18:55:30 -0400 Subject: [PATCH 03/17] updated zone.js ref --- test/karma.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/karma.config.js b/test/karma.config.js index 871f863..8271754 100644 --- a/test/karma.config.js +++ b/test/karma.config.js @@ -11,7 +11,7 @@ module.exports = function(config) { // list of files / patterns to load in the browser files: [ - 'www/build/js/zone.js', + 'node_modules/zone.js/dist/zone.js', 'node_modules/reflect-metadata/Reflect.js', 'node_modules/traceur/bin/traceur-runtime.js', // TypeError: undefined is not a constructor (evaluating 'new exports.Map()') 'app/**/*.spec.ts', From 9299bec29acfb3f7108401098dcd9b9c0b52efbb Mon Sep 17 00:00:00 2001 From: Stephen Hazleton Date: Sun, 22 May 2016 17:41:22 +1200 Subject: [PATCH 04/17] Use typings for components --- app/components/clickerButton/clickerButton.spec.ts | 4 ++-- app/components/clickerForm/clickerForm.spec.ts | 4 ++-- app/pages/clickerList/clickerList.spec.ts | 8 ++++---- app/pages/page2/page2.spec.ts | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/components/clickerButton/clickerButton.spec.ts b/app/components/clickerButton/clickerButton.spec.ts index a4d6901..74f1067 100644 --- a/app/components/clickerButton/clickerButton.spec.ts +++ b/app/components/clickerButton/clickerButton.spec.ts @@ -18,7 +18,7 @@ import { TestUtils } from '../../../test/testUtils'; import { Utils } from '../../services/utils'; let clickerButton: ClickerButton = null; -let clickerButtonFixture: ComponentFixture = null; +let clickerButtonFixture: ComponentFixture = null; class MockClickers { public doClick(): boolean { @@ -47,7 +47,7 @@ describe('ClickerButton', () => { beforeEach(injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => { return tcb .createAsync(ClickerButton) - .then((componentFixture: ComponentFixture) => { + .then((componentFixture: ComponentFixture) => { clickerButtonFixture = componentFixture; clickerButton = componentFixture.componentInstance; clickerButton['clicker'] = { name: 'TEST CLICKER' }; diff --git a/app/components/clickerForm/clickerForm.spec.ts b/app/components/clickerForm/clickerForm.spec.ts index c438b5f..87bc4bd 100644 --- a/app/components/clickerForm/clickerForm.spec.ts +++ b/app/components/clickerForm/clickerForm.spec.ts @@ -23,7 +23,7 @@ import { TestUtils } from '../../../test/testUtils'; import { Utils } from '../../services/utils'; let clickerForm: ClickerForm = null; -let clickerFormFixture: ComponentFixture = null; +let clickerFormFixture: ComponentFixture = null; class MockClickers { public newClicker(): boolean { @@ -58,7 +58,7 @@ describe('ClickerForm', () => { beforeEach(injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => { return tcb .createAsync(ClickerForm) - .then((componentFixture: ComponentFixture) => { + .then((componentFixture: ComponentFixture) => { clickerFormFixture = componentFixture; clickerForm = componentFixture.componentInstance; spyOn(clickerForm, 'newClicker').and.callThrough(); diff --git a/app/pages/clickerList/clickerList.spec.ts b/app/pages/clickerList/clickerList.spec.ts index 6b27d14..1358920 100644 --- a/app/pages/clickerList/clickerList.spec.ts +++ b/app/pages/clickerList/clickerList.spec.ts @@ -5,11 +5,11 @@ import { expect, injectAsync, it, -} from '@angular/core/testing'; +} from '@angular/core/testing'; import { ComponentFixture, TestComponentBuilder, -} from '@angular/compiler/testing'; +} from '@angular/compiler/testing'; import { provide } from '@angular/core'; import { ClickerList } from './clickerList'; import { Utils } from '../../services/utils'; @@ -37,7 +37,7 @@ class MockClass { } let clickerList: ClickerList = null; -let clickerListFixture: ComponentFixture = null; +let clickerListFixture: ComponentFixture = null; describe('ClickerList', () => { @@ -53,7 +53,7 @@ describe('ClickerList', () => { beforeEach(injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => { return tcb .createAsync(ClickerList) - .then((componentFixture: ComponentFixture) => { + .then((componentFixture: ComponentFixture) => { clickerListFixture = componentFixture; clickerList = componentFixture.componentInstance; clickerListFixture.detectChanges(); diff --git a/app/pages/page2/page2.spec.ts b/app/pages/page2/page2.spec.ts index 43a238c..52ec4d3 100644 --- a/app/pages/page2/page2.spec.ts +++ b/app/pages/page2/page2.spec.ts @@ -37,7 +37,7 @@ class MockClass { } let page2: Page2 = null; -let page2Fixture: ComponentFixture = null; +let page2Fixture: ComponentFixture = null; describe('Page2', () => { @@ -53,7 +53,7 @@ describe('Page2', () => { beforeEach(injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => { return tcb .createAsync(Page2) - .then((componentFixture: ComponentFixture) => { + .then((componentFixture: ComponentFixture) => { page2Fixture = componentFixture; page2 = componentFixture.componentInstance; page2Fixture.detectChanges(); From 07be383e236595cf810def16e9811f6b7ea22b3c Mon Sep 17 00:00:00 2001 From: Stephen Hazleton Date: Sun, 22 May 2016 17:42:40 +1200 Subject: [PATCH 05/17] explicit versioning --- package.json | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index e87f134..016fed3 100644 --- a/package.json +++ b/package.json @@ -1,49 +1,49 @@ { "dependencies": { "@angular/common": "^2.0.0-rc.1", - "@angular/compiler": "^2.0.0-rc.1", - "@angular/core": "^2.0.0-rc.1", - "@angular/http": "^2.0.0-rc.1", - "@angular/platform-browser": "^2.0.0-rc.1", - "@angular/platform-browser-dynamic": "^2.0.0-rc.1", - "@angular/router": "^2.0.0-rc.1", - "es6-shim": "^0.35.0", - "ionic-angular": "^2.0.0-beta.7", - "ionic-native": "^1.1.0", + "@angular/compiler": "2.0.0-rc.1", + "@angular/core": "2.0.0-rc.1", + "@angular/http": "2.0.0-rc.1", + "@angular/platform-browser": "2.0.0-rc.1", + "@angular/platform-browser-dynamic": "2.0.0-rc.1", + "@angular/router": "2.0.0-rc.1", + "es6-shim": "0.35.0", + "ionic-angular": "2.0.0-beta.7", + "ionic-native": "1.1.0", "ionicons": "3.0.0-alpha.3", - "reflect-metadata": "^0.1.3", - "rxjs": "^5.0.0-beta.6", - "zone.js": "^0.6.12" + "reflect-metadata": "0.1.3", + "rxjs": "5.0.0-beta.6", + "zone.js": "0.6.12" }, "devDependencies": { - "browserify-istanbul": "^2.0.0", + "browserify-istanbul": "2.0.0", "codecov.io": "0.1.6", "del": "2.2.0", "gulp": "3.9.1", "gulp-tslint": "4.3.5", - "gulp-typescript": "^2.12.1", + "gulp-typescript": "2.12.1", "gulp-watch": "4.3.5", - "ionic-gulp-browserify-typescript": "^1.1.0", - "ionic-gulp-fonts-copy": "^1.0.0", - "ionic-gulp-html-copy": "^1.0.0", - "ionic-gulp-sass-build": "^1.0.0", - "ionic-gulp-scripts-copy": "^2.0.0", - "isparta": "^4.0.0", - "jasmine-core": "^2.4.1", - "jasmine-spec-reporter": "^2.4.0", + "ionic-gulp-browserify-typescript": "1.1.0", + "ionic-gulp-fonts-copy": "1.0.0", + "ionic-gulp-html-copy": "1.0.0", + "ionic-gulp-sass-build": "1.0.0", + "ionic-gulp-scripts-copy": "2.0.0", + "isparta": "4.0.0", + "jasmine-core": "2.4.1", + "jasmine-spec-reporter": "2.4.0", "karma": "0.13.9", - "karma-browserify": "^5.0.4", + "karma-browserify": "5.0.4", "karma-chrome-launcher": "0.2.3", "karma-coverage": "0.5.5", "karma-jasmine": "0.3.8", - "karma-mocha-reporter": "^2.0.1", + "karma-mocha-reporter": "2.0.1", "karma-phantomjs-launcher": "1.0.0", "phantomjs-prebuilt": "2.1.7", - "protractor": "^3.1.1", + "protractor": "3.1.1", "run-sequence": "1.1.5", "traceur": "0.0.107", "ts-node": "0.7.1", - "tsify": "^0.15.2", + "tsify": "0.15.2", "tslint": "3.7.4", "tslint-eslint-rules": "1.2.0", "typings": "0.7.12" From 8a5d5ad93ff5fda1ed4246644e2eadb973a57d07 Mon Sep 17 00:00:00 2001 From: Stephen Hazleton Date: Sun, 22 May 2016 17:43:39 +1200 Subject: [PATCH 06/17] ws --- app/app.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/app.spec.ts b/app/app.spec.ts index e348c03..1e87d52 100644 --- a/app/app.spec.ts +++ b/app/app.spec.ts @@ -6,7 +6,7 @@ import { describe, expect, it, -} from '@angular/core/testing'; +} from '@angular/core/testing'; // this needs doing _once_ for the entire test suite, hence it's here setBaseTestProviders(TEST_BROWSER_STATIC_PLATFORM_PROVIDERS, TEST_BROWSER_STATIC_APPLICATION_PROVIDERS); From f79a8bbda30ae02e52d558bc6b904454a4671e77 Mon Sep 17 00:00:00 2001 From: Stephen Hazleton Date: Sun, 22 May 2016 18:02:54 +1200 Subject: [PATCH 07/17] porting changes from ionic starter --- app/app.ts | 13 +------------ config.xml | 8 ++++++-- gulpfile.js | 4 ++++ package.json | 2 +- www/index.html | 4 +++- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/app/app.ts b/app/app.ts index 6dd6dfb..52fcaf8 100644 --- a/app/app.ts +++ b/app/app.ts @@ -33,20 +33,9 @@ export class ClickerApp { private initializeApp(): void { this.platform.ready().then(() => { - // The platform is now ready. Note: if this callback fails to fire, follow - // the Troubleshooting guide for a number of possible solutions: - // // Okay, so the platform is ready and our plugins are available. // Here you can do any higher level native things you might need. - // - // First, let's hide the keyboard accessory bar (only works natively) since - // that's a better default: - // - // Keyboard.setAccessoryBarVisible(false); - // - // For example, we might change the StatusBar color. This one below is - // good for dark backgrounds and light text: - // StatusBar.setStyle(StatusBar.LIGHT_CONTENT) + StatusBar.styleDefault(); }); } diff --git a/config.xml b/config.xml index 66e198f..ca6bbdb 100644 --- a/config.xml +++ b/config.xml @@ -26,6 +26,10 @@ - - + + + + + + \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 6836586..0f2edd0 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -51,8 +51,12 @@ gulp.task('build', ['clean'], function(done){ ['sass', 'html', 'fonts', 'scripts'], function(){ buildBrowserify({ + minify: isRelease, browserifyOptions: { debug: !isRelease + }, + uglifyOptions: { + mangle: false } }).on('end', done); } diff --git a/package.json b/package.json index 016fed3..cdc6130 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "es6-shim": "0.35.0", "ionic-angular": "2.0.0-beta.7", "ionic-native": "1.1.0", - "ionicons": "3.0.0-alpha.3", + "ionicons": "3.0.0", "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", "zone.js": "0.6.12" diff --git a/www/index.html b/www/index.html index cf54a3d..18fdd14 100644 --- a/www/index.html +++ b/www/index.html @@ -18,10 +18,12 @@ + + + - From 3c505d409875cb76a79ca58c779d868d54e59ced Mon Sep 17 00:00:00 2001 From: Stephen Hazleton Date: Sun, 22 May 2016 18:03:16 +1200 Subject: [PATCH 08/17] fix ion-app location and upgrade to rc1 --- test/karma-static/context.html | 2 +- test/karma-static/debug.html | 2 +- test/karma.config.js | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/test/karma-static/context.html b/test/karma-static/context.html index 4d7fcbe..ffc78f7 100644 --- a/test/karma-static/context.html +++ b/test/karma-static/context.html @@ -11,6 +11,7 @@ +