You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/10/19 13:37:41 UTC
[16/50] [abbrv] allura git commit: [#7976] concat sourcemaps together
properly
[#7976] concat sourcemaps together properly
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/cd63778f
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/cd63778f
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/cd63778f
Branch: refs/heads/ib/7924
Commit: cd63778f4c93bf7a3503f41ffef9a88857058c01
Parents: d6a9114
Author: Dave Brondsema <da...@brondsema.net>
Authored: Thu Oct 1 14:54:33 2015 -0400
Committer: Heith Seewald <hs...@hsmb.local>
Committed: Fri Oct 2 10:01:49 2015 -0400
----------------------------------------------------------------------
Brocfile.js | 8 +++-----
package.json | 3 +--
2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/cd63778f/Brocfile.js
----------------------------------------------------------------------
diff --git a/Brocfile.js b/Brocfile.js
index 93cab0b..71a8f90 100644
--- a/Brocfile.js
+++ b/Brocfile.js
@@ -17,8 +17,7 @@
under the License.
*/
var babelTranspiler = require("broccoli-babel-transpiler");
-var sourceMap = require('broccoli-source-map');
-var concat = require('broccoli-concat');
+var sourceMapConcat = require('broccoli-sourcemap-concat');
var funnel = require('broccoli-funnel');
var uglifyJavaScript = require('broccoli-uglify-js');
@@ -31,11 +30,10 @@ tree = babelTranspiler(tree, {
sourceMaps: 'inline', // external doesn't work, have to use extract below
comments: false,
});
-tree = concat(tree, {
- inputFiles: ['**/*.js'],
+tree = sourceMapConcat(tree, {
+ inputFiles: ['**/*'],
outputFile: '/transpiled.js'
});
-tree = sourceMap.extract(tree);
if (process.env.BROCCOLI_ENV === 'production') {
/* can't use this for dev mode, since it drops the sourcemap comment even if we set output: {comments: true}
http://git-wip-us.apache.org/repos/asf/allura/blob/cd63778f/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 95fa5ac..f850f00 100644
--- a/package.json
+++ b/package.json
@@ -17,9 +17,8 @@
"devDependencies": {
"broccoli": "^0.16.8",
"broccoli-babel-transpiler": "^5.4.5",
- "broccoli-concat": "0.0.13",
"broccoli-funnel": "^0.2.8",
- "broccoli-source-map": "^0.2.3",
+ "broccoli-sourcemap-concat": "^2.0.1",
"broccoli-uglify-js": "^0.1.3"
}
}