mirror of
https://github.com/iNavFlight/inav-configurator.git
synced 2025-07-17 21:35:30 +03:00
Pin NW.js version used by NwBuilder
Sourced from package's deps
This commit is contained in:
parent
22335fa99e
commit
fc8cfeb24d
3 changed files with 52 additions and 10 deletions
|
@ -8,6 +8,7 @@ var minimist = require('minimist');
|
||||||
var archiver = require('archiver');
|
var archiver = require('archiver');
|
||||||
var del = require('del');
|
var del = require('del');
|
||||||
var NwBuilder = require('nw-builder');
|
var NwBuilder = require('nw-builder');
|
||||||
|
var semver = require('semver');
|
||||||
|
|
||||||
var gulp = require('gulp');
|
var gulp = require('gulp');
|
||||||
var concat = require('gulp-concat');
|
var concat = require('gulp-concat');
|
||||||
|
@ -235,6 +236,7 @@ gulp.task('apps', gulp.series('dist', function(done) {
|
||||||
flavor: 'normal',
|
flavor: 'normal',
|
||||||
macIcns: './images/inav.icns',
|
macIcns: './images/inav.icns',
|
||||||
winIco: './images/inav.ico',
|
winIco: './images/inav.ico',
|
||||||
|
version: get_nw_version()
|
||||||
});
|
});
|
||||||
builder.on('log', console.log);
|
builder.on('log', console.log);
|
||||||
builder.build(function (err) {
|
builder.build(function (err) {
|
||||||
|
@ -248,6 +250,10 @@ gulp.task('apps', gulp.series('dist', function(done) {
|
||||||
});
|
});
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
function get_nw_version() {
|
||||||
|
return semver.valid(semver.coerce(require('./package.json').dependencies.nw));
|
||||||
|
}
|
||||||
|
|
||||||
function get_release_filename(platform, ext) {
|
function get_release_filename(platform, ext) {
|
||||||
var pkg = require('./package.json');
|
var pkg = require('./package.json');
|
||||||
return 'INAV-Configurator_' + platform + '_' + pkg.version + '.' + ext;
|
return 'INAV-Configurator_' + platform + '_' + pkg.version + '.' + ext;
|
||||||
|
|
53
package-lock.json
generated
53
package-lock.json
generated
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "inav-configurator",
|
"name": "inav-configurator",
|
||||||
"version": "2.3.0",
|
"version": "2.3.1",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -3728,7 +3728,7 @@
|
||||||
"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
|
||||||
"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
|
"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"is-plain-object": "2.0.4"
|
"is-plain-object": "^2.0.4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3864,6 +3864,13 @@
|
||||||
"resolve": "^1.10.0",
|
"resolve": "^1.10.0",
|
||||||
"semver": "2 || 3 || 4 || 5",
|
"semver": "2 || 3 || 4 || 5",
|
||||||
"validate-npm-package-license": "^3.0.1"
|
"validate-npm-package-license": "^3.0.1"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"semver": {
|
||||||
|
"version": "5.7.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
|
||||||
|
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"normalize-path": {
|
"normalize-path": {
|
||||||
|
@ -3937,6 +3944,11 @@
|
||||||
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
|
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
|
||||||
"integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
|
"integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
|
||||||
},
|
},
|
||||||
|
"semver": {
|
||||||
|
"version": "5.7.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
|
||||||
|
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
|
||||||
|
},
|
||||||
"yargs": {
|
"yargs": {
|
||||||
"version": "3.32.0",
|
"version": "3.32.0",
|
||||||
"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
|
"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
|
||||||
|
@ -3979,7 +3991,7 @@
|
||||||
"semver": "^5.5.0",
|
"semver": "^5.5.0",
|
||||||
"simple-glob": "~0.2.0",
|
"simple-glob": "~0.2.0",
|
||||||
"tar-fs": "^1.13.0",
|
"tar-fs": "^1.13.0",
|
||||||
"temp": "temp@github:adam-lynch/node-temp#279c1350cb7e4f02515d91da9e35d39a40774016",
|
"temp": "github:adam-lynch/node-temp#remove_tmpdir_dep",
|
||||||
"thenify": "^3.3.0",
|
"thenify": "^3.3.0",
|
||||||
"update-notifier": "^2.4.0",
|
"update-notifier": "^2.4.0",
|
||||||
"winresourcer": "^0.9.0"
|
"winresourcer": "^0.9.0"
|
||||||
|
@ -4005,6 +4017,12 @@
|
||||||
"supports-color": "^5.3.0"
|
"supports-color": "^5.3.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"semver": {
|
||||||
|
"version": "5.7.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
|
||||||
|
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
|
||||||
|
"dev": true
|
||||||
|
},
|
||||||
"supports-color": {
|
"supports-color": {
|
||||||
"version": "5.5.0",
|
"version": "5.5.0",
|
||||||
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
|
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
|
||||||
|
@ -4016,7 +4034,7 @@
|
||||||
},
|
},
|
||||||
"temp": {
|
"temp": {
|
||||||
"version": "github:adam-lynch/node-temp#279c1350cb7e4f02515d91da9e35d39a40774016",
|
"version": "github:adam-lynch/node-temp#279c1350cb7e4f02515d91da9e35d39a40774016",
|
||||||
"from": "temp@github:adam-lynch/node-temp#279c1350cb7e4f02515d91da9e35d39a40774016",
|
"from": "github:adam-lynch/node-temp#remove_tmpdir_dep",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"rimraf": "~2.2.6"
|
"rimraf": "~2.2.6"
|
||||||
|
@ -4284,6 +4302,14 @@
|
||||||
"registry-auth-token": "^3.0.1",
|
"registry-auth-token": "^3.0.1",
|
||||||
"registry-url": "^3.0.3",
|
"registry-url": "^3.0.3",
|
||||||
"semver": "^5.1.0"
|
"semver": "^5.1.0"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"semver": {
|
||||||
|
"version": "5.7.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
|
||||||
|
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
|
||||||
|
"dev": true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"parse-filepath": {
|
"parse-filepath": {
|
||||||
|
@ -5068,9 +5094,10 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"semver": {
|
"semver": {
|
||||||
"version": "5.6.0",
|
"version": "6.3.0",
|
||||||
"resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
|
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
|
||||||
"integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
|
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
|
||||||
|
"dev": true
|
||||||
},
|
},
|
||||||
"semver-diff": {
|
"semver-diff": {
|
||||||
"version": "2.1.0",
|
"version": "2.1.0",
|
||||||
|
@ -5079,6 +5106,14 @@
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"semver": "^5.0.3"
|
"semver": "^5.0.3"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"semver": {
|
||||||
|
"version": "5.7.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
|
||||||
|
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
|
||||||
|
"dev": true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"semver-greatest-satisfied-range": {
|
"semver-greatest-satisfied-range": {
|
||||||
|
@ -5130,7 +5165,7 @@
|
||||||
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
|
||||||
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
|
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
|
||||||
"requires": {
|
"requires": {
|
||||||
"is-extendable": "0.1.1"
|
"is-extendable": "^0.1.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5950,7 +5985,7 @@
|
||||||
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
|
||||||
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
|
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
|
||||||
"requires": {
|
"requires": {
|
||||||
"is-extendable": "0.1.1"
|
"is-extendable": "^0.1.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"set-value": {
|
"set-value": {
|
||||||
|
|
|
@ -41,6 +41,7 @@
|
||||||
"xml2js": "^0.4.19"
|
"xml2js": "^0.4.19"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"nw-builder": "^3.5.7"
|
"nw-builder": "^3.5.7",
|
||||||
|
"semver": "6.3.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue