mhevery · Feb 14, 2019 · Feb 7, 2019 · Feb 7, 2019 · Feb 7, 2019 · Feb 7, 2019
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -280,6 +280,27 @@ jobs:
         # with either "0", "1" or "2" as node index. This can be passed to the "--shard" argument.
       - run: yarn --cwd aio example-e2e --setup --local --shard=${CIRCLE_NODE_INDEX}/${CIRCLE_NODE_TOTAL}
 
+  test_docs_examples_ivy:
+    <<: *job_defaults
+    docker:
+      # Needed because the example e2e tests depend on Chrome.
+      - image: *browsers_docker_image
+    parallelism: 3
+    steps:
+      - checkout:
+          <<: *post_checkout
+      - *restore_cache
+      - attach_workspace:
+          at: dist
+      - *define_env_vars
+      - *download_yarn
+        # Install aio
+      - run: yarn --cwd aio install --frozen-lockfile --non-interactive
+        # Run examples tests with ivy. The "CIRCLE_NODE_INDEX" will be set if "parallelism" is enabled.
+        # Since the parallelism is set to "3", there will be three parallel CircleCI containers
+        # with either "0", "1" or "2" as node index. This can be passed to the "--shard" argument.
+      - run: yarn --cwd aio example-e2e --setup --local --ivy --shard=${CIRCLE_NODE_INDEX}/${CIRCLE_NODE_TOTAL}
+
   # This job should only be run on PR builds, where `CI_PULL_REQUEST` is not `false`.
   aio_preview:
     <<: *job_defaults
@@ -541,12 +562,18 @@ workflows:
       - test_aio_local:
           requires:
             - build-npm-packages
+      # - test_aio_local_ivy:
+      #     requires:
+      #       - build-npm-packages
       - test_aio_tools:
           requires:
             - build-npm-packages
       - test_docs_examples:
           requires:
             - build-npm-packages
+      # - test_docs_examples_ivy:
+      #     requires:
+      #       - build-npm-packages
       - aio_preview:
           # Only run on PR builds. (There can be no previews for non-PR builds.)
           filters:
@@ -572,7 +599,8 @@ workflows:
             - test_aio_local
             # - test_aio_local_ivy
             - test_docs_examples
-            # Get the artifacts to publish from the build-npm-packages job
+            # - test_docs_examples_ivy
+            # Get the artifacts to publish from the build-packages-dist job
             # since the publishing script expects the legacy outputs layout.
             - build-npm-packages
             - legacy-misc-tests

diff --git a/aio/content/examples/.gitignore b/aio/content/examples/.gitignore
@@ -57,7 +57,9 @@ dist/
 
 # aot
 **/*.ngsummary.json
+upgrade-module/tsconfig-aot.json
 !rollup-config.js
+upgrade-module/rollup-config.js
 aot-compiler/**/*.d.ts
 aot-compiler/**/*.factory.d.ts
 upgrade-phonecat-2-hybrid/aot/**/*
@@ -84,5 +86,9 @@ upgrade-phonecat-2-hybrid/aot/**/*
 *stackblitz.no-link.html
 
 # ngUpgrade testing
+upgrade-phonecat-1-typescript/tsconfig-aot.json
+upgrade-phonecat-1-typescript/rollup-config.js
+upgrade-phonecat-3-final/tsconfig-aot.json
+upgrade-phonecat-3-final/rollup-config.js
 !upgrade-phonecat-*/**/karma.conf.js
 !upgrade-phonecat-*/**/karma-test-shim.js
diff --git a/aio/content/examples/ajs-quick-reference/src/app/app.component.ts b/aio/content/examples/ajs-quick-reference/src/app/app.component.ts
@@ -20,7 +20,7 @@ export class AppComponent {
   movies: IMovie[] = [];
   showImage = true;
   title = 'AngularJS to Angular Quick Ref Cookbook';
-  toggleImage(event: UIEvent) {
+  toggleImage(event?: UIEvent) {
     this.showImage = !this.showImage;
     this.eventType = (event && event.type) || 'not provided';
   }

diff --git a/aio/content/examples/ajs-quick-reference/src/app/date.pipe.ts b/aio/content/examples/ajs-quick-reference/src/app/date.pipe.ts
diff --git a/aio/content/examples/animations/src/app/app.module.ts b/aio/content/examples/animations/src/app/app.module.ts
@@ -19,6 +19,7 @@ import { HeroListAutoCalcPageComponent } from './hero-list-auto-page.component';
 import { HeroListAutoComponent } from './hero-list-auto.component';
 import { HomeComponent } from './home.component';
 import { AboutComponent } from './about.component';
+import { InsertRemoveComponent } from './insert-remove.component';
 
 
 @NgModule({
@@ -56,6 +57,7 @@ import { AboutComponent } from './about.component';
     HeroListAutoCalcPageComponent,
     HeroListAutoComponent,
     HomeComponent,
+    InsertRemoveComponent,
     AboutComponent
   ],
   bootstrap: [AppComponent]

diff --git a/aio/content/examples/component-interaction/example-config.json b/aio/content/examples/component-interaction/example-config.json
@@ -0,0 +1,11 @@
+{
+  "e2e": [
+    {
+      "cmd": "yarn",
+      "args": [
+        "e2e",
+        "--no-webdriver-update"
+      ]
+    }
+  ]
+}
diff --git a/aio/content/examples/dependency-injection-in-action/src/app/parent-finder.component.ts b/aio/content/examples/dependency-injection-in-action/src/app/parent-finder.component.ts
@@ -19,20 +19,20 @@ const DifferentParent = Parent;
 // #enddocregion provide-the-parent
 // The `parentType` defaults to `Parent` when omitting the second parameter.
 // #docregion provide-the-parent
-const provideParent =
+export function provideParent
 // #enddocregion provide-parent, provide-the-parent
 // #docregion provide-parent
-  (component: any, parentType?: any) => {
+  (component: any, parentType?: any) {
     return { provide: parentType || Parent, useExisting: forwardRef(() => component) };
-  };
+  }
 // #enddocregion provide-parent
 
 // Simpler syntax version that always provides the component in the name of `Parent`.
-const provideTheParent =
+export function provideTheParent
 // #docregion provide-the-parent
-  (component: any) => {
+  (component: any) {
     return { provide: Parent, useExisting: forwardRef(() => component) };
-  };
+  }
 // #enddocregion provide-the-parent
 
 

diff --git a/aio/content/examples/dependency-injection/example-config.json b/aio/content/examples/dependency-injection/example-config.json
@@ -0,0 +1,11 @@
+{
+  "e2e": [
+    {
+      "cmd": "yarn",
+      "args": [
+        "e2e",
+        "--no-webdriver-update"
+      ]
+    }
+  ]
+}
diff --git a/...laying-data/src/app/app-ctor.component.ts → ...ying-data/src/app/app-ctor.component.1.ts b/...laying-data/src/app/app-ctor.component.ts → ...ying-data/src/app/app-ctor.component.1.ts
diff --git a/aio/content/examples/http/e2e/src/app.e2e-spec.ts b/aio/content/examples/http/e2e/src/app.e2e-spec.ts
@@ -28,10 +28,7 @@ let checkLogForMessage = (message: string) => {
   expect(page.logList.getText()).toContain(message);
 };
 
-// TODO(i): temorarily disable these tests because angular-in-memory-web-api is not compatible with rxjs v6 yet
-//          and we don't have the backwards compatibility package yet.
-//          Reenable after rxjs v6 compatibility package is out or angular-in-memory-web-api is compatible with rxjs v6
-xdescribe('Http Tests', function() {
+describe('Http Tests', function() {
   beforeEach(() => {
     browser.get('');
   });

diff --git a/aio/content/examples/i18n/example-config.json b/aio/content/examples/i18n/example-config.json
@@ -1,3 +1,12 @@
 {
-  "projectType": "i18n"
-}
+  "projectType": "i18n",
+  "e2e": [
+    {
+      "cmd": "yarn",
+      "args": [
+        "e2e",
+        "--no-webdriver-update"
+      ]
+    }
+  ]
+}
diff --git a/aio/content/examples/ngmodule-faq/src/app/app.module.3.ts b/aio/content/examples/ngmodule-faq/src/app/app.module.3.ts
@@ -13,8 +13,8 @@ import { AppComponent }       from './app.component';
 // #enddocregion
 */
 // #docregion
-import { HighlightDirective } from './highlight.directive';
-import { TitleComponent }     from './title.component';
+import { HighlightDirective } from './highlight.directive.1';
+import { TitleComponent }     from './title.component.1';
 import { UserService }        from './user.service';
 
 /* Routing Module */

diff --git a/aio/content/examples/ngmodule-faq/src/app/contact/awesome.pipe.ts b/aio/content/examples/ngmodule-faq/src/app/contact/awesome.pipe.ts
diff --git a/aio/content/examples/ngmodule-faq/src/app/contact/contact-highlight.directive.ts b/aio/content/examples/ngmodule-faq/src/app/contact/contact-highlight.directive.ts
diff --git a/aio/content/examples/ngmodule-faq/src/app/hero/highlight.directive.ts b/aio/content/examples/ngmodule-faq/src/app/hero/highlight.directive.ts
diff --git a/...module-faq/src/app/highlight.directive.ts → ...dule-faq/src/app/highlight.directive.1.ts b/...module-faq/src/app/highlight.directive.ts → ...dule-faq/src/app/highlight.directive.1.ts
diff --git a/...ngmodule-faq/src/app/title.component.html → ...module-faq/src/app/title.component.1.html b/...ngmodule-faq/src/app/title.component.html → ...module-faq/src/app/title.component.1.html
diff --git a/...s/ngmodule-faq/src/app/title.component.ts → ...ngmodule-faq/src/app/title.component.1.ts b/...s/ngmodule-faq/src/app/title.component.ts → ...ngmodule-faq/src/app/title.component.1.ts
@@ -8,7 +8,7 @@ import { UserService } from './user.service';
 
 @Component({
   selector: 'app-title',
-  templateUrl: './title.component.html'
+  templateUrl: './title.component.1.html'
 })
 export class TitleComponent {
   title = 'Angular Modules';

diff --git a/aio/content/examples/quickstart/bs-config.1.json b/aio/content/examples/quickstart/bs-config.1.json
diff --git a/aio/content/examples/quickstart/src/app/app.component.ts b/aio/content/examples/quickstart/src/app/app.component.ts
diff --git a/aio/content/examples/quickstart/src/app/app.module.ts b/aio/content/examples/quickstart/src/app/app.module.ts
diff --git a/aio/content/examples/quickstart/src/index.html b/aio/content/examples/quickstart/src/index.html
diff --git a/aio/content/examples/quickstart/src/main.ts b/aio/content/examples/quickstart/src/main.ts
diff --git a/aio/content/examples/quickstart/src/tsconfig.1.json b/aio/content/examples/quickstart/src/tsconfig.1.json
diff --git a/aio/content/examples/quickstart/stackblitz.json b/aio/content/examples/quickstart/stackblitz.json
diff --git a/...t/examples/quickstart/example-config.json → ...p/crisis-list/crisis-list.component.1.css b/...t/examples/quickstart/example-config.json → ...p/crisis-list/crisis-list.component.1.css
diff --git a/...pp/crisis-list/crisis-list.component.html → .../crisis-list/crisis-list.component.1.html b/...pp/crisis-list/crisis-list.component.html → .../crisis-list/crisis-list.component.1.html
diff --git a/.../app/crisis-list/crisis-list.component.ts → ...pp/crisis-list/crisis-list.component.1.ts b/.../app/crisis-list/crisis-list.component.ts → ...pp/crisis-list/crisis-list.component.1.ts
@@ -4,7 +4,7 @@ import { Component } from '@angular/core';
 
 @Component({
   selector: 'app-crisis-list',
-  templateUrl: './crisis-list.component.html',
-  styleUrls: ['./crisis-list.component.css']
+  templateUrl: './crisis-list.component.1.html',
+  styleUrls: ['./crisis-list.component.1.css']
 })
 export class CrisisListComponent { }
diff --git a/...app/crisis-list/crisis-list.component.css → ...c/app/hero-list/hero-list.component.1.css b/...app/crisis-list/crisis-list.component.css → ...c/app/hero-list/hero-list.component.1.css
diff --git a/...rc/app/hero-list/hero-list.component.html → .../app/hero-list/hero-list.component.1.html b/...rc/app/hero-list/hero-list.component.html → .../app/hero-list/hero-list.component.1.html
diff --git a/.../src/app/hero-list/hero-list.component.ts → ...rc/app/hero-list/hero-list.component.1.ts b/.../src/app/hero-list/hero-list.component.ts → ...rc/app/hero-list/hero-list.component.1.ts
@@ -4,7 +4,7 @@ import { Component } from '@angular/core';
 
 @Component({
   selector: 'app-hero-list',
-  templateUrl: './hero-list.component.html',
-  styleUrls: ['./hero-list.component.css']
+  templateUrl: './hero-list.component.1.html',
+  styleUrls: ['./hero-list.component.1.css']
 })
 export class HeroListComponent { }
diff --git a/aio/content/examples/router/src/app/hero-list/hero-list.component.css b/aio/content/examples/router/src/app/hero-list/hero-list.component.css
diff --git a/aio/content/examples/setup/e2e-spec.ts b/aio/content/examples/setup/e2e-spec.ts
diff --git a/aio/content/examples/quickstart/e2e-spec.ts → ...nt/examples/setup/e2e/src/app.e2e-spec.ts b/aio/content/examples/quickstart/e2e-spec.ts → ...nt/examples/setup/e2e/src/app.e2e-spec.ts