Skip to content

Commit ba9cd55

Browse files
committed
chore(releasing): update to bootstrap4 beta, and add popper.js as dev. dep of bootstrap
1 parent 674758d commit ba9cd55

File tree

3 files changed

+30
-29
lines changed

3 files changed

+30
-29
lines changed

gulpfile.js

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,44 +12,50 @@ var gulp = require('gulp'),
1212
var bootstrapPath = './node_modules/bootstrap/scss/bootstrap';
1313
var fontawesomePath = './node_modules/font-awesome/scss';
1414
var config = {
15-
sassPath: './resources/sass',
16-
npmDir: './node_modules'
17-
}
15+
sassPath: './resources/sass',
16+
npmDir: './node_modules'
17+
}
1818

1919

2020
// Copy js files to public folder
21-
gulp.task('js', function() {
22-
return gulp.src([config.npmDir + '/bootstrap/dist/js/bootstrap.min.js',
23-
config.npmrDir + '/jquery/dist/jquery.min.js'
21+
gulp.task('js', function () {
22+
return gulp.src([
23+
config.npmDir + '/bootstrap/dist/js/bootstrap.min.js',
24+
config.npmDir + '/jquery/dist/jquery.min.js',
25+
config.npmDir + '/popper.js/dist/popper.js'
2426
])
2527
.pipe(gulp.dest('./public/js'));
2628
});
2729

2830
// Copy fontawesome icons to public/fonts folder
29-
gulp.task('icons', function() {
31+
gulp.task('icons', function () {
3032
return gulp.src(config.npmDir + '/font-awesome/fonts/**.*')
3133
.pipe(gulp.dest('./public/fonts'));
3234
});
3335

3436

35-
gulp.task('css', function() {
37+
gulp.task('css', function () {
3638
var processors = [
3739
cssnano,
3840
rtlcss
3941
];
4042
// [].concat( bootstrapPath , fontawesomePath )
4143
return gulp.src(config.sassPath + '/style.scss')
42-
.pipe(sass({ includePaths: [bootstrapPath, fontawesomePath] }).on('error', notify.onError(function(error) {
44+
.pipe(sass({
45+
includePaths: [bootstrapPath, fontawesomePath]
46+
}).on('error', notify.onError(function (error) {
4347
return error.message;
4448
})))
4549
.pipe(postcss(processors))
46-
.pipe(rename({ suffix: '-rtl.alpha6.min' }))
50+
.pipe(rename({
51+
suffix: '-rtl.beta.min'
52+
}))
4753
.pipe(gulp.dest('./public/css'))
4854
.pipe(notify("Sass files compiles successfuly!"));
4955
});
5056

5157
// Add browserSync task
52-
gulp.task('browserSync', function() {
58+
gulp.task('browserSync', function () {
5359
browserSync({
5460
server: {
5561
baseDir: './'
@@ -60,7 +66,7 @@ gulp.task('browserSync', function() {
6066
// Rerun the task when a file changes
6167
// Run this task : gulp watch
6268

63-
gulp.task('watch', ['css', 'browserSync'], function() {
69+
gulp.task('watch', ['css', 'browserSync'], function () {
6470
gulp.watch(config.sassPath + '/**/*.scss', ['css']);
6571
browserSync.watch("./*.html").on("change", browserSync.reload); // browserSync watch task
6672
});

package-lock.json

Lines changed: 8 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,13 @@
3838
"rtlcss": "^2.0.6"
3939
},
4040
"dependencies": {
41-
"bootstrap": "^4.0.0-alpha.6",
42-
"font-awesome": "^4.7.0"
41+
"bootstrap": "^4.0.0-beta",
42+
"font-awesome": "*",
43+
"popper.js": "^1.12.2"
4344
},
4445
"config": {
4546
"commitizen": {
4647
"path": "node_modules/cz-conventional-changelog"
4748
}
4849
}
49-
}
50+
}

0 commit comments

Comments
 (0)