Merge pull request #1289 from guix77/8.0.0

browserSync
This commit is contained in:
Austin Pray
2015-01-28 11:24:41 -06:00
4 changed files with 20 additions and 20 deletions

View File

@@ -24,5 +24,8 @@
"modernizr.js": { "modernizr.js": {
"bower": ["modernizr"] "bower": ["modernizr"]
} }
},
"config": {
"devUrl": "example.dev"
} }
} }

View File

@@ -3,6 +3,7 @@
var $ = require('gulp-load-plugins')(); var $ = require('gulp-load-plugins')();
var _ = require('lodash'); var _ = require('lodash');
var argv = require('yargs').argv; var argv = require('yargs').argv;
var browserSync = require('browser-sync');
var gulp = require('gulp'); var gulp = require('gulp');
var lazypipe = require('lazypipe'); var lazypipe = require('lazypipe');
var merge = require('merge-stream'); var merge = require('merge-stream');
@@ -15,6 +16,9 @@ var manifest = require('asset-builder')('./assets/manifest.json');
// - `path.dist` - Path to the build directory. default: `dist/` // - `path.dist` - Path to the build directory. default: `dist/`
var path = manifest.paths; var path = manifest.paths;
// `config` - Store arbitrary configuration values here.
var config = manifest.config || {};
// `globs` - These ultimately end up in their respective `gulp.src`. // `globs` - These ultimately end up in their respective `gulp.src`.
// - `globs.js` - array of asset-builder js Depenency objects. Example: // - `globs.js` - array of asset-builder js Depenency objects. Example:
// ``` // ```
@@ -119,7 +123,7 @@ var jsTasks = function(filename) {
var writeToManifest = function(directory) { var writeToManifest = function(directory) {
return lazypipe() return lazypipe()
.pipe(gulp.dest, path.dist + directory) .pipe(gulp.dest, path.dist + directory)
.pipe($.livereload) .pipe(browserSync.reload, {stream:true})
.pipe($.rev.manifest, revManifest, { .pipe($.rev.manifest, revManifest, {
base: path.dist, base: path.dist,
merge: true merge: true
@@ -195,12 +199,14 @@ gulp.task('clean', require('del').bind(null, [path.dist]));
// ### Watch // ### Watch
// `gulp watch` - recompile assets whenever they change // `gulp watch` - recompile assets whenever they change
gulp.task('watch', function() { gulp.task('watch', function() {
$.livereload.listen(); browserSync({
proxy: config.devUrl
});
gulp.watch([path.source + 'styles/**/*'], ['styles']); gulp.watch([path.source + 'styles/**/*'], ['styles']);
gulp.watch([path.source + 'scripts/**/*'], ['jshint', 'scripts']); gulp.watch([path.source + 'scripts/**/*'], ['jshint', 'scripts']);
gulp.watch(['bower.json'], ['wiredep']); gulp.watch(['bower.json'], ['wiredep']);
gulp.watch('**/*.php').on('change', function(file) { gulp.watch('**/*.php', function() {
$.livereload.changed(file.path); browserSync.reload();
}); });
}); });

View File

@@ -54,15 +54,6 @@ function assets() {
add_filter('script_loader_src', __NAMESPACE__ . '\\jquery_local_fallback', 10, 2); add_filter('script_loader_src', __NAMESPACE__ . '\\jquery_local_fallback', 10, 2);
} }
/**
* Livereload client
* https://github.com/livereload/livereload-js
*/
if (WP_ENV === 'development') {
wp_register_script('livereload', 'http://localhost:35729/livereload.js?snipver=1', null, false, true);
wp_enqueue_script('livereload');
}
if (is_single() && comments_open() && get_option('thread_comments')) { if (is_single() && comments_open() && get_option('thread_comments')) {
wp_enqueue_script('comment-reply'); wp_enqueue_script('comment-reply');
} }

View File

@@ -27,6 +27,7 @@
}, },
"devDependencies": { "devDependencies": {
"asset-builder": "~0.3.0", "asset-builder": "~0.3.0",
"browser-sync": "^1.9.1",
"del": "^1.1.1", "del": "^1.1.1",
"gulp": "^3.8.10", "gulp": "^3.8.10",
"gulp-changed": "^1.1.0", "gulp-changed": "^1.1.0",
@@ -36,7 +37,6 @@
"gulp-imagemin": "^2.0.0", "gulp-imagemin": "^2.0.0",
"gulp-jshint": "^1.8.4", "gulp-jshint": "^1.8.4",
"gulp-less": "^2.0.1", "gulp-less": "^2.0.1",
"gulp-livereload": "^3.4.0",
"gulp-load-plugins": "^0.8.0", "gulp-load-plugins": "^0.8.0",
"gulp-pleeease": "^1.1.0", "gulp-pleeease": "^1.1.0",
"gulp-plumber": "^0.6.3", "gulp-plumber": "^0.6.3",