From 006f74ec952c29aea40ba3c28a6b4b72bfeb959e Mon Sep 17 00:00:00 2001 From: Cory Forsyth Date: Mon, 6 Jul 2015 17:46:02 -0400 Subject: [PATCH] add jquery --- Brocfile.js | 10 ++++++++-- broccoli/jquery.js | 17 +++++++++++++++++ package.json | 1 + tests/index.html | 1 + 4 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 broccoli/jquery.js diff --git a/Brocfile.js b/Brocfile.js index f06ccac7a..1d32bcaf0 100644 --- a/Brocfile.js +++ b/Brocfile.js @@ -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'}}, @@ -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 ]); diff --git a/broccoli/jquery.js b/broccoli/jquery.js new file mode 100644 index 000000000..7127020a7 --- /dev/null +++ b/broccoli/jquery.js @@ -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; + } +}; diff --git a/package.json b/package.json index 181473eae..47d440ebc 100644 --- a/package.json +++ b/package.json @@ -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" } } diff --git a/tests/index.html b/tests/index.html index 72f9ac74c..691eb1da5 100644 --- a/tests/index.html +++ b/tests/index.html @@ -10,6 +10,7 @@
+