修正CSS @import 多种语法的问题

aui · Dec 29, 2014 · 664fa34 · 664fa34
1 parent c3514f7
commit 664fa34
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "font-spider",
   "description": "Font optimizer",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "homepage": "https://github.com/aui/font-spider",
   "author": {
     "name": "aui",

diff --git a/src/optimizer.js b/src/optimizer.js
@@ -74,7 +74,12 @@ Optimizer.prototype.minify = function (dest, chars) {
 
         // result.output
 
-        fs.renameSync(temp, dest);
+        if (fs.existsSync(temp)) {
+            fs.renameSync(temp, dest);
+        } else {
+            console.error('error', result.output);
+        }
+
     }
 
     fs.unlinkSync(charsfile);

diff --git a/src/spider.js b/src/spider.js
@@ -279,7 +279,14 @@ Spider.prototype = {
 				case 'import':
 
 					RE_URL.lastIndex = 0;
-					var url = RE_URL.exec(rule['import'])[1];
+					var url = rule['import'];
+
+					// @import url("./g.css?t=2009");
+					// @import "./g.css?t=2009";
+					if (/url/i.test(url)) {
+						url = RE_URL.exec(url)[1];
+					}
+
 					url = url.replace(RE_QUERY, '');
 
 					if (!RE_SERVER.test(url)) {

diff --git a/test/css/g2.css b/test/css/g2.css
diff --git a/test/css/ui.css b/test/css/ui.css
@@ -2,6 +2,7 @@
 
 /** Reset */
 @import url("./g.css?t=2009");
+@import "./g2.css";
 @font-face {
   font-family: 'art';
   /*IE*/