Skip to content

Commit

Permalink
feat(examples): upgrade to v9 and enable ivy
Browse files Browse the repository at this point in the history
  • Loading branch information
Fabian Wiles authored and gregmagolan committed Oct 2, 2019
1 parent faaf73e commit 2b5a5a7
Show file tree
Hide file tree
Showing 9 changed files with 621 additions and 707 deletions.
3 changes: 3 additions & 0 deletions examples/angular/.bazelrc
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
import %workspace%/../../common.bazelrc
# Use the Angular IVy compiler
# See https://github.com/angular/angular/blob/master/docs/BAZEL.md#various-flags-used-for-tests
build --define=compile=aot
39 changes: 0 additions & 39 deletions examples/angular/angular-metadata.tsconfig.json

This file was deleted.

37 changes: 18 additions & 19 deletions examples/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,41 +8,40 @@
"yarn": ">=1.9.2 <2.0.0"
},
"dependencies": {
"@angular/animations": "8.2.6",
"@angular/cdk": "8.2.0",
"@angular/common": "8.2.6",
"@angular/core": "8.2.6",
"@angular/forms": "8.2.6",
"@angular/material": "8.2.0",
"@angular/platform-browser": "8.2.6",
"@angular/platform-browser-dynamic": "8.2.6",
"@angular/router": "8.2.6",
"@ngrx/store": "8.0.1",
"@angular/animations": "9.0.0-next.8",
"@angular/cdk": "8.2.2",
"@angular/common": "9.0.0-next.8",
"@angular/core": "9.0.0-next.8",
"@angular/forms": "9.0.0-next.8",
"@angular/material": "8.2.2",
"@angular/platform-browser": "9.0.0-next.8",
"@angular/platform-browser-dynamic": "9.0.0-next.8",
"@angular/router": "9.0.0-next.8",
"@ngrx/store": "8.3.0",
"date-fns": "1.30.1",
"rxjs": "6.5.2",
"systemjs": "0.21.6",
"tslib": "1.10.0",
"zone.js": "0.10.2"
},
"devDependencies": {
"@angular/bazel": "8.2.6",
"@angular/cli": "8.3.4",
"@angular/compiler": "8.2.6",
"@angular/compiler-cli": "8.2.6",
"@angular/bazel": "9.0.0-next.8",
"@angular/cli": "9.0.0-next.5",
"@angular/compiler": "9.0.0-next.8",
"@angular/compiler-cli": "9.0.0-next.8",
"@bazel/bazel": "^0.29.0",
"@bazel/benchmark-runner": "0.1.0",
"@bazel/buildifier": "0.28.0",
"@bazel/ibazel": "0.10.3",
"@bazel/karma": "latest",
"@bazel/protractor": "latest",
"@bazel/typescript": "latest",
"@bazel/karma": "^0.38.0",
"@bazel/protractor": "^0.38.0",
"@bazel/typescript": "^0.38.0",
"@types/jasmine": "3.4.0",
"@types/node": "6.14.6",
"core-js": "2.6.9",
"firebase-tools": "7.1.0",
"history-server": "^1.3.1",
"patch-package": "^6.2.0",
"ts-morph": "3.1.0",
"typescript": "3.4.5"
},
"scripts": {
Expand All @@ -53,7 +52,7 @@
"e2e": "bazel test //e2e:all",
"test": "bazel test //src/...",
"benchmark": "ibazel-benchmark-runner //src:devserver src/app/hello-world/hello-world.component.ts --url=http://localhost:5432",
"postinstall": "patch-package && ngc -p angular-metadata.tsconfig.json",
"postinstall": "patch-package && ivy-ngcc",
"generate": "node tools/generator/index.js",
"generate:clean": "node tools/generator/index.js --clean"
}
Expand Down
1 change: 0 additions & 1 deletion examples/angular/src/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ ts_devserver(
# These scripts will be included in the JS bundle after require.js
# They should have only named UMD modules, or require.js will throw.
scripts = [
"@npm//:node_modules/@ngrx/store/bundles/store.umd.min.js",
"@npm//:node_modules/tslib/tslib.js",
":rxjs_umd_modules",
# We are manaully adding the bazel generated named-UMD date-fns bundle here as
Expand Down
6 changes: 3 additions & 3 deletions examples/angular/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ const routes: Routes = [
{
path: '',
pathMatch: 'full',
loadChildren: () => import('./home/home.ngfactory').then(m => m.HomeModuleNgFactory)
loadChildren: () => import('./home/home').then(m => m.HomeModule)
},
{
path: 'hello',
pathMatch: 'full',
loadChildren: () =>
import('./hello-world/hello-world.module.ngfactory').then(m => m.HelloWorldModuleNgFactory)
import('./hello-world/hello-world.module').then(m => m.HelloWorldModule)
},
{
path: 'todos',
pathMatch: 'full',
loadChildren: () => import('./todos/todos.module.ngfactory').then(m => m.TodosModuleNgFactory)
loadChildren: () => import('./todos/todos.module').then(m => m.TodosModule)
}
];

Expand Down
4 changes: 2 additions & 2 deletions examples/angular/src/main.dev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
* Used to launch the application under Bazel development mode.
*/
import {platformBrowser} from '@angular/platform-browser';
import {AppModuleNgFactory} from './app/app.module.ngfactory';
import {AppModule} from './app/app.module';

platformBrowser().bootstrapModuleFactory(AppModuleNgFactory);
platformBrowser().bootstrapModule(AppModule);
4 changes: 2 additions & 2 deletions examples/angular/src/main.prod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/
import {enableProdMode} from '@angular/core';
import {platformBrowser} from '@angular/platform-browser';
import {AppModuleNgFactory} from './app/app.module.ngfactory';
import {AppModule} from './app/app.module';

enableProdMode();
platformBrowser().bootstrapModuleFactory(AppModuleNgFactory);
platformBrowser().bootstrapModule(AppModule);
Loading

0 comments on commit 2b5a5a7

Please sign in to comment.