test: replace mentions of build-webpack with build-angular

packages/@angular/cli/plugins/karma.js

@@ -1,4 +1,4 @@
 throw new Error(
-  'In Angular CLI >6.0 the Karma plugin is now exported by "@angular-devkit/build-webpack" instead.\n'
-  + 'Please replace "@angular/cli" with "@angular-devkit/build-webpack" in your "karma.conf.js" file.'
+  'In Angular CLI >6.0 the Karma plugin is now exported by "@angular-devkit/build-angular" instead.\n'
+  + 'Please replace "@angular/cli" with "@angular-devkit/build-angular" in your "karma.conf.js" file.'
 );

tests/e2e/tests/basic/assets.ts

@@ -33,7 +33,7 @@ export default function () {
       './src/output-asset.txt': 'output-asset.txt',
       './node_modules/some-package/node_modules-asset.txt': 'node_modules-asset.txt',
     }))
-    // TODO(architect): Review allowOutsideOutDir logic inside build-webpack.
+    // TODO(architect): Review allowOutsideOutDir logic inside build-angular.
     // // Add invalid asset config in angular.json.
     // .then(() => updateJsonFile('angular.json', configJson => {
     //   const app = configJson['apps'][0];

tests/e2e/tests/build/allow-js.ts

@@ -3,7 +3,7 @@ import { updateTsConfig } from '../../utils/project';
 import { appendToFile, writeFile } from '../../utils/fs';
 
 export default async function() {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   await writeFile('projects/test-project/src/my-js-file.js', 'console.log(1); export const a = 2;');
   await appendToFile('projects/test-project/src/main.ts', `

tests/e2e/tests/build/aot/aot-decorators.ts

@@ -4,7 +4,7 @@ import {expectToFail} from '../../../utils/utils';
 import {ngVersionMatches} from '../../../utils/version';
 
 export default function() {
-  // TODO(architect): This behaviour seems to have changed in devkit/build-webpack. Figure out why.
+  // TODO(architect): This behaviour seems to have changed in devkit/build-angular. Figure out why.
   return;
 
   return ng('generate', 'component', 'test-component', '--module', 'app.module.ts')

tests/e2e/tests/build/aot/aot-i18n.ts

@@ -6,7 +6,7 @@ import { SemVer } from 'semver';
 
 // tslint:disable:max-line-length
 export default function () {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   return Promise.resolve()
     .then(() => createDir('projects/test-project/src/locale'))

tests/e2e/tests/build/base-href.ts

@@ -3,7 +3,7 @@ import { expectFileToMatch } from '../../utils/fs';
 
 
 export default function() {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   return ng('build', '--base-href', '/myUrl')
     .then(() => expectFileToMatch('dist/test-project/index.html', /<base href="\/myUrl">/));

tests/e2e/tests/build/build-app-shell.ts

@@ -28,15 +28,15 @@ export default function () {
     .then(() => updateJsonFile('angular.json', workspaceJson => {
       const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect['server'] = {
-        builder: '@angular-devkit/build-webpack:server',
+        builder: '@angular-devkit/build-angular:server',
         options: {
           outputPath: 'dist/test-project-server',
           main: 'projects/test-project/src/main.server.ts',
           tsConfig: 'projects/test-project/tsconfig.server.json'
         }
       };
       appArchitect['app-shell'] = {
-        builder: '@angular-devkit/build-webpack:app-shell',
+        builder: '@angular-devkit/build-angular:app-shell',
         options: {
           browserTarget: 'test-project:build:production',
           serverTarget: 'test-project:server',

tests/e2e/tests/build/build-errors.ts

@@ -13,7 +13,7 @@ const extraErrors = [
 ];
 
 export default function () {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   if (process.platform.startsWith('win')) {
     return Promise.resolve();

tests/e2e/tests/build/build-optimizer.ts

@@ -4,7 +4,7 @@ import { expectToFail } from '../../utils/utils';
 
 
 export default function () {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   return ng('build', '--aot', '--build-optimizer')
     .then(() => expectToFail(() => expectFileToMatch('dist/test-project/main.js', /\.decorators =/)))

tests/e2e/tests/build/chunk-hash.ts

@@ -42,7 +42,7 @@ function validateHashes(
 }
 
 export default function() {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
   return;
 
   let oldHashes: Map<string, string>;

tests/e2e/tests/build/delete-output-path.ts

@@ -4,7 +4,7 @@ import {deleteFile, expectFileToExist} from '../../utils/fs';
 import {getGlobalVariable} from '../../utils/env';
 
 export default function() {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   // Skip this in ejected tests.
   if (getGlobalVariable('argv').eject) {

tests/e2e/tests/build/extract-licenses.ts

@@ -4,7 +4,7 @@ import {expectToFail} from '../../utils/utils';
 import {ng} from '../../utils/process';
 
 export default function() {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   return ng('build', '--prod', '--extract-licenses=false')
     .then(() => expectFileToExist(join(process.cwd(), 'dist')))

tests/e2e/tests/build/json.ts

@@ -5,7 +5,7 @@ import {getGlobalVariable} from '../../utils/env';
 
 
 export default function() {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   // Skip this in ejected tests.
   if (getGlobalVariable('argv').eject) {

tests/e2e/tests/build/no-entry-module.ts

@@ -3,7 +3,7 @@ import { ng } from '../../utils/process';
 
 
 export default async function() {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   const mainTs = await readFile('projects/test-project/src/main.ts');
 

tests/e2e/tests/build/output-dir.ts

@@ -7,7 +7,7 @@ import {expectToFail} from '../../utils/utils';
 
 
 export default function() {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   // Skip this in ejected tests.
   if (getGlobalVariable('argv').eject) {

tests/e2e/tests/build/platform-server.ts

@@ -38,7 +38,7 @@ export default function () {
     .then(() => updateJsonFile('angular.json', workspaceJson => {
       const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect['server'] = {
-        builder: '@angular-devkit/build-webpack:server',
+        builder: '@angular-devkit/build-angular:server',
         options: {
           outputPath: 'dist/test-project-server',
           main: 'projects/test-project/src/main.server.ts',

tests/e2e/tests/build/poll.ts

@@ -9,7 +9,7 @@ import {expectToFail, wait} from '../../utils/utils';
 const webpackGoodRegEx = /: Compiled successfully./;
 
 export default function() {
-  // TODO(architect): This test is behaving oddly both here and in devkit/build-webpack.
+  // TODO(architect): This test is behaving oddly both here and in devkit/build-angular.
   // It seems to be because of file watchers.
   return;
 

tests/e2e/tests/build/polyfills.ts

@@ -3,7 +3,7 @@ import { ng } from '../../utils/process';
 import { oneLineTrim } from 'common-tags';
 
 export default function () {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   return Promise.resolve()
     .then(() => ng('build'))

tests/e2e/tests/build/prod-build.ts

@@ -7,7 +7,7 @@ import {getGlobalVariable} from '../../utils/env';
 
 
 export default function() {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   // Skip this in ejected tests.
   const ejected = getGlobalVariable('argv').eject;

tests/e2e/tests/build/rebuild-css-change.ts

@@ -9,7 +9,7 @@ import {getGlobalVariable} from '../../utils/env';
 const webpackGoodRegEx = /: Compiled successfully./;
 
 export default function() {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   if (process.platform.startsWith('win')) {
     return Promise.resolve();

tests/e2e/tests/build/rebuild-deps-type-check.ts

@@ -13,7 +13,7 @@ const errorRe = /ERROR in/;
 
 
 export default function() {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   if (process.platform.startsWith('win')) {
     return Promise.resolve();

tests/e2e/tests/build/rebuild-error.ts

@@ -18,7 +18,7 @@ const extraErrors = [
 ];
 
 export default function () {
-  // TODO(architect): This test is behaving oddly both here and in devkit/build-webpack.
+  // TODO(architect): This test is behaving oddly both here and in devkit/build-angular.
   // It seems to be because of file watchers.
   return;
 

tests/e2e/tests/build/rebuild-ngfactories.ts

@@ -9,7 +9,7 @@ import { getGlobalVariable } from '../../utils/env';
 const validBundleRegEx = /: Compiled successfully./;
 
 export default function () {
-  // TODO(architect): This test is behaving oddly both here and in devkit/build-webpack.
+  // TODO(architect): This test is behaving oddly both here and in devkit/build-angular.
   // It seems to be because of file watchers.
   return;
 

tests/e2e/tests/build/rebuild-types.ts

@@ -10,7 +10,7 @@ import {getGlobalVariable} from '../../utils/env';
 const successRe = /: Compiled successfully/;
 
 export default async function() {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   if (process.platform.startsWith('win')) {
     return;

tests/e2e/tests/build/script-target.ts

@@ -5,7 +5,7 @@ import { getGlobalVariable } from '../../utils/env';
 
 
 export default function () {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   // Skip this test in Angular 2, it had different bundles.
   if (getGlobalVariable('argv').ng2) {

tests/e2e/tests/build/sourcemap.ts

@@ -4,7 +4,7 @@ import {expectToFail} from '../../utils/utils';
 
 
 export default function() {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   return ng('build', '--source-map')
     .then(() => expectFileToExist('dist/test-project/main.js.map'))

tests/e2e/tests/build/styles/empty-style-urls.ts

@@ -3,7 +3,7 @@ import { ng } from '../../../utils/process';
 
 
 export default function () {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   return Promise.resolve()
     // Write assets.

tests/e2e/tests/build/styles/extract-css.ts

@@ -9,7 +9,7 @@ import { expectToFail } from '../../../utils/utils';
 import { oneLineTrim } from 'common-tags';
 
 export default function () {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   return Promise.resolve()
     .then(() => writeMultipleFiles({

tests/e2e/tests/build/styles/imports.ts

@@ -10,7 +10,7 @@ import { updateJsonFile } from '../../../utils/project';
 import { getGlobalVariable } from '../../../utils/env';
 
 export default function () {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   // Disable parts of it in webpack tests.
   const ejected = getGlobalVariable('argv').eject;

tests/e2e/tests/build/styles/inline-urls.ts

@@ -16,7 +16,7 @@ const imgSvg = `
 `;
 
 export default function () {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   return Promise.resolve()
     .then(() => silentNpm('install', 'font-awesome@4.7.0'))

tests/e2e/tests/build/styles/less.ts

@@ -10,7 +10,7 @@ import { stripIndents } from 'common-tags';
 import { updateJsonFile } from '../../../utils/project';
 
 export default function () {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   return writeMultipleFiles({
     'projects/test-project/src/styles.less': stripIndents`

tests/e2e/tests/build/styles/material-import.ts

@@ -7,7 +7,7 @@ import { stripIndents } from 'common-tags';
 import { updateJsonFile } from '../../../utils/project';
 
 export default function () {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   const extensions = ['css', 'scss', 'less', 'styl'];
   let promise: Promise<any> = Promise.resolve()

tests/e2e/tests/build/styles/postcss.ts

@@ -4,7 +4,7 @@ import { ng } from '../../../utils/process';
 import { stripIndents } from 'common-tags';
 
 export default function () {
-    // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+    // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   return writeFile('projects/test-project/src/styles.css', stripIndents`
       /* normal-comment */

tests/e2e/tests/build/styles/scss.ts

@@ -10,7 +10,7 @@ import { stripIndents } from 'common-tags';
 import { updateJsonFile } from '../../../utils/project';
 
 export default function () {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   return writeMultipleFiles({
     'projects/test-project/src/styles.scss': stripIndents`

tests/e2e/tests/build/styles/stylus.ts

@@ -10,7 +10,7 @@ import { stripIndents } from 'common-tags';
 import { updateJsonFile } from '../../../utils/project';
 
 export default function () {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   return writeMultipleFiles({
     'projects/test-project/src/styles.styl': stripIndents`

tests/e2e/tests/build/subresource-integrity.ts

@@ -5,7 +5,7 @@ import { expectToFail } from '../../utils/utils';
 const integrityRe = /integrity="\w+-[A-Za-z0-9\/\+=]+"/;
 
 export default async function() {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   // WEBPACK4_DISABLED - disabled pending a webpack 4 version
   return;

tests/e2e/tests/build/ts-paths.ts

@@ -5,7 +5,7 @@ import {stripIndents} from 'common-tags';
 
 
 export default function() {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   return updateTsConfig(json => {
     json['compilerOptions']['baseUrl'] = './src';

tests/e2e/tests/build/vendor-chunk.ts

@@ -4,7 +4,7 @@ import {expectToFail} from '../../utils/utils';
 
 
 export default function() {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   return ng('build')
     .then(() => expectFileToExist('dist/test-project/vendor.js'))

tests/e2e/tests/build/watch.ts

@@ -10,7 +10,7 @@ import { expectToFail } from '../../utils/utils';
 const webpackGoodRegEx = /: Compiled successfully./;
 
 export default function () {
-  // TODO(architect): This test is behaving oddly both here and in devkit/build-webpack.
+  // TODO(architect): This test is behaving oddly both here and in devkit/build-angular.
   // It seems to be because of file watchers.
   return;
 

tests/e2e/tests/commands/build/build-outdir.ts

@@ -3,7 +3,7 @@ import {updateJsonFile} from '../../../utils/project';
 import {expectToFail} from '../../../utils/utils';
 
 export default function() {
-  // TODO(architect): This isn't working correctly in devkit/build-webpack, due to module resolution.
+  // TODO(architect): This isn't working correctly in devkit/build-angular, due to module resolution.
   return;
 
   return Promise.resolve()

tests/e2e/tests/commands/serve/serve-path.ts

@@ -3,7 +3,7 @@ import { killAllProcesses } from '../../../utils/process';
 import { ngServe } from '../../../utils/project';
 
 export default function () {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   return Promise.resolve()
     .then(() => ngServe('--serve-path', 'test/'))

tests/e2e/tests/i18n/build-locale.ts

@@ -4,7 +4,7 @@ import { getGlobalVariable } from '../../utils/env';
 
 
 export default function () {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   // Skip this test in Angular 2/4.
   if (getGlobalVariable('argv').ng2 || getGlobalVariable('argv').ng4) {

tests/e2e/tests/i18n/extract-default.ts

@@ -7,7 +7,7 @@ import {
 
 
 export default function() {
-  // TODO(architect): Delete this test. It is now in devkit/build-webpack.
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   return ng('generate', 'component', 'i18n-test')
     .then(() => writeFile(