Upgrade: Update copy-props (closes #123) (#131)

gulpjs · Dec 21, 2017 · 9d6db31 · 9d6db31
1 parent 62f0269
commit 9d6db31
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/lib/shared/config/env-flags.js b/lib/shared/config/env-flags.js
@@ -12,11 +12,11 @@ function mergeConfigToEnvFlags(env, config) {
   return copyProps(env, config, toFrom, convert, true);
 }
 
-function convert(value, configKey, envKey) {
-  if (envKey === 'configBase') {
-    return path.dirname(value);
+function convert(configInfo, envInfo) {
+  if (envInfo.keyChain === 'configBase') {
+    return path.dirname(configInfo.value);
   }
-  return value;
+  return configInfo.value;
 }
 
 module.exports = mergeConfigToEnvFlags;
diff --git a/lib/shared/config/load-files.js b/lib/shared/config/load-files.js
@@ -16,11 +16,11 @@ function loadConfigFiles(configFiles, configFileOrder) {
 
     copyProps(require(filePath), config, convert);
 
-    function convert(value, name) {
-      if (name === 'flags.gulpfile') {
-        return path.resolve(path.dirname(filePath), value);
+    function convert(loadedInfo) {
+      if (loadedInfo.keyChain === 'flags.gulpfile') {
+        return path.resolve(path.dirname(filePath), loadedInfo.value);
       }
-      return value;
+      return loadedInfo.value;
     }
   }
 

diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
   "dependencies": {
     "archy": "^1.0.0",
     "chalk": "^1.1.0",
-    "copy-props": "^1.4.1",
+    "copy-props": "^2.0.1",
     "fancy-log": "^1.1.0",
     "gulplog": "^1.0.0",
     "interpret": "^1.0.0",