Merge branch 'less.js/1.5.0-wip'

Conflicts:
	.jshintrc
	Makefile
	package.json

Author: jonschlinkert

.gitignore

@@ -14,3 +14,5 @@ npm-debug.log
 tmp
 test/browser/less.js
 test/browser/test-runner-*.htm
+test/sourcemaps/*.map
+test/sourcemaps/*.css

.jshintignore

@@ -0,0 +1,5 @@
+benchmark/
+build/
+dist/
+node_modules/
+test/browser/

.jshintrc

@@ -1,15 +1,9 @@
 {
-  "curly": true,
-  "eqeqeq": true,
-  "evil": true,
-  "immed": true,
-  "latedef": true,
-  "newcap": true,
-  "noarg": true,
-  "sub": true,
-  "undef": true,
-  "unused": true,
-  "boss": true,
-  "eqnull": true,
-  "node": true
+    "evil": true,
+    "boss": true,
+    "expr": true,
+    "laxbreak": true,
+    "node": true,
+    "unused": "vars",
+    "noarg": true
 }

CHANGELOG.md

@@ -1,6 +1,6 @@
 # 1.5.0 WIP
 
- - support for import inline option to include css that you do not want less to parse e.g. `@import (inline) "file.css";`
+ - support for import inline option to include css that you do NOT want less to parse e.g. `@import (inline) "file.css";`
  - better support for modifyVars (refresh styles with new variables, using a file cache), is now more resiliant
  - support for import reference option to reference external css, but not output it. Any mixin calls or extend's will be output.
  - support for guards on selectors (currently only if you have a single selector)
@@ -12,6 +12,7 @@
  - Fix the saturate function to pass through when using the CSS syntax
  - Added svg-gradient function
  - Added no-js option to lessc (in browser, use javascriptEnabled: false) which disallows JavaScript in less files
+ - switched from the little supported and buggy cssmin (previously ycssmin) to clean-css
 
 # 1.4.2
 

Makefile

@@ -0,0 +1,114 @@
+#
+# Run all tests
+#
+test: 
+	node test/less-test.js
+
+#
+# Run benchmark
+#
+benchmark:
+	node benchmark/less-benchmark.js
+
+#
+# Build less.js
+#
+SRC = lib/less
+HEADER = build/header.js
+VERSION = `cat package.json | grep version \
+														| grep -o '[0-9]\.[0-9]\.[0-9]\+'`
+DIST = dist/less-${VERSION}.js
+RHINO = dist/less-rhino-${VERSION}.js
+DIST_MIN = dist/less-${VERSION}.min.js
+
+browser-prepare: DIST := test/browser/less.js
+
+alpha: DIST := dist/less-${VERSION}-alpha.js
+alpha: DIST_MIN := dist/less-${VERSION}-alpha.min.js
+
+beta: DIST := dist/less-${VERSION}-beta.js
+beta: DIST_MIN := dist/less-${VERSION}-beta.min.js
+
+less:
+	@@mkdir -p dist
+	@@touch ${DIST}
+	@@cat ${HEADER} | sed s/@VERSION/${VERSION}/ > ${DIST}
+	@@echo "(function (window, undefined) {" >> ${DIST}
+	@@cat build/require.js\
+	      build/browser-header.js\
+	      ${SRC}/parser.js\
+	      ${SRC}/functions.js\
+	      ${SRC}/colors.js\
+	      ${SRC}/tree/*.js\
+	      ${SRC}/tree.js\
+	      ${SRC}/env.js\
+	      ${SRC}/visitor.js\
+	      ${SRC}/import-visitor.js\
+	      ${SRC}/join-selector-visitor.js\
+	      ${SRC}/to-css-visitor.js\
+	      ${SRC}/extend-visitor.js\
+	      ${SRC}/browser.js\
+	      build/amd.js >> ${DIST}
+	@@echo "})(window);" >> ${DIST}
+	@@echo ${DIST} built.
+	
+browser-prepare: less
+	node test/browser-test-prepare.js
+	
+browser-test: browser-prepare
+	phantomjs test/browser/phantom-runner.js
+
+browser-test-server: browser-prepare
+	phantomjs test/browser/phantom-runner.js --no-tests
+
+jshint:
+	node_modules/.bin/jshint --config ./.jshintrc .
+
+test-sourcemaps:
+	node bin/lessc --source-map --source-map-inline test/less/import.less test/sourcemaps/import.css
+	node bin/lessc --source-map --source-map-inline test/less/sourcemaps/basic.less test/sourcemaps/basic.css
+	node node_modules/http-server/bin/http-server test/sourcemaps -p 8083
+
+rhino:
+	@@mkdir -p dist
+	@@touch ${RHINO}
+	@@cat build/require-rhino.js\
+	      build/rhino-header.js\
+	      ${SRC}/parser.js\
+	      ${SRC}/env.js\
+	      ${SRC}/visitor.js\
+	      ${SRC}/import-visitor.js\
+	      ${SRC}/join-selector-visitor.js\
+	      ${SRC}/to-css-visitor.js\
+	      ${SRC}/extend-visitor.js\
+	      ${SRC}/functions.js\
+	      ${SRC}/colors.js\
+	      ${SRC}/tree/*.js\
+	      ${SRC}/tree.js\
+	      ${SRC}/rhino.js > ${RHINO}
+	@@echo ${RHINO} built.
+
+min: less
+	@@echo minifying...
+	@@uglifyjs ${DIST} > ${DIST_MIN}
+	@@echo ${DIST_MIN} built.
+
+alpha: min
+
+beta: min
+
+alpha-release: alpha
+	git add dist/*.js
+	git commit -m "Update alpha ${VERSION}"
+
+dist: min rhino
+	git add dist/*
+	git commit -a -m "(dist) build ${VERSION}"
+	git archive master --prefix=less/ -o less-${VERSION}.tar.gz
+	npm publish less-${VERSION}.tar.gz
+
+stable:
+	npm tag less@${VERSION} stable
+
+
+.PHONY: test benchmark

bin/lessc

@@ -11,7 +11,7 @@ var args = process.argv.slice(1);
 var options = {
     depends: false,
     compress: false,
-    yuicompress: false,
+    cleancss: false,
     max_line_len: -1,
     optimization: 1,
     silent: false,
@@ -52,6 +52,8 @@ var checkBooleanArg = function(arg) {
     return Boolean(onOff[2]);
 };
 
+var warningMessages = "";
+
 args = args.filter(function (arg) {
     var match;
 
@@ -95,7 +97,11 @@ args = args.filter(function (arg) {
             options.depends = true;
             break;
         case 'yui-compress':
-            options.yuicompress = true;
+            warningMessages += "yui-compress option has been removed. assuming clean-css.";
+            options.cleancss = true;
+            break;
+        case 'clean-css':
+            options.cleancss = true;
             break;
         case 'max-line-len':
             if (checkArgFunc(arg, match[2])) {
@@ -132,6 +138,21 @@ args = args.filter(function (arg) {
                 options.dumpLineNumbers = match[2];
             }
             break;
+        case 'source-map':
+            if (!match[2]) {
+                options.sourceMap = true;
+            } else {
+                options.sourceMap = match[2];
+            }
+            break;
+        case 'source-map-rootpath':
+            if (checkArgFunc(arg, match[2])) {
+                options.sourceMapRootpath = match[2];
+            }
+            break;
+        case 'source-map-inline':
+            options.outputSourceFiles = true;
+            break;
         case 'rp':
         case 'rootpath':
             if (checkArgFunc(arg, match[2])) {
@@ -169,7 +190,22 @@ if (input && input != '-') {
 var output = args[2];
 var outputbase = args[2];
 if (output) {
+    options.sourceMapOutputFilename = output;
     output = path.resolve(process.cwd(), output);
+    if (warningMessages) {
+        sys.puts(warningMessages);
+    }
+}
+
+options.sourceMapBasepath = process.cwd();
+
+if (options.sourceMap === true) {
+    if (!output) {
+        sys.puts("the sourcemap option only has an optional filename if the css filename is given");
+        return;
+    }
+    options.sourceMapFullFilename = options.sourceMapOutputFilename + ".map";
+    options.sourceMap = path.basename(options.sourceMapFullFilename);
 }
 
 if (! input) {
@@ -202,6 +238,12 @@ if (options.depends) {
     sys.print(outputbase + ": ");
 }
 
+var writeSourceMap = function(output) {
+    var filename = options.sourceMapFullFilename || options.sourceMap;
+    ensureDirectory(filename);
+    fs.writeFileSync(filename, output, 'utf8');
+};
+
 var parseLessFile = function (e, data) {
     if (e) {
         sys.puts("lessc: " + e.message);
@@ -230,7 +272,14 @@ var parseLessFile = function (e, data) {
                     verbose: options.verbose,
                     ieCompat: options.ieCompat,
                     compress: options.compress,
-                    yuicompress: options.yuicompress,
+                    cleancss: options.cleancss,
+                    sourceMap: Boolean(options.sourceMap),
+                    sourceMapFilename: options.sourceMap,
+                    sourceMapOutputFilename: options.sourceMapOutputFilename,
+                    sourceMapBasepath: options.sourceMapBasepath,
+                    sourceMapRootpath: options.sourceMapRootpath || "",
+                    outputSourceFiles: options.outputSourceFiles,
+                    writeSourceMap: writeSourceMap,
                     maxLineLen: options.maxLineLen,
                     strictMath: options.strictMath,
                     strictUnits: options.strictUnits

build/browser-header.js

@@ -0,0 +1,4 @@
+if (typeof(window.less) === 'undefined') { window.less = {}; }
+less = window.less;
+tree = window.less.tree = {};
+less.mode = 'browser';

build/rhino-header.js

@@ -0,0 +1,4 @@
+if (typeof(window) === 'undefined') { less = {} }
+else                                { less = window.less = {} }
+tree = less.tree = {};
+less.mode = 'rhino';