Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update BrowserSync #1457

Merged
merged 2 commits into from
May 7, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ## Globals
var argv = require('minimist')(process.argv.slice(2));
var autoprefixer = require('gulp-autoprefixer');
var browserSync = require('browser-sync');
var browserSync = require('browser-sync').create();
var changed = require('gulp-changed');
var concat = require('gulp-concat');
var flatten = require('gulp-flatten');
Expand Down Expand Up @@ -143,9 +143,7 @@ var jsTasks = function(filename) {
var writeToManifest = function(directory) {
return lazypipe()
.pipe(gulp.dest, path.dist + directory)
.pipe(function() {
return gulpif('**/*.{js,css}', browserSync.reload({stream:true}));
})
.pipe(browserSync.stream, {match: '**/*.{js,css}'})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually just remove this. With the new version the path.dist in files is enough to make things work.

Everything works exactly as expected when you remove this line.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seriously? I'll try that too.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep it reloads images and such too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think that really works. I'm seeing it picking up every changed file in dist, including source maps. The additional files mess up BrowserSync's asset-injection and force a full page reload. With a lot of files, they can also send multiple reload triggers.

pastedgraphic-2

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JavaScript files should be a full page reload. CSS injecting is working properly over here after omitting the inline reload.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you compare my bs_files-only branch with the code you're running? I'm only seeing full reloads from that, no CSS injection and a ton of changed file notices.

.pipe(rev.manifest, revManifest, {
base: path.dist,
merge: true
Expand Down Expand Up @@ -198,7 +196,8 @@ gulp.task('scripts', ['jshint'], function() {
gulp.task('fonts', function() {
return gulp.src(globs.fonts)
.pipe(flatten())
.pipe(gulp.dest(path.dist + 'fonts'));
.pipe(gulp.dest(path.dist + 'fonts'))
.pipe(browserSync.stream());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

});

// ### Images
Expand All @@ -210,7 +209,8 @@ gulp.task('images', function() {
interlaced: true,
svgoPlugins: [{removeUnknownsAndDefaults: false}]
}))
.pipe(gulp.dest(path.dist + 'images'));
.pipe(gulp.dest(path.dist + 'images'))
.pipe(browserSync.stream());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

});

// ### JSHint
Expand All @@ -235,8 +235,8 @@ gulp.task('clean', require('del').bind(null, [path.dist]));
// build step for that asset and inject the changes into the page.
// See: http://www.browsersync.io
gulp.task('watch', function() {
browserSync({
files: [path.dist, '{lib,templates}/**/*.php', '*.php'],
browserSync.init({
files: ['{lib,templates}/**/*.php', '*.php'],
proxy: config.devUrl,
snippetOptions: {
whitelist: ['/wp-admin/admin-ajax.php'],
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"devDependencies": {
"asset-builder": "^1.0.2",
"browser-sync": "2.5.0",
"browser-sync": "^2.7.1",
"del": "^1.1.1",
"gulp": "^3.8.11",
"gulp-autoprefixer": "^2.1.0",
Expand Down