Commit 2b06b295 authored by lostinlight's avatar lostinlight

Bump deps, fix gulpfile

parent 38cfb640
This diff is collapsed.
......@@ -9,11 +9,11 @@
"author": "lostinlight",
"license": "AGPL-3.0-or-later",
"hexo": {
"version": "3.7.1"
"version": "3.8.0"
},
"scripts": {},
"dependencies": {
"hexo": "^3.7.1",
"hexo": "^3.8.0",
"hexo-autonofollow": "git+https://gitlab.com/lostinlight/hexo-autonofollow.git",
"hexo-browsersync": "^0.3.0",
"hexo-deployer-git": "^1.0.0",
......@@ -27,30 +27,29 @@
"hexo-processor-static": "^1.1.0",
"hexo-renderer-ejs": "^0.3.1",
"hexo-renderer-markdown-it": "^3.4.1",
"hexo-server": "^0.3.2",
"hexo-yam": "^1.0.4"
"hexo-server": "^0.3.3",
"hexo-yam": "^1.1.0"
},
"devDependencies": {
"babel-core": "^6.26.3",
"@babel/core": "^7.0.0",
"@babel/preset-env": "^7.4.2",
"babel-eslint": "^10.0.1",
"babel-preset-es2015": "^6.24.1",
"del": "^3.0.0",
"del": "^4.0.0",
"gulp": "^4.0.0",
"gulp-autoprefixer": "^6.0.0",
"gulp-babel": "^7.0.1",
"gulp-babel": "^8.0.0",
"gulp-concat": "^2.6.1",
"gulp-cssnano": "^2.1.3",
"gulp-eslint": "^5.0.0",
"gulp-notify": "^3.2.0",
"gulp-plumber": "^1.2.0",
"gulp-rename": "^1.2.3",
"gulp-sass": "^4.0.1",
"gulp-sourcemaps": "^2.6.4",
"gulp-plumber": "^1.2.1",
"gulp-rename": "^1.4.0",
"gulp-sass": "^4.0.2",
"gulp-sourcemaps": "^2.6.5",
"gulp-stylelint": "^8.0.0",
"gulp-uglify": "^3.0.0",
"imagemin-jpeg-recompress": "^6.0.0",
"stylelint": "^9.9.0",
"uglifyjs-webpack-plugin": "^2.1.1",
"gulp-uglify": "^3.0.2",
"stylelint": "^9.10.1",
"uglifyjs-webpack-plugin": "^2.1.2",
"webpack-stream": "^5.2.1"
}
}
......@@ -16,7 +16,6 @@
],
"rules": {
"linebreak-style": ["error", "unix"],
"quotes": ["warn", "single"],
"semi": ["error", "always"],
"camelcase": ["warn", { "properties": "always" }],
"no-cond-assign": ["error", "except-parens"]
......
......@@ -42,7 +42,7 @@
.pipe(sourcemaps.init())
.pipe(customPlumber('Ouch! Error Running Sass'))
.pipe(sass({errLogToConsole: true}))
.pipe(autoprefixer(['last 2 versions', 'IE 9', 'iOS 8', 'Android 4']))
.pipe(autoprefixer(['last 3 versions', 'IE 10', 'iOS 9', 'Android 4']))
.pipe(rename({ suffix: '.min' })) // for using in dev mode
.pipe(sourcemaps.write('./'))
.pipe(gulp.dest('source/css'));
......@@ -52,7 +52,7 @@
return gulp.src('source/assets/scss/main.scss')
.pipe(customPlumber('Ouch! Error Running Sass'))
.pipe(sass({errLogToConsole: true}))
.pipe(autoprefixer(['last 2 versions', 'IE 9', 'iOS 8', 'Android 4']))
.pipe(autoprefixer(['last 3 versions', 'IE 10', 'iOS 9', 'Android 4']))
.pipe(rename({ suffix: '.min' }))
.pipe(cssnano())
.pipe(gulp.dest('source/css/'))
......@@ -69,7 +69,7 @@
return gulp.src(['source/assets/scripts/*.js', '!source/assets/scripts/*ball.js'])
.pipe(sourcemaps.init())
.pipe(babel({
presets: ['es2015']
presets: ["@babel/preset-env"]
}))
.pipe(customPlumber('Ouch! Error Running Scripts'))
.pipe(eslint())
......@@ -83,7 +83,7 @@
gulp.task('scripts:build', function() {
return gulp.src(['source/assets/scripts/*.js', '!source/assets/scripts/*ball.js'])
.pipe(babel({
presets: ['es2015']
presets: ["@babel/preset-env"]
}))
.pipe(customPlumber('Ouch! Error Running Scripts'))
//.pipe(concat('main.js'))
......@@ -93,14 +93,14 @@
});
// Vendor Scripts
gulp.task('vendor', function() {
return gulp.src('source/assets/scripts/vendor/*.js')
.pipe(customPlumber('Ouch! Error Running Vendor'))
.pipe(concat('vendor.js')) // only if http2 not configured on server
.pipe(rename({suffix: '.min'}))
.pipe(uglify())
.pipe(gulp.dest('source/js/'));
});
// gulp.task('vendor', function() {
// return gulp.src('source/assets/scripts/vendor/*.js')
// .pipe(customPlumber('Ouch! Error Running Vendor'))
// .pipe(concat('vendor.js')) // only if http2 not configured on server
// .pipe(rename({suffix: '.min'}))
// .pipe(uglify())
// .pipe(gulp.dest('source/js/'));
// });
// Clean
gulp.task('clean', function () {
......@@ -114,9 +114,7 @@
});
// Development Mode
gulp.task('default', gulp.series('styles:lint', 'styles:serve', 'webpack', 'scripts:serve', 'vendor', 'watch', function (done) { done();
}));
gulp.task('default', gulp.series('styles:lint', 'styles:serve', 'webpack', 'scripts:serve', 'watch'));
// Production Mode
gulp.task('build', gulp.series('clean', 'styles:build', 'scripts:build', 'webpack', 'vendor', function (done) { done();
}));
gulp.task('build', gulp.series('clean', gulp.parallel('styles:build', 'webpack', 'scripts:build')));
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment