filipesilva · Oct 15, 2019 · Oct 15, 2019 · Oct 16, 2019 · Oct 16, 2019 · Oct 21, 2019
diff --git a/integration/_payload-limits.json b/integration/_payload-limits.json
@@ -2,67 +2,56 @@
   "cli-hello-world": {
     "master": {
       "uncompressed": {
-        "runtime": 1542,
-        "main": 154385,
-        "polyfills": 45541
+        "runtime-es2015": 1485,
+        "main-es2015": 141461,
+        "polyfills-es2015": 36808
       }
     }
   },
   "cli-hello-world-ivy-minimal": {
     "master": {
       "uncompressed": {
-        "runtime": 1485,
-        "main": 14213,
-        "polyfills": 45482
+        "runtime-es2015": 1485,
+        "main-es2015": 14440,
+        "polyfills-es2015": 36808
       }
     }
   },
   "cli-hello-world-ivy-compat": {
     "master": {
       "uncompressed": {
-        "runtime": 1485,
-        "main": 125495,
-        "polyfills": 45482
+        "runtime-es2015": 1485,
+        "main-es2015": 147474,
+        "polyfills-es2015": 36808
       }
     }
   },
   "cli-hello-world-ivy-i18n": {
     "master": {
       "uncompressed": {
         "runtime-es2015": 1485,
-        "runtime-es5": 1485,
         "main-es2015": 128258,
-        "main-es5": 150321,
-        "polyfills-es2015": 42102,
-        "polyfills-es5": 136343
+        "polyfills-es2015": 42102
       }
     }
   },
   "cli-hello-world-lazy": {
     "master": {
       "uncompressed": {
         "runtime-es2015": 2289,
-        "runtime-es5": 2286,
         "main-es2015": 265613,
-        "main-es5": 309747,
         "polyfills-es2015": 36808,
-        "polyfills-es5": 127499,
-        "5-es2015": 751,
-        "5-es5": 1234
+        "5-es2015": 751
       }
     }
   },
   "cli-hello-world-lazy-rollup": {
     "master": {
       "uncompressed": {
         "runtime-es2015": 2289,
-        "runtime-es5": 2286,
         "main-es2015": 225584,
-        "main-es5": 269438,
         "polyfills-es2015": 36808,
-        "polyfills-es5": 127675,
-        "5-es2015": 779,
-        "5-es5": 1304
+        "5-es2015": 779
       }
     }
   },

diff --git a/integration/cli-hello-world-ivy-compat/.gitignore b/integration/cli-hello-world-ivy-compat/.gitignore
@@ -0,0 +1,46 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+/out-tsc
+# Only exists if Bazel was run
+/bazel-out
+
+# dependencies
+/node_modules
+
+# profiling files
+chrome-profiler-events*.json
+speed-measure-plugin*.json
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+.history/*
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+yarn-error.log
+testem.log
+/typings
+
+# System Files
+.DS_Store
+Thumbs.db
diff --git a/integration/cli-hello-world-ivy-compat/README.md b/integration/cli-hello-world-ivy-compat/README.md
@@ -1,6 +1,6 @@
 # CliHelloWorldIvy
 
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.2.0-rc.0.
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 9.0.0-next.9.
 
 ## Development server
 

diff --git a/integration/cli-hello-world-ivy-compat/angular.json b/integration/cli-hello-world-ivy-compat/angular.json
@@ -1,17 +1,14 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "version": 1,
-  "cli": {
-    "packageManager": "yarn"
-  },
   "newProjectRoot": "projects",
   "projects": {
     "cli-hello-world-ivy-compat": {
+      "projectType": "application",
+      "schematics": {},
       "root": "",
       "sourceRoot": "src",
-      "projectType": "application",
       "prefix": "app",
-      "schematics": {},
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
@@ -20,7 +17,8 @@
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.app.json",
+            "tsConfig": "tsconfig.app.json",
+            "aot": true,
             "assets": [
               "src/favicon.ico",
               "src/assets"
@@ -44,7 +42,6 @@
               "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true,
@@ -53,6 +50,11 @@
                   "type": "initial",
                   "maximumWarning": "2mb",
                   "maximumError": "5mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb",
+                  "maximumError": "10kb"
                 }
               ]
             }
@@ -87,16 +89,16 @@
           "options": {
             "main": "src/test.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.spec.json",
-            "karmaConfig": "src/karma.conf.js",
-            "styles": [
-              "src/styles.css"
-            ],
-            "scripts": [],
+            "tsConfig": "tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
             "assets": [
               "src/favicon.ico",
               "src/assets"
             ],
+            "styles": [
+              "src/styles.css"
+            ],
+            "scripts": [],
             "progress": false,
             "watch": false
           }
@@ -105,21 +107,15 @@
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
+              "tsconfig.app.json",
+              "tsconfig.spec.json",
+              "e2e/tsconfig.json"
             ],
             "exclude": [
               "**/node_modules/**"
             ]
           }
-        }
-      }
-    },
-    "cli-hello-world-ivy-compat-e2e": {
-      "root": "e2e/",
-      "projectType": "application",
-      "prefix": "",
-      "architect": {
+        },
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
@@ -138,18 +134,8 @@
               "devServerTarget": "cli-hello-world-ivy-compat:serve:ci-production"
             }
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": "e2e/tsconfig.e2e.json",
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
-    }
-  },
+    }},
   "defaultProject": "cli-hello-world-ivy-compat"
 }
diff --git a/integration/cli-hello-world-ivy-compat/browserslist b/integration/cli-hello-world-ivy-compat/browserslist
@@ -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'.
diff --git a/integration/cli-hello-world-ivy-compat/e2e/protractor.conf.js b/integration/cli-hello-world-ivy-compat/e2e/protractor.conf.js
@@ -1,19 +1,19 @@
+// @ts-check
 // Protractor configuration file, see link for more information
 // https://github.com/angular/protractor/blob/master/lib/config.ts
 
 const { SpecReporter } = require('jasmine-spec-reporter');
 
+/**
+ * @type { import("protractor").Config }
+ */
 exports.config = {
   allScriptsTimeout: 11000,
   specs: [
     './src/**/*.e2e-spec.ts'
   ],
   capabilities: {
-    browserName: 'chrome',
-    chromeOptions: {
-      binary: process.env.CHROME_BIN,
-      args: ['--no-sandbox']
-    }
+    'browserName': 'chrome'
   },
   directConnect: true,
   baseUrl: 'http://localhost:4200/',
@@ -25,8 +25,8 @@ exports.config = {
   },
   onPrepare() {
     require('ts-node').register({
-      project: require('path').join(__dirname, './tsconfig.e2e.json')
+      project: require('path').join(__dirname, './tsconfig.json')
     });
     jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
   }
-};
+};
diff --git a/integration/cli-hello-world-ivy-compat/e2e/src/app.e2e-spec.ts b/integration/cli-hello-world-ivy-compat/e2e/src/app.e2e-spec.ts
@@ -1,6 +1,7 @@
 import { AppPage } from './app.po';
+import { browser, logging } from 'protractor';
 
-describe('cli-hello-world-ivy App', () => {
+describe('cli-hello-world-ivy-compat App', () => {
   let page: AppPage;
 
   beforeEach(() => {
@@ -9,11 +10,19 @@ describe('cli-hello-world-ivy App', () => {
 
   it('should display welcome message', () => {
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual('Welcome to cli-hello-world-ivy-compat!');
+    expect(page.getTitleText()).toEqual('cli-hello-world-ivy-compat app is running!');
   });
 
   it('the percent pipe should work', () => {
     page.navigateTo();
     expect(page.getPipeContent()).toEqual('100 % awesome');
   })
+
+  afterEach(async () => {
+    // Assert that there are no errors emitted from the browser
+    const logs = await browser.manage().logs().get(logging.Type.BROWSER);
+    expect(logs).not.toContain(jasmine.objectContaining({
+      level: logging.Level.SEVERE,
+    } as logging.Entry));
+  });
 });
diff --git a/integration/cli-hello-world-ivy-compat/e2e/src/app.po.ts b/integration/cli-hello-world-ivy-compat/e2e/src/app.po.ts
@@ -2,11 +2,11 @@ import { browser, by, element } from 'protractor';
 
 export class AppPage {
   navigateTo() {
-    return browser.get('/');
+    return browser.get(browser.baseUrl) as Promise<any>;
   }
 
-  getParagraphText() {
-    return element(by.css('app-root h1')).getText();
+  getTitleText() {
+    return element(by.css('app-root .content span')).getText() as Promise<string>;
   }
 
   getPipeContent() {

diff --git a/...ion/cli-hello-world/e2e/tsconfig.e2e.json → ...-hello-world-ivy-compat/e2e/tsconfig.json b/...ion/cli-hello-world/e2e/tsconfig.e2e.json → ...-hello-world-ivy-compat/e2e/tsconfig.json
@@ -2,7 +2,6 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "outDir": "../out-tsc/e2e",
-    "baseUrl": "./",
     "module": "commonjs",
     "target": "es5",
     "types": [

diff --git a/...li-hello-world-ivy-i18n/src/karma.conf.js → .../cli-hello-world-ivy-compat/karma.conf.js b/...li-hello-world-ivy-i18n/src/karma.conf.js → .../cli-hello-world-ivy-compat/karma.conf.js
@@ -16,7 +16,7 @@ module.exports = function (config) {
       clearContext: false // leave Jasmine Spec Runner output visible in browser
     },
     coverageIstanbulReporter: {
-      dir: require('path').join(__dirname, 'coverage'),
+      dir: require('path').join(__dirname, './coverage/latest-app'),
       reports: ['html', 'lcovonly', 'text-summary'],
       fixWebpackSourcePaths: true
     },
@@ -25,13 +25,8 @@ module.exports = function (config) {
     colors: true,
     logLevel: config.LOG_INFO,
     autoWatch: true,
-    browsers: ['CustomChrome'],
+    browsers: ['Chrome'],
     singleRun: false,
-    customLaunchers: {
-      CustomChrome: {
-        base: 'Chrome',
-        flags: ['--no-sandbox']
-      }
-    }
+    restartOnFileChange: true
   });
 };