Skip to content

Commit

Permalink
Merge pull request cferdinandi#52 from cferdinandi/development
Browse files Browse the repository at this point in the history
v4.2.2
  • Loading branch information
cferdinandi authored Aug 15, 2016
2 parents b4c8419 + a066e26 commit 3549020
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 31 deletions.
2 changes: 1 addition & 1 deletion dist/css/myplugin.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* gulp-boilerplate v4.2.1: My Gulp.js boilerplate for creating new web projects
* gulp-boilerplate v4.2.2: My Gulp.js boilerplate for creating new web projects
* (c) 2016 Chris Ferdinandi
* MIT License
* http://github.com/cferdinandi/Plugin
Expand Down
2 changes: 1 addition & 1 deletion dist/css/myplugin.min.css
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/*! gulp-boilerplate v4.2.1 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/Plugin */
/*! gulp-boilerplate v4.2.2 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/Plugin */
2 changes: 1 addition & 1 deletion dist/js/myplugin.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* gulp-boilerplate v4.2.1: My Gulp.js boilerplate for creating new web projects
* gulp-boilerplate v4.2.2: My Gulp.js boilerplate for creating new web projects
* (c) 2016 Chris Ferdinandi
* MIT License
* http://github.com/cferdinandi/Plugin
Expand Down
4 changes: 2 additions & 2 deletions dist/js/myplugin.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/dist/css/myplugin.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* gulp-boilerplate v4.2.1: My Gulp.js boilerplate for creating new web projects
* gulp-boilerplate v4.2.2: My Gulp.js boilerplate for creating new web projects
* (c) 2016 Chris Ferdinandi
* MIT License
* http://github.com/cferdinandi/Plugin
Expand Down
2 changes: 1 addition & 1 deletion docs/dist/css/myplugin.min.css
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/*! gulp-boilerplate v4.2.1 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/Plugin */
/*! gulp-boilerplate v4.2.2 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/Plugin */
2 changes: 1 addition & 1 deletion docs/dist/js/myplugin.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* gulp-boilerplate v4.2.1: My Gulp.js boilerplate for creating new web projects
* gulp-boilerplate v4.2.2: My Gulp.js boilerplate for creating new web projects
* (c) 2016 Chris Ferdinandi
* MIT License
* http://github.com/cferdinandi/Plugin
Expand Down
4 changes: 2 additions & 2 deletions docs/dist/js/myplugin.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@ <h1>My Plugin</h1>
</main>

<!-- Javascript -->
<script src="dist/js/classList.js"></script>
<script src="dist/js/myplugin.js"></script>
<script>
myplugin.init();
myPlugin.init();
</script>


Expand Down
19 changes: 7 additions & 12 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ gulp.task('build:scripts', ['clean:dist'], function() {
.pipe(rename, { suffix: '.min' })
.pipe(uglify)
.pipe(header, banner.min, { package : package })
.pipe(gulp.dest, paths.scripts.output);
.pipe(gulp.dest, paths.scripts.output)
.pipe(livereload);

return gulp.src(paths.scripts.input)
.pipe(plumber())
Expand Down Expand Up @@ -153,7 +154,8 @@ gulp.task('build:styles', ['clean:dist'], function() {
}
}))
.pipe(header(banner.min, { package : package }))
.pipe(gulp.dest(paths.styles.output));
.pipe(gulp.dest(paths.styles.output))
.pipe(livereload());
});

// Generate SVG sprites
Expand Down Expand Up @@ -237,7 +239,8 @@ gulp.task('build:docs', ['compile', 'clean:docs'], function() {
}))
.pipe(header(fs.readFileSync(paths.docs.templates + '/_header.html', 'utf8')))
.pipe(footer(fs.readFileSync(paths.docs.templates + '/_footer.html', 'utf8')))
.pipe(gulp.dest(paths.docs.output));
.pipe(gulp.dest(paths.docs.output))
.pipe(livereload());
});

// Copy distribution files to docs
Expand All @@ -262,15 +265,7 @@ gulp.task('clean:docs', function () {
// Spin up livereload server and listen for file changes
gulp.task('listen', function () {
livereload.listen();
gulp.watch(paths.input).on('change', function(file) {
gulp.start('default');
gulp.start('refresh');
});
});

// Run livereload after file change
gulp.task('refresh', ['compile', 'docs'], function () {
livereload.changed();
gulp.watch(paths.input, ['default']);
});


Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gulp-boilerplate",
"version": "4.2.1",
"version": "4.2.2",
"description": "My Gulp.js boilerplate for creating new web projects",
"main": "./dist/js/myplugin.min.js",
"author": {
Expand Down
3 changes: 1 addition & 2 deletions src/docs/_templates/_footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
</main>

<!-- Javascript -->
<script src="dist/js/classList.js"></script>
<script src="dist/js/myplugin.js"></script>
<script>
myplugin.init();
myPlugin.init();
</script>


Expand Down
7 changes: 3 additions & 4 deletions src/sass/myplugin.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// Import styles for compiling
@import
"config",
"mixins",
"components/myplugin";
@import "config";
@import "mixins";
@import "components/myplugin";

0 comments on commit 3549020

Please sign in to comment.