解决 fis.plugin 配置项覆盖问题

fex-team · Apr 18, 2016 · 49850cf · 49850cf
1 parent 8a2d403
commit 49850cf
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/lib/compile.js b/lib/compile.js
@@ -689,6 +689,7 @@ function pipe(file, type, keep) {
         delete settings.__name;
         delete settings.__plugin;
         delete settings.__pos;
+        delete settings.__isPlugin;
 
         callback(processor, settings, key);
       } else {

diff --git a/lib/config.js b/lib/config.js
@@ -317,6 +317,10 @@ var Config = Object.derive(/** @lends fis.config.Config.prototype */{
         var properties = match.properties;
 
         if (typeof pattern === 'string') {
+
+          // 去掉空格
+          pattern = pattern.replace(/\s+/g, '');
+
           if (pattern[0] === '!') {
             negate = true;
             pattern = pattern.substring(1);

diff --git a/lib/fis.js b/lib/fis.js
@@ -296,6 +296,7 @@ fis.plugin = function(key, options, position) {
   options = options || {};
   options.__name = options.__plugin = key;
   options.__pos = position;
+  options.__isPlugin = true;
   return options;
 };
 
@@ -345,7 +346,7 @@ fis.require = function() {
         }
       }
     } catch (e) {
-      fis.log.error('load plugin [%s] config error : %s.', pluginName, e.message);
+      fis.log.error('load plugin [%s] config error : %s.', pluginName, e.stack);
     }
   }
 

diff --git a/lib/util.js b/lib/util.js
@@ -1511,7 +1511,13 @@ _.applyMatches = function(path, matches, allowed) {
             k = k === '&' ? 0 : k;
             return m[k] || '';
           });
-        } else if (typeof(value) === 'function' && ~['release', 'url', 'relative'].indexOf(key)) {
+        } else if (typeof(value) === 'function' &&
+          ~[
+            'release',
+            'url',
+            'relative',
+            'moduleId'
+          ].indexOf(key)) {
           value = value.call(null, m, path);
         }
 
@@ -1531,7 +1537,7 @@ _.applyMatches = function(path, matches, allowed) {
             pos = pos === 'prepend' ? 0 : (pos === 'append' ? obj[key].length : (parseInt(pos) || 0));
             obj[key].splice(pos, 0, value);
           }
-        } else if (_.isPlainObject(value) && _.isPlainObject(obj[key])) {
+        } else if (_.isPlainObject(value) && _.isPlainObject(obj[key]) && !value.__isPlugin && !obj[key].__isPlugin) {
           fis.util.assign(obj[key], value);
         } else {
           obj[key] = value;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fis3",
-  "version": "3.3.26",
+  "version": "3.3.27",
   "description": "fis 3.0",
   "main": "index.js",
   "bin": {