diff --git a/gulpfile.js b/gulpfile.js index 16825763..266a418b 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -19,7 +19,7 @@ const targz = require('targz'); const gulp = require('gulp'); const concat = require('gulp-concat'); -const install = require("gulp-install"); +const yarn = require("gulp-yarn"); const rename = require('gulp-rename'); const os = require('os'); const git = require('gulp-git'); @@ -227,10 +227,7 @@ function dist_src() { .pipe(gulp.src('package.json', { passthrougth: true })) .pipe(gulp.src('changelog.html', { passthrougth: true })) .pipe(gulp.dest(DIST_DIR)) - .pipe(install({ - commands: { - 'package.json': 'yarn' - }, + .pipe(yarn({ production: true, ignoreScripts: true })); diff --git a/package.json b/package.json index c770cb22..61fdd92c 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,6 @@ "author": "The Betaflight open source project.", "license": "GPL-3.0", "dependencies": { - "gulp": "^4.0.1", "i18next": "^14.1.1", "i18next-xhr-backend": "^2.0.0", "jquery-textcomplete": "^1.8.5", @@ -53,11 +52,12 @@ "del": "^4.1.1", "follow-redirects": "^1.6.1", "fs-extra": "^7.0.1", + "gulp": "^4.0.2", "gulp-concat": "~2.6.1", "gulp-debian": "~0.1.8", "gulp-git": "^2.9.0", - "gulp-install": "^1.1.0", "gulp-rename": "^1.4.0", + "gulp-yarn": "^2.0.0", "gulp-zip": "^4.1.0", "inflection": "1.12.0", "jquery-ui-npm": "1.12.0", diff --git a/yarn.lock b/yarn.lock index 9bbf751c..9bd8d753 100644 --- a/yarn.lock +++ b/yarn.lock @@ -408,7 +408,7 @@ async-settle@^1.0.0: dependencies: async-done "^1.2.2" -async@^2.0.0, async@^2.6.1: +async@^2.0.0, async@^2.5.0, async@^2.6.1: version "2.6.2" resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381" integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg== @@ -1057,11 +1057,6 @@ d@1: dependencies: es5-ext "^0.10.9" -dargs@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/dargs/-/dargs-5.1.0.tgz#ec7ea50c78564cd36c9d5ec18f66329fade27829" - integrity sha1-7H6lDHhWTNNsnV7Bj2Yyn63ieCk= - dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" @@ -1374,9 +1369,9 @@ es-to-primitive@^1.2.0: is-symbol "^1.0.2" es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: - version "0.10.49" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.49.tgz#059a239de862c94494fec28f8150c977028c6c5e" - integrity sha512-3NMEhi57E31qdzmYp2jwRArIUsj1HI/RxbQ4bgnSB+AIKIxsAmTiK83bYMifIcpWvEc3P1X30DhUKOqEtF/kvg== + version "0.10.50" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.50.tgz#6d0e23a0abdb27018e5ac4fd09b412bc5517a778" + integrity sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw== dependencies: es6-iterator "~2.0.3" es6-symbol "~3.1.1" @@ -2043,24 +2038,12 @@ gulp-git@^2.9.0: through2 "^2.0.3" vinyl "^2.0.1" -gulp-install@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/gulp-install/-/gulp-install-1.1.0.tgz#9386b46cb4669b47257b6adf4e3ea2e83c928a1a" - integrity sha1-k4a0bLRmm0cle2rfTj6i6DySiho= - dependencies: - dargs "^5.1.0" - gulp-util "^3.0.7" - lodash.groupby "^4.6.0" - p-queue "^1.0.0" - through2 "^2.0.3" - which "^1.2.14" - gulp-rename@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.4.0.tgz#de1c718e7c4095ae861f7296ef4f3248648240bd" integrity sha512-swzbIGb/arEoFK89tPY58vg3Ok1bw+d35PfUNwWqdo7KM4jkmuGA78JiDNqR+JeZFaeeHnRg9N7aihX3YPmsyg== -gulp-util@^3.0.7, gulp-util@^3.0.8: +gulp-util@^3.0.8: version "3.0.8" resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f" integrity sha1-AFTh50RQLifATBh8PsxQXdVLu08= @@ -2084,6 +2067,16 @@ gulp-util@^3.0.7, gulp-util@^3.0.8: through2 "^2.0.0" vinyl "^0.5.0" +gulp-yarn@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/gulp-yarn/-/gulp-yarn-2.0.0.tgz#96ab3b63a191faba7f14200a55596652f61a078d" + integrity sha512-dmKdSvqpuwXa1klSiwzfozdobnsVj1csiV8JlTfOnrv6Sj5SPoaQYElJZrfvHGNo5vJMc9qpROijHM2OUZocYA== + dependencies: + async "^2.5.0" + plugin-error "^1.0.1" + through2 "^2.0.3" + which "^1.3.0" + gulp-zip@^4.1.0: version "4.2.0" resolved "https://registry.yarnpkg.com/gulp-zip/-/gulp-zip-4.2.0.tgz#e25e738c41ad0795ad853d1d8aeb1744d2a4ca82" @@ -2095,10 +2088,10 @@ gulp-zip@^4.1.0: vinyl "^2.1.0" yazl "^2.1.0" -gulp@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/gulp/-/gulp-4.0.1.tgz#987a38a55a7d3677f6b49e291b06bc05809f33d9" - integrity sha512-yDVtVunxrAdsk7rIV/b7lVSBifPN1Eqe6wTjsESGrFcL+MEVzaaeNTkpUuGTUptloSOU+8oJm/lBJbgPV+tMAw== +gulp@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/gulp/-/gulp-4.0.2.tgz#543651070fd0f6ab0a0650c6a3e6ff5a7cb09caa" + integrity sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA== dependencies: glob-watcher "^5.0.3" gulp-cli "^2.2.0" @@ -2974,11 +2967,6 @@ lodash.flatten@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= -lodash.groupby@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.groupby/-/lodash.groupby-4.6.0.tgz#0b08a1dcf68397c397855c3239783832df7403d1" - integrity sha1-Cwih3PaDl8OXhVwyOXg4Mt90A9E= - lodash.isarguments@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" @@ -3729,11 +3717,6 @@ p-map@^2.0.0: resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw== -p-queue@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-1.2.0.tgz#639cb8b07270c15b71d7a6446a8e30414f3c96d1" - integrity sha1-Y5y4sHJwwVtx16ZEao4wQU88ltE= - p-try@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" @@ -5253,7 +5236,7 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= -which@1.3.1, which@^1.2.1, which@^1.2.14, which@^1.2.9: +which@1.3.1, which@^1.2.1, which@^1.2.14, which@^1.2.9, which@^1.3.0: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==