Broccoli fun

.travis.yml

@@ -4,6 +4,8 @@ node_js:
 - '0.11'
 after_success:
 - "./bin/publish_to_s3.js"
+before_install:
+  - npm install -g "npm@^2.0.0"
 env:
   global:
   - EMBER_ENV=production

Brocfile.js

@@ -1,72 +1,67 @@
 /* jshint node:true, undef:true, unused:true */
-var AMDFormatter     = require('es6-module-transpiler-amd-formatter');
+var compileModules   = require('broccoli-es6-module-transpiler');
+var merge            = require('broccoli-merge-trees');
 var uglify           = require('broccoli-uglify-js');
-var compileModules   = require('broccoli-compile-modules');
-var mergeTrees       = require('broccoli-merge-trees');
-var moveFile         = require('broccoli-file-mover');
-var es3Recast        = require('broccoli-es3-safe-recast');
-var concat           = require('broccoli-concat');
-var replace          = require('broccoli-string-replace');
 var calculateVersion = require('git-repo-version');
-var path             = require('path');
-var trees            = [];
-var env              = process.env.EMBER_ENV || 'development';
+var browserify       = require('broccoli-watchify');
+var fs               = require('fs');
 
-var bundle = compileModules('lib', {
-  inputFiles: ['rsvp.umd.js'],
-  output: '/rsvp.js',
-  formatter: 'bundle',
+
+var stew   = require('broccoli-stew');
+
+var find   = stew.find;
+var mv     = stew.mv;
+var rename = stew.rename;
+var env    = stew.env;
+var map    = stew.map;
+
+var lib       = find('lib');
+var testDir   = find('test');
+var testFiles = find('test/{index.html,worker.js}');
+
+// should be mv
+var json3     = rename(find('node_modules/json3/lib/{json3.js}'), 'node_modules/json3/lib', 'test/');
+var mocha     = rename(find('node_modules/mocha/mocha.{js,css}'), 'node_modules/mocha/',    'test/');
+
+var testVendor = merge([ json3, mocha ]);
+
+var rsvp = compileModules(lib, {
+  format: 'bundle',
+  entry: 'rsvp.umd.js',
+  output: 'rsvp.js'
 });
 
-trees.push(bundle);
-trees.push(compileModules('lib', {
-  inputFiles: ['**/*.js'],
-  output: '/amd/',
-  formatter: new AMDFormatter()
-}));
+var testBundle = browserify(merge([
+  mv(rsvp, 'test'),
+  testDir
+]), {
+  browserify: { entries: ['./test/index.js'] },
+  init: function (b) { b.external('vertx'); }
+});
 
-if (process.env.EMBER_ENV === 'production') {
-  trees.push(uglify(moveFile(bundle, {
-    srcFile: 'rsvp.js',
-    destFile: 'rsvp.min.js'
-  }), {
-    mangle: true,
-    compress: true
-  }));
-}
+var dist = rsvp;
 
-var distTree = mergeTrees(trees.concat('config'));
-var distTrees = [];
+env('production', function() {
+  dist = merge([
+    rename(uglify(dist), '.js', '.min.js'),
+    dist
+  ]);
+});
 
-distTrees.push(concat(distTree, {
-  inputFiles: [
-    'versionTemplate.txt',
-    'rsvp.js'
-  ],
-  outputFile: '/rsvp.js'
-}));
+function prependLicense(content) {
+  var version = JSON.parse(fs.readFileSync('./package.json')).version;
+  var license = fs.readFileSync('./config/versionTemplate.txt').toString().replace(/VERSION_PLACEHOLDER_STRING/, version);
 
-if (process.env.EMBER_ENV === 'production') {
-  distTrees.push(concat(distTree, {
-    inputFiles: [
-      'versionTemplate.txt',
-      'rsvp.min.js'
-    ],
-    outputFile: '/rsvp.min.js'
-  }));
+  return license + '\n' + content;
 }
 
-if (env !== 'development') {
-  distTrees = distTrees.map(es3Recast);
-}
+// exclude source maps for now, until map/cat supports source maps
+dist = find(dist, '!*.map');
 
-module.exports = replace(mergeTrees(distTrees), {
-  files: [
-    'rsvp.js',
-    'rsvp.min.js'
-  ],
-  pattern: {
-    match: /VERSION_PLACEHOLDER_STRING/g,
-    replacement: calculateVersion(10)
-  }
-});
+module.exports = merge([
+  map(dist, prependLicense),
+  testFiles,
+  testVendor,
+  mv(rsvp, 'test'),
+  mv(testBundle, 'test')
+]);

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Master
 
+* upgrade build tooling
 * improve performance of instrumentation (also add seperate flag to include "stack" with instrumentation as it is unfortunately slow)
 * ensure minified RSVP.defer() maintains known external API [#293](https://github.com/tildeio/rsvp.js/pull/293)
 * add `finally` to the readme

bower.json

@@ -18,5 +18,8 @@
     "tests",
     "vendor",
     "tasks"
-  ]
+  ],
+  "devDependencies": {
+    "loader.js": "^1.0.0"
+  }
 }

lib/rsvp/asap.js

@@ -1,5 +1,6 @@
 var len = 0;
-
+var toString = {}.toString;
+var vertxNext;
 export default function asap(callback, arg) {
   queue[len] = callback;
   queue[len + 1] = arg;
@@ -12,7 +13,7 @@ export default function asap(callback, arg) {
   }
 }
 
-var browserWindow = (typeof window !== 'undefined') ? window : undefined
+var browserWindow = (typeof window !== 'undefined') ? window : undefined;
 var browserGlobal = browserWindow || {};
 var BrowserMutationObserver = browserGlobal.MutationObserver || browserGlobal.WebKitMutationObserver;
 var isNode = typeof process !== 'undefined' && {}.toString.call(process) === '[object process]';
@@ -88,7 +89,7 @@ function attemptVertex() {
   try {
     var r = require;
     var vertx = r('vertx');
-    var vertxNext = vertx.runOnLoop || vertx.runOnContext;
+    vertxNext = vertx.runOnLoop || vertx.runOnContext;
     return useVertxTimer();
   } catch(e) {
     return useSetTimeout();

package.json

@@ -10,36 +10,32 @@
   "devDependencies": {
     "bower": "^1.3.9",
     "brfs": "0.0.8",
-    "broccoli-compile-modules": "^1.0.0",
-    "broccoli-concat": "0.0.7",
     "broccoli-es3-safe-recast": "0.0.8",
-    "broccoli-file-mover": "^0.4.0",
+    "broccoli-es6-module-transpiler": "^0.5.0",
     "broccoli-jshint": "^0.5.1",
     "broccoli-merge-trees": "^0.1.4",
-    "broccoli-static-compiler": "^0.1.4",
-    "broccoli-string-replace": "0.0.1",
+    "broccoli-replace": "^0.2.0",
+    "broccoli-stew": "0.0.6",
     "broccoli-uglify-js": "^0.1.3",
+    "broccoli-watchify": "^0.2.0",
     "browserify": "^4.2.0",
     "ember-cli": "0.1.4",
     "ember-publisher": "0.0.7",
-    "es6-module-transpiler-amd-formatter": "0.2.2",
-    "express": "^4.5.0",
     "git-repo-version": "0.0.2",
-    "jshint": "~0.9.1",
     "json3": "^3.3.2",
-    "mkdirp": "^0.5.0",
+    "minimatch": "^2.0.1",
     "mocha": "^1.20.1",
     "promises-aplus-tests-phantom": "^2.1.0-revise",
-    "release-it": "0.0.10",
-    "testem": "^0.6.17"
+    "release-it": "0.0.10"
   },
   "scripts": {
-    "start": "ember server",
-    "build": "ember build",
-    "test": "testem ci -R dot",
-    "test:server": "testem",
-    "lint": "jshint lib",
+    "server": "ember s",
+    "test": "ember test",
+    "test:server": "ember test --server",
+    "test:node": "ember build && mocha ./dist/test/browserify",
     "prepublish": "ember build --environment production",
+    "build": "ember build --environment production",
+    "lint": "jshint lib",
     "dry-run-release": "ember build --environment production && release-it --dry-run --non-interactive"
   },
   "repository": {

test/tests/extension-test.js → test/extension-test.js

@@ -2426,7 +2426,7 @@ describe("RSVP extensions", function() {
   if (typeof Worker !== 'undefined') {
     describe('web worker', function () {
       it('should work', function (done) {
-        var worker = new Worker('tests/worker.js');
+        var worker = new Worker('worker.js');
         worker.addEventListener('error', function(reason) {
           done(new Error("Test failed:" + reason));
         });
@@ -2553,4 +2553,4 @@ describe("on node 0.10.x, using process.nextTick recursively shows deprecation w
         });
   });
 
-});
+});

test/index.html

@@ -2,14 +2,12 @@
 <head>
   <meta charset="utf-8">
   <title>rsvp.js Tests</title>
-  <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
+  <link rel="stylesheet" href="mocha.css" />
 </head>
 <body>
   <div id="mocha"></div>
-  <script src="../dist/rsvp.js"></script>
-  <script src="../node_modules/json3/lib/json3.js"></script>
-  <script src="vendor/assert.js"></script>
-  <script src="../node_modules/mocha/mocha.js"></script>
+  <script src="json3.js"></script>
+  <script src="mocha.js"></script>
   <script src="/testem.js"></script>
   <script>
     mocha.setup({
@@ -18,7 +16,7 @@
       ignoreLeaks: true
     });
   </script>
-  <script src="../tmp/test-bundle.js"></script>
+  <script src="browserify.js"></script>
   <script>
     if (window.mochaPhantomJS) { mochaPhantomJS.run(); }
     else { mocha.run(); }

test/index.js

@@ -0,0 +1,3 @@
+require('./test-adapter.js');
+require('./extension-test.js');
+require('promises-aplus-tests-phantom/lib/testFiles');

test/test-adapter.js

@@ -1,18 +1,16 @@
 /*global RSVP*/
 
 var assert = require('assert');
+var g = typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : this;
 
-var RSVP = require('../dist/rsvp');
+var RSVP = g.RSVP || require('./rsvp.js');
 var defer = RSVP.defer;
 var resolve = RSVP.resolve;
 var reject = RSVP.reject;
 
-var g = typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : this;
-
 module.exports = g.adapter = {
   resolved: resolve,
   rejected: reject,
   deferred: defer,
   RSVP: RSVP
 };
-

test/tests/worker.js → test/worker.js

@@ -1,4 +1,4 @@
-importScripts('../../dist/rsvp.js');
+importScripts('rsvp.js');
 new RSVP.Promise(function(resolve, reject) {
   self.onmessage = function (e) {
     if (e.data === 'ping') {

testem.json

@@ -1,11 +1,15 @@
 {
   "test_page": "test/index.html",
   "parallel": 5,
-  "before_tests": "npm run build-all",
+  "framework": "mocha",
+  "before_tests": "npm run build",
   "launchers": {
     "Mocha": {
-      "command": "./node_modules/.bin/mocha test/main.js"
+      "command": "./node_modules/.bin/mocha dist/test/browserify.js"
     }
   },
-  "launch_in_ci":  ["PhantomJS", "Mocha"]
+  "launch_in_ci":  [
+    "PhantomJS",
+    "Mocha"
+  ]
 }