Refactor: remove lodash.merge

Author: JPeer264

lib/mapping/generateMapping.ts

@@ -1,5 +1,4 @@
-import { fromCallback } from 'universalify';
-import merge from 'lodash.merge';
+import { fromPromise } from 'universalify';
 import rcs from 'rcs-core';
 import path from 'path';
 import json from 'json-extra';
@@ -24,26 +23,23 @@ const generateMapping = (
   let fileNameExt = '.json';
   let mappingName = 'CSS_NAME_MAPPING';
 
-  const optionsDefault: GenerateMappingOptions = {
+  const options: GenerateMappingOptions = {
     cssMapping: true,
     cssMappingMin: false,
     json: true,
     origValues: true,
     isSelectors: true,
     overwrite: false,
+    ...opts,
   };
 
-  let options = opts;
   let callback = cb;
 
   // set cb if options are not set
   if (typeof callback !== 'function') {
     callback = options as () => void;
-    options = {};
   }
 
-  options = merge({}, optionsDefault, options);
-
   if (options.cssMappingMin) {
     options.origValues = false;
     mappingName = 'CSS_NAME_MAPPING_MIN';
@@ -83,4 +79,4 @@ const generateMapping = (
   });
 }; // /generateMapping
 
-export default fromCallback(generateMapping);
+export default fromPromise(generateMapping);

lib/process/processSync.ts

@@ -1,4 +1,3 @@
-import merge from 'lodash.merge';
 import fs from 'fs';
 import rcs from 'rcs-core';
 import path from 'path';
@@ -23,7 +22,7 @@ function processSync(type: 'pug', pathString: string | string[], opts?: AllOptio
 function processSync(type: 'any', pathString: string | string[], opts?: AllOptions['any']): void;
 function processSync(type: any, pathString: string | string[], opts: any = {}): void {
   let globString: string;
-  const options = merge({}, optionsDefault, opts);
+  const options = { ...optionsDefault, ...opts };
 
   assert(
     availableTypes.includes(type),

package-lock.json

@@ -50,7 +50,6 @@
     "fs-extra": "^8.1.0",
     "glob": "^7.1.6",
     "json-extra": "^0.5.0",
-    "lodash.merge": "^4.6.2",
     "universalify": "^0.1.2"
   },
   "peerDependencies": {