Merge pull request #10 from bustlelabs/use-broccoli-2

Use broccoli multi-builder 0.2.2

Brocfile.js

@@ -1,36 +1,24 @@
 /* jshint node:true */
 
-var multiBuilder = require('broccoli-multi-builder');
+var builder = require('broccoli-multi-builder');
 var mergeTrees = require('broccoli-merge-trees');
 var testTreeBuilder = require('./broccoli/test-tree-builder');
 
-var jsSrc = './src/js';
-var vendoredModules = ['content-kit-compiler', 'content-kit-utils'];
+var vendoredModules = [
+    {name: 'content-kit-compiler', options: {libDirName: 'src'}},
+    {name: 'content-kit-utils', options: {libDirName: 'src'}}
+];
 var packageName = require('./package.json').name;
 
-var amdTree = multiBuilder.buildAMD({
-  isGlobal: false,
-  src: jsSrc,
+var buildOptions = {
+  libDirName: 'src/js',
   vendoredModules: vendoredModules,
   packageName: packageName
-});
-
-var globalTree = multiBuilder.buildAMD({
-  isGlobal: true,
-  src: jsSrc,
-  vendoredModules: vendoredModules,
-  packageName: packageName
-});
-
-var cjsTree = multiBuilder.buildCJS({
-  src: jsSrc,
-  vendoredModules: vendoredModules,
-  packageName: packageName
-});
+};
 
 module.exports = mergeTrees([
-  amdTree,
-  globalTree,
-  cjsTree,
+  builder.build('amd', buildOptions),
+  builder.build('global', buildOptions),
+  builder.build('commonjs', buildOptions),
   testTreeBuilder.build()
 ]);

broccoli/test-tree-builder.js

@@ -7,6 +7,15 @@ var mergeTrees = require('broccoli-merge-trees');
 var pkg = require('../package.json');
 var packageName = pkg.name;
 var outputFileName = packageName + '-tests.amd.js';
+var path = require('path');
+
+function loaderTree() {
+  var loaderDir = path.dirname(require.resolve('loader.js'));
+  return funnel(loaderDir, {
+    include: ['loader.js'],
+    destDir: '/tests/loader.js'
+  });
+}
 
 function buildTestTree() {
   var testJSTree = funnel('./tests', {
@@ -24,6 +33,7 @@ function buildTestTree() {
     outputFile: '/tests/' + outputFileName
   });
 
+  // bring in qunit
   var testExtTree = funnel('./node_modules', {
     include: [
       'qunitjs/qunit/qunit.js',
@@ -32,19 +42,22 @@ function buildTestTree() {
     destDir: '/tests'
   });
 
+  // bring in test-loader
   testExtTree = mergeTrees([testExtTree, funnel('./bower_components', {
     include: [
       'ember-cli-test-loader/test-loader.js'
     ],
     destDir: '/tests'
   })]);
 
+  // include HTML file
   var testHTMLTree = funnel('./tests', {
     include: ['index.html'],
     destDir: '/tests'
   });
 
   var testTree = mergeTrees([
+    loaderTree(),
     testJSTree,
     testExtTree,
     testHTMLTree

package.json

@@ -3,15 +3,14 @@
   "version": "0.1.3",
   "description": "A modern, minimalist WYSIWYG editor.",
   "repository": "https://github.com/bustlelabs/content-kit-editor",
-  "main": "dist/content-kit-editor.js",
+  "main": "dist/commonjs/content-kit-editor/index.js",
   "engines": {
     "node": "0.10.x"
   },
   "scripts": {
     "start": "node server/index.js",
     "test": "testem ci",
-    "build": "rm -rf dist && broccoli build dist",
-    "prepublish": "npm run build"
+    "build": "rm -rf dist && broccoli build dist"
   },
   "keywords": [
     "html",
@@ -34,7 +33,7 @@
     "broccoli-concat": "0.0.13",
     "broccoli-funnel": "^0.2.3",
     "broccoli-merge-trees": "^0.2.1",
-    "broccoli-multi-builder": "^0.1.0",
+    "broccoli-multi-builder": "^0.2.2",
     "content-kit-compiler": "^0.3.1",
     "content-kit-utils": "^0.2.0",
     "del": "^1.1.1",
@@ -49,6 +48,7 @@
     "gulp-open": "^0.2.8",
     "gulp-qunit": "^1.2.1",
     "gulp-uglify": "^1.1.0",
+    "loader.js": "^3.2.0",
     "qunitjs": "^1.17.1",
     "testem": "^0.8.4"
   }

tests/index.html

@@ -12,7 +12,8 @@
 
   <script src="./qunitjs/qunit/qunit.js"></script>
   <script src="/testem.js"></script>
-  <script src="../content-kit-editor.amd.js"></script>
+  <script src="./loader.js/loader.js"></script>
+  <script src="../amd/content-kit-editor.js"></script>
   <script src="./content-kit-editor-tests.amd.js"></script>
   <script src="./ember-cli-test-loader/test-loader.js"></script>
   <script>