feat(@ngtools/webpack): support Angular 8

filipesilva · alexeagle · commit 6e3d2e0c4dc4 · 2019-03-20T12:29:01.000-07:00
This requires updating projects to TypeScript 3.3
diff --git a/package.json b/package.json
@@ -72,11 +72,11 @@
     "quicktype-core": "^6.0.15",
     "temp": "^0.9.0",
     "tslint": "^5.13.1",
-    "typescript": "3.2.4"
+    "typescript": "3.3.3333"
   },
   "devDependencies": {
-    "@angular/compiler": "^8.0.0-beta.0",
-    "@angular/compiler-cli": "^8.0.0-beta.0",
+    "@angular/compiler": "^8.0.0-beta.9",
+    "@angular/compiler-cli": "^8.0.0-beta.9",
     "@bazel/karma": "~0.26.0",
     "@bazel/typescript": "~0.26.0",
     "@ngtools/json-schema": "^1.1.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
@@ -56,19 +56,19 @@
     "node-sass": "4.11.0"
   },
   "devDependencies": {
-    "@angular/animations": "^8.0.0-beta.0",
-    "@angular/cdk": "^7.1.0",
-    "@angular/common": "^8.0.0-beta.0",
-    "@angular/compiler": "^8.0.0-beta.0",
-    "@angular/compiler-cli": "^8.0.0-beta.0",
-    "@angular/core": "^8.0.0-beta.0",
-    "@angular/http": "^8.0.0-beta.0",
-    "@angular/material": "^7.1.0",
-    "@angular/platform-browser": "^8.0.0-beta.0",
-    "@angular/platform-browser-dynamic": "^8.0.0-beta.0",
-    "@angular/platform-server": "^8.0.0-beta.0",
-    "@angular/router": "^8.0.0-beta.0",
-    "@angular/service-worker": "^8.0.0-beta.0",
+    "@angular/animations": "^8.0.0-beta.9",
+    "@angular/cdk": "^7.3.4",
+    "@angular/common": "^8.0.0-beta.9",
+    "@angular/compiler": "^8.0.0-beta.9",
+    "@angular/compiler-cli": "^8.0.0-beta.9",
+    "@angular/core": "^8.0.0-beta.9",
+    "@angular/http": "^8.0.0-beta.9",
+    "@angular/material": "^7.3.4",
+    "@angular/platform-browser": "^8.0.0-beta.9",
+    "@angular/platform-browser-dynamic": "^8.0.0-beta.9",
+    "@angular/platform-server": "^8.0.0-beta.9",
+    "@angular/router": "^8.0.0-beta.9",
+    "@angular/service-worker": "^8.0.0-beta.9",
     "codelyzer": "^4.2.1",
     "core-js": "^2.4.1",
     "bootstrap": "^4.0.0",
diff --git a/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts
@@ -70,7 +70,7 @@ describe('Browser Builder service worker', () => {
         const ngswJson = JSON.parse(virtualFs.fileBufferToString(
           host.scopedSync().read(normalize('dist/ngsw.json'))));
         // Verify index and assets are there.
-        expect(ngswJson).toEqual({
+        expect(ngswJson).toEqual(jasmine.objectContaining({
           configVersion: 1,
           index: '/index.html',
           navigationUrls: [
@@ -108,7 +108,7 @@ describe('Browser Builder service worker', () => {
             '/index.html': '1bcafd53046ffb270ac5e6f3cab23e0442f95c4f',
             '/spectrum.png': '8d048ece46c0f3af4b598a95fd8e4709b631c3c0',
           },
-        });
+        }));
       }),
     ).toPromise().then(done, done.fail);
   });
@@ -127,7 +127,7 @@ describe('Browser Builder service worker', () => {
         const ngswJson = JSON.parse(virtualFs.fileBufferToString(
           host.scopedSync().read(normalize('dist/ngsw.json'))));
         // Verify index and assets include the base href.
-        expect(ngswJson).toEqual({
+        expect(ngswJson).toEqual(jasmine.objectContaining({
           configVersion: 1,
           index: '/foo/bar/index.html',
           navigationUrls: [
@@ -163,7 +163,7 @@ describe('Browser Builder service worker', () => {
             '/foo/bar/assets/folder-asset.txt': '617f202968a6a81050aa617c2e28e1dca11ce8d4',
             '/foo/bar/index.html': '925d80777b6ba64b526b0be79761d254dfe94c65',
           },
-        });
+        }));
       }),
     ).toPromise().then(done, done.fail);
   });
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
@@ -16,8 +16,8 @@
     "ng-packagr": "^4.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^8.0.0-beta.0",
-    "@angular/compiler-cli": "^8.0.0-beta.0",
+    "@angular/compiler": "^8.0.0-beta.9",
+    "@angular/compiler-cli": "^8.0.0-beta.9",
     "ng-packagr": "^4.0.0",
     "tsickle": ">=0.34.0",
     "tslib": "^1.9.0"
diff --git a/packages/angular_devkit/build_optimizer/package.json b/packages/angular_devkit/build_optimizer/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "loader-utils": "1.2.3",
     "source-map": "0.5.6",
-    "typescript": "3.2.4",
+    "typescript": "3.3.3333",
     "webpack-sources": "1.3.0"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
@@ -28,14 +28,14 @@
     "webpack-sources": "1.3.0"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": ">=5.0.0 <8.0.0 || ^7.0.0-beta.0",
-    "typescript": ">=2.4.0 < 3.3",
+    "@angular/compiler-cli": ">=6.0.0 <9.0.0 || ^8.0.0-beta.0",
+    "typescript": ">=2.7 < 3.4",
     "webpack": "^4.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^7.2.0-rc.0",
-    "@angular/compiler-cli": "^7.2.0-rc.0",
-    "typescript": "3.2.4",
+    "@angular/compiler": "^8.0.0-beta.9",
+    "@angular/compiler-cli": "^8.0.0-beta.9",
+    "typescript": "3.3.3333",
     "webpack": "4.29.6"
   }
 }
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,10 +8,10 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~8.0.0-beta.7',
+  Angular: '~8.0.0-beta.9',
   RxJs: '~6.4.0',
   ZoneJs: '~0.8.26',
-  TypeScript: '~3.2.2',
+  TypeScript: '~3.3.3333',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
   DevkitBuildAngular: '~0.800.0-beta.7',
diff --git a/packages/schematics/schematics/schematic/files/package.json b/packages/schematics/schematics/schematic/files/package.json
@@ -18,6 +18,6 @@
     "@types/jasmine": "^3.3.9",
     "@types/node": "^8.0.31",
     "jasmine": "^3.3.1",
-    "typescript": "~3.2.2"
+    "typescript": "~3.3.3333"
   }
 }
diff --git a/tests/angular_devkit/build_angular/hello-world-app/package.json b/tests/angular_devkit/build_angular/hello-world-app/package.json
@@ -12,6 +12,8 @@
   },
   "private": true,
   "dependencies": {
+    "//NOTE1": "These dependencies are not actually installed so it doesn't matter what they are.",
+    "//NOTE2": "The used dependencies are the ones in packages/angular_devkit/build_angular.",
     "@angular/animations": "^6.0.0-rc.0",
     "@angular/common": "^6.0.0-rc.0",
     "@angular/compiler": "^6.0.0-rc.0",
diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -1,16 +1,16 @@
 {
-    "description": "snapshot versions of Angular for e2e testing",
-    "private": true,
-    "dependencies": {
-        "@angular/core": "github:angular/core-builds#1bc5b9bba8227986648e0acacf1c0fe003325050",
-        "@angular/common": "github:angular/common-builds#8e5855a592e822c8c01ed8c76ddcb613adec8c28",
-        "@angular/platform-browser": "github:angular/platform-browser-builds#a680285668388f1ea495b4418e258dd3a7dfddbf",
-        "@angular/compiler": "github:angular/compiler-builds#5010a0df7672579c111122e703ae2a31e533bfe9",
-        "@angular/compiler-cli": "github:angular/compiler-cli-builds#b2f95784933f67e50916d5491046672452c4470a",
-        "@angular/animations": "github:angular/animations-builds#2ae4075eba3acd11c871ea9ce9acec0ca5679bb1",
-        "@angular/forms": "github:angular/forms-builds#5030b6e9a7174b525ee8e6ee60a3a3a91ef95a3c",
-        "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#4fac5c151609dcf3d4b5bc23f7fa391c6ba393e4",
-        "@angular/router":  "github:angular/router-builds#05ee97ccb532b2f8f18cc072034d5d3e51492a3c",
-        "@angular/language-service": "github:angular/language-service-builds#f0414cf6ca0825aa977639cf41d1935dd5791a6d"
-    }
+  "description": "snapshot versions of Angular for e2e testing",
+  "private": true,
+  "dependencies": {
+    "@angular/animations": "github:angular/animations-builds#3b8e68552cebd4ceb002bd76fa7b437c181d47bb",
+    "@angular/common": "github:angular/common-builds#b0404757a6e8ff33ea84483ff8c9a30287fd8a76",
+    "@angular/compiler": "github:angular/compiler-builds#4020c3ff5a1fb399aefa6107b3da7e77888d8e2b",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#ba3b8ad856de163aff1b3e8638a4e0b3763bcd07",
+    "@angular/core": "github:angular/core-builds#ef4e2529f7c922aeac93faa8a3de2ff42e08880f",
+    "@angular/forms": "github:angular/forms-builds#b50673e14fab734e6cf354e1a28b7171c3fd071d",
+    "@angular/language-service": "github:angular/language-service-builds#9694464453152dc76ca58b5b79558af34d480c07",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#65df04a6f2d04cd042e42b698cdc2eabafd89270",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#ec545d9cc098d1c2c5e0f156dca74a7dab5faa30",
+    "@angular/router": "github:angular/router-builds#c1883b22cb2445354675269aed42babf8e2bec5b"
+  }
 }
diff --git a/tests/legacy-cli/e2e/tests/ivy/ivy.ts b/tests/legacy-cli/e2e/tests/ivy/ivy.ts
@@ -5,17 +5,11 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { getGlobalVariable } from '../../utils/env';
 import { request } from '../../utils/http';
 import { killAllProcesses } from '../../utils/process';
 import { createProject, ngServe } from '../../utils/project';
 
 export default async function() {
-  const argv = getGlobalVariable('argv');
-  if (!argv['ng-snapshots']) {
-    // Only run this test on 8.x versions of Angular, which are currently only on snapshots.
-    return;
-  }
   try {
     await createProject('ivy-project', '--enable-ivy');
 
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`"dependencies": {`
`12`	`12`	`"loader-utils": "1.2.3",`
`13`	`13`	`"source-map": "0.5.6",`
`14`		`- "typescript": "3.2.4",`
	`14`	`+ "typescript": "3.3.3333",`
`15`	`15`	`"webpack-sources": "1.3.0"`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@`
`18`	`18`	`"@types/jasmine": "^3.3.9",`
`19`	`19`	`"@types/node": "^8.0.31",`
`20`	`20`	`"jasmine": "^3.3.1",`
`21`		`- "typescript": "~3.2.2"`
	`21`	`+ "typescript": "~3.3.3333"`
`22`	`22`	`}`
`23`	`23`	`}`