diff --git a/gulpfile.js b/gulpfile.js index 98fbb02..526e64d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,7 +1,7 @@ const {src, dest, series, task} = require('gulp'); const del = require('del'); const ts = require('gulp-typescript'); -const npmDist = require('gulp-npm-dist'); +const exec = require('child_process').exec; let tsSource = ts.createProject('tsconfig.json') let pageFiles = ['src/assets/pages/**', 'src/assets/pages/scripts/*', 'src/assets/pages/styles/*'] @@ -33,12 +33,14 @@ function typescript() { .pipe(dest('build/util/')); } -function dependencies() { +function dependencies(cb) { // Installs dependencies into build folder - - return src(npmDist(), {base: './node_modules'}) - .pipe(dest('./build/node_modules')); - + exec('npm --prefix ./build install ./build --production', './node_modules/.bin/electron-rebuild -m ./build/node_modules', + (err, stdout, stderr) => { + console.log(stdout); + console.log(stderr) + cb(err); + }); } exports.clean = clean; diff --git a/package-lock.json b/package-lock.json index 7913852..6434543 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2316,11 +2316,27 @@ } } }, - "gulp-npm-dist": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/gulp-npm-dist/-/gulp-npm-dist-1.0.3.tgz", - "integrity": "sha512-7nank8dgqYXOR6K7VM5VdzvAmCGCaudUEbVKOkCVyu+/EK3QuD8PUJ+UlV/f2QWswN0jDXnHlM7FuT2BUt8P3w==", - "dev": true + "gulp-exec": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/gulp-exec/-/gulp-exec-5.0.0.tgz", + "integrity": "sha512-XFW5GJr5gpdRc7nAS6fNK2cqtLDjNnIKLbcVGIA6XAWCx7E4aVn/pzEJm6NvjtIU9VMsl4igkkSAo8Le8L1Lww==", + "dev": true, + "requires": { + "plugin-error": "^1.0.1", + "through2": "^3.0.1" + }, + "dependencies": { + "through2": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz", + "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==", + "dev": true, + "requires": { + "inherits": "^2.0.4", + "readable-stream": "2 || 3" + } + } + } }, "gulp-typescript": { "version": "6.0.0-alpha.1", diff --git a/package.json b/package.json index 9873e4b..3c0805d 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "@types/jquery": "^3.5.1", "gulp": "^4.0.2", "gulp-typescript": "^6.0.0-alpha.1", - "gulp-npm-dist": "^1.0.3", + "gulp-exec": "^5.0.0", "del": "^6.0.0" } }