You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2015/12/17 20:22:18 UTC
[31/50] [abbrv] allura git commit: [#7919] add tooltipster to
navbar.js output file;
Explicitly list es6.js files needed, don't share the main broccoli output tree
so future es6 files aren't needlessly included
[#7919] add tooltipster to navbar.js output file; Explicitly list es6.js files needed, don't share the main broccoli output tree so future es6 files aren't needlessly included
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/5c218d8d
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/5c218d8d
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/5c218d8d
Branch: refs/heads/db/8034
Commit: 5c218d8d038a5bbe06226142c82e25e7dedcbdd2
Parents: 320e528
Author: Dave Brondsema <da...@brondsema.net>
Authored: Mon Dec 7 16:47:55 2015 -0500
Committer: Heith Seewald <he...@gmail.com>
Committed: Wed Dec 16 13:55:38 2015 -0600
----------------------------------------------------------------------
Brocfile.js | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/5c218d8d/Brocfile.js
----------------------------------------------------------------------
diff --git a/Brocfile.js b/Brocfile.js
index 38f82e8..72969b6 100644
--- a/Brocfile.js
+++ b/Brocfile.js
@@ -29,15 +29,18 @@ var tree = funnel('Allura/allura/public/nf/js', {
include: ['*.es6.js'],
});
tree = babelTranspiler(tree, {
- browserPolyfill: true,
//filterExtensions:['es6.js'],
- sourceMaps: 'inline', // external doesn't work, have to use extract below
+ sourceMaps: 'inline', // external doesn't work, but sourceMapConcat will extract them
comments: false,
});
+tree = sourceMapConcat(tree, {
+ inputFiles: ['**/*'],
+ outputFile: '/transpiled.js'
+});
/* exactly what's needed for the navbar, so separate apps may use it too */
var react_file = 'public/nf/js/react-with-addons' + (production ? '.min' : '') + '.js';
-var navbar_deps = funnel('Allura/allura', {
+var navbar = funnel('Allura/allura', {
include: ['public/nf/js/underscore-min.js',
react_file,
'public/nf/js/react-dom.js',
@@ -45,22 +48,26 @@ var navbar_deps = funnel('Allura/allura', {
'public/nf/js/react-reorderable.min.js',
'lib/widgets/resources/js/jquery.lightbox_me.js',
'public/nf/js/admin_modal.js',
+ 'public/nf/js/jquery.tooltipster.js',
+ 'public/nf/js/navbar.es6.js',
+ 'public/nf/js/context-menu.es6.js',
+ 'public/nf/js/tooltip.es6.js'
],
});
-navbar = mergeTrees([navbar_deps, tree]);
-navbar = sourceMapConcat(navbar, {
+navbar = babelTranspiler(navbar, {
+ filterExtensions:['es6.js'],
+ sourceMaps: 'inline', // external doesn't work, but sourceMapConcat will extract them
+ comments: false,
+});
+var navbar = sourceMapConcat(navbar, {
// headerFiles & footerFiles used to specify some that must come before or after others
headerFiles: [react_file],
inputFiles: ['**/*.js'],
- footerFiles: ['navbar.es6.js',],
+ footerFiles: ['public/nf/js/navbar.js',], // this used to be navbar.es6.js but the babel transpiler dropped the .es6
outputFile: '/navbar.js',
});
-tree = sourceMapConcat(tree, {
- inputFiles: ['**/*'],
- outputFile: '/transpiled.js'
-});
-
+// output both
var output = mergeTrees([tree, navbar]);
if (production) {