Bump deps, fix gulpfile

This commit is contained in:
lostinlight 2019-03-23 23:23:36 +03:00
parent 38cfb6409f
commit 2b06b295d6
4 changed files with 3980 additions and 2674 deletions

6592
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -9,11 +9,11 @@
"author": "lostinlight", "author": "lostinlight",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"hexo": { "hexo": {
"version": "3.7.1" "version": "3.8.0"
}, },
"scripts": {}, "scripts": {},
"dependencies": { "dependencies": {
"hexo": "^3.7.1", "hexo": "^3.8.0",
"hexo-autonofollow": "git+https://gitlab.com/lostinlight/hexo-autonofollow.git", "hexo-autonofollow": "git+https://gitlab.com/lostinlight/hexo-autonofollow.git",
"hexo-browsersync": "^0.3.0", "hexo-browsersync": "^0.3.0",
"hexo-deployer-git": "^1.0.0", "hexo-deployer-git": "^1.0.0",
@ -27,30 +27,29 @@
"hexo-processor-static": "^1.1.0", "hexo-processor-static": "^1.1.0",
"hexo-renderer-ejs": "^0.3.1", "hexo-renderer-ejs": "^0.3.1",
"hexo-renderer-markdown-it": "^3.4.1", "hexo-renderer-markdown-it": "^3.4.1",
"hexo-server": "^0.3.2", "hexo-server": "^0.3.3",
"hexo-yam": "^1.0.4" "hexo-yam": "^1.1.0"
}, },
"devDependencies": { "devDependencies": {
"babel-core": "^6.26.3", "@babel/core": "^7.0.0",
"@babel/preset-env": "^7.4.2",
"babel-eslint": "^10.0.1", "babel-eslint": "^10.0.1",
"babel-preset-es2015": "^6.24.1", "del": "^4.0.0",
"del": "^3.0.0",
"gulp": "^4.0.0", "gulp": "^4.0.0",
"gulp-autoprefixer": "^6.0.0", "gulp-autoprefixer": "^6.0.0",
"gulp-babel": "^7.0.1", "gulp-babel": "^8.0.0",
"gulp-concat": "^2.6.1", "gulp-concat": "^2.6.1",
"gulp-cssnano": "^2.1.3", "gulp-cssnano": "^2.1.3",
"gulp-eslint": "^5.0.0", "gulp-eslint": "^5.0.0",
"gulp-notify": "^3.2.0", "gulp-notify": "^3.2.0",
"gulp-plumber": "^1.2.0", "gulp-plumber": "^1.2.1",
"gulp-rename": "^1.2.3", "gulp-rename": "^1.4.0",
"gulp-sass": "^4.0.1", "gulp-sass": "^4.0.2",
"gulp-sourcemaps": "^2.6.4", "gulp-sourcemaps": "^2.6.5",
"gulp-stylelint": "^8.0.0", "gulp-stylelint": "^8.0.0",
"gulp-uglify": "^3.0.0", "gulp-uglify": "^3.0.2",
"imagemin-jpeg-recompress": "^6.0.0", "stylelint": "^9.10.1",
"stylelint": "^9.9.0", "uglifyjs-webpack-plugin": "^2.1.2",
"uglifyjs-webpack-plugin": "^2.1.1",
"webpack-stream": "^5.2.1" "webpack-stream": "^5.2.1"
} }
} }

View File

@ -16,7 +16,6 @@
], ],
"rules": { "rules": {
"linebreak-style": ["error", "unix"], "linebreak-style": ["error", "unix"],
"quotes": ["warn", "single"],
"semi": ["error", "always"], "semi": ["error", "always"],
"camelcase": ["warn", { "properties": "always" }], "camelcase": ["warn", { "properties": "always" }],
"no-cond-assign": ["error", "except-parens"] "no-cond-assign": ["error", "except-parens"]

View File

@ -42,7 +42,7 @@
.pipe(sourcemaps.init()) .pipe(sourcemaps.init())
.pipe(customPlumber('Ouch! Error Running Sass')) .pipe(customPlumber('Ouch! Error Running Sass'))
.pipe(sass({errLogToConsole: true})) .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(rename({ suffix: '.min' })) // for using in dev mode
.pipe(sourcemaps.write('./')) .pipe(sourcemaps.write('./'))
.pipe(gulp.dest('source/css')); .pipe(gulp.dest('source/css'));
@ -52,7 +52,7 @@
return gulp.src('source/assets/scss/main.scss') return gulp.src('source/assets/scss/main.scss')
.pipe(customPlumber('Ouch! Error Running Sass')) .pipe(customPlumber('Ouch! Error Running Sass'))
.pipe(sass({errLogToConsole: true})) .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(rename({ suffix: '.min' }))
.pipe(cssnano()) .pipe(cssnano())
.pipe(gulp.dest('source/css/')) .pipe(gulp.dest('source/css/'))
@ -69,7 +69,7 @@
return gulp.src(['source/assets/scripts/*.js', '!source/assets/scripts/*ball.js']) return gulp.src(['source/assets/scripts/*.js', '!source/assets/scripts/*ball.js'])
.pipe(sourcemaps.init()) .pipe(sourcemaps.init())
.pipe(babel({ .pipe(babel({
presets: ['es2015'] presets: ["@babel/preset-env"]
})) }))
.pipe(customPlumber('Ouch! Error Running Scripts')) .pipe(customPlumber('Ouch! Error Running Scripts'))
.pipe(eslint()) .pipe(eslint())
@ -83,7 +83,7 @@
gulp.task('scripts:build', function() { gulp.task('scripts:build', function() {
return gulp.src(['source/assets/scripts/*.js', '!source/assets/scripts/*ball.js']) return gulp.src(['source/assets/scripts/*.js', '!source/assets/scripts/*ball.js'])
.pipe(babel({ .pipe(babel({
presets: ['es2015'] presets: ["@babel/preset-env"]
})) }))
.pipe(customPlumber('Ouch! Error Running Scripts')) .pipe(customPlumber('Ouch! Error Running Scripts'))
//.pipe(concat('main.js')) //.pipe(concat('main.js'))
@ -93,14 +93,14 @@
}); });
// Vendor Scripts // Vendor Scripts
gulp.task('vendor', function() { // gulp.task('vendor', function() {
return gulp.src('source/assets/scripts/vendor/*.js') // return gulp.src('source/assets/scripts/vendor/*.js')
.pipe(customPlumber('Ouch! Error Running Vendor')) // .pipe(customPlumber('Ouch! Error Running Vendor'))
.pipe(concat('vendor.js')) // only if http2 not configured on server // .pipe(concat('vendor.js')) // only if http2 not configured on server
.pipe(rename({suffix: '.min'})) // .pipe(rename({suffix: '.min'}))
.pipe(uglify()) // .pipe(uglify())
.pipe(gulp.dest('source/js/')); // .pipe(gulp.dest('source/js/'));
}); // });
// Clean // Clean
gulp.task('clean', function () { gulp.task('clean', function () {
@ -114,9 +114,7 @@
}); });
// Development Mode // 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 // 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')));
}));