File tree Expand file tree Collapse file tree 3 files changed +9
-7
lines changed Expand file tree Collapse file tree 3 files changed +9
-7
lines changed Original file line number Diff line number Diff line change @@ -380,14 +380,14 @@ function dist_src() {
380
380
381
381
function dist_node_modules_css ( ) {
382
382
return gulp
383
- . src ( "./**/*.min.css" )
384
- . pipe ( gulp . dest ( DIST_DIR ) ) ;
383
+ . src ( "./node_modules/ **/*.min.css" )
384
+ . pipe ( gulp . dest ( ` ${ DIST_DIR } node_modules` ) ) ;
385
385
}
386
386
387
387
function dist_ol_css ( ) {
388
388
return gulp
389
389
. src ( "./node_modules/ol/ol.css" , { base : "node_modules" } )
390
- . pipe ( gulp . dest ( DIST_DIR ) ) ;
390
+ . pipe ( gulp . dest ( ` ${ DIST_DIR } css/tabs/` ) ) ;
391
391
}
392
392
393
393
function dist_less ( ) {
Original file line number Diff line number Diff line change @@ -337,6 +337,5 @@ <h3 class="dialogInformationTitle"></h3>
337
337
< a href ="# " class ="dialogInformation-confirmButton regular-button "> </ a >
338
338
</ div >
339
339
</ dialog >
340
- <!-- CORDOVA_INCLUDE cordova.js -->
341
340
</ body >
342
341
</ html >
Original file line number Diff line number Diff line change @@ -56,9 +56,12 @@ function readConfiguratorVersionMetadata() {
56
56
CONFIGURATOR . version = manifest . version ;
57
57
CONFIGURATOR . gitRevision = manifest . gitRevision ;
58
58
} else {
59
- CONFIGURATOR . productName = __APP_PRODUCTNAME__ ;
60
- CONFIGURATOR . version = __APP_VERSION__ ;
61
- CONFIGURATOR . gitRevision = __APP_REVISION__ ;
59
+ // These are injected by vite. If not checking
60
+ // for undefined occasionally there is a race
61
+ // condition where this fails the nwjs and cordova builds
62
+ CONFIGURATOR . productName = typeof __APP_PRODUCTNAME__ !== 'undefined' ? __APP_PRODUCTNAME__ : 'Betaflight Configurator' ;
63
+ CONFIGURATOR . version = typeof __APP_VERSION__ !== 'undefined' ? __APP_VERSION__ : '0.0.0' ;
64
+ CONFIGURATOR . gitRevision = typeof __APP_REVISION__ !== 'undefined' ? __APP_REVISION__ : 'unknown' ;
62
65
}
63
66
}
64
67
You can’t perform that action at this time.
0 commit comments