feat: 升级对于配置的解析

SimonTart · Apr 15, 2020 · e9ac2d0 · e9ac2d0
1 parent ef92f27
commit e9ac2d0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-color-variable",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "PostCSS plugin color variable",
   "keywords": [
     "postcss",

diff --git a/src/index.js b/src/index.js
@@ -43,8 +43,6 @@ function resolveConfigFilesPath (filePaths, configPath) {
 
     const folder = getPathFolder(configPath)
     return path.resolve(folder, filePath)
-
-    return filePath
   })
 }
 
@@ -61,7 +59,7 @@ function resolveConfig (config, configPath) {
       const aliasPath = alias[key]
       const absolutePath = resolveConfigFilePath(aliasPath, configPath)
 
-      if (path.isAbsolute((absolutePath))) {
+      if (path.isAbsolute(absolutePath)) {
         result[key] = absolutePath
         return result
       }
@@ -95,7 +93,7 @@ function resolveOpts (opts) {
 }
 
 function getConfig (opts) {
-  return Object.assign({}, DefaultConfig, resolveFileConfig(opts.searchFrom), resolveOpts(opts))
+  return Object.assign({}, DefaultConfig, resolveFileConfig(opts.searchFrom), resolveOpts(opts, opts.configPath))
 }
 
 module.exports = postcss.plugin('postcss-color-variable', (opts = {}) => {