Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
upgrade to iv8
  • Loading branch information
jecelyn authored and jecelyn committed Mar 26, 2019
1 parent 4d83df2 commit b24ebe6
Show file tree
Hide file tree
Showing 23 changed files with 1,118 additions and 1,133 deletions.
35 changes: 0 additions & 35 deletions angular.json
Expand Up @@ -128,41 +128,6 @@
}
}
}
},
"lib": {
"root": "projects/lib",
"sourceRoot": "projects/lib/src",
"projectType": "library",
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"options": {
"tsConfig": "projects/lib/tsconfig.lib.json",
"project": "projects/lib/ng-package.json"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/lib/src/test.ts",
"tsConfig": "projects/lib/tsconfig.spec.json",
"karmaConfig": "projects/lib/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"projects/lib/tsconfig.lib.json",
"projects/lib/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
}
},
"defaultProject": "site2019"
Expand Down
44 changes: 21 additions & 23 deletions package.json
Expand Up @@ -3,6 +3,7 @@
"version": "1.0.0",
"scripts": {
"ng": "ng",
"postinstall": "ivy-ngcc",
"start": "ng serve",
"prebuild": "yarn lint",
"build": "ng build",
Expand All @@ -15,39 +16,36 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~7.2.10",
"@angular/common": "~7.2.10",
"@angular/compiler": "~7.2.10",
"@angular/core": "~7.2.10",
"@angular/forms": "~7.2.10",
"@angular/platform-browser": "~7.2.10",
"@angular/platform-browser-dynamic": "~7.2.10",
"@angular/router": "~7.2.10",
"core-js": "^2.6.3",
"@angular/animations": "~8.0.0-beta.9",
"@angular/common": "~8.0.0-beta.9",
"@angular/compiler": "~8.0.0-beta.9",
"@angular/core": "~8.0.0-beta.9",
"@angular/forms": "~8.0.0-beta.9",
"@angular/platform-browser": "~8.0.0-beta.9",
"@angular/platform-browser-dynamic": "~8.0.0-beta.9",
"@angular/router": "~8.0.0-beta.9",
"core-js": "^2.5.4",
"marked": "^0.6.1",
"rxjs": "~6.4.0",
"tslib": "^1.9.0",
"zone.js": "~0.8.29"
"zone.js": "~0.8.26"
},
"devDependencies": {
"@angular-builders/custom-webpack": "^7.4.3",
"@angular-devkit/build-angular": "^0.13.6",
"@angular-devkit/build-ng-packagr": "^0.13.6",
"@angular/cli": "^7.3.6",
"@angular/compiler-cli": "~7.2.10",
"@angular/language-service": "~7.2.10",
"@angular-devkit/build-angular": "~0.800.0-beta.7",
"@angular/cli": "~8.0.0-beta.9",
"@angular/compiler-cli": "~8.0.0-beta.9",
"@angular/language-service": "~8.0.0-beta.9",
"@types/googlemaps": "^3.30.16",
"@types/marked": "^0.6.1",
"@types/node": "~10.12.21",
"codelyzer": "^4.5.0",
"@types/node": "~8.9.4",
"codelyzer": "~4.5.0",
"husky": "^1.3.1",
"ng-packagr": "^4.7.1",
"ng-packagr": "^4.0.0-rc.3",
"prerender-spa-plugin": "^3.4.0",
"ts-node": "~8.0.2",
"tsickle": "0.34.2",
"tslib": "^1.9.0",
"tslint": "~5.12.1",
"typescript": "^3.2.4",
"ts-node": "~7.0.0",
"tslint": "~5.13.1",
"typescript": "~3.3.3333",
"webpack-bundle-analyzer": "^3.1.0"
}
}
7 changes: 0 additions & 7 deletions projects/lib/ng-package.json

This file was deleted.

8 changes: 0 additions & 8 deletions projects/lib/package.json

This file was deleted.

19 changes: 0 additions & 19 deletions projects/lib/src/lib/lib.component.ts

This file was deleted.

10 changes: 0 additions & 10 deletions projects/lib/src/lib/lib.module.ts

This file was deleted.

9 changes: 0 additions & 9 deletions projects/lib/src/lib/lib.service.ts

This file was deleted.

7 changes: 0 additions & 7 deletions projects/lib/src/public_api.ts

This file was deleted.

32 changes: 0 additions & 32 deletions projects/lib/tsconfig.lib.json

This file was deleted.

18 changes: 0 additions & 18 deletions projects/lib/tsconfig.spec.json

This file was deleted.

17 changes: 0 additions & 17 deletions projects/lib/tslint.json

This file was deleted.

1 change: 1 addition & 0 deletions projects/site2019/scripts/ga.ts
@@ -1,3 +1,4 @@
/* tslint:disable */
export class GoogleAnalytics {
static run(config: { trackingID: string }) {
const tag = document.createElement('script');
Expand Down
24 changes: 16 additions & 8 deletions projects/site2019/src/app/app-routing.module.ts
Expand Up @@ -16,35 +16,43 @@ import { Routes, RouterModule } from '@angular/router';
const routes: Routes = [
{
path: 'coc',
loadChildren: './coc/coc.module#CocModule'
// loadChildren: './coc/coc.module#CocModule'
loadChildren: () => import('./coc/coc.module').then(m => m.CocModule)
},
{
path: 'speakers',
loadChildren: './speakers/speakers.module#SpeakersModule'
// loadChildren: './speakers/speakers.module#SpeakersModule'
loadChildren: () => import('./speakers/speakers.module').then(m => m.SpeakersModule)
},
{
path: 'sessions',
loadChildren: './sessions/sessions.module#SessionsModule'
// loadChildren: './sessions/sessions.module#SessionsModule'
loadChildren: () => import('./sessions/sessions.module').then(m => m.SessionsModule)
},
{
path: 'team',
loadChildren: './team/team.module#TeamModule'
// loadChildren: './team/team.module#TeamModule'
loadChildren: () => import('./team/team.module').then(m => m.TeamModule)
},
{
path: 'form',
loadChildren: './form/form.module#FormModule'
// loadChildren: './form/form.module#FormModule'
loadChildren: () => import('./form/form.module').then(m => m.FormModule)
},
{
path: 'schedule',
loadChildren: './schedule/schedule.module#ScheduleModule'
// loadChildren: './schedule/schedule.module#ScheduleModule'
loadChildren: () => import('./schedule/schedule.module').then(m => m.ScheduleModule)
},
{
path: 'post',
loadChildren: './post/post.module#PostModule'
// loadChildren: './post/post.module#PostModule'
loadChildren: () => import('./post/post.module').then(m => m.PostModule)
},
{
path: '',
loadChildren: './home/home.module#HomeModule',
// loadChildren: './home/home.module#HomeModule',
loadChildren: () => import('./home/home.module').then(m => m.HomeModule),
pathMatch: 'prefix'
},
// {
Expand Down
Expand Up @@ -15,8 +15,7 @@ export class FormPageComponent implements OnInit {

private urlPattern = 'https://docs.google.com/forms/d/e/{id}/viewform?embedded=true';

constructor(private route: ActivatedRoute, private sanitizer: DomSanitizer,
private pageSvc: PageService) { }
constructor(private route: ActivatedRoute, private sanitizer: DomSanitizer, private pageSvc: PageService) { }

ngOnInit() {
this.route.params.subscribe(x => {
Expand Down
Expand Up @@ -81,7 +81,7 @@ export class HomeEarlyPageComponent implements OnInit {

ngOnInit() {
const title = 'July 06-07';
this.pageSvc.setPage({ title: title });
this.pageSvc.setPage({ title });
}

scrollTo(location) {
Expand Down
Expand Up @@ -154,7 +154,7 @@ export class HomeTicketPageComponent implements OnInit {

ngOnInit() {
const title = 'July 06-07';
this.pageSvc.setPage({ title: title });
this.pageSvc.setPage({ title });
this.speakers = speakerList.map(x => ({
...x,
...{
Expand Down
Expand Up @@ -15,8 +15,7 @@ export class PostPageComponent implements OnInit {

selectedPost: { title: '', desc: '', content: '' };

constructor(private route: ActivatedRoute, private http: HttpClient,
private pageSvc: PageService) { }
constructor(private route: ActivatedRoute, private http: HttpClient, private pageSvc: PageService) { }

ngOnInit() {
this.route.params.subscribe(async x => {
Expand Down
1 change: 1 addition & 0 deletions projects/site2019/src/app/services/page.service.ts
Expand Up @@ -44,6 +44,7 @@ export class PageService {

document.dispatchEvent(new Event('prerender-ready'));

// tslint:disable-next-line
if (!environment.production || !window['gtag']) return;

gtag('config', this.trackingID, {
Expand Down
3 changes: 2 additions & 1 deletion projects/site2019/src/main.ts
Expand Up @@ -11,7 +11,8 @@ if (environment.production) {
GoogleAnalytics.run({ trackingID: environment.gaTrackingID });
} else {
// mock gtag
window['gtag'] = function () {
// tslint:disable-next-line
window['gtag'] = () => {
console.log('gtag called');
return null;
};
Expand Down
7 changes: 5 additions & 2 deletions projects/site2019/tsconfig.app.json
Expand Up @@ -7,5 +7,8 @@
"exclude": [
"test.ts",
"**/*.spec.ts"
]
}
],
"angularCompilerOptions": {
"enableIvy": true
}
}

0 comments on commit b24ebe6

Please sign in to comment.