opensourcemirror
/
nextcloud-calendar
mirror of https://github.com/nextcloud/calendar.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1447 from nextcloud/bugfix/1286/babel_is_part_of_the_server_now 

Don't ship special build with babel for IE anymore
This commit is contained in:
Georg Ehrke 2019-09-02 15:51:17 +00:00 committed by GitHub
parent d9676068cd 0c7085760f
commit f0ef42e604
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/gulpfile.js
View File

@ -40,8 +40,6 @@ const cssBuildTarget = 'app.scss';
const cssBuildTargetMin = 'app.min.scss';
const vendorTarget = 'vendor.js';
const vendorTargetMin = 'vendor.min.js';
const vendorIETarget = 'vendor.ie.js';
const vendorIETargetMin = 'vendor.ie.min.js';
const vendorCssTarget = 'vendor.css';
const vendorCssTargetMin = 'vendor.min.css';
const karmaConfig = __dirname + '/../tests/js/config/karma.js';
@ -86,10 +84,9 @@ gulp.task('_buildAndMinifyCSSSources', gulpsync.sync(['_buildCSSSources', '_mini
gulp.task('_buildAndMinifyJavaScriptSources', gulpsync.sync(['_buildJavaScriptSources', '_minifyJavaScriptSources']));
gulp.task('_buildAndMinifyCSSVendor', gulpsync.sync(['_buildCSSVendor', '_minifyCSSVendor']));
gulp.task('_buildAndMinifyJavaScriptVendor', gulpsync.sync(['_buildJavaScriptVendor', '_minifyJavaScriptVendor']));
gulp.task('_buildAndMinifyIEJavaScriptVendor', gulpsync.sync(['_buildIEJavaScriptVendor', '_minifyIEJavaScriptVendor']));
gulp.task('_buildSource', ['_buildAndMinifyCSSSources', '_buildAndMinifyJavaScriptSources']);
gulp.task('_buildVendor', ['_buildAndMinifyCSSVendor', '_buildAndMinifyJavaScriptVendor', '_buildAndMinifyIEJavaScriptVendor']);
gulp.task('_buildVendor', ['_buildAndMinifyCSSVendor', '_buildAndMinifyJavaScriptVendor']);
// #############################################################################
// ################################ SOURCE CSS #################################
@ -184,25 +181,6 @@ gulp.task('_minifyJavaScriptVendor', () => {
.pipe(gulp.dest(destinationFolder));
});
// #############################################################################
// ############################### VENDOR IE JS ################################
// #############################################################################
gulp.task('_buildIEJavaScriptVendor', () => {
return gulp.src(['node_modules/babel-polyfill/dist/polyfill.js'].concat(vendorSources))
.pipe(concat(vendorIETarget))
.pipe(gulp.dest(destinationFolder));
});
gulp.task('_minifyIEJavaScriptVendor', () => {
return gulp.src([destinationFolder + vendorIETarget])
.pipe(sourcemaps.init({identityMap: true, largeFile: true}))
.pipe(concat(vendorIETargetMin))
.pipe(strip())
.pipe(uglify())
.pipe(sourcemaps.write('./', {includeContent: false}))
.pipe(gulp.dest(destinationFolder));
});
gulp.task('jslint', () => {
return gulp.src(lintJsSources)
.pipe(jshint('.jshintrc'))

13
templates/main.php
View File

@ -39,15 +39,10 @@ foreach ($styles as $style) {
style('calendar', $style);
}
$scripts = [];
if ($_['isIE']) {
$scripts[] = 'public/vendor.ie.min';
} else {
$scripts[] = 'public/vendor.min';
}
$scripts[] = 'public/app.min';
$scripts = [
'public/vendor.min',
'public/app.min'
];
foreach ($scripts as $script) {
script('calendar', $script);