Skip to content

Commit

Permalink
chore(dependencies): update to Angular 8 and latest Ionic (ionic-team…
Browse files Browse the repository at this point in the history
  • Loading branch information
brandyscarney authored Jul 25, 2019
1 parent f5830d0 commit ef040c1
Show file tree
Hide file tree
Showing 12 changed files with 2,160 additions and 2,515 deletions.
12 changes: 12 additions & 0 deletions browserslist
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries

# You can see what browsers were selected by your queries by running:
# npx browserslist

> 0.5%
last 2 versions
Firefox ESR
not dead
not IE 9-11 # For IE 9-11 support, remove 'not'.
4,565 changes: 2,103 additions & 2,462 deletions package-lock.json

Large diffs are not rendered by default.

50 changes: 21 additions & 29 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,25 @@
"test": "ng test --watch=false",
"lint": "ng lint"
},
"husky": {
"hooks": {
"pre-commit": "npm run lint",
"pre-push": "npm run test"
}
},
"repository": {
"type": "git",
"url": "https://github.com/ionic-team/ionic-conference-app.git"
},
"private": true,
"dependencies": {
"@angular/common": "7.2.9",
"@angular/core": "7.2.9",
"@angular/forms": "7.2.9",
"@angular/http": "~7.2.9",
"@angular/platform-browser": "7.2.9",
"@angular/platform-browser-dynamic": "7.2.9",
"@angular/pwa": "0.13.9",
"@angular/router": "7.2.9",
"@angular/service-worker": "~7.2.9",
"@angular/common": "8.1.1",
"@angular/core": "8.1.1",
"@angular/forms": "8.1.1",
"@angular/platform-browser": "8.1.1",
"@angular/platform-browser-dynamic": "8.1.1",
"@angular/pwa": "~0.801.1",
"@angular/router": "8.1.1",
"@angular/service-worker": "~8.1.1",
"@ionic-native/core": "5.0.0-beta.15",
"@ionic-native/in-app-browser": "5.0.0-beta.15",
"@ionic-native/splash-screen": "5.0.0-beta.15",
"@ionic-native/status-bar": "5.0.0-beta.15",
"@ionic/angular": "^4.5.0",
"@ionic/angular": "^4.7.0",
"@ionic/storage": "^2.1.3",
"cordova-android": "8.0.0",
"cordova-ios": "^5.0.1",
Expand All @@ -51,24 +44,23 @@
"rxjs": "6.5.2",
"sw-toolbox": "3.6.0",
"tslib": "^1.9.0",
"zone.js": "^0.8.26"
"zone.js": "~0.9.1"
},
"devDependencies": {
"@angular-devkit/architect": "0.13.9",
"@angular-devkit/build-angular": "0.13.9",
"@angular-devkit/core": "7.3.9",
"@angular-devkit/schematics": "7.3.9",
"@angular/cli": "7.3.9",
"@angular/compiler": "7.2.9",
"@angular/compiler-cli": "7.2.9",
"@angular/language-service": "~7.2.15",
"@ionic/angular-toolkit": "1.5.1",
"@angular-devkit/architect": "^0.801.1",
"@angular-devkit/build-angular": "^0.801.1",
"@angular-devkit/core": "^8.1.1",
"@angular-devkit/schematics": "^8.1.1",
"@angular/cli": "^8.1.1",
"@angular/compiler": "8.1.1",
"@angular/compiler-cli": "8.1.1",
"@angular/language-service": "~8.1.1",
"@ionic/angular-toolkit": "^2.0.0",
"@ionic/lab": "^2.0.2",
"@types/jasmine": "3.3.12",
"@types/jasminewd2": "2.0.6",
"@types/node": "12.0.8",
"codelyzer": "^4.4.4",
"husky": "2.2.0",
"codelyzer": "^5.0.1",
"jasmine-core": "3.4.0",
"jasmine-spec-reporter": "4.2.1",
"karma": "4.1.0",
Expand All @@ -80,7 +72,7 @@
"puppeteer": "1.17.0",
"ts-node": "8.2.0",
"tslint": "^5.17.0",
"typescript": "~3.2.4"
"typescript": "~3.4.5"
},
"cordova": {
"platforms": [
Expand Down
12 changes: 6 additions & 6 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,27 @@ const routes: Routes = [
},
{
path: 'account',
loadChildren: './pages/account/account.module#AccountModule'
loadChildren: () => import('./pages/account/account.module').then(m => m.AccountModule)
},
{
path: 'support',
loadChildren: './pages/support/support.module#SupportModule'
loadChildren: () => import('./pages/support/support.module').then(m => m.SupportModule)
},
{
path: 'login',
loadChildren: './pages/login/login.module#LoginModule'
loadChildren: () => import('./pages/login/login.module').then(m => m.LoginModule)
},
{
path: 'signup',
loadChildren: './pages/signup/signup.module#SignUpModule'
loadChildren: () => import('./pages/signup/signup.module').then(m => m.SignUpModule)
},
{
path: 'app',
loadChildren: './pages/tabs-page/tabs-page.module#TabsModule'
loadChildren: () => import('./pages/tabs-page/tabs-page.module').then(m => m.TabsModule)
},
{
path: 'tutorial',
loadChildren: './pages/tutorial/tutorial.module#TutorialModule',
loadChildren: () => import('./pages/tutorial/tutorial.module').then(m => m.TutorialModule),
canLoad: [CheckTutorial]
}
];
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/map/map.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Platform } from '@ionic/angular';
styleUrls: ['./map.scss']
})
export class MapPage implements AfterViewInit {
@ViewChild('mapCanvas') mapElement: ElementRef;
@ViewChild('mapCanvas', { static: true }) mapElement: ElementRef;

constructor(public confData: ConferenceData, public platform: Platform) {}

Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/schedule/schedule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { UserData } from '../../providers/user-data';
})
export class SchedulePage implements OnInit {
// Gets a reference to the list element
@ViewChild('scheduleList') scheduleList: IonList;
@ViewChild('scheduleList', { static: true }) scheduleList: IonList;

dayIndex = 0;
queryText = '';
Expand Down
12 changes: 6 additions & 6 deletions src/app/pages/tabs-page/tabs-page-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const routes: Routes = [
},
{
path: 'session/:sessionId',
loadChildren: '../session-detail/session-detail.module#SessionDetailModule'
loadChildren: () => import('../session-detail/session-detail.module').then(m => m.SessionDetailModule)
}
]
},
Expand All @@ -27,15 +27,15 @@ const routes: Routes = [
children: [
{
path: '',
loadChildren: '../speaker-list/speaker-list.module#SpeakerListModule'
loadChildren: () => import('../speaker-list/speaker-list.module').then(m => m.SpeakerListModule)
},
{
path: 'session/:sessionId',
loadChildren: '../session-detail/session-detail.module#SessionDetailModule'
loadChildren: () => import('../session-detail/session-detail.module').then(m => m.SessionDetailModule)
},
{
path: 'speaker-details/:speakerId',
loadChildren: '../speaker-detail/speaker-detail.module#SpeakerDetailModule'
loadChildren: () => import('../speaker-detail/speaker-detail.module').then(m => m.SpeakerDetailModule)
}
]
},
Expand All @@ -44,7 +44,7 @@ const routes: Routes = [
children: [
{
path: '',
loadChildren: '../map/map.module#MapModule'
loadChildren: () => import('../map/map.module').then(m => m.MapModule)
}
]
},
Expand All @@ -53,7 +53,7 @@ const routes: Routes = [
children: [
{
path: '',
loadChildren: '../about/about.module#AboutModule'
loadChildren: () => import('../about/about.module').then(m => m.AboutModule)
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/tutorial/tutorial.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { Storage } from '@ionic/storage';
export class TutorialPage {
showSkip = true;

@ViewChild('slides') slides: IonSlides;
@ViewChild('slides', { static: true }) slides: IonSlides;

constructor(
public menu: MenuController,
Expand Down
5 changes: 2 additions & 3 deletions src/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"baseUrl": "./",
"module": "es2015"
},
"baseUrl": "./"
},
// "angularCompilerOptions": {
// "enableIvy": true
// },
Expand Down
1 change: 0 additions & 1 deletion src/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"compilerOptions": {
"outDir": "../out-tsc/spec",
"baseUrl": "./",
"module": "commonjs",
"types": [
"jasmine",
"node"
Expand Down
4 changes: 3 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{
"compilerOptions": {
"downlevelIteration": true,
"importHelpers": true,
"module": "esnext",
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es5",
"target": "es2015",
"lib": [
"es2017",
"dom"
Expand Down
8 changes: 4 additions & 4 deletions tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,12 @@
"kebab-case"
],
"no-output-on-prefix": true,
"use-input-property-decorator": true,
"use-output-property-decorator": true,
"use-host-property-decorator": true,
"no-inputs-metadata-property": true,
"no-outputs-metadata-property": true,
"no-host-metadata-property": true,
"no-input-rename": true,
"no-output-rename": true,
"use-life-cycle-interface": true,
"use-lifecycle-interface": true,
"use-pipe-transform-interface": true,
"directive-class-suffix": true
}
Expand Down

0 comments on commit ef040c1

Please sign in to comment.