Skip to content
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

Jump to bottom

Fix/build output layout #3716

Merged
merged 3 commits into from
Dec 31, 2023
Merged

Fix/build output layout #3716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5adac62
fix: `ol.css` for nwjs build
chmelevskij Dec 31, 2023
ed70b50
fix: global vars broken by race condition
chmelevskij Dec 31, 2023
1f77d5e
fix: only copy node modules css
chmelevskij Dec 31, 2023
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
6 changes: 3 additions & 3 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,14 +371,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() {
Expand Down
1 change: 0 additions & 1 deletion src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,5 @@ <h3 class="dialogInformationTitle"></h3>
<a href="#" class="dialogInformation-confirmButton regular-button"></a>
</div>
</dialog>
<!-- CORDOVA_INCLUDE cordova.js -->
</body>
</html>
9 changes: 6 additions & 3 deletions src/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
}

Expand Down