Skip to content

Filtered format deferred #982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thomas-topway-it wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Filtered format deferred #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
32d62ad
add deferred support
thomas-topway-it Nov 28, 2025
0ac82dc
add watch
thomas-topway-it Nov 28, 2025
42180b1
add plumber
thomas-topway-it Nov 28, 2025
4c6ebbf
add support deferred
thomas-topway-it Nov 28, 2025
3c73456
Update ext.srf.filtered.js
thomas-topway-it Nov 28, 2025
9962f33
Update ext.srf.filtered.js.map
thomas-topway-it Nov 28, 2025
1ab5dbc
fix phpcs
thomas-topway-it Nov 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
264 changes: 141 additions & 123 deletions formats/filtered/gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,154 +1,172 @@
var gulp = require( 'gulp' );

var browserify = require( 'browserify' );
var tsify = require( 'tsify' );
var uglify = require( 'gulp-uglify' );
var concat = require( 'gulp-concat' );
var replace = require( 'gulp-replace' );
var sourcemaps = require( 'gulp-sourcemaps' );
var source = require( 'vinyl-source-stream' );
var buffer = require( 'vinyl-buffer' );


gulp.task( 'buildFiltered', function () {

return browserify( {
basedir: '.',
debug: true, // true, to enable source mapping
entries: [ 'resources/ts/bootstrap.ts' ],
cache: {},
packageCache: {}
} )
.exclude( 'jquery' )
.plugin( tsify )
.bundle()

.pipe( source( 'ext.srf.filtered.js' ) )
.pipe( buffer() )
.pipe( sourcemaps.init( { loadMaps: true } ) )
// .pipe( uglify() )
.pipe( sourcemaps.write( './' ) )
.pipe( gulp.dest( 'resources/js' ) );

} );

gulp.task( 'buildFilteredTests', function () {

return browserify( {
basedir: '.',
debug: false, // false, to disable source mapping
entries: [ 'tests/qunit/bootstrap.ts' ],
cache: {},
packageCache: {}
} )
// .exclude( 'jquery' )
.plugin( tsify )
.bundle()

.pipe( source( 'ext.srf.formats.filtered.test.js' ) )
// .pipe( buffer() )
// .pipe( sourcemaps.init( { loadMaps: true } ) )
// .pipe( uglify() )
// .pipe( sourcemaps.write( './' ) )
.pipe( gulp.dest( '../../tests/qunit/formats' ) );

} );

gulp.task( 'buildExternalJS', function () {

var gulp = require('gulp');

var browserify = require('browserify');
var tsify = require('tsify');
var uglify = require('gulp-uglify');
var concat = require('gulp-concat');
var replace = require('gulp-replace');
var sourcemaps = require('gulp-sourcemaps');
var source = require('vinyl-source-stream');
var buffer = require('vinyl-buffer');
var plumber = require('gulp-plumber');

gulp.task('buildFiltered', function () {
return (
browserify({
basedir: '.',
debug: true, // true, to enable source mapping
entries: ['resources/ts/bootstrap.ts'],
cache: {},
packageCache: {},
})
.exclude('jquery')
.plugin(tsify)
.bundle()

.on('error', function (err) {
console.error(err.toString());
this.emit('end');
})

.pipe(source('ext.srf.filtered.js'))
.pipe(buffer())
.pipe(plumber())
.pipe(sourcemaps.init({ loadMaps: true }))
// .pipe( uglify() )
.pipe(sourcemaps.write('./'))
.pipe(gulp.dest('resources/js'))
);
});

gulp.task('buildFilteredTests', function () {
return (
browserify({
basedir: '.',
debug: false, // false, to disable source mapping
entries: ['tests/qunit/bootstrap.ts'],
cache: {},
packageCache: {},
})
// .exclude( 'jquery' )
.plugin(tsify)
.bundle()

.pipe(source('ext.srf.formats.filtered.test.js'))
// .pipe( buffer() )
// .pipe( sourcemaps.init( { loadMaps: true } ) )
// .pipe( uglify() )
// .pipe( sourcemaps.write( './' ) )
.pipe(gulp.dest('../../tests/qunit/formats'))
);
});

gulp.task('buildExternalJS', function () {
var config = {
'ext.srf.filtered.leaflet.js': [
'node_modules/leaflet/dist/leaflet-src.js',
'node_modules/leaflet.markercluster/dist/leaflet.markercluster-src.js',
'node_modules/leaflet-providers/leaflet-providers.js'
'node_modules/leaflet-providers/leaflet-providers.js',
],
'ext.srf.filtered.slider.js': [
'node_modules/ion-rangeslider/js/ion.rangeSlider.js'
'node_modules/ion-rangeslider/js/ion.rangeSlider.js',
],
'ext.srf.filtered.select.js': [
'node_modules/select2/dist/js/select2.js'
]
'ext.srf.filtered.select.js': ['node_modules/select2/dist/js/select2.js'],
};

var res = true;

for ( var target in config ) {

res = res && gulp.src( config[ [ target ] ] )
.pipe( concat( target ) )
// .pipe( uglify() )
.pipe( gulp.dest( 'resources/js' ) );

for (var target in config) {
res =
res &&
gulp
.src(config[[target]])
.pipe(concat(target))
// .pipe( uglify() )
.pipe(gulp.dest('resources/js'));
}

return res;
});

} );

gulp.task( 'buildLeafletCSS', function () {

gulp.task('buildLeafletCSS', function () {
return gulp
.src( [
.src([
'node_modules/leaflet/dist/leaflet.css',
'node_modules/leaflet.markercluster/dist/MarkerCluster.css',
'node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css'
] )
.pipe( concat( 'ext.srf.filtered.leaflet.css' ) )
.pipe( gulp.dest( 'resources/css' ) );

} );

gulp.task( 'buildSliderCSS', function () {

'node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css',
])
.pipe(concat('ext.srf.filtered.leaflet.css'))
.pipe(gulp.dest('resources/css'));
});

gulp.task('buildSliderCSS', function () {
return (
gulp
.src([
'node_modules/ion-rangeslider/css/ion.rangeSlider.css',
'node_modules/ion-rangeslider/css/ion.rangeSlider.skinNice.css',
])
.pipe(concat('ext.srf.filtered.slider.css'))
// Need to remove some upstream CSS:
.pipe(
replace(
'.irs-line-mid,\n' +
'.irs-line-left,\n' +
'.irs-line-right,\n' +
'.irs-bar,\n' +
'.irs-bar-edge,\n' +
'.irs-slider {\n' +
' background: url(../img/sprite-skin-nice.png) repeat-x;\n' +
'}\n' +
'\n',
'',
),
)
.pipe(gulp.dest('resources/css'))
);
});

gulp.task('buildSelectCSS', function () {
return gulp
.src( [
'node_modules/ion-rangeslider/css/ion.rangeSlider.css',
'node_modules/ion-rangeslider/css/ion.rangeSlider.skinNice.css'
] )
.pipe( concat( 'ext.srf.filtered.slider.css' ) )
// Need to remove some upstream CSS:
.pipe( replace( '.irs-line-mid,\n' +
'.irs-line-left,\n' +
'.irs-line-right,\n' +
'.irs-bar,\n' +
'.irs-bar-edge,\n' +
'.irs-slider {\n' +
' background: url(../img/sprite-skin-nice.png) repeat-x;\n' +
'}\n' +
'\n', '' ) )
.pipe( gulp.dest( 'resources/css' ) );
} );

gulp.task( 'buildSelectCSS', function () {

return gulp
.src( [ 'node_modules/select2/dist/css/select2.css' ] )
.pipe( concat( 'ext.srf.filtered.select.css' ) )
.pipe( gulp.dest( 'resources/css' ) );

} );

gulp.task( 'copyExternalImages', function () {
.src(['node_modules/select2/dist/css/select2.css'])
.pipe(concat('ext.srf.filtered.select.css'))
.pipe(gulp.dest('resources/css'));
});

gulp.task('copyExternalImages', function () {
var config = {
'ext.srf.filtered.leaflet.css': [
'node_modules/leaflet/dist/images/*'
],
'ext.srf.filtered.leaflet.css': ['node_modules/leaflet/dist/images/*'],
// 'ext.srf.filtered.slider.css': [
// 'node_modules/ion-rangeslider/img/*nice.png'
// ]
};

var ret = true;

for ( var target in config ) {

ret = ret && gulp.src( config[ target ] )
.pipe( gulp.dest( 'resources/css/images' ) );
for (var target in config) {
ret =
ret && gulp.src(config[target]).pipe(gulp.dest('resources/css/images'));
}

return ret;
} );

gulp.task( 'buildExternalCSS', gulp.parallel( 'buildLeafletCSS', 'buildSliderCSS', 'buildSelectCSS' ) );
gulp.task( 'default', gulp.parallel( 'buildFiltered', 'buildFilteredTests', 'buildExternalJS', 'buildExternalCSS', 'copyExternalImages' ) );
});

gulp.task('watch', function () {
gulp.watch('resources/ts/**/*.ts', gulp.series('buildFiltered'));
gulp.watch('tests/qunit/**/*.ts', gulp.series('buildFilteredTests'));
});

gulp.task(
'buildExternalCSS',
gulp.parallel('buildLeafletCSS', 'buildSliderCSS', 'buildSelectCSS'),
);
gulp.task(
'default',
gulp.parallel(
'buildFiltered',
'buildFilteredTests',
'buildExternalJS',
'buildExternalCSS',
'copyExternalImages',
),
);
10 changes: 5 additions & 5 deletions formats/filtered/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
"main": "ext.srf.filtered.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"postinstall": "gulp"
"postinstall": "gulp",
"watch": "gulp watch"
},
"author": "Stephan Gambke",
"license": "GPL-2.0-or-later",
"dependencies": {
},
"devDependencies": {
"@fullcalendar/core": "^6.1.15",
"@fullcalendar/daygrid": "^6.1.15",
Expand All @@ -26,6 +25,7 @@
"gulp": "^4.0.0",
"gulp-cli": "^2.0.1",
"gulp-concat": "^2.6.1",
"gulp-plumber": "^1.2.1",
"gulp-replace": "^0.6.1",
"gulp-sourcemaps": "^2.4.1",
"gulp-uglify": "^2.1.2",
Expand All @@ -36,8 +36,8 @@
"nouislider": "^10.1.0",
"select2": "4.0.3",
"tsify": "^3.0.1",
"typescript": "^5.7.3",
"vinyl-buffer": "^1.0.0",
"vinyl-source-stream": "^2.0.0",
"typescript": "^5.7.3"
"vinyl-source-stream": "^2.0.0"
}
}
Loading