github/less.js
1
1
Fork 0
mirror of https://github.com/less/less.js.git synced 2026-04-09 03:00:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

simplify sourcemapfilename in lessc and expose the output filename

Browse Source
This commit is contained in:
Luke Page
2014-09-20 03:26:06 +01:00
parent c07531a46f
commit 40e0b212a6
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bin/lessc
View File

@@ -153,7 +153,7 @@ args = args.filter(function (arg) {
case 'source-map':
options.sourceMap = true;
if (match[2]) {
sourceMapOptions.sourceMapFilename = match[2];
sourceMapOptions.sourceMapFullFilename = match[2];
}
break;
case 'source-map-rootpath':
@@ -258,7 +258,7 @@ if (output) {
sourceMapOptions.sourceMapBasepath = options.sourceMapBasepath || (input ? path.dirname(input) : process.cwd());
if (options.sourceMap) {
if (!sourceMapOptions.sourceMapFilename) {
if (!sourceMapOptions.sourceMapFullFilename) {
if (!output && !sourceMapFileInline) {
console.log("the sourcemap option only has an optional filename if the css filename is given");
console.log("consider adding --source-map-map-inline which embeds the sourcemap into the css");
@@ -270,7 +270,7 @@ if (options.sourceMap) {
// its in the same directory, so always just the basename
sourceMapOptions.sourceMapFilename = path.basename(sourceMapOptions.sourceMapFullFilename);
} else if (options.sourceMap && !sourceMapFileInline) {
var mapFilename = path.resolve(process.cwd(), sourceMapOptions.sourceMapFilename),
var mapFilename = path.resolve(process.cwd(), sourceMapOptions.sourceMapFullFilename),
mapDir = path.dirname(mapFilename),
outputDir = path.dirname(output);
// find the path from the map to the output file
@@ -278,7 +278,6 @@ if (options.sourceMap) {
path.relative(mapDir, outputDir), path.basename(output));
// make the sourcemap filename point to the sourcemap relative to the css file output directory
sourceMapOptions.sourceMapFullFilename = sourceMapOptions.sourceMapFilename;
sourceMapOptions.sourceMapFilename = path.join(
path.relative(outputDir, mapDir), path.basename(sourceMapOptions.sourceMapFullFilename));
console.log(sourceMapOptions.sourceMapFile);
@@ -317,7 +316,7 @@ if (options.depends) {
if (!sourceMapFileInline) {
var writeSourceMap = function(output) {
var filename = sourceMapOptions.sourceMapFullFilename || sourceMapOptions.sourceMapFilename;
var filename = sourceMapOptions.sourceMapFullFilename;
ensureDirectory(filename);
fs.writeFileSync(filename, output, 'utf8');
};

3
lib/less/source-map-builder.js
View File

@@ -39,6 +39,9 @@ module.exports = function (SourceMapOutput) {
SourceMapBuilder.prototype.getSourceMapURL = function() {
return this.sourceMapURL;
};
SourceMapBuilder.prototype.getOutputFilename = function() {
return this.options.sourceMapOutputFilename;
};
return SourceMapBuilder;
};