Merge pull request #38 from hao123-fe/dev

fix css inline and release v0.1.5

Author: allen-zh

configs/default.js

@@ -3,6 +3,7 @@ var requireAnalyze = require("../plugins/requireAnalyze.js");
 var jsWrapper = require("../plugins/jsWrapper.js");
 var autoPackAnalyze = require("../plugins/autoPackAnalyze.js");
 var outputHermap = require("../plugins/outputHermap.js");
+var cssInline = require("../plugins/cssInline.js");
 
 //copy fis-plus default configs
 module.exports = {
@@ -50,7 +51,8 @@ module.exports = {
             autoPackAnalyze,
             outputHermap
         ],
-        packager: null
+        packager: [],
+        postpackager: [ cssInline ]
     },
     //    modules: {
     //        parser: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "her",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "A High-performence Enhanced Rendering solution - Hao123前端高性能渲染解决方案",
   "keywords": [
     "herJS",

plugins/cssInline.js

@@ -0,0 +1,17 @@
+/**
+ * postpackager cssInline
+ * 
+ * @author zhangwentao <zhangwentao@baidu.com>
+ */
+
+module.exports = function(ret, conf, settings, opt) {
+    fis.util.map(ret.map.her, function (herId) {
+        var herRes = ret.map.her[herId];
+        if (herRes.inline && herRes.file) {
+            // console.log(herId);
+            herRes.content = herRes.file.getContent();
+            delete herRes.inline;
+            delete herRes.file;
+        }
+    });
+};

plugins/outputHermap.js

@@ -41,18 +41,18 @@ var exports = module.exports = function (ret, conf, settings, opt) {
     fis.util.map(conf, function (path, patterns, index) {
       var pid, subpath, pkg;
       var needInline = false;
-      var inlineReg = /\?__inline/;
+      var INLINE_REG = /\?__inline/;
+      
+      if (INLINE_REG.test(path)) {
+        needInline = true;
+        path = path.replace(INLINE_REG, '');
+      }
+
       if (typeof patterns === 'string' || patterns instanceof RegExp) {
         patterns = [patterns];
       }
       if (fis.util.is(patterns, 'Array') && patterns.length) {
-        pid = 'p' + index;
-
-        if (inlineReg.test(path)) {
-          needInline = true;
-          path = path.replace(inlineReg, '');
-        }
-        
+        pid = 'p' + index;        
         subpath = path.replace(/^\//, '');
         pkg = fis.file(root, subpath);
         if (typeof ret.src[pkg.subpath] !== 'undefined') {
@@ -144,6 +144,7 @@ var exports = module.exports = function (ret, conf, settings, opt) {
           }
         });
       });
+
       if (defines.length) {
         pkg.file.setContent(content);
         ret.pkg[pkg.file.subpath] = pkg.file;
@@ -182,9 +183,11 @@ var exports = module.exports = function (ret, conf, settings, opt) {
         herRes.defines = defines;
         herRes.requires = deps;
         herRes.requireAsyncs = asyncs;
-
+          
+        // for cssInline
         if (pkg.inline) {
-          herRes.content = content;
+          herRes.inline = true;
+          herRes.file = pkg.file;
         }
       }
     });