fix(@angular-devkit/build-angular): allow bundleDependencies to be a boolean

Author: alan-agius4

packages/angular/cli/lib/config/schema.json

@@ -1874,12 +1874,19 @@
               "default": true
             },
             "bundleDependencies": {
-              "type": "string",
-              "description": "Available on server platform only. Which external dependencies to bundle into the module. By default, all of node_modules will be kept as requires.",
-              "default": "none",
-              "enum": [
-                "none",
-                "all"
+              "description": "Available on server platform only. Which external dependencies to bundle into the module. By default, all of node_modules will be bundled.",
+              "default": true,
+              "oneOf": [
+                {
+                  "type": "boolean"
+                },
+                {
+                  "type": "string",
+                  "enum": [
+                    "none",
+                    "all"
+                  ]
+                }
               ]
             },
             "statsJson": {

packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts

@@ -48,7 +48,7 @@ export interface BuildOptions {
   localize?: Localize;
   i18nMissingTranslation?: I18NMissingTranslation;
   extractCss?: boolean;
-  bundleDependencies?: 'none' | 'all';
+  bundleDependencies?: boolean;
   watch?: boolean;
   outputHashing?: string;
   poll?: number;

packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts

@@ -39,7 +39,7 @@ export function getServerConfig(wco: WebpackConfigOptions): Configuration {
     node: false,
   };
 
-  if (wco.buildOptions.bundleDependencies == 'none') {
+  if (!wco.buildOptions.bundleDependencies) {
     config.externals = [
       /^@angular/,
       (context: string, request: string, callback: (error?: null, result?: string) => void) => {

packages/angular_devkit/build_angular/src/server/index.ts

@@ -120,10 +120,19 @@ async function initialize(
   config: webpack.Configuration;
   i18n: I18nOptions;
 }> {
+  let bundleDependencies: boolean | undefined;
+  if (typeof options.bundleDependencies === 'string') {
+    bundleDependencies = options.bundleDependencies === 'all';
+    context.logger.warn(`Option 'bundleDependencies' string value is deprecated since version 9. Use a boolean value instead.`);
+  } else {
+    bundleDependencies = options.bundleDependencies;
+  }
+
   const originalOutputPath = options.outputPath;
   const { config, i18n } = await generateI18nBrowserWebpackConfigFromContext(
     {
       ...options,
+      bundleDependencies,
       buildOptimizer: false,
       aot: true,
       platform: 'server',

packages/angular_devkit/build_angular/src/server/schema.json

@@ -218,12 +218,19 @@
       "x-deprecated": "Since version 9. This option has no effect on server platform."
     },
     "bundleDependencies": {
-      "type": "string",
       "description": "Available on server platform only. Which external dependencies to bundle into the module. By default, all of node_modules will be bundled.",
-      "default": "all",
-      "enum": [
-        "none",
-        "all"
+      "default": true,
+      "oneOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "string",
+          "enum": [
+            "none",
+            "all"
+          ]
+        }
       ]
     },
     "statsJson": {

packages/angular_devkit/build_angular/test/server/base_spec_large.ts

@@ -10,7 +10,6 @@ import { Architect } from '@angular-devkit/architect';
 import { getSystemPath, join, normalize, virtualFs } from '@angular-devkit/core';
 import { take, tap } from 'rxjs/operators';
 import { ServerBuilderOutput } from '../../src';
-import { BundleDependencies } from '../../src/server/schema';
 import { createArchitect, host, veEnabled } from '../utils';
 
 
@@ -86,7 +85,7 @@ describe('Server Builder', () => {
     });
 
     const run = await architect.scheduleTarget(target, {
-      bundleDependencies: BundleDependencies.None,
+      bundleDependencies: false,
       sourceMap: {
         styles: false,
         scripts: true,
@@ -108,7 +107,7 @@ describe('Server Builder', () => {
 
   it('supports component styles sourcemaps', async () => {
     const overrides = {
-      bundleDependencies: BundleDependencies.None,
+      bundleDependencies: false,
       sourceMap: {
         styles: true,
         scripts: true,

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

@@ -70,7 +70,7 @@ export default async function () {
   );
 
   // works with optimization and bundleDependencies enabled
-  await ng('run', 'test-project:server:production', '--optimization', '--bundleDependencies', 'all');
+  await ng('run', 'test-project:server:production', '--optimization', '--bundleDependencies');
   await exec(normalize('node'), 'dist/test-project/server/main.js');
   await expectFileToMatch(
     'dist/test-project/server/index.html',

tests/legacy-cli/e2e/tests/misc/universal-bundle-dependencies.ts

@@ -15,7 +15,7 @@ export default async function() {
     appArchitect['server'] = {
       builder: '@angular-devkit/build-angular:server',
       options: {
-        bundleDependencies: 'none',
+        bundleDependencies: false,
         outputPath: 'dist/test-project-server',
         main: 'src/main.server.ts',
         tsConfig: 'tsconfig.server.json',