From 1d3aafc08f102fa4d80d03619a70e41931acf544 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 27 Aug 2014 14:42:10 -0400 Subject: [PATCH] adding sourceRoot to minified mapping --- minifier.js | 5 +++-- src/meta/js.js | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/minifier.js b/minifier.js index 0d4f2b7966..7860792f90 100644 --- a/minifier.js +++ b/minifier.js @@ -13,7 +13,7 @@ var uglifyjs = require('uglify-js'), }; /* Javascript */ -Minifier.js.minify = function (scripts, minify, callback) { +Minifier.js.minify = function (scripts, relativePath, minify, callback) { var options = {}; scripts = scripts.filter(function(file) { @@ -23,6 +23,7 @@ Minifier.js.minify = function (scripts, minify, callback) { if (!minify) { options.sourceMapURL = '/nodebb.min.js.map'; options.outSourceMap = 'nodebb.min.js.map'; + options.sourceRoot = relativePath; options.mangle = false; options.compress = false; options.prefix = 1; @@ -56,7 +57,7 @@ Minifier.js.minify = function (scripts, minify, callback) { process.on('message', function(payload) { switch(payload.action) { case 'js': - Minifier.js.minify(payload.scripts, payload.minify, function(data) { + Minifier.js.minify(payload.scripts, payload.relativePath, payload.minify, function(data) { process.stdout.write(data.js); process.send({ type: 'end', diff --git a/src/meta/js.js b/src/meta/js.js index e4d361c74f..e75902f79d 100644 --- a/src/meta/js.js +++ b/src/meta/js.js @@ -6,6 +6,7 @@ var winston = require('winston'), async = require('async'), _ = require('underscore'), os = require('os'), + nconf = require('nconf'), plugins = require('../plugins'), emitter = require('../emitter'), @@ -177,6 +178,7 @@ module.exports = function(Meta) { Meta.js.prepare(function() { minifier.send({ action: 'js', + relativePath: nconf.get('url') + '/', minify: minify, scripts: Meta.js.scripts.all });