@loopback/build 6.0.0 → 6.1.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.1.0](https://github.com/strongloop/loopback-next/compare/@loopback/build@6.0.0...@loopback/build@6.1.0) (2020-06-30)
+
+
+### Features
+
+* **build:** add a helper to merge mocha config objects ([3ce9eef](https://github.com/strongloop/loopback-next/commit/3ce9eefdb3a286f2d2b2690ec471f00d8124efb9))
+
+
+
+
+
 # [6.0.0](https://github.com/strongloop/loopback-next/compare/@loopback/build@5.4.3...@loopback/build@6.0.0) (2020-06-23)
 
 

package/index.js

@@ -20,3 +20,5 @@ exports.typeScriptPath = path.resolve(
   require.resolve('typescript/package.json'),
   '..',
 );
+
+exports.mergeMochaConfigs = require('./src/merge-mocha-configs');

package/package.json

@@ -6,7 +6,7 @@
     "url": "https://github.com/strongloop/loopback-next.git",
     "directory": "packages/build"
   },
-  "version": "6.0.0",
+  "version": "6.1.0",
   "engines": {
     "node": ">=10.16"
   },
@@ -18,7 +18,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@loopback/eslint-config": "^8.0.2",
+    "@loopback/eslint-config": "^8.0.3",
     "@types/mocha": "^7.0.2",
     "@types/node": "^10.17.26",
     "cross-spawn": "^7.0.3",
@@ -26,6 +26,7 @@
     "eslint": "^7.3.1",
     "fs-extra": "^9.0.1",
     "glob": "^7.1.6",
+    "lodash": "^4.17.15",
     "mocha": "^8.0.1",
     "nyc": "^15.1.0",
     "prettier": "^2.0.5",
@@ -45,5 +46,5 @@
     "test": "npm run mocha",
     "mocha": "node bin/run-mocha --timeout 30000 \"test/integration/*.js\" \"test/unit/*.js\""
   },
-  "gitHead": "9ccb0b7ae75727ec9b90c5bba18885edb3f93a92"
+  "gitHead": "b89db3d3b8be6a36e63e91c2331d217fda7538de"
 }

package/src/merge-mocha-configs.js

@@ -0,0 +1,39 @@
+// Copyright IBM Corp. 2017,2020. All Rights Reserved.
+// Node module: @loopback/build
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
+'use strict';
+
+const debug = require('debug')('loopback:build:merge-mocha-configs');
+const {assignWith} = require('lodash');
+
+module.exports = mergeMochaConfigs;
+
+/**
+ * Merge multiple Mocha configuration files into a single one.
+ *
+ * @param {MochaConfig[]} configs A list of Mocha configuration objects
+ * as provided by `.mocharc.js` files.
+ */
+function mergeMochaConfigs(...configs) {
+  debug('Merging mocha configurations', ...configs);
+  const result = assignWith({}, ...configs, assignMochaConfigEntry);
+  debug('Merged config:', result);
+  return result;
+}
+
+function assignMochaConfigEntry(targetValue, sourceValue, key) {
+  switch (key) {
+    case 'timeout':
+      return Math.max(targetValue || 0, sourceValue);
+    case 'require':
+      if (Array.isArray(sourceValue)) {
+        debug('Adding an array of files to require:', sourceValue);
+        return [...(targetValue || []), ...sourceValue];
+      } else {
+        debug('Adding a single file to require:', sourceValue);
+        return [...(targetValue || []), sourceValue];
+      }
+  }
+}