feat(@angular-devkit/architect): support mixing configurations

Author: tomblachut

packages/angular_devkit/architect/src/architect.ts

@@ -197,24 +197,32 @@ export class Architect {
     const {
       project: projectName,
       target: targetName,
-      configuration: configurationName,
+      configuration: configurationSpecifier,
       overrides,
     } = targetSpec;
 
+    const configurationNames = configurationSpecifier
+      ? configurationSpecifier.split(',').filter(Boolean)
+      : [];
+
     const project = this._workspace.getProject(projectName);
     const target = this._getProjectTarget(projectName, targetName);
     const options = target.options;
-    let configuration: TargetConfiguration = {};
+    const configurations: TargetConfiguration[] = [];
 
-    if (configurationName) {
+    if (configurationNames && configurationNames.length) {
       if (!target.configurations) {
-        throw new ConfigurationNotFoundException(projectName, configurationName);
+        throw new ConfigurationNotFoundException(projectName, configurationNames[0]);
       }
 
-      configuration = target.configurations[configurationName];
+      for (const configurationName of configurationNames) {
+        const configuration = target.configurations[configurationName];
+
+        if (!configuration) {
+          throw new ConfigurationNotFoundException(projectName, configurationName);
+        }
 
-      if (!configuration) {
-        throw new ConfigurationNotFoundException(projectName, configurationName);
+        configurations.push(configuration);
       }
     }
 
@@ -225,7 +233,7 @@ export class Architect {
       builder: target.builder,
       options: {
         ...options,
-        ...configuration,
+        ...Object.assign({}, ...configurations),
         ...overrides as {},
       } as OptionsT,
     };

packages/angular_devkit/architect/src/architect_spec.ts

@@ -41,6 +41,10 @@ describe('Architect', () => {
               prod: {
                 optionalBrowserOption: false,
               },
+              another: {
+                optionalBrowserOption: true,
+                anotherOptionalBrowserOption: true,
+              },
             },
           },
           badBrowser: {
@@ -74,6 +78,13 @@ describe('Architect', () => {
     expect(builderConfig.options.optionalBrowserOption).toBe(false);
   });
 
+  it('mixes configurations', () => {
+    const targetSpec = { project: 'app', target: 'browser', configuration: 'prod,another' };
+    const builderConfig = architect.getBuilderConfiguration<BrowserTargetOptions>(targetSpec);
+    expect(builderConfig.options.optionalBrowserOption).toBe(true);
+    expect(builderConfig.options.anotherOptionalBrowserOption).toBe(true);
+  });
+
   it('lists targets by name', () => {
     expect(architect.listProjectTargets('app')).toEqual(['browser', 'badBrowser', 'karma']);
   });

packages/angular_devkit/architect/test/browser/index.ts

@@ -21,6 +21,7 @@ const failBuildEvent: BuildEvent = {
 export interface BrowserTargetOptions {
   browserOption: number;
   optionalBrowserOption: boolean;
+  anotherOptionalBrowserOption: boolean;
 }
 
 export default class BrowserTarget implements Builder<BrowserTargetOptions> {

packages/angular_devkit/architect/test/browser/schema.json

@@ -13,6 +13,11 @@
       "type": "boolean",
       "description": "A non-required option with a default",
       "default": false
+    },
+    "anotherOptionalBrowserOption": {
+      "type": "boolean",
+      "description": "Another non-required option with a default",
+      "default": false
     }
   },
   "additionalProperties": false,