refactor(@angular-devkit/build-webpack): align builders source directory structure with build-angular

The source code for the builders within the `@angular-devkit/build-webpack` package have been moved
into a `builders` subdirectory to more closely align with the structure of the builders in the
`@angular-devkit/build-angular` package. An initial `package.json` exports field definition has also
been added that currently continues to allow deep imports.

Author: clydin

packages/angular_devkit/build_webpack/BUILD.bazel

@@ -14,12 +14,12 @@ package(default_visibility = ["//visibility:public"])
 
 ts_json_schema(
     name = "webpack_schema",
-    src = "src/webpack/schema.json",
+    src = "src/builders/webpack/schema.json",
 )
 
 ts_json_schema(
     name = "webpack_dev_server_schema",
-    src = "src/webpack-dev-server/schema.json",
+    src = "src/builders/webpack-dev-server/schema.json",
 )
 
 ts_library(
@@ -32,14 +32,14 @@ ts_library(
             "src/**/*_spec.ts",
         ],
     ) + [
-        "//packages/angular_devkit/build_webpack:src/webpack-dev-server/schema.ts",
-        "//packages/angular_devkit/build_webpack:src/webpack/schema.ts",
+        "//packages/angular_devkit/build_webpack:src/builders/webpack-dev-server/schema.ts",
+        "//packages/angular_devkit/build_webpack:src/builders/webpack/schema.ts",
     ],
     data = [
         "builders.json",
         "package.json",
-        "src/webpack-dev-server/schema.json",
-        "src/webpack/schema.json",
+        "src/builders/webpack-dev-server/schema.json",
+        "src/builders/webpack/schema.json",
     ],
     module_name = "@angular-devkit/build-webpack",
     module_root = "src/index.d.ts",

packages/angular_devkit/build_webpack/builders.json

@@ -2,23 +2,23 @@
   "$schema": "../architect/src/builders-schema.json",
   "builders": {
     "build": {
-      "implementation": "./src/webpack",
-      "schema": "./src/webpack/schema.json",
+      "implementation": "./src/builders/webpack",
+      "schema": "./src/builders/webpack/schema.json",
       "description": "Build a webpack app."
     },
     "webpack": {
-      "implementation": "./src/webpack",
-      "schema": "./src/webpack/schema.json",
+      "implementation": "./src/builders/webpack",
+      "schema": "./src/builders/webpack/schema.json",
       "description": "Build a webpack app."
     },
     "dev-server": {
-      "implementation": "./src/webpack-dev-server",
-      "schema": "./src/webpack-dev-server/schema.json",
+      "implementation": "./src/builders/webpack-dev-server",
+      "schema": "./src/builders/webpack-dev-server/schema.json",
       "description": "Serve a webpack app."
     },
     "webpack-dev-server": {
-      "implementation": "./src/webpack-dev-server",
-      "schema": "./src/webpack-dev-server/schema.json",
+      "implementation": "./src/builders/webpack-dev-server",
+      "schema": "./src/builders/webpack-dev-server/schema.json",
       "description": "Serve a webpack app."
     }
   }

packages/angular_devkit/build_webpack/package.json

@@ -6,6 +6,15 @@
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
+  "exports": {
+    ".": {
+      "types": "./src/index.d.ts",
+      "default": "./src/index.js"
+    },
+    "./package.json": "./package.json",
+    "./*": "./*.js",
+    "./*.js": "./*.js"
+  },
   "dependencies": {
     "@angular-devkit/architect": "0.0.0-EXPERIMENTAL-PLACEHOLDER",
     "rxjs": "7.8.1"

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

@@ -11,7 +11,7 @@ import { resolve as pathResolve } from 'path';
 import { Observable, from, isObservable, of, switchMap } from 'rxjs';
 import webpack from 'webpack';
 import WebpackDevServer from 'webpack-dev-server';
-import { getEmittedFiles, getWebpackConfig } from '../utils';
+import { getEmittedFiles, getWebpackConfig } from '../../utils';
 import { BuildResult, WebpackFactory, WebpackLoggingCallback } from '../webpack';
 import { Schema as WebpackDevServerBuilderSchema } from './schema';
 

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

@@ -41,7 +41,7 @@ describe('Dev Server Builder', () => {
   }
 
   beforeEach(async () => {
-    const ngJsonPath = path.join(__dirname, '../../test/basic-app/angular.json');
+    const ngJsonPath = path.join(__dirname, '../../../test/basic-app/angular.json');
     const workspaceRoot = path.dirname(require.resolve(ngJsonPath));
     await createArchitect(workspaceRoot);
   });

packages/angular_devkit/build_webpack/src/webpack-dev-server/schema.json renamed to packages/angular_devkit/build_webpack/src/builders/webpack-dev-server/schema.json

@@ -10,7 +10,7 @@ import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/ar
 import { resolve as pathResolve } from 'path';
 import { Observable, from, isObservable, of, switchMap } from 'rxjs';
 import webpack from 'webpack';
-import { EmittedFiles, getEmittedFiles, getWebpackConfig } from '../utils';
+import { EmittedFiles, getEmittedFiles, getWebpackConfig } from '../../utils';
 import { Schema as RealWebpackBuilderSchema } from './schema';
 
 export type WebpackBuilderSchema = RealWebpackBuilderSchema;

packages/angular_devkit/build_webpack/src/webpack/index.ts renamed to packages/angular_devkit/build_webpack/src/builders/webpack/index.ts

@@ -39,7 +39,7 @@ describe('Webpack Builder basic test', () => {
   }
 
   describe('basic app', () => {
-    const ngJsonPath = path.join(__dirname, '../../test/basic-app/angular.json');
+    const ngJsonPath = path.join(__dirname, '../../../test/basic-app/angular.json');
     const workspaceRoot = path.dirname(require.resolve(ngJsonPath));
     const outputPath = join(normalize(workspaceRoot), 'dist');
 
@@ -90,7 +90,7 @@ describe('Webpack Builder basic test', () => {
 
   describe('Angular app', () => {
     jasmine.DEFAULT_TIMEOUT_INTERVAL = 150000;
-    const ngJsonPath = path.join(__dirname, '../../test/angular-app/angular.json');
+    const ngJsonPath = path.join(__dirname, '../../../test/angular-app/angular.json');
     const workspaceRoot = path.dirname(require.resolve(ngJsonPath));
     const outputPath = join(normalize(workspaceRoot), 'dist');
 

packages/angular_devkit/build_webpack/src/webpack/index_spec.ts renamed to packages/angular_devkit/build_webpack/src/builders/webpack/index_spec.ts

@@ -6,6 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './webpack';
-export * from './webpack-dev-server';
+export * from './builders/webpack';
+export * from './builders/webpack-dev-server';
 export { EmittedFiles } from './utils';