mirror of
https://github.com/phpbb/phpbb.git
synced 2025-04-04 07:53:06 +02:00
Merge pull request #5922 from hanakin/ticket/16414
[ticket/16414] update pkg.json & gulpjs deps
This commit is contained in:
Marc Alexander
GitHub
commit
3e46d3aa1f
61
gulpfile.js
61
gulpfile.js
@ -3,67 +3,62 @@
|
||||
const del = require('del');
|
||||
const gulp = require('gulp');
|
||||
const autoprefixer = require('gulp-autoprefixer');
|
||||
const sass = require('gulp-sass');
|
||||
// const sass = require('gulp-sass');
|
||||
const rename = require('gulp-rename');
|
||||
const sourcemaps = require('gulp-sourcemaps');
|
||||
const cssnano = require('cssnano');
|
||||
const postcss = require('gulp-postcss');
|
||||
const sorting = require('postcss-sorting');
|
||||
const atimport = require('postcss-import');
|
||||
const torem = require('postcss-pxtorem');
|
||||
// const torem = require('postcss-pxtorem');
|
||||
const sortOrder = require('./.postcss-sorting.json');
|
||||
const pkg = require('./package.json');
|
||||
// const pkg = require('./package.json');
|
||||
|
||||
// Config
|
||||
const build = {
|
||||
css: './phpBB/styles/prosilver/theme/',
|
||||
};
|
||||
|
||||
const AUTOPREFIXER_BROWSERS = [
|
||||
'> 1%',
|
||||
'last 2 versions'
|
||||
];
|
||||
|
||||
gulp.task('css', () => {
|
||||
const css = gulp
|
||||
.src(build.css + '*.css')
|
||||
.pipe(autoprefixer(AUTOPREFIXER_BROWSERS))
|
||||
.pipe(
|
||||
postcss([
|
||||
sorting(sortOrder)
|
||||
])
|
||||
)
|
||||
.pipe(gulp.dest(build.css));
|
||||
.src(build.css + '*.css')
|
||||
.pipe(autoprefixer())
|
||||
.pipe(
|
||||
postcss([
|
||||
sorting(sortOrder),
|
||||
]),
|
||||
)
|
||||
.pipe(gulp.dest(build.css));
|
||||
|
||||
return css;
|
||||
});
|
||||
|
||||
gulp.task('clean', () => {
|
||||
del(['dist']);
|
||||
del([ 'dist' ]);
|
||||
});
|
||||
|
||||
gulp.task('minify', () => {
|
||||
const css = gulp
|
||||
.src(build.css + '/bidi.css')
|
||||
.pipe(sourcemaps.init())
|
||||
.pipe(
|
||||
postcss([
|
||||
atimport(),
|
||||
cssnano()
|
||||
])
|
||||
)
|
||||
.pipe(rename({
|
||||
suffix: '.min',
|
||||
extname: '.css'
|
||||
}))
|
||||
.pipe(sourcemaps.write('./'))
|
||||
.pipe(gulp.dest(build.css));
|
||||
.src(build.css + '/bidi.css')
|
||||
.pipe(sourcemaps.init())
|
||||
.pipe(
|
||||
postcss([
|
||||
atimport(),
|
||||
cssnano(),
|
||||
]),
|
||||
)
|
||||
.pipe(rename({
|
||||
suffix: '.min',
|
||||
extname: '.css',
|
||||
}))
|
||||
.pipe(sourcemaps.write('./'))
|
||||
.pipe(gulp.dest(build.css));
|
||||
|
||||
return css;
|
||||
});
|
||||
|
||||
gulp.task('watch', () => {
|
||||
gulp.watch('phpBB/styles/prosilver/theme/*.css', ['css']);
|
||||
gulp.watch('phpBB/styles/prosilver/theme/*.css', [ 'css' ]);
|
||||
});
|
||||
|
||||
gulp.task('default', ['css', 'watch']);
|
||||
gulp.task('default', [ 'css', 'watch' ]);
|
||||
|
||||
6244
package-lock.json
generated
6244
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
98
package.json
98
package.json
@ -1,25 +1,73 @@
|
||||
{
|
||||
"name": "phpbb",
|
||||
"version": "3.3.0-dev",
|
||||
"version": "4.0.0-dev",
|
||||
"description": "phpBB Forum Software application",
|
||||
"main": " ",
|
||||
"directories": {
|
||||
"doc": "docs"
|
||||
},
|
||||
"xo": {
|
||||
"ignores": [
|
||||
"./**/adm/style/admin.js",
|
||||
"./**/adm/style/ajax.js",
|
||||
"./**/adm/style/permissions.js",
|
||||
"./**/adm/style/tooltip.js",
|
||||
"./**/assets/javascript/core.js",
|
||||
"./**/assets/javascript/editor.js",
|
||||
"./**/assets/javascript/installer.js",
|
||||
"./**/assets/javascript/plupload.js",
|
||||
"./**/styles/prosilver/template/ajax.js",
|
||||
"./**/styles/prosilver/template/forum_fn.js",
|
||||
"./**/phpbb/**/*.js",
|
||||
"./**/tests/**/*.js"
|
||||
],
|
||||
"rules": {
|
||||
"quote-props": [
|
||||
"quotes": [
|
||||
"error",
|
||||
"single"
|
||||
],
|
||||
"comma-dangle": [
|
||||
"error",
|
||||
"always-multiline"
|
||||
],
|
||||
"max-params": [
|
||||
"error",
|
||||
6
|
||||
],
|
||||
"block-spacing": "error",
|
||||
"array-bracket-spacing": [
|
||||
"error",
|
||||
"always"
|
||||
]
|
||||
],
|
||||
"object-curly-spacing": [
|
||||
"error",
|
||||
"always"
|
||||
],
|
||||
"multiline-comment-style": "off",
|
||||
"computed-property-spacing": "off",
|
||||
"space-in-parens": "off",
|
||||
"capitalized-comments": "off",
|
||||
"no-lonely-if": "off"
|
||||
},
|
||||
"env": {
|
||||
"es6": true,
|
||||
"browser": true,
|
||||
"node": true,
|
||||
"jquery": true
|
||||
}
|
||||
"env": [
|
||||
"es6",
|
||||
"browser",
|
||||
"node",
|
||||
"jquery"
|
||||
]
|
||||
},
|
||||
"browserslist": [
|
||||
"> 1%",
|
||||
"not ie 11",
|
||||
"not samsung 10.1",
|
||||
"not and_uc 12.12",
|
||||
"not op_mini all",
|
||||
"edge >= 18",
|
||||
"ff >= 72",
|
||||
"chrome >= 79",
|
||||
"safari >= 13",
|
||||
"ios >= 12.4"
|
||||
],
|
||||
"scripts": {
|
||||
"test": "echo \"Error: no test specified\" && exit 1"
|
||||
},
|
||||
@ -27,10 +75,6 @@
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/phpbb/phpbb.git"
|
||||
},
|
||||
"browserslist": [
|
||||
"> 1%",
|
||||
"last 2 versions"
|
||||
],
|
||||
"keywords": [
|
||||
"phpBB",
|
||||
"phpbb",
|
||||
@ -46,20 +90,20 @@
|
||||
},
|
||||
"homepage": "https://www.phpbb.com",
|
||||
"devDependencies": {
|
||||
"cssnano": "^4.1.10",
|
||||
"del": "^5.1.0",
|
||||
"gulp": "^4.0.2",
|
||||
"gulp-autoprefixer": "^7.0.1",
|
||||
"gulp-postcss": "^8.0.0",
|
||||
"gulp-rename": "^1.4.0",
|
||||
"gulp-sass": "^4.0.2",
|
||||
"gulp-sourcemaps": "^2.6.5",
|
||||
"postcss-import": "^12.0.1",
|
||||
"postcss-pxtorem": "^4.0.1",
|
||||
"postcss-sorting": "^5.0.1",
|
||||
"stylelint": "^11.1.1",
|
||||
"stylelint-order": "^3.1.1",
|
||||
"xo": "^0.25.4"
|
||||
"cssnano": "4.1.10",
|
||||
"del": "5.1.0",
|
||||
"gulp": "4.0.2",
|
||||
"gulp-autoprefixer": "7.0.1",
|
||||
"gulp-postcss": "8.0.0",
|
||||
"gulp-rename": "2.0.0",
|
||||
"gulp-sass": "4.0.2",
|
||||
"gulp-sourcemaps": "2.6.5",
|
||||
"postcss-import": "12.0.1",
|
||||
"postcss-pxtorem": "5.1.1",
|
||||
"postcss-sorting": "5.0.1",
|
||||
"stylelint": "13.2.1",
|
||||
"stylelint-order": "4.0.0",
|
||||
"xo": "0.28.0"
|
||||
},
|
||||
"dependencies": {}
|
||||
}
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
/* global phpbb */
|
||||
|
||||
/**
|
||||
* phpBB3 ACP functions
|
||||
*/
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
/* global phpbb */
|
||||
|
||||
/**
|
||||
* Hide and show all checkboxes
|
||||
* status = true (show boxes), false (hide boxes)
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
(function($) { // Avoid conflicts with other libraries
|
||||
/* global phpbb */
|
||||
|
||||
"use strict";
|
||||
(function ($) { // Avoid conflicts with other libraries
|
||||
'use strict';
|
||||
|
||||
$('#tz_date').change(function() {
|
||||
phpbb.timezoneSwitchDate(false);
|
||||
});
|
||||
|
||||
$(document).ready(
|
||||
phpbb.timezoneEnableDateSelection
|
||||
);
|
||||
$('#tz_date').change(() => {
|
||||
phpbb.timezoneSwitchDate(false);
|
||||
});
|
||||
|
||||
$(document).ready(
|
||||
phpbb.timezoneEnableDateSelection,
|
||||
);
|
||||
})(jQuery); // Avoid conflicts with other libraries
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
/* global phpbb */
|
||||
|
||||
/*
|
||||
javascript for Bubble Tooltips by Alessandro Fulciniti
|
||||
- http://pro.html.it - http://web-graphics.com
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
/* global phpbb */
|
||||
|
||||
/**
|
||||
* bbCode control by subBlue design [ www.subBlue.com ]
|
||||
* Includes unixsafe colour palette selector by SHS`
|
||||
|
||||
@ -1,20 +1,18 @@
|
||||
/* global phpbb */
|
||||
|
||||
(function($) { // Avoid conflicts with other libraries
|
||||
(function ($) { // Avoid conflicts with other libraries
|
||||
'use strict';
|
||||
|
||||
'use strict';
|
||||
$('#tz_date').change(() => {
|
||||
phpbb.timezoneSwitchDate(false);
|
||||
});
|
||||
|
||||
$('#tz_date').change(function() {
|
||||
phpbb.timezoneSwitchDate(false);
|
||||
});
|
||||
|
||||
$('#tz_select_date_suggest').click(function(){
|
||||
phpbb.timezonePreselectSelect(true);
|
||||
});
|
||||
|
||||
$(function () {
|
||||
phpbb.timezoneEnableDateSelection();
|
||||
phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('timezone-preselect') === 'true');
|
||||
});
|
||||
$('#tz_select_date_suggest').click(() => {
|
||||
phpbb.timezonePreselectSelect(true);
|
||||
});
|
||||
|
||||
$(() => {
|
||||
phpbb.timezoneEnableDateSelection();
|
||||
phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('timezone-preselect') === 'true');
|
||||
});
|
||||
})(jQuery); // Avoid conflicts with other libraries
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user