From 58912da4aca6da026d74b58d85115e63aaea9ae9 Mon Sep 17 00:00:00 2001 From: Filipe Silva Date: Mon, 15 Oct 2018 09:56:07 +0100 Subject: [PATCH 1/2] fix(@angular-devkit/build-angular): pin copy-webpack-plugin Fix #12553 Fix #12260 --- packages/angular_devkit/build_angular/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index 710c81daa32d..5b4a65effa03 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -15,7 +15,7 @@ "autoprefixer": "^8.4.1", "circular-dependency-plugin": "^5.0.2", "clean-css": "^4.1.11", - "copy-webpack-plugin": "^4.5.2", + "copy-webpack-plugin": "4.5.2", "file-loader": "^1.1.11", "glob": "^7.0.3", "html-webpack-plugin": "^3.0.6", From 5085d3d62fffa4377b5c9bdd4133ce6bfeb2b69f Mon Sep 17 00:00:00 2001 From: Filipe Silva Date: Mon, 15 Oct 2018 13:12:36 +0100 Subject: [PATCH 2/2] test: remove ivy e2e This test should only be on the 7.x branches. --- .../legacy-cli/e2e/tests/experimental/ivy.ts | 38 ------------------- 1 file changed, 38 deletions(-) delete mode 100644 tests/legacy-cli/e2e/tests/experimental/ivy.ts diff --git a/tests/legacy-cli/e2e/tests/experimental/ivy.ts b/tests/legacy-cli/e2e/tests/experimental/ivy.ts deleted file mode 100644 index 794b6c7b6569..000000000000 --- a/tests/legacy-cli/e2e/tests/experimental/ivy.ts +++ /dev/null @@ -1,38 +0,0 @@ -/** - * @license - * Copyright Google Inc. All Rights Reserved. - * - * 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 { request } from '../../utils/http'; -import { killAllProcesses } from '../../utils/process'; -import { createProject, ngServe } from '../../utils/project'; - -export default async function() { - try { - await createProject('ivy-project', '--experimental-ivy'); - - await ngServe('--prod'); - - // Verify the index.html - const body = await request('http://localhost:4200/'); - if (!body.match(/<\/app-root>/)) { - throw new Error('Response does not match expected value.'); - } - - // Verify it's Ivy. - const mainUrlMatch = body.match(/src="(main\.[a-z0-9]{0,32}\.js)"/); - const mainUrl = mainUrlMatch && mainUrlMatch[1]; - const main = await request('http://localhost:4200/' + mainUrl); - - if (!main.match(/ngComponentDef\s*=/)) { - throw new Error('Ivy could not be found.'); - } - if (main.match(/ngDevMode/)) { - throw new Error('NgDevMode was not tree shaken away.'); - } - } finally { - await killAllProcesses(); - } -}