Comparing version 0.16.3 to 0.16.4
# master | ||
# 0.16.4 | ||
* Return server objects for easier extensibility | ||
# 0.16.3 | ||
@@ -4,0 +8,0 @@ |
@@ -9,10 +9,11 @@ var Watcher = require('./watcher') | ||
options = options || {} | ||
var server = {} | ||
console.log('Serving on http://' + options.host + ':' + options.port + '\n') | ||
var watcher = options.watcher || new Watcher(builder, {verbose: true}) | ||
server.watcher = options.watcher || new Watcher(builder, {verbose: true}) | ||
var app = connect().use(middleware(watcher)) | ||
server.app = connect().use(middleware(server.watcher)) | ||
var server = http.createServer(app) | ||
server.http = http.createServer(server.app) | ||
@@ -32,7 +33,7 @@ // We register these so the 'exit' handler removing temp dirs is called | ||
watcher.on('change', function(results) { | ||
server.watcher.on('change', function(results) { | ||
console.log('Built - ' + Math.round(results.totalTime / 1e6) + ' ms @ ' + new Date().toString()) | ||
}) | ||
watcher.on('error', function(err) { | ||
server.watcher.on('error', function(err) { | ||
console.log('Built with error:') | ||
@@ -47,3 +48,4 @@ // Should also show file and line/col if present; see cli.js | ||
server.listen(parseInt(options.port, 10), options.host) | ||
server.http.listen(parseInt(options.port, 10), options.host) | ||
return server | ||
} |
{ | ||
"name": "broccoli", | ||
"description": "Fast client-side asset builder", | ||
"version": "0.16.3", | ||
"version": "0.16.4", | ||
"author": "Jo Liss <joliss42@gmail.com>", | ||
@@ -6,0 +6,0 @@ "main": "lib/index.js", |
@@ -70,6 +70,5 @@ # Broccoli | ||
```js | ||
var pickFiles = require('broccoli-static-compiler') | ||
var funnel = require('broccoli-funnel') | ||
module.exports = pickFiles('app', { | ||
srcDir: '/', | ||
module.exports = funnel('app', { | ||
destDir: 'appkit' | ||
@@ -80,7 +79,7 @@ }) | ||
That example uses the plugin | ||
[`broccoli-static-compiler`](https://www.npmjs.com/package/broccoli-static-compiler). | ||
[`broccoli-funnel`](https://www.npmjs.com/package/broccoli-funnel). | ||
In order for the `require` call to work, you must first put the plugin in | ||
your `devDependencies` and install it, with | ||
npm install --save-dev broccoli-static-compiler | ||
npm install --save-dev broccoli-funnel | ||
@@ -87,0 +86,0 @@ With the above `Brocfile.js` and the file tree from the previous example, |
60941
556
199