Skip to content

Commit 4890ca2

Browse files
committed
fix: cordova browserify/rollup conflict
browserify seems to clash with rollup setup, remove browserify in favour of rollup.
1 parent 039727a commit 4890ca2

File tree

3 files changed

+25
-593
lines changed

3 files changed

+25
-593
lines changed

gulpfile.js

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,12 @@ const del = require('del');
1111
const NwBuilder = require('nw-builder');
1212
const innoSetup = require('@quanle94/innosetup');
1313
const deb = require('gulp-debian');
14-
const conffiles = './test/configs';
1514
const buildRpm = require('rpm-builder');
1615
const commandExistsSync = require('command-exists').sync;
1716
const targz = require('targz');
1817

1918
const gulp = require('gulp');
2019
const rollup = require('rollup');
21-
const concat = require('gulp-concat');
2220
const yarn = require("gulp-yarn");
2321
const rename = require('gulp-rename');
2422
const replace = require('gulp-replace');
@@ -34,9 +32,6 @@ const sourcemaps = require('gulp-sourcemaps');
3432

3533
const cordova = require("cordova-lib").cordova;
3634

37-
const browserify = require('browserify');
38-
const glob = require('glob');
39-
4035
const DIST_DIR = './dist/';
4136
const APPS_DIR = './apps/';
4237
const DEBUG_DIR = './debug/';
@@ -91,8 +86,6 @@ gulp.task('clean-cache', clean_cache);
9186

9287
gulp.task('clean-cordova', clean_cordova);
9388

94-
gulp.task('test-cordova', cordova_browserify);
95-
9689

9790
// Function definitions are processed before function calls.
9891

@@ -968,7 +961,6 @@ function cordova_dist() {
968961
distTasks.push(cordova_manifestjson);
969962
distTasks.push(cordova_configxml);
970963
distTasks.push(cordova_rename_build_json);
971-
distTasks.push(cordova_browserify);
972964
distTasks.push(cordova_depedencies);
973965
if (cordovaDependencies) {
974966
distTasks.push(cordova_platforms);
@@ -1088,51 +1080,6 @@ function cordova_rename_build_json() {
10881080
.pipe(gulp.dest(CORDOVA_DIST_DIR));
10891081
}
10901082

1091-
function cordova_browserify(done) {
1092-
const readFile = function(file) {
1093-
return new Promise(function(resolve) {
1094-
if (!file.includes("node_modules")) {
1095-
fs.readFile(file, 'utf8', async function (err,data) {
1096-
if (data.match('require\\(.*\\)')) {
1097-
await cordova_execbrowserify(file);
1098-
}
1099-
resolve();
1100-
});
1101-
} else {
1102-
resolve();
1103-
}
1104-
});
1105-
};
1106-
glob(`${CORDOVA_DIST_DIR}www/**/*.js`, {}, function (err, files) {
1107-
const readLoop = function() {
1108-
if (files.length === 0) {
1109-
done();
1110-
} else {
1111-
const file = files.pop();
1112-
readFile(file).then(function() {
1113-
readLoop();
1114-
});
1115-
}
1116-
};
1117-
readLoop();
1118-
});
1119-
}
1120-
1121-
function cordova_execbrowserify(file) {
1122-
const filename = file.split('/').pop();
1123-
const destpath = file.replace(filename, '');
1124-
console.log(`Include required modules in ${file}`);
1125-
return browserify(file, { ignoreMissing: true })
1126-
.transform("babelify", {
1127-
presets: ["@babel/preset-env"],
1128-
sourceMaps: false,
1129-
global:true,
1130-
ignore: [/\/node_modules\/(?!md5.js\/)/] })
1131-
.bundle()
1132-
.pipe(source(filename))
1133-
.pipe(gulp.dest(destpath));
1134-
}
1135-
11361083
function cordova_depedencies() {
11371084
process.chdir(CORDOVA_DIST_DIR);
11381085
return gulp.src(['./package.json', './yarn.lock'])

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
"@storybook/vue": "^6.5.12",
9696
"babel-loader": "^8.2.5",
9797
"babelify": "^10.0.0",
98-
"browserify": "^17.0.0",
9998
"chai": "^4.3.6",
10099
"command-exists": "^1.2.9",
101100
"cordova-lib": "^11.0.0",
@@ -106,7 +105,6 @@
106105
"fs-extra": "^10.1.0",
107106
"glob": "^8.0.3",
108107
"gulp": "^4.0.2",
109-
"gulp-concat": "~2.6.1",
110108
"gulp-debian": "^0.3.2",
111109
"gulp-json-editor": "^2.5.6",
112110
"gulp-less": "^5.0.0",

0 commit comments

Comments
 (0)