Merge pull request #6212 from marc1706/ticket/16746

[ticket/16746] Update node dev dependencies to latest versions & fix gulp
This commit is contained in:
Marc Alexander 2021-05-14 09:03:51 +02:00 committed by GitHub
commit 726c90668e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5138 additions and 4622 deletions

View file

@ -14,9 +14,6 @@
} }
], ],
"properties-order": [ "properties-order": [
{
"emptyLineBefore": false,
"properties": [
"font", "font",
"font-family", "font-family",
"font-size", "font-size",
@ -56,12 +53,8 @@
"word-wrap", "word-wrap",
"word-break", "word-break",
"tab-size", "tab-size",
"hyphens" "hyphens",
]
},
{
"emptyLineBefore": false,
"properties": [
"background", "background",
"background-color", "background-color",
"background-image", "background-image",
@ -111,38 +104,22 @@
"outline-style", "outline-style",
"outline-color", "outline-color",
"outline-offset", "outline-offset",
"tap-highlight-color" "tap-highlight-color",
]
},
{
"emptyLineBefore": false,
"properties": [
"box-decoration-break", "box-decoration-break",
"box-shadow", "box-shadow",
"text-shadow" "text-shadow",
]
},
{
"emptyLineBefore": false,
"properties": [
"color", "color",
"opacity" "opacity",
]
},
{
"emptyLineBefore": false,
"properties": [
"position", "position",
"z-index", "z-index",
"top", "top",
"right", "right",
"bottom", "bottom",
"left" "left",
]
},
{
"emptyLineBefore": false,
"properties": [
"display", "display",
"visibility", "visibility",
"float", "float",
@ -158,18 +135,14 @@
"flex-order", "flex-order",
"flex-pack", "flex-pack",
"flex-align", "flex-align",
"flex-basis",
"flex-grow", "flex-grow",
"flex-shrink", "flex-shrink",
"flex-basis",
"flex-wrap", "flex-wrap",
"justify-content", "justify-content",
"align-items", "align-items",
"align-self" "align-self",
]
},
{
"emptyLineBefore": false,
"properties": [
"box-sizing", "box-sizing",
"width", "width",
"min-width", "min-width",
@ -186,12 +159,8 @@
"padding-top", "padding-top",
"padding-right", "padding-right",
"padding-bottom", "padding-bottom",
"padding-left" "padding-left",
]
},
{
"emptyLineBefore": false,
"properties": [
"table-layout", "table-layout",
"empty-cells", "empty-cells",
"caption-side", "caption-side",
@ -200,12 +169,8 @@
"list-style", "list-style",
"list-style-position", "list-style-position",
"list-style-type", "list-style-type",
"list-style-image" "list-style-image",
]
},
{
"emptyLineBefore": false,
"properties": [
"content", "content",
"quotes", "quotes",
"counter-reset", "counter-reset",
@ -236,8 +201,6 @@
"animation-iteration-count", "animation-iteration-count",
"animation-direction", "animation-direction",
"pointer-events" "pointer-events"
]
}
], ],
"unspecified-properties-position": "bottomAlphabetical" "unspecified-properties-position": "bottomAlphabetical"
} }

View file

@ -2,7 +2,7 @@
const del = require('del'); const del = require('del');
const gulp = require('gulp'); const gulp = require('gulp');
const autoprefixer = require('gulp-autoprefixer'); const autoprefixer = require('autoprefixer');
// const sass = require('gulp-sass'); // const sass = require('gulp-sass');
const rename = require('gulp-rename'); const rename = require('gulp-rename');
const sourcemaps = require('gulp-sourcemaps'); const sourcemaps = require('gulp-sourcemaps');
@ -19,26 +19,24 @@ const build = {
css: './phpBB/styles/prosilver/theme/', css: './phpBB/styles/prosilver/theme/',
}; };
gulp.task('css', () => { gulp.task('css', gulp.series(() => {
const css = gulp return gulp
.src(build.css + '*.css') .src(build.css + '*.css')
.pipe(autoprefixer())
.pipe( .pipe(
postcss([ postcss([
autoprefixer(),
sorting(sortOrder), sorting(sortOrder),
]), ]),
) )
.pipe(gulp.dest(build.css)); .pipe(gulp.dest(build.css));
}));
return css; gulp.task('clean', gulp.series(() => {
});
gulp.task('clean', () => {
del([ 'dist' ]); del([ 'dist' ]);
}); }));
gulp.task('minify', () => { gulp.task('minify', gulp.series(() => {
const css = gulp return gulp
.src(build.css + '/bidi.css') .src(build.css + '/bidi.css')
.pipe(sourcemaps.init()) .pipe(sourcemaps.init())
.pipe( .pipe(
@ -53,12 +51,10 @@ gulp.task('minify', () => {
})) }))
.pipe(sourcemaps.write('./')) .pipe(sourcemaps.write('./'))
.pipe(gulp.dest(build.css)); .pipe(gulp.dest(build.css));
}));
return css; gulp.task('watch', gulp.series(() => {
}); gulp.watch('phpBB/styles/prosilver/theme/*.css', gulp.series('css'));
}));
gulp.task('watch', () => { gulp.task('default', gulp.series('css', 'watch'));
gulp.watch('phpBB/styles/prosilver/theme/*.css', [ 'css' ]);
});
gulp.task('default', [ 'css', 'watch' ]);

9314
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -90,20 +90,21 @@
}, },
"homepage": "https://www.phpbb.com", "homepage": "https://www.phpbb.com",
"devDependencies": { "devDependencies": {
"cssnano": "4.1.10", "autoprefixer": "^10.2.5",
"del": "5.1.0", "cssnano": "^5.0.2",
"gulp": "4.0.2", "del": "^6.0.0",
"gulp-autoprefixer": "7.0.1", "gulp": "^4.0.2",
"gulp-postcss": "8.0.0", "gulp-postcss": "^9.0.0",
"gulp-rename": "2.0.0", "gulp-rename": "^2.0.0",
"gulp-sass": "4.0.2", "gulp-sass": "^4.1.0",
"gulp-sourcemaps": "2.6.5", "gulp-sourcemaps": "^3.0.0",
"postcss-import": "12.0.1", "postcss": "^8.2.15",
"postcss-pxtorem": "5.1.1", "postcss-import": "^14.0.2",
"postcss-sorting": "5.0.1", "postcss-pxtorem": "^6.0.0",
"stylelint": "13.2.1", "postcss-sorting": "^6.0.0",
"stylelint-order": "4.0.0", "stylelint": "^13.13.1",
"xo": "^0.33.1", "stylelint-order": "^4.1.0",
"yargs-parser": ">=13.1.2" "xo": "^0.40.1",
"yargs-parser": "^20.2.7"
} }
} }