feat(examples): upgrade to v9 and enable ivy (#1227)

bazel-contrib · Oct 2, 2019 · 1c7426f · 1c7426f
1 parent 89e3a89
commit 1c7426f
Show file tree

Hide file tree

Showing 8 changed files with 603 additions and 503 deletions.
diff --git a/examples/angular/.bazelrc b/examples/angular/.bazelrc
@@ -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
diff --git a/examples/angular/angular-metadata.tsconfig.json b/examples/angular/angular-metadata.tsconfig.json
diff --git a/examples/angular/package.json b/examples/angular/package.json
@@ -8,15 +8,15 @@
         "yarn": ">=1.9.2 <2.0.0"
     },
     "dependencies": {
-        "@angular/animations": "8.2.8",
+        "@angular/animations": "9.0.0-next.8",
         "@angular/cdk": "8.2.2",
-        "@angular/common": "8.2.8",
-        "@angular/core": "8.2.8",
-        "@angular/forms": "8.2.8",
+        "@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": "8.2.8",
-        "@angular/platform-browser-dynamic": "8.2.8",
-        "@angular/router": "8.2.8",
+        "@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.3",
@@ -25,17 +25,17 @@
         "zone.js": "0.10.2"
     },
     "devDependencies": {
-        "@angular/bazel": "8.2.8",
-        "@angular/cli": "8.3.6",
-        "@angular/compiler": "8.2.8",
-        "@angular/compiler-cli": "8.2.8",
+        "@angular/bazel": "9.0.0-next.8",
+        "@angular/cli": "9.0.0-next.6",
+        "@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",
@@ -52,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"
     }

diff --git a/...ngular/patches/@angular+bazel+8.2.8.patch → ...patches/@angular+bazel+9.0.0-next.8.patch b/...ngular/patches/@angular+bazel+8.2.8.patch → ...patches/@angular+bazel+9.0.0-next.8.patch
diff --git a/examples/angular/src/app/app-routing.module.ts b/examples/angular/src/app/app-routing.module.ts
@@ -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)
   }
 ];
 

diff --git a/examples/angular/src/main.dev.ts b/examples/angular/src/main.dev.ts
@@ -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);
diff --git a/examples/angular/src/main.prod.ts b/examples/angular/src/main.prod.ts
@@ -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);