Skip to content

Commit

Permalink
add jquery
Browse files Browse the repository at this point in the history
  • Loading branch information
bantic authored and mixonic committed Jul 8, 2015
1 parent 06def74 commit 006f74e
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 2 deletions.
10 changes: 8 additions & 2 deletions Brocfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ var mergeTrees = require('broccoli-merge-trees');
var testTreeBuilder = require('broccoli-test-builder');
var styles = require('./broccoli/styles');
var demo = require('./broccoli/demo');
var jquery = require('./broccoli/jquery');

var vendoredModules = [
{name: 'content-kit-compiler', options: {libDirName: 'src'}},
Expand All @@ -18,12 +19,17 @@ var buildOptions = {
packageName: packageName
};

var jqueryTree = jquery.build('/demo/jquery');
var testTree = testTreeBuilder.build();
var demoTree = demo();
demoTree = mergeTrees([demoTree, jqueryTree]);

module.exports = mergeTrees([
builder.build('amd', buildOptions),
builder.build('global', buildOptions),
// FIXME Later we may want to bring back the commonjs build
// builder.build('commonjs', buildOptions),
styles(),
demo(),
testTreeBuilder.build()
demoTree,
testTree
]);
17 changes: 17 additions & 0 deletions broccoli/jquery.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/* jshint node:true */
var funnel = require('broccoli-funnel');

module.exports = {
build: function(destDir) {
var path = require('path');
var jqueryPath = path.dirname(
require.resolve('jquery')
);
var tree = funnel(jqueryPath, {
include: ['jquery.js'],
destDir: destDir
});

return tree;
}
};
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
"gulp-open": "^0.2.8",
"gulp-qunit": "^1.2.1",
"gulp-uglify": "^1.1.0",
"jquery": "^2.1.4",
"testem": "^0.8.4"
}
}
1 change: 1 addition & 0 deletions tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<div id="qunit"></div>
<div id="qunit-fixture"></div>

<script src="./jquery/jquery.js"></script>
<script src="./qunit/qunit.js"></script>
<script src="/testem.js"></script>
<script src="./loader.js/loader.js"></script>
Expand Down

0 comments on commit 006f74e

Please sign in to comment.