Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-15 04:15:28 +03:00
Code Wiki Activity

Update dependencies to be able to run with node 10

Browse source 
- Update gulp to 4.0.0
- Update nw.js to 0.31.4-sdk
This commit is contained in:
Alberto García Hierro 2018-07-08 22:17:10 +01:00
parent 040b0c5fa4
commit 78312e52ee
4 changed files with 1832 additions and 1086 deletions
Download patch file Download diff file Expand all files Collapse all files

18
gulpfile.js
View file

@ -119,7 +119,7 @@ sources.mapJs = [
sources.receiverCss = [ sources.receiverCss = [
'./src/css/tabs/receiver_msp.css', './src/css/tabs/receiver_msp.css',
'./css/opensans_webfontkit/fonts.css', './src/css/opensans_webfontkit/fonts.css',
'./js/libraries/jquery.nouislider.min.css', './js/libraries/jquery.nouislider.min.css',
'./js/libraries/jquery.nouislider.pips.min.css', './js/libraries/jquery.nouislider.pips.min.css',
]; ];
@ -184,15 +184,15 @@ var buildJsTasks = [];
} }
})(); })();
gulp.task('build-all-js', buildJsTasks); gulp.task('build-all-js', gulp.parallel(buildJsTasks))
gulp.task('build-all-css', buildCssTasks); gulp.task('build-all-css', gulp.parallel(buildCssTasks));
gulp.task('build', ['build-all-css', 'build-all-js']); gulp.task('build', gulp.parallel('build-all-css', 'build-all-js'));
gulp.task('clean', function() { return del(['./build/**', './dist/**'], {force: true}); }); gulp.task('clean', function() { return del(['./build/**', './dist/**'], {force: true}); });
// Real work for dist task. Done in another task to call it via // Real work for dist task. Done in another task to call it via
// run-sequence. // run-sequence.
gulp.task('dist-build', ['build'], function() { gulp.task('dist-build', gulp.series('build'), function() {
var distSources = [ var distSources = [
'./package.json', // For NW.js './package.json', // For NW.js
'./manifest.json', // For Chrome app './manifest.json', // For Chrome app
@ -218,7 +218,7 @@ gulp.task('dist', function(done) {
}); });
// Create app directories in ./apps // Create app directories in ./apps
gulp.task('apps', ['dist'], function(done) { gulp.task('apps', gulp.series('dist'), function(done) {
var builder = new NwBuilder({ var builder = new NwBuilder({
files: './dist/**/*', files: './dist/**/*',
buildDir: appsDir, buildDir: appsDir,
@ -294,7 +294,7 @@ gulp.task('release-linux64', function() {
//For build only linux, without install Wine //For build only linux, without install Wine
//run task `apps` get error //run task `apps` get error
//Error building NW apps:Error while updating the Windows icon. Wine (winehq.org) must be installed to add custom icons from Mac and Linux. //Error building NW apps:Error while updating the Windows icon. Wine (winehq.org) must be installed to add custom icons from Mac and Linux.
gulp.task('release-only-linux', ['dist'], function (done) { gulp.task('release-only-linux', gulp.series('dist'), function (done) {
var builder = new NwBuilder({ var builder = new NwBuilder({
files: './dist/**/*', files: './dist/**/*',
buildDir: appsDir, buildDir: appsDir,
@ -323,8 +323,8 @@ gulp.task('release', function() {
gulp.task('watch', function () { gulp.task('watch', function () {
for(var k in output) { for(var k in output) {
gulp.watch(sources[k], [get_task_name(k)]); gulp.watch(sources[k], gulp.series(get_task_name(k)));
} }
}); });
gulp.task('default', ['build']); gulp.task('default', gulp.series('build'));

2891
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

7
package.json
View file

@ -24,13 +24,14 @@
"archiver": "^2.0.3", "archiver": "^2.0.3",
"bluebird": "3.4.1", "bluebird": "3.4.1",
"del": "^3.0.0", "del": "^3.0.0",
"gulp": "~3.9.1", "graceful-fs": "^4.1.11",
"gulp-concat": "~2.6.1", "gulp": "^4.0.0",
"gulp-concat": "^2.6.1",
"inflection": "1.12.0", "inflection": "1.12.0",
"jquery": "2.1.4", "jquery": "2.1.4",
"jquery-ui-npm": "1.12.0", "jquery-ui-npm": "1.12.0",
"marked": "^0.3.17", "marked": "^0.3.17",
"nw": "^0.25.4-sdk", "nw": "^0.31.4-sdk",
"nw-builder": "^3.5.4", "nw-builder": "^3.5.4",
"openlayers": "^4.6.5", "openlayers": "^4.6.5",
"run-sequence": "^2.2.0", "run-sequence": "^2.2.0",

2
src/css/tabs/receiver_msp.css
View file

@ -2,7 +2,7 @@
/* A generous padding around the window edges ensures that we continue to receive mousemove events (since /* A generous padding around the window edges ensures that we continue to receive mousemove events (since
* cursor stays in the window for longer) * cursor stays in the window for longer)
*/ */
padding: 25px 25px 0; padding: 15px 15px 0;
text-align: center; text-align: center;
} }