Fixing issue #163

Author: leog

README.md

@@ -3,7 +3,7 @@ require-css
 
 RequireJS CSS requiring and optimization, with almond support.
 
-Useful for writing modular CSS dependencies alongside scripts. For an example of widget rendering see [ZestJS](http://zestjs.org).
+Useful for writing modular CSS dependencies alongside scripts.
 
 For LESS inclusion, use [require-less](https://github.com/guybedford/require-less), which behaves and builds the css exactly like this module apart from the preprocessing step.
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "require-css",
-  "version": "0.1.4",
+  "version": "0.1.8",
   "ignore": ["example", "test", ".gitignore"],
   "main": ["css.js", "css-builder.js", "normalize.js"]
 }

css-builder.js

@@ -7,6 +7,7 @@ define(['require', './normalize'], function(req, normalize) {
     if (config.optimizeCss == 'none') {
       return css;
     }
+    
     if (typeof process !== "undefined" && process.versions && !!process.versions.node && require.nodeRequire) {
       try {
         var csso = require.nodeRequire('csso');
@@ -95,7 +96,9 @@ define(['require', './normalize'], function(req, normalize) {
   // NB add @media query support for media imports
   var importRegEx = /@import\s*(url)?\s*(('([^']*)'|"([^"]*)")|\(('([^']*)'|"([^"]*)"|([^\)]*))\))\s*;?/g;
   var absUrlRegEx = /^([^\:\/]+:\/)?\//;
-
+  
+  // Write Css module definition
+  var writeCSSDefinition = "define('@writecss', function() {return function writeCss(c) {var d=document,a='appendChild',i='styleSheet',s=d.createElement('style');s.type='text/css';d.getElementsByTagName('head')[0][a](s);s[i]?s[i].cssText=c:s[a](d.createTextNode(c));};});";
 
   var siteRoot;
 
@@ -106,11 +109,11 @@ define(['require', './normalize'], function(req, normalize) {
   var curModule = 0;
   var config;
 
+  var writeCSSForLayer = true;
   var layerBuffer = [];
   var cssBuffer = {};
 
   cssAPI.load = function(name, req, load, _config) {
-
     //store config
     config = config || _config;
 
@@ -153,14 +156,40 @@ define(['require', './normalize'], function(req, normalize) {
   }
 
   cssAPI.write = function(pluginName, moduleName, write, parse) {
+    var cssModule;
+    
     //external URLS don't get added (just like JS requires)
     if (moduleName.match(absUrlRegEx))
       return;
 
     layerBuffer.push(cssBuffer[moduleName]);
+    
+    if (!global._requirejsCssData) {
+      global._requirejsCssData = {
+        usedBy: {css: true},
+        css: ''
+      }
+    } else {
+      global._requirejsCssData.usedBy.css = true;
+    }
+
+    if (config.buildCSS != false) {
+      var style = cssBuffer[moduleName];
+
+      if (config.writeCSSModule && style) {
+ 	    if (writeCSSForLayer) {
+    	  writeCSSForLayer = false;
+          write(writeCSSDefinition);
+        }
 
-    if (config.buildCSS != false)
-    write.asModule(pluginName + '!' + moduleName, 'define(function(){})');
+        cssModule = 'define(["@writecss"], function(writeCss){\n writeCss("'+ escape(compress(style)) +'");\n})';
+      }
+      else {
+		cssModule = 'define(function(){})';
+      }
+
+      write.asModule(pluginName + '!' + moduleName, cssModule);
+    }
   }
 
   cssAPI.onLayerEnd = function(write, data) {
@@ -173,15 +202,20 @@ define(['require', './normalize'], function(req, normalize) {
 
       var css = layerBuffer.join('');
 
-      if (fs.existsSync(outPath))
-        console.log('RequireCSS: Warning, separateCSS module path "' + outPath + '" already exists and is being replaced by the layer CSS.');
-
       process.nextTick(function() {
+        if (global._requirejsCssData) {
+          css = global._requirejsCssData.css = css + global._requirejsCssData.css;
+          delete global._requirejsCssData.usedBy.css;
+          if (Object.keys(global._requirejsCssData.usedBy).length === 0) {
+            delete global._requirejsCssData;
+          }
+        }
+        
         saveFile(outPath, compress(css));
       });
 
     }
-    else if (config.buildCSS != false) {
+    else if (config.buildCSS != false && config.writeCSSModule != true) {
       var styles = config.IESelectorLimit ? layerBuffer : [layerBuffer.join('')];
       for (var i = 0; i < styles.length; i++) {
         if (styles[i] == '')
@@ -194,6 +228,7 @@ define(['require', './normalize'], function(req, normalize) {
     }
     //clear layer buffer for next layer
     layerBuffer = [];
+    writeCSSForLayer = true;
   }
 
   return cssAPI;

css.js

@@ -1,7 +1,7 @@
 /*
  * Require-CSS RequireJS css! loader plugin
- * 0.1.2
- * Guy Bedford 2013
+ * 0.1.8
+ * Guy Bedford 2014
  * MIT
  */
 
@@ -37,7 +37,7 @@ define(function() {
 
   var head = document.getElementsByTagName('head')[0];
 
-  var engine = window.navigator.userAgent.match(/Trident\/([^ ;]*)|AppleWebKit\/([^ ;]*)|Opera\/([^ ;]*)|rv\:([^ ;]*)(.*?)Gecko\/([^ ;]*)|MSIE\s([^ ;]*)/) || 0;
+  var engine = window.navigator.userAgent.match(/Trident\/([^ ;]*)|AppleWebKit\/([^ ;]*)|Opera\/([^ ;]*)|rv\:([^ ;]*)(.*?)Gecko\/([^ ;]*)|MSIE\s([^ ;]*)|AndroidWebKit\/([^ ;]*)/) || 0;
 
   // use <style> @import load method (IE < 9, Firefox < 18)
   var useImportLoad = false;
@@ -49,12 +49,12 @@ define(function() {
   if (engine[1] || engine[7])
     useImportLoad = parseInt(engine[1]) < 6 || parseInt(engine[7]) <= 9;
   // webkit
-  else if (engine[2])
+  else if (engine[2] || engine[8] || 'WebkitAppearance' in document.documentElement.style)
     useOnload = false;
   // gecko
   else if (engine[4])
     useImportLoad = parseInt(engine[4]) < 18;
-  
+
 //>>excludeEnd('excludeRequireCss')
   //main api object
   var cssAPI = {};
@@ -74,13 +74,14 @@ define(function() {
   var ieCurCallback;
 
   var createIeLoad = function(url) {
+    curSheet.addImport(url);
+    curStyle.onload = function(){ processIeLoad() };
+    
     ieCnt++;
-    if (ieCnt == 32) {
+    if (ieCnt == 31) {
       createStyle();
       ieCnt = 0;
     }
-    curSheet.addImport(url);
-    curStyle.onload = function(){ processIeLoad() };
   }
   var processIeLoad = function() {
     ieCurCallback();
@@ -150,16 +151,13 @@ define(function() {
 
 //>>excludeEnd('excludeRequireCss')
   cssAPI.normalize = function(name, normalize) {
-    if (name.substr(name.length - 4, 4) == '.css')
-      name = name.substr(0, name.length - 4);
-
     return normalize(name);
   }
 
 //>>excludeStart('excludeRequireCss', pragmas.excludeRequireCss)
   cssAPI.load = function(cssId, req, load, config) {
 
-    (useImportLoad ? importLoad : linkLoad)(req.toUrl(cssId + '.css'), load);
+    (useImportLoad ? importLoad : linkLoad)((useImportLoad ? req.toUrl(cssId) : cssId), load);
 
   }
 

css.min.js

@@ -1,6 +1,6 @@
 {
   "name": "require-css",
-  "version": "0.1.4",
+  "version": "0.1.8",
   "volo": {
     "type": "directory"
   }