Merge remote-tracking branch 'origin/source-maps'

Author: pirxpilot

Makefile

@@ -3,10 +3,18 @@ all: clean lint test
 lint:
 	./node_modules/.bin/jshint *.js
 
-TESTS = opts stdout stdin config config-all js-config js-config-all invalid
+TESTS = opts source-maps source-maps-file stdout stdin config config-all js-config js-config-all invalid
+
+
 DIFF = diff -q
 
-test: test/build test-help test-version $(patsubst %,test/build/%.css,$(TESTS)) test-multi test-replace test-local-plugins
+test: test/build \
+	test-help \
+	test-version \
+	$(patsubst %,test/build/%.css,$(TESTS)) \
+	test-multi \
+	test-replace \
+	test-local-plugins
 
 test-help:
 	./bin/postcss --help
@@ -41,6 +49,15 @@ test/build/opts.css: test/in.css
 	./bin/postcss -u postcss-url --postcss-url.url=rebase -o $@ $<
 	$(DIFF) $@ $(subst build,ref,$@)
 
+test/build/source-maps.css: test/in.css
+	./bin/postcss -u postcss-url --postcss-url.url=rebase --map -o $@ $<
+	$(DIFF) $@ $(subst build,ref,$@)
+
+test/build/source-maps-file.css: test/in.css
+	./bin/postcss -u postcss-url --postcss-url.url=rebase --map file -o $@ $<
+	$(DIFF) $@ $(subst build,ref,$@)
+	$(DIFF) ${@}.map $(subst build,ref,${@}.map)
+
 test/build/stdout.css: test/in.css
 	./bin/postcss --use ./test/dummy-plugin $< > $@
 	$(DIFF) $@ $(subst build,ref,$@)

Readme.md

@@ -43,6 +43,18 @@ Replace input file(s) with generated output. Either `--output`, `--dir` or
 
 Plugin to be used. Multiple plugins can be specified. At least one plugin needs to be specified either with `--use` option or in the config file.
 
+#### `--map|-m`
+
+Activate source map generation. By default inline maps are generated. To generate source maps
+in a separate _.map_ file use `--map file` or `--no-map.inline`.
+
+You can use [advances source map options][source-map-options] - some examples:
+
+- `--no-map` - do not generated source maps - even if previous maps exist
+- `--map.annotation <path>` - specify alternaive path to be used in source map annotation appended to CSS
+- `--no-map.annotation` - supress adding annotation to CSS
+- `--no-map.sourcesContent` - remove origin CSS from maps
+
 #### `--local-plugins`
 
 Look up plugins starting from `node_modules` located in the current working
@@ -153,3 +165,4 @@ MIT
 
 [postcss]: https://github.com/postcss/postcss
 [postcss-import]: https://github.com/postcss/postcss-import
+[source-map-options]: https://github.com/postcss/postcss/blob/master/docs/source-maps.md

index.js

@@ -21,6 +21,8 @@ var argv = require("yargs")
   .describe('o', 'Output file (stdout if not provided)')
   .alias('d', 'dir')
   .describe('d', 'Output directory')
+  .alias('m', 'map')
+  .describe('m', 'Source map')
   .boolean('r')
   .alias('r', 'replace')
   .describe('r', 'Replace input file(s) with generated output')
@@ -119,6 +121,13 @@ var customSyntaxOptions = ['syntax', 'parser', 'stringifier']
     return cso;
   }, Object.create(null));
 
+
+var mapOptions = argv.map;
+// treat `--map file` as `--no-map.inline`
+if (mapOptions === 'file') {
+  mapOptions = { inline: false };
+}
+
 var async = require('neo-async');
 var fs = require('fs');
 var readFile = require('read-file-stdin');
@@ -170,6 +179,7 @@ function compile(input, fn) {
   } else if (argv.replace) {
     output = input;
   }
+
   processCSS(processor, input, output, fn);
 }
 
@@ -179,7 +189,7 @@ function processCSS(processor, input, output, fn) {
       if (typeof result.warnings === 'function') {
         result.warnings().forEach(console.error);
       }
-      fn(null, result.css);
+      fn(null, result);
     }
 
     var options = {
@@ -191,18 +201,23 @@ function processCSS(processor, input, output, fn) {
       options[opt] = customSyntaxOptions[opt];
     });
 
+    if (typeof mapOptions !== 'undefined') {
+      options.map = mapOptions;
+    }
+
     var result = processor.process(css, options);
+
     if (typeof result.then === 'function') {
       result.then(onResult).catch(fn);
-    } else{
+    } else {
       process.nextTick(onResult.bind(null, result));
     }
   }
 
   async.waterfall([
     async.apply(readFile, input),
     doProcess,
-    async.apply(writeFile, output)
+    async.apply(writeResult, output)
   ], fn);
 }
 
@@ -219,6 +234,16 @@ function onError(err, keepAlive) { // XXX: avoid overloaded signature?
   }
 }
 
+function writeResult (name, content, fn) {
+  var funcs = [
+    async.apply(writeFile, name, content.css)
+  ];
+  if (content.map && name) {
+    funcs.push(async.apply(writeFile, name + '.map', content.map.toString()));
+  }
+  async.parallel(funcs, fn);
+}
+
 function writeFile(name, content, fn) {
   if (!name) {
     process.stdout.write(content);

package.json

@@ -33,4 +33,4 @@
     "postcss-import": "^7.1.0",
     "postcss-url": "^4.0.0"
   }
-}
+}