update gulp and gulpfile

tasks/assets.js

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

tasks/common.js

@@ -0,0 +1,25 @@
+/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */
+const gulp = require('gulp');
+const rimraf = require('gulp-rimraf');
+const fs = require('node-fs');
+
+const {config} = require('./config');
+
+exports.del = (dir) =>
+	gulp.src(dir, {read: false, allowEmpty: true})
+		.pipe(rimraf());
+
+exports.copy = (sFile, sNewFile, done) => {
+	fs.writeFileSync(sNewFile, fs.readFileSync(sFile));
+	done();
+};
+
+exports.zip = (srcDir, destDir, fileName) =>
+	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);
+

tasks/config.js

@@ -0,0 +1,134 @@
+/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */
+const path = require('path');
+const {argv} = require('yargs');
+
+const config = {
+	head: {
+		rainloop: '/* RainLoop Webmail (c) RainLoop Team | Licensed under RainLoop Software License */',
+		agpl: '/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL v3 */'
+	},
+	devVersion: '0.0.0',
+	releasesPath: 'build/dist/releases',
+	community: true,
+	watch: false,
+	watchInterval: 1000,
+	googleCompile: false,
+
+	rainloopBuilded: false,
+	destPath: '',
+	cleanPath: '',
+	zipSrcPath: '',
+	zipFile: '',
+	zipFileShort: '',
+
+	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/';
+config.paths.staticMinJS = 'rainloop/v/' + config.devVersion + '/static/js/min/';
+config.paths.staticCSS = 'rainloop/v/' + config.devVersion + '/static/css/';
+config.paths.momentLocales = 'rainloop/v/' + config.devVersion + '/app/localization/moment/';
+
+config.paths.assets = {
+	src: 'assets/**/*.*'
+};
+
+config.paths.less = {
+	main: {
+		src: 'dev/Styles/@Main.less',
+		watch: ['dev/Styles/*.less'],
+		options: {
+			paths: [
+				path.join(__dirname, 'dev', 'Styles'),
+				path.join(__dirname, 'vendors', 'bootstrap', 'less')
+			]
+		}
+	}
+};
+
+config.paths.css = {
+	main: {
+		name: 'app.css',
+		src: [
+			'node_modules/normalize.css/normalize.css',
+			'vendors/jquery-ui/css/smoothness/jquery-ui-1.10.3.custom.css',
+			'vendors/fontastic/styles.css',
+			'vendors/jquery-nanoscroller/nanoscroller.css',
+			'vendors/jquery-letterfx/jquery-letterfx.min.css',
+			'vendors/inputosaurus/inputosaurus.css',
+			'vendors/flags/flags-fixed.css',
+			'node_modules/opentip/css/opentip.css',
+			'node_modules/pikaday/css/pikaday.css',
+			'vendors/lightgallery/dist/css/lightgallery.min.css',
+			'vendors/lightgallery/dist/css/lg-transitions.min.css',
+			'vendors/Progress.js/minified/progressjs.min.css',
+			'dev/Styles/_progressjs.css'
+		]
+	},
+	social: {
+		name: 'social.css',
+		src: [
+			'vendors/fontastic/styles.css',
+			'dev/Styles/_social.css'
+		]
+	}
+};
+
+config.paths.js = {
+	moment: {
+		locales: [
+			'node_modules/moment/locale/*.js'
+		]
+	},
+	libs: {
+		name: 'libs.js',
+		src: [
+			'node_modules/jquery/dist/jquery.min.js',
+			'node_modules/jquery-migrate/dist/jquery-migrate.min.js',
+			'node_modules/jquery-mousewheel/jquery.mousewheel.js',
+			'node_modules/jquery-scrollstop/jquery.scrollstop.js',
+			'node_modules/jquery-backstretch/jquery.backstretch.min.js',
+			'vendors/jquery-ui/js/jquery-ui-1.10.3.custom.min.js', // custom
+			'vendors/jquery-nanoscroller/jquery.nanoscroller.js', // custom (modified)
+			'vendors/jquery-wakeup/jquery.wakeup.js', // no-npm
+			'vendors/jquery-letterfx/jquery-letterfx.min.js', // no-npm
+			'vendors/inputosaurus/inputosaurus.js', // custom (modified)
+			'vendors/routes/signals.min.js', // fixed
+			'vendors/routes/hasher.min.js', // fixed
+			'vendors/routes/crossroads.min.js', // fixed
+			'vendors/jua/jua.min.js', // custom
+			'vendors/keymaster/keymaster.js', // custom (modified)
+			'vendors/qr.js/qr.min.js', // fixed (license)
+			'vendors/bootstrap/js/bootstrap.min.js', // fixed
+			'node_modules/underscore/underscore-min.js',
+			'node_modules/moment/min/moment.min.js',
+			'node_modules/knockout/build/output/knockout-latest.js',
+			'node_modules/knockout-transformations/dist/knockout-transformations.min.js',
+			'node_modules/knockout-sortable/build/knockout-sortable.min.js ',
+			'node_modules/matchmedia-polyfill/matchMedia.js',
+			'node_modules/matchmedia-polyfill/matchMedia.addListener.js',
+			'node_modules/simplestatemanager/dist/ssm.min.js',
+			'node_modules/autolinker/dist/Autolinker.min.js',
+			'node_modules/opentip/lib/opentip.js',
+			'node_modules/opentip/lib/adapter-jquery.js',
+			'vendors/lightgallery/dist/js/lightgallery.min.js', // license
+			'vendors/lightgallery/dist/js/lg-fullscreen.min.js',
+			'vendors/lightgallery/dist/js/lg-thumbnail.min.js',
+			'vendors/lightgallery/dist/js/lg-zoom.min.js',
+			'vendors/lightgallery/dist/js/lg-autoplay.min.js',
+			'node_modules/ifvisible.js/src/ifvisible.min.js'
+		]
+	},
+	app: {
+		name: 'app.js'
+	},
+	admin: {
+		name: 'admin.js'
+	}
+};
+
+exports.config = config;

tasks/css.js

@@ -0,0 +1,83 @@
+/* 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 {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}),
+		src = config.paths.css.main.src.concat([config.paths.less.main.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(lessFilter.restore)
+		.pipe(concat(config.paths.css.main.name))
+		.pipe(autoprefixer())
+		.pipe(replace(/\.\.\/(img|images|fonts|svg)\//g, '$1/'))
+		.pipe(eol('\n', true))
+		.pipe(gulp.dest(config.paths.staticCSS))
+		.pipe(livereload());
+};
+
+const cssSocialBuild = () => {
+	const autoprefixer = require('gulp-autoprefixer'),
+		src = config.paths.css.social.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/'))
+		.pipe(eol('\n', true))
+		.pipe(gulp.dest(config.paths.staticCSS));
+};
+
+const cssMainMin = () => {
+	const cleanCss = require('gulp-clean-css');
+	return gulp.src(config.paths.staticCSS + config.paths.css.main.name)
+		.pipe(cleanCss())
+		.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)
+		.pipe(cleanCss())
+		.pipe(rename({suffix: '.min'}))
+		.pipe(eol('\n', true))
+		.pipe(gulp.dest(config.paths.staticCSS));
+};
+
+const cssBuild = gulp.parallel(cssMainBuild, cssSocialBuild);
+const cssMin = gulp.parallel(cssMainMin, cssSocialMin);
+
+const cssLint = (done) => done();
+
+const cssState1 = gulp.series(cssLint);
+const cssState2 = gulp.series(cssClean, cssBuild, cssMin);
+
+exports.cssLint = cssLint;
+exports.cssBuild = cssBuild;
+
+exports.css = gulp.parallel(cssState1, cssState2);

tasks/js.js

@@ -0,0 +1,86 @@
+/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */
+const gulp = require('gulp');
+
+const
+	concat = require('gulp-concat-util'),
+	header = require('gulp-header'),
+	rename = require('gulp-rename'),
+	replace = require('gulp-replace'),
+	uglify = require('gulp-uglify'),
+	plumber = require('gulp-plumber'),
+	gulpif = require('gulp-if'),
+	eol = require('gulp-eol'),
+	eslint = require('gulp-eslint'),
+	cache = require('gulp-cached'),
+	expect = require('gulp-expect-file'),
+	size = require('gulp-size'),
+	gutil = require('gulp-util');
+
+const {config} = require('./config');
+const {del, getHead} = require('./common');
+
+const {webpack} = require('./webpack');
+
+const jsClean = () => del(config.paths.staticJS + '/**/*.js');
+
+// 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'}))
+		.pipe(eol('\n', true))
+		.pipe(replace(/sourceMappingURL=[a-z0-9\.\-_]{1,20}\.map/ig, ''))
+		.pipe(gulp.dest(config.paths.staticJS));
+};
+
+// app
+const jsApp = () =>
+	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)
+		.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
+		}))
+		.pipe(eol('\n', true))
+		.pipe(size({
+			showFiles: true,
+			showTotal: false
+		}))
+		.pipe(gulp.dest(config.paths.staticMinJS))
+		.on('error', gutil.log);
+
+const jsLint = () =>
+	gulp.src(config.paths.globjs)
+		.pipe(cache('eslint'))
+		.pipe(eslint())
+		.pipe(gulpif(config.watch, plumber()))
+		.pipe(eslint.format())
+		.pipe(eslint.failAfterError());
+
+const jsState1 = gulp.series(jsLint);
+const jsState3 = gulp.parallel(jsLibs, jsApp, jsAdmin);
+const jsState2 = gulp.series(jsClean, webpack, jsState3, jsMin);
+
+exports.jsLint = jsLint;
+exports.js = gulp.parallel(jsState1, jsState2);

tasks/owncloud.js

@@ -0,0 +1,100 @@
+/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */
+/* eslint-disable consistent-return */
+
+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 owncloudCopy = () => {
+	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/'})
+		.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/'));
+	}
+
+	return true;
+};
+
+const owncloudCopyRainLoopClean = (done) => {
+	if (config.cleanPath) {
+		return del(config.cleanPath);
+	}
+	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')
+			.replace('<version>0.0</version>', '<version>' + versionFull + '</version>')
+			.replace('<licence></licence>', '<licence>' + (config.community ? 'AGPLv3' : 'RainLoop Software License') + '</licence>')
+	);
+
+	fs.writeFileSync(dist + 'rainloop/appinfo/version', versionFull);
+	fs.writeFileSync(dist + 'rainloop/VERSION', versionFull);
+
+	config.destPath = config.releasesPath + '/owncloud/' + versionFull + '/';
+	config.cleanPath = dist;
+	config.zipSrcPath = dist;
+	config.zipFile = 'rainloop-owncloud-app-' + (config.community ? '' : 'standard-') + versionFull + '.zip';
+	config.zipFileShort = 'rainloop' + (config.community ? '' : '-standard') + '.zip';
+
+	done();
+};
+
+const owncloudZip = (done) => {
+	if (config.destPath && config.zipSrcPath && config.zipFile) {
+		return zip(config.zipSrcPath, config.destPath, config.zipFile);
+	}
+
+	done();
+};
+
+const owncloudClean = (done) => {
+	if (config.cleanPath) {
+		return del(config.cleanPath);
+	}
+
+	done();
+};
+
+const owncloudShortname = (done) => {
+	copy(config.destPath + config.zipFile, config.destPath + config.zipFileShort, done);
+};
+
+exports.owncloud = gulp.series(
+	owncloudCopy,
+	rainloopBuild,
+	owncloudCopyRainLoop,
+	owncloudCopyRainLoopClean,
+	owncloudSetup,
+	owncloudZip,
+	owncloudClean,
+	owncloudShortname
+);

tasks/rainloop.js

@@ -0,0 +1,87 @@
+/* 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 rainloopCopy = () => {
+	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})
+		.pipe(chmod(0o644, 0o755))
+		.pipe(gulp.dest(dist + 'rainloop/v/' + versionFull));
+};
+
+const rainloopSetup = (done) => {
+	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 + 'rainloop/v/' + versionFull + '/index.php.root', fs.readFileSync(dist + 'index.php'));
+
+	if (config.community)
+	{
+		require('rimraf').sync(dist + 'rainloop/v/' + versionFull + '/app/libraries/RainLoop/Providers/Prem.php');
+	}
+
+	config.destPath = config.releasesPath + '/webmail/' + versionFull + '/';
+	config.cleanPath = dist;
+	config.zipSrcPath = dist;
+	config.zipFile = 'rainloop-' + (config.community ? 'community-' : '') + versionFull + '.zip';
+	config.zipFileShort = 'rainloop-' + (config.community ? 'community-' : '') + 'latest.zip';
+
+	config.rainloopBuilded = true;
+
+	done();
+};
+
+const rainloopZip = (done) => {
+	if (config.destPath && config.zipSrcPath && config.zipFile) {
+		return zip(config.zipSrcPath, config.destPath, config.zipFile);
+	}
+
+	done();
+};
+
+const rainloopClean = (done) => {
+	if (config.cleanPath) {
+		return del(config.cleanPath);
+	}
+
+	done();
+};
+
+const rainloopShortName = (done) => copy(config.destPath + config.zipFile, config.destPath + config.zipFileShort, done);
+
+exports.rainloopBuild = gulp.series(
+	rainloopCopy,
+	rainloopSetup,
+);
+
+exports.rainloop = gulp.series(
+	exports.rainloopBuild,
+	rainloopZip,
+	rainloopClean,
+	rainloopShortName
+);

tasks/vendors.js

@@ -0,0 +1,56 @@
+/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */
+const gulp = require('gulp'),
+	header = require('gulp-header'),
+	stripbom = require('gulp-stripbom');
+
+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 moment = gulp.series(momentLocalesClear, momentLocales);
+
+// lightgallery
+const lightgalleryFontsClear = () => del('rainloop/v/' + config.devVersion + '/static/css/fonts/lg.*');
+
+const lightgalleryFontsCopy = () =>
+	gulp.src('vendors/lightgallery/dist/fonts/lg.*')
+		.pipe(gulp.dest('rainloop/v/' + config.devVersion + '/static/css/fonts'));
+
+const lightgallery = gulp.series(lightgalleryFontsClear, lightgalleryFontsCopy);
+
+// fontastic
+const fontasticFontsClear = () => del('rainloop/v/' + config.devVersion + '/static/css/fonts/rainloop.*');
+
+const fontasticFontsCopy = () =>
+	gulp.src('vendors/fontastic/fonts/rainloop.*')
+		.pipe(gulp.dest('rainloop/v/' + config.devVersion + '/static/css/fonts'));
+
+const fontastic = gulp.series(fontasticFontsClear, fontasticFontsCopy);
+
+// ckeditor
+const ckeditorClear = () => del('rainloop/v/' + config.devVersion + '/static/ckeditor');
+
+const ckeditorCopy = () =>
+	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/**/*')
+		.pipe(gulp.dest('rainloop/v/' + config.devVersion + '/static/ckeditor/plugins'));
+
+const ckeditorSetup = () =>
+	gulp.src('rainloop/v/' + config.devVersion + '/static/ckeditor/*.js')
+		.pipe(stripbom())
+		// eslint-disable-next-line quotes
+		.pipe(header("\uFEFF")) // BOM
+		.pipe(gulp.dest('rainloop/v/' + config.devVersion + '/static/ckeditor'));
+
+const ckeditor = gulp.series(ckeditorClear, ckeditorCopy, ckeditorCopyPlugins, ckeditorSetup);
+
+exports.vendors = gulp.parallel(moment, ckeditor, fontastic, lightgallery);

tasks/webpack.js

@@ -0,0 +1,41 @@
+/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */
+const webpack = require('webpack');
+const gutil = require('gulp-util');
+
+const {config} = require('./config');
+
+const webpackCfgBuilder = require('../webpack.config.builder.js');
+
+const webpackError = (err) => {
+	if (err) {
+		gutil.log('[webpack]', '---');
+		gutil.log('[webpack]', err.error ? err.error.toString() : '');
+		gutil.log('[webpack]', err.message || '');
+		gutil.log('[webpack]', '---');
+	}
+};
+
+const webpackCallback = (done) => (err, stats) => {
+	if (err) {
+		if (config.watch) {
+			webpackError(err);
+		} else {
+			throw new gutil.PluginError('webpack', err);
+		}
+	} else if (stats && stats.compilation && stats.compilation.errors && stats.compilation.errors[0]) {
+		if (config.watch) {
+			stats.compilation.errors.forEach(webpackError);
+		} else {
+			throw new gutil.PluginError('webpack', stats.compilation.errors[0]);
+		}
+	}
+
+	done();
+};
+
+exports.webpack = (done) => {
+	webpack(
+		webpackCfgBuilder(config.paths.staticJS, !config.community, 'production'),
+		webpackCallback(done)
+	);
+};