browser-sync
Advanced tools
Comparing version 0.7.4 to 0.7.5
@@ -13,14 +13,28 @@ | ||
open: false, | ||
minify: true | ||
minify: true, | ||
logConnections: false, | ||
notify: { | ||
styles: [ | ||
"background-color: red", | ||
"color: white", | ||
"padding: 10px", | ||
"display: none", | ||
"font-family: sans-serif", | ||
"position: absolute", | ||
"z-index: 9999", | ||
"right: 0px", | ||
"border-bottom-left-radius: 5px" | ||
] | ||
} | ||
}; | ||
//var clientScript = require("/Users/shakyshane/Sites/browser-sync-modules/browser-sync-client/index"); | ||
// | ||
//browserSync.use("client:script", clientScript.middleware, function (err) { | ||
// console.log(err); | ||
//}); | ||
var clientScript = require("/Users/shakyshane/Sites/browser-sync-modules/browser-sync-client/index"); | ||
browserSync.init(files, options, function (err, bs) { | ||
browserSync.use("client:script", clientScript.middleware, function (err) { | ||
console.log(err); | ||
}); | ||
var bs = browserSync.init(files, options, function (err, bs) { | ||
console.timeEnd("init"); | ||
return true; | ||
}); | ||
}); |
@@ -55,3 +55,5 @@ #! /usr/bin/env node | ||
module.exports.init = function (userFiles, userConfig, cb) { | ||
var config = _.merge(defaultConfig, userConfig); | ||
var config = _.merge(defaultConfig, userConfig, function (a, b) { | ||
return _.isArray(a) ? _.union(a, b) : undefined; | ||
}); | ||
var files = options._mergeFilesOption(userFiles, config.exclude); | ||
@@ -69,2 +71,2 @@ config = init.mergeOptions(defaultConfig, config, init.allowedOptions); | ||
browserSync.registerPlugin(name, func, cb); | ||
}; | ||
}; |
{ | ||
"name": "browser-sync", | ||
"description": "Live CSS Reload & Browser Syncing", | ||
"version": "0.7.4", | ||
"version": "0.7.5", | ||
"homepage": "https://github.com/shakyshane/browser-sync", | ||
@@ -46,3 +46,3 @@ "author": { | ||
"commander": "~2.1.0", | ||
"browser-sync-control-panel": "0.0.3" | ||
"browser-sync-control-panel": "0.0.4" | ||
}, | ||
@@ -49,0 +49,0 @@ "devDependencies": { |
@@ -1,2 +0,2 @@ | ||
# browser-sync [![Build Status](https://travis-ci.org/shakyShane/browser-sync.png?branch=master)](https://travis-ci.org/shakyShane/browser-sync) [![NPM version](https://badge.fury.io/js/browser-sync.png)](http://badge.fury.io/js/browser-sync) [![Built with Grunt](https://cdn.gruntjs.com/builtwith.png)](http://gruntjs.com/) | ||
# browser-sync [![Build Status](https://travis-ci.org/shakyShane/browser-sync.png?branch=master)](https://travis-ci.org/shakyShane/browser-sync) [![NPM version](https://badge.fury.io/js/browser-sync.png)](http://badge.fury.io/js/browser-sync) | ||
@@ -64,8 +64,8 @@ > Keep multiple browsers & devices in sync when building websites. | ||
``` | ||
398 Shane Osbourne | ||
416 Shane Osbourne | ||
13 Hugo Bessa | ||
2 Paul Robertson | ||
2 Hugo Dias | ||
2 brutaldev | ||
2 chase_chou | ||
2 Hugo Dias | ||
1 Sylvain Emery | ||
1 Tony Holdstock-Brown | ||
@@ -80,2 +80,3 @@ 1 Werner van Deventer | ||
1 Robert Vock | ||
1 Sylvain Emery | ||
``` | ||
@@ -82,0 +83,0 @@ |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
213938
2161
85
+ Addedbrowser-sync-control-panel@0.0.4(transitive)
- Removedbrowser-sync-control-panel@0.0.3(transitive)