Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-25 01:05:15 +03:00
Code Issues Wiki Activity

Fix/build output layout (#3716)

Browse source 
* fix: `ol.css` for nwjs build

* fix: global vars broken by race condition

* fix: only copy node modules css
This commit is contained in:
Tomas Chmelevskij 2023-12-31 20:42:33 +01:00 • committed by GitHub
parent 259d2ea9c7
commit c217aade59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gulpfile.js
View file

@ -380,14 +380,14 @@ function dist_src() {
function dist_node_modules_css() {
return gulp
.src("./**/*.min.css")
.pipe(gulp.dest(DIST_DIR));
.src("./node_modules/**/*.min.css")
.pipe(gulp.dest(`${DIST_DIR}node_modules`));
}
function dist_ol_css() {
return gulp
.src("./node_modules/ol/ol.css", { base: "node_modules" })
.pipe(gulp.dest(DIST_DIR));
.pipe(gulp.dest(`${DIST_DIR}css/tabs/`));
}
function dist_less() {

1
src/index.html
View file

@ -337,6 +337,5 @@
<a href="#" class="dialogInformation-confirmButton regular-button"></a>
</div>
</dialog>
<!-- CORDOVA_INCLUDE cordova.js -->
</body>
</html>

9
src/js/main.js
View file

@ -56,9 +56,12 @@ function readConfiguratorVersionMetadata() {
CONFIGURATOR.version = manifest.version;
CONFIGURATOR.gitRevision = manifest.gitRevision;
} else {
CONFIGURATOR.productName = __APP_PRODUCTNAME__;
CONFIGURATOR.version = __APP_VERSION__;
CONFIGURATOR.gitRevision = __APP_REVISION__;
// These are injected by vite. If not checking
// for undefined occasionally there is a race
// condition where this fails the nwjs and cordova builds
CONFIGURATOR.productName = typeof __APP_PRODUCTNAME__ !== 'undefined' ? __APP_PRODUCTNAME__ : 'Betaflight Configurator';
CONFIGURATOR.version = typeof __APP_VERSION__ !== 'undefined' ? __APP_VERSION__ : '0.0.0';
CONFIGURATOR.gitRevision = typeof __APP_REVISION__ !== 'undefined' ? __APP_REVISION__ : 'unknown';
}
}