Add prettier

This commit is contained in:
RainLoop Team 2019-07-04 22:09:27 +03:00
parent 08da3030b0
commit 450528ff00
61 changed files with 516 additions and 1456 deletions

View file

@ -1,9 +1,7 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */
const gulp = require('gulp');
const {config} = require('./config');
const { config } = require('./config');
const assetsCopy = () =>
gulp.src(config.paths.assets.src)
.pipe(gulp.dest(config.paths.static));
const assetsCopy = () => gulp.src(config.paths.assets.src).pipe(gulp.dest(config.paths.static));
exports.assets = gulp.series(assetsCopy);

View file

@ -3,11 +3,9 @@ const gulp = require('gulp');
const rimraf = require('gulp-rimraf');
const fs = require('node-fs');
const {config} = require('./config');
const { config } = require('./config');
exports.del = (dir) =>
gulp.src(dir, {read: false, allowEmpty: true})
.pipe(rimraf());
exports.del = (dir) => gulp.src(dir, { read: false, allowEmpty: true }).pipe(rimraf());
exports.copy = (sFile, sNewFile, done) => {
fs.writeFileSync(sNewFile, fs.readFileSync(sFile));
@ -15,11 +13,11 @@ exports.copy = (sFile, sNewFile, done) => {
};
exports.zip = (srcDir, destDir, fileName) =>
gulp.src(srcDir + '**/*')
gulp
.src(srcDir + '**/*')
.pipe(require('gulp-zip')(fileName))
.pipe(gulp.dest(destDir));
exports.getHead = () => (!config.community ? config.head.rainloop : config.head.agpl);
exports.cleanStatic = () => exports.del(config.paths.static);

View file

@ -1,6 +1,6 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */
const path = require('path');
const {argv} = require('yargs');
const { argv } = require('yargs');
const config = {
head: {
@ -9,7 +9,8 @@ const config = {
},
devVersion: '0.0.0',
releasesPath: 'build/dist/releases',
community: true,
community: !argv.pro,
source: !!argv.source,
watch: false,
watchInterval: 1000,
googleCompile: false,
@ -24,8 +25,6 @@ const config = {
paths: {}
};
config.community = !argv.pro;
config.paths.globjs = 'dev/**/*.js';
config.paths.static = 'rainloop/v/' + config.devVersion + '/static/';
config.paths.staticJS = 'rainloop/v/' + config.devVersion + '/static/js/';
@ -42,10 +41,7 @@ config.paths.less = {
src: 'dev/Styles/@Main.less',
watch: ['dev/Styles/*.less'],
options: {
paths: [
path.join(__dirname, 'dev', 'Styles'),
path.join(__dirname, 'vendors', 'bootstrap', 'less')
]
paths: [path.join(__dirname, 'dev', 'Styles'), path.join(__dirname, 'vendors', 'bootstrap', 'less')]
}
}
};
@ -71,18 +67,13 @@ config.paths.css = {
},
social: {
name: 'social.css',
src: [
'vendors/fontastic/styles.css',
'dev/Styles/_social.css'
]
src: ['vendors/fontastic/styles.css', 'dev/Styles/_social.css']
}
};
config.paths.js = {
moment: {
locales: [
'node_modules/moment/locale/*.js'
]
locales: ['node_modules/moment/locale/*.js']
},
libs: {
name: 'libs.js',

View file

@ -1,35 +1,37 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */
const gulp = require('gulp');
const
concat = require('gulp-concat-util'),
rename = require('gulp-rename'),
replace = require('gulp-replace'),
plumber = require('gulp-plumber'),
gulpif = require('gulp-if'),
eol = require('gulp-eol'),
livereload = require('gulp-livereload'),
filter = require('gulp-filter'),
expect = require('gulp-expect-file');
const concat = require('gulp-concat-util');
const rename = require('gulp-rename');
const replace = require('gulp-replace');
const plumber = require('gulp-plumber');
const gulpif = require('gulp-if');
const eol = require('gulp-eol');
const livereload = require('gulp-livereload');
const filter = require('gulp-filter');
const expect = require('gulp-expect-file');
const {config} = require('./config');
const {del} = require('./common');
const { config } = require('./config');
const { del } = require('./common');
const cssClean = () => del(config.paths.staticCSS + '/*.css');
const cssMainBuild = () => {
const autoprefixer = require('gulp-autoprefixer'),
less = require('gulp-less'),
lessFilter = filter('**/*.less', {restore: true}),
lessFilter = filter('**/*.less', { restore: true }),
src = config.paths.css.main.src.concat([config.paths.less.main.src]);
return gulp.src(src)
.pipe(expect.real({errorOnFailure: true}, src))
return gulp
.src(src)
.pipe(expect.real({ errorOnFailure: true }, src))
.pipe(lessFilter)
.pipe(gulpif(config.watch, plumber()))
.pipe(less({
'paths': config.paths.less.main.options.paths
}))
.pipe(
less({
'paths': config.paths.less.main.options.paths
})
)
.pipe(lessFilter.restore)
.pipe(concat(config.paths.css.main.name))
.pipe(autoprefixer())
@ -42,8 +44,9 @@ const cssMainBuild = () => {
const cssSocialBuild = () => {
const autoprefixer = require('gulp-autoprefixer'),
src = config.paths.css.social.src;
return gulp.src(src)
.pipe(expect.real({errorOnFailure: true}, src))
return gulp
.src(src)
.pipe(expect.real({ errorOnFailure: true }, src))
.pipe(concat(config.paths.css.social.name))
.pipe(autoprefixer())
.pipe(replace(/\.\.\/(img|images|fonts|svg)\//g, '$1/'))
@ -53,18 +56,20 @@ const cssSocialBuild = () => {
const cssMainMin = () => {
const cleanCss = require('gulp-clean-css');
return gulp.src(config.paths.staticCSS + config.paths.css.main.name)
return gulp
.src(config.paths.staticCSS + config.paths.css.main.name)
.pipe(cleanCss())
.pipe(rename({suffix: '.min'}))
.pipe(rename({ suffix: '.min' }))
.pipe(eol('\n', true))
.pipe(gulp.dest(config.paths.staticCSS));
};
const cssSocialMin = () => {
const cleanCss = require('gulp-clean-css');
return gulp.src(config.paths.staticCSS + config.paths.css.social.name)
return gulp
.src(config.paths.staticCSS + config.paths.css.social.name)
.pipe(cleanCss())
.pipe(rename({suffix: '.min'}))
.pipe(rename({ suffix: '.min' }))
.pipe(eol('\n', true))
.pipe(gulp.dest(config.paths.staticCSS));
};

View file

@ -1,8 +1,7 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */
const gulp = require('gulp');
const
concat = require('gulp-concat-util'),
const concat = require('gulp-concat-util'),
header = require('gulp-header'),
rename = require('gulp-rename'),
replace = require('gulp-replace'),
@ -14,64 +13,79 @@ const
cache = require('gulp-cached'),
expect = require('gulp-expect-file'),
size = require('gulp-size'),
sourcemaps = require('gulp-sourcemaps'),
gutil = require('gulp-util');
const {config} = require('./config');
const {del, getHead} = require('./common');
const { config } = require('./config');
const { del, getHead } = require('./common');
const {webpack} = require('./webpack');
const { webpack } = require('./webpack');
const jsClean = () => del(config.paths.staticJS + '/**/*.js');
const jsClean = () => del(config.paths.staticJS + '/**/*.{js,map}');
// libs
const jsLibs = () => {
const src = config.paths.js.libs.src;
return gulp.src(src)
.pipe(expect.real({errorOnFailure: true}, src))
.pipe(concat(config.paths.js.libs.name, {separator: '\n\n'}))
return gulp
.src(src)
.pipe(expect.real({ errorOnFailure: true }, src))
.pipe(concat(config.paths.js.libs.name, { separator: '\n\n' }))
.pipe(eol('\n', true))
.pipe(replace(/sourceMappingURL=[a-z0-9\.\-_]{1,20}\.map/ig, ''))
.pipe(replace(/sourceMappingURL=[a-z0-9.\-_]{1,20}\.map/gi, ''))
.pipe(gulp.dest(config.paths.staticJS));
};
// app
const jsApp = () =>
gulp.src(config.paths.staticJS + config.paths.js.app.name)
gulp
.src(config.paths.staticJS + config.paths.js.app.name)
.pipe(header(getHead() + '\n'))
.pipe(eol('\n', true))
.pipe(gulp.dest(config.paths.staticJS))
.on('error', gutil.log);
const jsAdmin = () =>
gulp.src(config.paths.staticJS + config.paths.js.admin.name)
gulp
.src(config.paths.staticJS + config.paths.js.admin.name)
.pipe(header(getHead() + '\n'))
.pipe(eol('\n', true))
.pipe(gulp.dest(config.paths.staticJS))
.on('error', gutil.log);
const jsMin = () =>
gulp.src(config.paths.staticJS + '*.js')
.pipe(replace(/"rainloop\/v\/([^\/]+)\/static\/js\/"/g, '"rainloop/v/$1/static/js/min/"'))
.pipe(size({
showFiles: true,
showTotal: false
}))
.pipe(rename({suffix: '.min'}))
.pipe(uglify({
mangle: true,
compress: true,
ie8: false
}))
gulp
.src(config.paths.staticJS + '*.js')
.pipe(
size({
showFiles: true,
showTotal: false
})
)
.pipe(gulpif(config.source, sourcemaps.init({ loadMaps: true })))
.pipe(replace(/"rainloop\/v\/([^/]+)\/static\/js\/"/g, '"rainloop/v/$1/static/js/min/"'))
.pipe(rename({ suffix: '.min' }))
.pipe(
uglify({
mangle: true,
compress: true,
ie8: false
})
)
.pipe(eol('\n', true))
.pipe(size({
showFiles: true,
showTotal: false
}))
.pipe(gulpif(config.source, sourcemaps.write('./')))
.pipe(
size({
showFiles: true,
showTotal: false
})
)
.pipe(gulp.dest(config.paths.staticMinJS))
.on('error', gutil.log);
const jsLint = () =>
gulp.src(config.paths.globjs)
const jsLint = (cb) => cb();
const jsLint1 = () =>
gulp
.src(config.paths.globjs)
.pipe(cache('eslint'))
.pipe(eslint())
.pipe(gulpif(config.watch, plumber()))

View file

@ -5,33 +5,27 @@ const gulp = require('gulp');
const fs = require('node-fs');
const pkg = require('../package.json');
const {config} = require('./config');
const {copy, zip, del} = require('./common');
const {rainloopBuild} = require('./rainloop');
const { config } = require('./config');
const { copy, zip, del } = require('./common');
const { rainloopBuild } = require('./rainloop');
const owncloudCopy = () => {
const
versionFull = pkg.ownCloudVersion,
dist = config.releasesPath + '/owncloud/' + versionFull + '/src/'
;
const versionFull = pkg.ownCloudVersion,
dist = config.releasesPath + '/owncloud/' + versionFull + '/src/';
fs.mkdirSync(dist, '0777', true);
fs.mkdirSync(dist + 'rainloop', '0777', true);
return gulp.src('build/owncloud/rainloop-app/**/*', {base: 'build/owncloud/rainloop-app/'})
return gulp
.src('build/owncloud/rainloop-app/**/*', { base: 'build/owncloud/rainloop-app/' })
.pipe(gulp.dest(dist + 'rainloop'));
};
const owncloudCopyRainLoop = () => {
const
versionFull = pkg.ownCloudVersion,
dist = config.releasesPath + '/owncloud/' + versionFull + '/src/rainloop/'
;
if (config.rainloopBuilded && config.destPath)
{
return gulp.src(config.destPath + '/src/**/*', {base: config.destPath + '/src/'})
.pipe(gulp.dest(dist + 'app/'));
const versionFull = pkg.ownCloudVersion,
dist = config.releasesPath + '/owncloud/' + versionFull + '/src/rainloop/';
if (config.rainloopBuilded && config.destPath) {
return gulp.src(config.destPath + '/src/**/*', { base: config.destPath + '/src/' }).pipe(gulp.dest(dist + 'app/'));
}
return true;
@ -45,15 +39,17 @@ const owncloudCopyRainLoopClean = (done) => {
};
const owncloudSetup = (done) => {
const
versionFull = pkg.ownCloudVersion,
dist = config.releasesPath + '/owncloud/' + versionFull + '/src/'
;
fs.writeFileSync(dist + 'rainloop/appinfo/info.xml',
fs.readFileSync(dist + 'rainloop/appinfo/info.xml', 'utf8')
const versionFull = pkg.ownCloudVersion,
dist = config.releasesPath + '/owncloud/' + versionFull + '/src/';
fs.writeFileSync(
dist + 'rainloop/appinfo/info.xml',
fs
.readFileSync(dist + 'rainloop/appinfo/info.xml', 'utf8')
.replace('<version>0.0</version>', '<version>' + versionFull + '</version>')
.replace('<licence></licence>', '<licence>' + (config.community ? 'AGPLv3' : 'RainLoop Software License') + '</licence>')
.replace(
'<licence></licence>',
'<licence>' + (config.community ? 'AGPLv3' : 'RainLoop Software License') + '</licence>'
)
);
fs.writeFileSync(dist + 'rainloop/appinfo/version', versionFull);

View file

@ -1,47 +1,46 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */
/* eslint-disable consistent-return */
const gulp = require('gulp');
const fs = require('node-fs');
const chmod = require('gulp-chmod');
const pkg = require('../package.json');
const {config} = require('./config');
const {copy, zip, del} = require('./common');
const { config } = require('./config');
const { copy, zip, del } = require('./common');
const rainloopCopy = () => {
const
versionFull = pkg.version,
dist = config.releasesPath + '/webmail/' + versionFull + '/src/'
;
const versionFull = pkg.version,
dist = config.releasesPath + '/webmail/' + versionFull + '/src/';
fs.mkdirSync(dist, '0777', true);
fs.mkdirSync(dist + 'data');
fs.mkdirSync(dist + 'rainloop/v/' + versionFull, '0777', true);
return gulp.src('rainloop/v/' + config.devVersion + '/**/*', {base: 'rainloop/v/' + config.devVersion})
return gulp
.src('rainloop/v/' + config.devVersion + '/**/*', { base: 'rainloop/v/' + config.devVersion })
.pipe(chmod(0o644, 0o755))
.pipe(gulp.dest(dist + 'rainloop/v/' + versionFull));
};
const rainloopSetup = (done) => {
const
versionFull = pkg.version,
dist = config.releasesPath + '/webmail/' + versionFull + '/src/'
;
const versionFull = pkg.version,
dist = config.releasesPath + '/webmail/' + versionFull + '/src/';
fs.writeFileSync(dist + 'data/VERSION', versionFull);
fs.writeFileSync(dist + 'data/EMPTY', versionFull);
fs.writeFileSync(dist + 'index.php', fs.readFileSync('index.php', 'utf8')
.replace('\'APP_VERSION\', \'0.0.0\'', '\'APP_VERSION\', \'' + versionFull + '\'')
.replace('\'APP_VERSION_TYPE\', \'source\'', '\'APP_VERSION_TYPE\', \'' + (config.community ? 'community' : 'standard') + '\'')
fs.writeFileSync(
dist + 'index.php',
fs
.readFileSync('index.php', 'utf8')
.replace("'APP_VERSION', '0.0.0'", "'APP_VERSION', '" + versionFull + "'")
.replace(
"'APP_VERSION_TYPE', 'source'",
"'APP_VERSION_TYPE', '" + (config.community ? 'community' : 'standard') + "'"
)
);
fs.writeFileSync(dist + 'rainloop/v/' + versionFull + '/index.php.root', fs.readFileSync(dist + 'index.php'));
if (config.community)
{
if (config.community) {
require('rimraf').sync(dist + 'rainloop/v/' + versionFull + '/app/libraries/RainLoop/Providers/Prem.php');
}
@ -74,14 +73,6 @@ const rainloopClean = (done) => {
const rainloopShortName = (done) => copy(config.destPath + config.zipFile, config.destPath + config.zipFileShort, done);
exports.rainloopBuild = gulp.series(
rainloopCopy,
rainloopSetup,
);
exports.rainloopBuild = gulp.series(rainloopCopy, rainloopSetup);
exports.rainloop = gulp.series(
exports.rainloopBuild,
rainloopZip,
rainloopClean,
rainloopShortName
);
exports.rainloop = gulp.series(exports.rainloopBuild, rainloopZip, rainloopClean, rainloopShortName);

View file

@ -1,17 +1,15 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */
const gulp = require('gulp'),
header = require('gulp-header'),
stripbom = require('gulp-stripbom');
const gulp = require('gulp');
const header = require('gulp-header');
const stripbom = require('gulp-stripbom');
const {config} = require('./config');
const {del} = require('./common');
const { config } = require('./config');
const { del } = require('./common');
// moment
const momentLocalesClear = () => del('rainloop/v/' + config.devVersion + '/app/localization/moment/*.js');
const momentLocales = () =>
gulp.src(config.paths.js.moment.locales)
.pipe(gulp.dest(config.paths.momentLocales));
const momentLocales = () => gulp.src(config.paths.js.moment.locales).pipe(gulp.dest(config.paths.momentLocales));
const moment = gulp.series(momentLocalesClear, momentLocales);
@ -19,7 +17,8 @@ const moment = gulp.series(momentLocalesClear, momentLocales);
const lightgalleryFontsClear = () => del('rainloop/v/' + config.devVersion + '/static/css/fonts/lg.*');
const lightgalleryFontsCopy = () =>
gulp.src('vendors/lightgallery/dist/fonts/lg.*')
gulp
.src('vendors/lightgallery/dist/fonts/lg.*')
.pipe(gulp.dest('rainloop/v/' + config.devVersion + '/static/css/fonts'));
const lightgallery = gulp.series(lightgalleryFontsClear, lightgalleryFontsCopy);
@ -28,7 +27,8 @@ const lightgallery = gulp.series(lightgalleryFontsClear, lightgalleryFontsCopy);
const fontasticFontsClear = () => del('rainloop/v/' + config.devVersion + '/static/css/fonts/rainloop.*');
const fontasticFontsCopy = () =>
gulp.src('vendors/fontastic/fonts/rainloop.*')
gulp
.src('vendors/fontastic/fonts/rainloop.*')
.pipe(gulp.dest('rainloop/v/' + config.devVersion + '/static/css/fonts'));
const fontastic = gulp.series(fontasticFontsClear, fontasticFontsCopy);
@ -37,18 +37,26 @@ const fontastic = gulp.series(fontasticFontsClear, fontasticFontsCopy);
const ckeditorClear = () => del('rainloop/v/' + config.devVersion + '/static/ckeditor');
const ckeditorCopy = () =>
gulp.src(['vendors/ckeditor/**/*', '!vendors/ckeditor/samples{,/**}', '!vendors/ckeditor/adapters{,/**}', '!vendors/ckeditor/*.md'])
gulp
.src([
'vendors/ckeditor/**/*',
'!vendors/ckeditor/samples{,/**}',
'!vendors/ckeditor/adapters{,/**}',
'!vendors/ckeditor/*.md'
])
.pipe(gulp.dest('rainloop/v/' + config.devVersion + '/static/ckeditor'));
const ckeditorCopyPlugins = () =>
gulp.src('vendors/ckeditor-plugins/**/*')
gulp
.src('vendors/ckeditor-plugins/**/*')
.pipe(gulp.dest('rainloop/v/' + config.devVersion + '/static/ckeditor/plugins'));
const ckeditorSetup = () =>
gulp.src('rainloop/v/' + config.devVersion + '/static/ckeditor/*.js')
gulp
.src('rainloop/v/' + config.devVersion + '/static/ckeditor/*.js')
.pipe(stripbom())
// eslint-disable-next-line quotes
.pipe(header("\uFEFF")) // BOM
.pipe(header('\uFEFF')) // BOM
.pipe(gulp.dest('rainloop/v/' + config.devVersion + '/static/ckeditor'));
const ckeditor = gulp.series(ckeditorClear, ckeditorCopy, ckeditorCopyPlugins, ckeditorSetup);

View file

@ -2,7 +2,7 @@
const webpack = require('webpack');
const gutil = require('gulp-util');
const {config} = require('./config');
const { config } = require('./config');
const webpackCfgBuilder = require('../webpack.config.builder.js');
@ -34,8 +34,5 @@ const webpackCallback = (done) => (err, stats) => {
};
exports.webpack = (done) => {
webpack(
webpackCfgBuilder(config.paths.staticJS, !config.community, 'production'),
webpackCallback(done)
);
webpack(webpackCfgBuilder(config.paths.staticJS, !config.community, 'production'), webpackCallback(done));
};