refactor(@angular-devkit/build-webpack): move @angular-devkit/core to a dev dependency

The package's `@angular-devkit/core` dependency is only used in non-test code to provide a single type which is no longer needed with the latest architect.

Author: clydin

packages/angular_devkit/build_webpack/BUILD.bazel

@@ -48,7 +48,6 @@ ts_library(
     module_root = "src/index.d.ts",
     deps = [
         "//packages/angular_devkit/architect",
-        "//packages/angular_devkit/core",
         "@npm//@types/node",
         "@npm//@types/webpack",
         "@npm//@types/webpack-dev-server",

packages/angular_devkit/build_webpack/package.json

@@ -8,9 +8,12 @@
   "builders": "builders.json",
   "dependencies": {
     "@angular-devkit/architect": "0.0.0",
-    "@angular-devkit/core": "0.0.0",
     "rxjs": "6.6.7"
   },
+  "devDependencies": {
+    "@angular-devkit/core": "0.0.0",
+    "node-fetch": "2.6.1"
+  },
   "peerDependencies": {
     "webpack": "^4.6.0",
     "webpack-dev-server": "^3.1.4"

packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts

@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { BuilderContext, createBuilder } from '@angular-devkit/architect';
-import { json } from '@angular-devkit/core';
 import * as net from 'net';
 import { resolve as pathResolve } from 'path';
 import { Observable, from, isObservable, of } from 'rxjs';
@@ -117,12 +116,12 @@ export function runWebpackDevServer(
 }
 
 
-export default createBuilder<
-  json.JsonObject & WebpackDevServerBuilderSchema, DevServerBuildOutput
->((options, context) => {
-  const configPath = pathResolve(context.workspaceRoot, options.webpackConfig);
+export default createBuilder<WebpackDevServerBuilderSchema, DevServerBuildOutput>(
+  (options, context) => {
+    const configPath = pathResolve(context.workspaceRoot, options.webpackConfig);
 
-  return from(import(configPath)).pipe(
-    switchMap((config: webpack.Configuration) => runWebpackDevServer(config, context)),
-  );
-});
+    return from(import(configPath)).pipe(
+      switchMap((config: webpack.Configuration) => runWebpackDevServer(config, context)),
+    );
+  },
+);

packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec.ts

@@ -8,8 +8,8 @@
 import { Architect } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { TestingArchitectHost } from '@angular-devkit/architect/testing';
-import { schema, workspaces } from '@angular-devkit/core';
-import { NodeJsSyncHost } from '@angular-devkit/core/node';
+import { schema, workspaces } from '@angular-devkit/core'; // tslint:disable-line:no-implicit-dependencies
+import { NodeJsSyncHost } from '@angular-devkit/core/node'; // tslint:disable-line:no-implicit-dependencies
 import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
 import * as path from 'path';
 import { DevServerBuildOutput } from './index';

packages/angular_devkit/build_webpack/src/webpack/index.ts

@@ -6,15 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
-import { json } from '@angular-devkit/core';
 import { resolve as pathResolve } from 'path';
 import { Observable, from, isObservable, of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import * as webpack from 'webpack';
 import { EmittedFiles, getEmittedFiles } from '../utils';
 import { Schema as RealWebpackBuilderSchema } from './schema';
 
-export type WebpackBuilderSchema = json.JsonObject & RealWebpackBuilderSchema;
+export type WebpackBuilderSchema = RealWebpackBuilderSchema;
 
 export interface WebpackLoggingCallback {
   (stats: webpack.Stats, config: webpack.Configuration): void;

packages/angular_devkit/build_webpack/src/webpack/index_spec.ts

@@ -8,8 +8,8 @@
 import { Architect } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { TestingArchitectHost } from '@angular-devkit/architect/testing';
-import { join, normalize, schema, workspaces } from '@angular-devkit/core';
-import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node';
+import { join, normalize, schema, workspaces } from '@angular-devkit/core'; // tslint:disable-line:no-implicit-dependencies
+import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node'; // tslint:disable-line:no-implicit-dependencies
 import * as path from 'path';
 import { BuildResult } from './index';
 

yarn.lock

@@ -8689,6 +8689,11 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
+[email protected], node-fetch@^2.2.0, node-fetch@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
+
 node-fetch@^1.0.1:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
@@ -8697,11 +8702,6 @@ node-fetch@^1.0.1:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
-node-fetch@^2.2.0, node-fetch@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
-  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
-
 node-forge@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"