Merge pull request microsoft#316 from Microsoft/ianc/making-merge-config-partial

iclanton · web-flow · commit deb63bc938c3 · 2017-08-15T11:58:57.000-07:00
Allow a partial config to be passed to GulpTask.mergeConfig.
diff --git a/common/changes/@microsoft/gulp-core-build/ianc-making-merge-config-partial_2017-08-15-18-41.json b/common/changes/@microsoft/gulp-core-build/ianc-making-merge-config-partial_2017-08-15-18-41.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/gulp-core-build",
+      "comment": "Allow a partial config to be passed to GulpTask.mergeConfig.",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@microsoft/gulp-core-build",
+  "email": "iclanton@users.noreply.github.com"
+}
diff --git a/common/reviews/api/gulp-core-build.api.ts b/common/reviews/api/gulp-core-build.api.ts
@@ -98,7 +98,7 @@ class GulpTask<TTaskConfig> implements IExecutable {
   public logError(message: string): void;
   public logVerbose(message: string): void;
   public logWarning(message: string): void;
-  public mergeConfig(taskConfig: TTaskConfig): void;
+  public mergeConfig(taskConfig: Partial<TTaskConfig>): void;
   public name: string;
   public onRegister(): void;
   public readJSONSync(localPath: string): Object | undefined;
diff --git a/common/reviews/api/node-library-build.api.ts b/common/reviews/api/node-library-build.api.ts
@@ -85,7 +85,7 @@ class GulpTask<TTaskConfig> implements IExecutable {
   logError(message: string): void;
   logVerbose(message: string): void;
   logWarning(message: string): void;
-  mergeConfig(taskConfig: TTaskConfig): void;
+  mergeConfig(taskConfig: Partial<TTaskConfig>): void;
   name: string;
   onRegister(): void;
   readJSONSync(localPath: string): Object | undefined;
diff --git a/common/reviews/api/web-library-build.api.ts b/common/reviews/api/web-library-build.api.ts
@@ -85,7 +85,7 @@ class GulpTask<TTaskConfig> implements IExecutable {
   logError(message: string): void;
   logVerbose(message: string): void;
   logWarning(message: string): void;
-  mergeConfig(taskConfig: TTaskConfig): void;
+  mergeConfig(taskConfig: Partial<TTaskConfig>): void;
   name: string;
   onRegister(): void;
   readJSONSync(localPath: string): Object | undefined;
diff --git a/core-build/gulp-core-build/src/tasks/GulpTask.ts b/core-build/gulp-core-build/src/tasks/GulpTask.ts
@@ -106,7 +106,7 @@ export abstract class GulpTask<TTaskConfig> implements IExecutable {
    * Do not use this function if the configuration contains complex objects that cannot be merged.
    * @param taskConfig - configuration settings which should be applied
    */
-  public mergeConfig(taskConfig: TTaskConfig): void {
+  public mergeConfig(taskConfig: Partial<TTaskConfig>): void {
     /* tslint:disable:typedef */
     const merge = require('lodash.merge');
     /* tslint:enable:typedef */
