@import with .css files no longer precompiles. This gives us some extra

cloudhead · cloudhead · commit 5d5024e70e24 · 2010-03-30T15:32:38.000-04:00
flexibility.
diff --git a/lib/less/tree/import.js b/lib/less/tree/import.js
@@ -14,16 +14,23 @@ if (typeof(require) !== 'undefined') { var tree = require('less/tree') }
 tree.Import = function Import(path, imports) {
     var that = this;
 
+    this._path = path;
+
     // The '.less' extension is optional
     if (path instanceof tree.Quoted) {
         this.path = /\.(le?|c)ss$/.test(path.content) ? path.content : path.content + '.less';
     } else {
         this.path = path.value.content || path.value;
     }
 
-    imports.push(this.path, function (root) {
-        that.root = root;
-    });
+    this.css = /css$/.test(this.path);
+
+    // Only pre-compile .less files
+    if (! this.css) {
+        imports.push(this.path, function (root) {
+            that.root = root;
+        });
+    }
 };
 
 //
@@ -36,16 +43,26 @@ tree.Import = function Import(path, imports) {
 // ruleset.
 //
 tree.Import.prototype = {
-    toCSS: function () { return "" },
+    toCSS: function () {
+        if (this.css) {
+            return "@import " + this._path.toCSS() + ';\n';
+        } else {
+            return "";
+        }
+    },
     eval: function () {
-        for (var i = 0; i < this.root.rules.length; i++) {
-            if (this.root.rules[i] instanceof tree.Import) {
-                Array.prototype
-                     .splice
-                     .apply(this.root.rules,
-                            [i, 1].concat(this.root.rules[i].eval()));
+        if (this.css) {
+            return this;
+        } else {
+            for (var i = 0; i < this.root.rules.length; i++) {
+                if (this.root.rules[i] instanceof tree.Import) {
+                    Array.prototype
+                         .splice
+                         .apply(this.root.rules,
+                                [i, 1].concat(this.root.rules[i].eval()));
+                }
             }
+            return this.root.rules;
         }
-        return this.root.rules;
     }
 };
diff --git a/test/css/import.css b/test/css/import.css
@@ -1,6 +1,4 @@
-#css {
-  color: yellow;
-}
+@import "import-test-d.css";
 #import {
   color: red;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-#css {`
`2`		`- color: yellow;`
`3`		`-}`
	`1`	`+@import "import-test-d.css";`
`4`	`2`	`#import {`
`5`	`3`	`color: red;`
`6`	`4`	`}`