Updated merge library, added tests for overrides and recursive merging. (#288)

* Updated merge library, added tests for overrides and recursive merging.

* Removed console logs.

* Replaced webpack merge with lodash merge.

* Updated test to account for arrays

* Updated package to be exact.

Author: blackbaud-brandonhare

config/sky-pages/sky-pages.config.js

@@ -3,7 +3,7 @@
 
 const fs = require('fs-extra');
 const path = require('path');
-const merge = require('merge');
+const merge = require('lodash.merge');
 const logger = require('../../utils/logger');
 
 /**
@@ -59,7 +59,7 @@ module.exports = {
     hierarchy.forEach(file => {
       if (fs.existsSync(file.filePath)) {
         logger.info(`Merging ${file.fileName}`);
-        merge.recursive(skyuxConfig, readConfig(file.filePath));
+        skyuxConfig = merge(skyuxConfig, readConfig(file.filePath));
       }
     });
 

package.json

@@ -73,6 +73,7 @@
     "karma-sourcemap-loader": "0.3.7",
     "karma-webpack": "2.0.3",
     "loader-utils": "1.1.0",
+    "lodash.merge": "4.6.0",
     "merge": "1.2.0",
     "ngc-webpack": "3.0.0",
     "node-sass": "4.5.3",

test/config-sky-pages.spec.js

@@ -67,6 +67,16 @@ describe('config sky-pages', () => {
         if (!isSpaDirectory && isDefaultConfig) {
           config.a = 1; // Merged through entire process
           config.z = 9; // Unique to this file
+          config.o = {
+            keyOne: 'keyOne',
+            keyTwo: {
+              nestedTwo: 'nestedTwo'
+            }
+          }; // Testing recursive merge
+          config.n = {
+            toDelete: true
+          }; // Testing merge override
+          config.arr = ['stringOne', 'stringTwo'] // Testing array values not concatenated
 
         // Asking for builder's skyuxconfig.build.json
         } else if (!isSpaDirectory && isCommandConfig) {
@@ -87,6 +97,14 @@ describe('config sky-pages', () => {
           config.b = 3;
           config.c = 2;
           config.w = 6; // Unique to this file
+          config.o = {
+            keyOne: 'changed',
+            keyTwo: {
+              nestedTwo: 'changed'
+            }
+          };
+          config.n = null;
+          config.arr = ['stringOne', 'stringThree'];
         }
 
         return config;
@@ -106,6 +124,11 @@ describe('config sky-pages', () => {
     expect(config.x).toEqual(7);
     expect(config.y).toEqual(8);
     expect(config.z).toEqual(9);
+    expect(config.o.keyOne).toEqual('changed');
+    expect(config.o.keyTwo.nestedTwo).toEqual('changed');
+    expect(config.n).toEqual(null);
+    expect(config.arr.length).toBe(2);
+    expect(config.arr).not.toContain('stringTwo');
 
     expect(logger.info.calls.allArgs()).toEqual([
       ['Merging App Builder skyuxconfig.json'],