makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 12:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5922 from hanakin/ticket/16414

Browse source 
[ticket/16414] update pkg.json & gulpjs deps
This commit is contained in:
Marc Alexander 2020-04-14 13:04:15 +02:00 • committed by GitHub
commit 3e46d3aa1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 3599 additions and 2856 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
gulpfile.js
View file

@ -3,67 +3,62 @@
const del = require('del'); const del = require('del');
const gulp = require('gulp'); const gulp = require('gulp');
const autoprefixer = require('gulp-autoprefixer'); const autoprefixer = require('gulp-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');
const cssnano = require('cssnano'); const cssnano = require('cssnano');
const postcss = require('gulp-postcss'); const postcss = require('gulp-postcss');
const sorting = require('postcss-sorting'); const sorting = require('postcss-sorting');
const atimport = require('postcss-import'); const atimport = require('postcss-import');
const torem = require('postcss-pxtorem'); // const torem = require('postcss-pxtorem');
const sortOrder = require('./.postcss-sorting.json'); const sortOrder = require('./.postcss-sorting.json');
const pkg = require('./package.json'); // const pkg = require('./package.json');
// Config // Config
const build = { const build = {
css: './phpBB/styles/prosilver/theme/', css: './phpBB/styles/prosilver/theme/',
}; };
const AUTOPREFIXER_BROWSERS = [
'> 1%',
'last 2 versions'
];
gulp.task('css', () => { gulp.task('css', () => {
const css = gulp const css = gulp
.src(build.css + '*.css') .src(build.css + '*.css')
.pipe(autoprefixer(AUTOPREFIXER_BROWSERS)) .pipe(autoprefixer())
.pipe( .pipe(
postcss([ postcss([
sorting(sortOrder) sorting(sortOrder),
]) ]),
) )
.pipe(gulp.dest(build.css)); .pipe(gulp.dest(build.css));
return css; return css;
}); });
gulp.task('clean', () => { gulp.task('clean', () => {
del(['dist']); del([ 'dist' ]);
}); });
gulp.task('minify', () => { gulp.task('minify', () => {
const css = gulp const css = gulp
.src(build.css + '/bidi.css') .src(build.css + '/bidi.css')
.pipe(sourcemaps.init()) .pipe(sourcemaps.init())
.pipe( .pipe(
postcss([ postcss([
atimport(), atimport(),
cssnano() cssnano(),
]) ]),
) )
.pipe(rename({ .pipe(rename({
suffix: '.min', suffix: '.min',
extname: '.css' extname: '.css',
})) }))
.pipe(sourcemaps.write('./')) .pipe(sourcemaps.write('./'))
.pipe(gulp.dest(build.css)); .pipe(gulp.dest(build.css));
return css; return css;
}); });
gulp.task('watch', () => { 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
View file

File diff suppressed because it is too large Load diff

98
package.json
View file

@ -1,25 +1,73 @@
{ {
"name": "phpbb", "name": "phpbb",
"version": "3.3.0-dev", "version": "4.0.0-dev",
"description": "phpBB Forum Software application", "description": "phpBB Forum Software application",
"main": " ", "main": " ",
"directories": { "directories": {
"doc": "docs" "doc": "docs"
}, },
"xo": { "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": { "rules": {
"quote-props": [ "quotes": [
"error",
"single"
],
"comma-dangle": [
"error",
"always-multiline"
],
"max-params": [
"error",
6
],
"block-spacing": "error",
"array-bracket-spacing": [
"error", "error",
"always" "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": { "env": [
"es6": true, "es6",
"browser": true, "browser",
"node": true, "node",
"jquery": true "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": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1"
}, },
@ -27,10 +75,6 @@
"type": "git", "type": "git",
"url": "git+https://github.com/phpbb/phpbb.git" "url": "git+https://github.com/phpbb/phpbb.git"
}, },
"browserslist": [
"> 1%",
"last 2 versions"
],
"keywords": [ "keywords": [
"phpBB", "phpBB",
"phpbb", "phpbb",
@ -46,20 +90,20 @@
}, },
"homepage": "https://www.phpbb.com", "homepage": "https://www.phpbb.com",
"devDependencies": { "devDependencies": {
"cssnano": "^4.1.10", "cssnano": "4.1.10",
"del": "^5.1.0", "del": "5.1.0",
"gulp": "^4.0.2", "gulp": "4.0.2",
"gulp-autoprefixer": "^7.0.1", "gulp-autoprefixer": "7.0.1",
"gulp-postcss": "^8.0.0", "gulp-postcss": "8.0.0",
"gulp-rename": "^1.4.0", "gulp-rename": "2.0.0",
"gulp-sass": "^4.0.2", "gulp-sass": "4.0.2",
"gulp-sourcemaps": "^2.6.5", "gulp-sourcemaps": "2.6.5",
"postcss-import": "^12.0.1", "postcss-import": "12.0.1",
"postcss-pxtorem": "^4.0.1", "postcss-pxtorem": "5.1.1",
"postcss-sorting": "^5.0.1", "postcss-sorting": "5.0.1",
"stylelint": "^11.1.1", "stylelint": "13.2.1",
"stylelint-order": "^3.1.1", "stylelint-order": "4.0.0",
"xo": "^0.25.4" "xo": "0.28.0"
}, },
"dependencies": {} "dependencies": {}
} }

2
phpBB/adm/style/admin.js
View file

@ -1,3 +1,5 @@
/* global phpbb */
/** /**
* phpBB3 ACP functions * phpBB3 ACP functions
*/ */

2
phpBB/adm/style/permissions.js
View file

@ -1,3 +1,5 @@
/* global phpbb */
/** /**
* Hide and show all checkboxes * Hide and show all checkboxes
* status = true (show boxes), false (hide boxes) * status = true (show boxes), false (hide boxes)

18
phpBB/adm/style/timezone.js
View file

@ -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() { $('#tz_date').change(() => {
phpbb.timezoneSwitchDate(false); phpbb.timezoneSwitchDate(false);
}); });
$(document).ready(
phpbb.timezoneEnableDateSelection
);
$(document).ready(
phpbb.timezoneEnableDateSelection,
);
})(jQuery); // Avoid conflicts with other libraries })(jQuery); // Avoid conflicts with other libraries

2
phpBB/adm/style/tooltip.js
View file

@ -1,3 +1,5 @@
/* global phpbb */
/* /*
javascript for Bubble Tooltips by Alessandro Fulciniti javascript for Bubble Tooltips by Alessandro Fulciniti
- http://pro.html.it - http://web-graphics.com - http://pro.html.it - http://web-graphics.com

2
phpBB/assets/javascript/editor.js
View file

@ -1,3 +1,5 @@
/* global phpbb */
/** /**
* bbCode control by subBlue design [ www.subBlue.com ] * bbCode control by subBlue design [ www.subBlue.com ]
* Includes unixsafe colour palette selector by SHS` * Includes unixsafe colour palette selector by SHS`

26
phpBB/styles/prosilver/template/timezone.js
View file

@ -1,20 +1,18 @@
/* global phpbb */ /* 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() { $('#tz_select_date_suggest').click(() => {
phpbb.timezoneSwitchDate(false); phpbb.timezonePreselectSelect(true);
}); });
$('#tz_select_date_suggest').click(function(){
phpbb.timezonePreselectSelect(true);
});
$(function () {
phpbb.timezoneEnableDateSelection();
phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('timezone-preselect') === 'true');
});
$(() => {
phpbb.timezoneEnableDateSelection();
phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('timezone-preselect') === 'true');
});
})(jQuery); // Avoid conflicts with other libraries })(jQuery); // Avoid conflicts with other libraries