Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-14 20:10:13 +03:00
Code Issues Wiki Activity

fix: cordova browserify/rollup conflict (#3180)

Browse source
This commit is contained in:
Tomas Chmelevskij 2022-12-29 23:54:04 +01:00 • committed by GitHub
parent 039727ac23
commit 3d6a690ccd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 593 deletions
Download patch file Download diff file Expand all files Collapse all files

53
gulpfile.js
View file

@ -11,14 +11,12 @@ const del = require('del');
const NwBuilder = require('nw-builder');
const innoSetup = require('@quanle94/innosetup');
const deb = require('gulp-debian');
const conffiles = './test/configs';
const buildRpm = require('rpm-builder');
const commandExistsSync = require('command-exists').sync;
const targz = require('targz');
const gulp = require('gulp');
const rollup = require('rollup');
const concat = require('gulp-concat');
const yarn = require("gulp-yarn");
const rename = require('gulp-rename');
const replace = require('gulp-replace');
@ -34,9 +32,6 @@ const sourcemaps = require('gulp-sourcemaps');
const cordova = require("cordova-lib").cordova;
const browserify = require('browserify');
const glob = require('glob');
const DIST_DIR = './dist/';
const APPS_DIR = './apps/';
const DEBUG_DIR = './debug/';
@ -91,8 +86,6 @@ gulp.task('clean-cache', clean_cache);
gulp.task('clean-cordova', clean_cordova);
gulp.task('test-cordova', cordova_browserify);
// Function definitions are processed before function calls.
@ -968,7 +961,6 @@ function cordova_dist() {
distTasks.push(cordova_manifestjson);
distTasks.push(cordova_configxml);
distTasks.push(cordova_rename_build_json);
distTasks.push(cordova_browserify);
distTasks.push(cordova_depedencies);
if (cordovaDependencies) {
distTasks.push(cordova_platforms);
@ -1088,51 +1080,6 @@ function cordova_rename_build_json() {
.pipe(gulp.dest(CORDOVA_DIST_DIR));
}
function cordova_browserify(done) {
const readFile = function(file) {
return new Promise(function(resolve) {
if (!file.includes("node_modules")) {
fs.readFile(file, 'utf8', async function (err,data) {
if (data.match('require\\(.*\\)')) {
await cordova_execbrowserify(file);
}
resolve();
});
} else {
resolve();
}
});
};
glob(`${CORDOVA_DIST_DIR}www/**/*.js`, {}, function (err, files) {
const readLoop = function() {
if (files.length === 0) {
done();
} else {
const file = files.pop();
readFile(file).then(function() {
readLoop();
});
}
};
readLoop();
});
}
function cordova_execbrowserify(file) {
const filename = file.split('/').pop();
const destpath = file.replace(filename, '');
console.log(`Include required modules in ${file}`);
return browserify(file, { ignoreMissing: true })
.transform("babelify", {
presets: ["@babel/preset-env"],
sourceMaps: false,
global:true,
ignore: [/\/node_modules\/(?!md5.js\/)/] })
.bundle()
.pipe(source(filename))
.pipe(gulp.dest(destpath));
}
function cordova_depedencies() {
process.chdir(CORDOVA_DIST_DIR);
return gulp.src(['./package.json', './yarn.lock'])