diff --git a/@xen-orchestra/async-map/package.json b/@xen-orchestra/async-map/package.json index 2aa399da7..7db3e60c6 100644 --- a/@xen-orchestra/async-map/package.json +++ b/@xen-orchestra/async-map/package.json @@ -24,7 +24,6 @@ "url": "https://vates.fr" }, "preferGlobal": false, - "bin": {}, "files": [ "index.js", "legacy.js" diff --git a/@xen-orchestra/cron/package.json b/@xen-orchestra/cron/package.json index 1eed83a95..316507855 100644 --- a/@xen-orchestra/cron/package.json +++ b/@xen-orchestra/cron/package.json @@ -28,7 +28,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/@xen-orchestra/defined/package.json b/@xen-orchestra/defined/package.json index e8ce7db09..6358e9d10 100644 --- a/@xen-orchestra/defined/package.json +++ b/@xen-orchestra/defined/package.json @@ -18,7 +18,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/@xen-orchestra/emit-async/package.json b/@xen-orchestra/emit-async/package.json index 958d70a0e..da6cab6d2 100644 --- a/@xen-orchestra/emit-async/package.json +++ b/@xen-orchestra/emit-async/package.json @@ -18,7 +18,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/@xen-orchestra/fs/package.json b/@xen-orchestra/fs/package.json index 95ee648f8..a4037893a 100644 --- a/@xen-orchestra/fs/package.json +++ b/@xen-orchestra/fs/package.json @@ -14,7 +14,6 @@ }, "preferGlobal": true, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/@xen-orchestra/log/package.json b/@xen-orchestra/log/package.json index aee0e114d..641c815e3 100644 --- a/@xen-orchestra/log/package.json +++ b/@xen-orchestra/log/package.json @@ -18,7 +18,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "configure.js", "dist/", diff --git a/@xen-orchestra/mixin/package.json b/@xen-orchestra/mixin/package.json index 5aca8d3cb..c667ffac3 100644 --- a/@xen-orchestra/mixin/package.json +++ b/@xen-orchestra/mixin/package.json @@ -18,7 +18,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/packages/complex-matcher/package.json b/packages/complex-matcher/package.json index 630c479e0..71e2d4af5 100644 --- a/packages/complex-matcher/package.json +++ b/packages/complex-matcher/package.json @@ -18,7 +18,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/packages/value-matcher/package.json b/packages/value-matcher/package.json index fd25d5153..fcda9232b 100644 --- a/packages/value-matcher/package.json +++ b/packages/value-matcher/package.json @@ -18,7 +18,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/packages/vhd-lib/package.json b/packages/vhd-lib/package.json index e7e80e874..8bb07fb9c 100644 --- a/packages/vhd-lib/package.json +++ b/packages/vhd-lib/package.json @@ -13,7 +13,6 @@ "url": "https://github.com/vatesfr/xen-orchestra.git" }, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/packages/xo-acl-resolver/package.json b/packages/xo-acl-resolver/package.json index c702e7348..b92a0107d 100644 --- a/packages/xo-acl-resolver/package.json +++ b/packages/xo-acl-resolver/package.json @@ -17,7 +17,6 @@ "url": "https://vates.fr" }, "preferGlobal": false, - "bin": {}, "files": [ "index.js" ], diff --git a/packages/xo-collection/package.json b/packages/xo-collection/package.json index b71ac1bab..168a545c7 100644 --- a/packages/xo-collection/package.json +++ b/packages/xo-collection/package.json @@ -18,7 +18,6 @@ }, "preferGlobal": false, "main": "dist/collection", - "bin": {}, "files": [ "dist/", "*.js" diff --git a/packages/xo-common/package.json b/packages/xo-common/package.json index 90b307dc7..f5e7bb168 100644 --- a/packages/xo-common/package.json +++ b/packages/xo-common/package.json @@ -17,7 +17,6 @@ "url": "https://vates.fr" }, "preferGlobal": false, - "bin": {}, "files": [ "dist/", "*.js" diff --git a/packages/xo-lib/package.json b/packages/xo-lib/package.json index 219d4a85e..7024e3cba 100644 --- a/packages/xo-lib/package.json +++ b/packages/xo-lib/package.json @@ -22,7 +22,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/packages/xo-remote-parser/package.json b/packages/xo-remote-parser/package.json index 58178ebdd..3ba829900 100644 --- a/packages/xo-remote-parser/package.json +++ b/packages/xo-remote-parser/package.json @@ -18,7 +18,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/packages/xo-server-audit/package.json b/packages/xo-server-audit/package.json index 3b919a5c3..394f151a9 100644 --- a/packages/xo-server-audit/package.json +++ b/packages/xo-server-audit/package.json @@ -26,7 +26,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/packages/xo-server-auth-github/package.json b/packages/xo-server-auth-github/package.json index 40fd0da21..baf34ce2c 100644 --- a/packages/xo-server-auth-github/package.json +++ b/packages/xo-server-auth-github/package.json @@ -22,7 +22,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/packages/xo-server-auth-google/package.json b/packages/xo-server-auth-google/package.json index 969e6f9ed..43343f04a 100644 --- a/packages/xo-server-auth-google/package.json +++ b/packages/xo-server-auth-google/package.json @@ -25,7 +25,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/packages/xo-server-auth-saml/package.json b/packages/xo-server-auth-saml/package.json index 99c1b77f1..725dc4c14 100644 --- a/packages/xo-server-auth-saml/package.json +++ b/packages/xo-server-auth-saml/package.json @@ -25,7 +25,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/packages/xo-server-backup-reports/package.json b/packages/xo-server-backup-reports/package.json index 929fae304..75b1670c4 100644 --- a/packages/xo-server-backup-reports/package.json +++ b/packages/xo-server-backup-reports/package.json @@ -28,7 +28,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/packages/xo-server-load-balancer/package.json b/packages/xo-server-load-balancer/package.json index d7781eb26..15c717536 100644 --- a/packages/xo-server-load-balancer/package.json +++ b/packages/xo-server-load-balancer/package.json @@ -23,7 +23,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/packages/xo-server-perf-alert/package.json b/packages/xo-server-perf-alert/package.json index 0d10404ff..62ca4584b 100644 --- a/packages/xo-server-perf-alert/package.json +++ b/packages/xo-server-perf-alert/package.json @@ -13,7 +13,6 @@ }, "preferGlobal": true, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/packages/xo-server-test/package.json b/packages/xo-server-test/package.json index 35f605187..83d69ab3b 100644 --- a/packages/xo-server-test/package.json +++ b/packages/xo-server-test/package.json @@ -18,7 +18,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/packages/xo-server-transport-email/package.json b/packages/xo-server-transport-email/package.json index 438ac8167..fc48d532a 100644 --- a/packages/xo-server-transport-email/package.json +++ b/packages/xo-server-transport-email/package.json @@ -24,7 +24,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/packages/xo-server-transport-nagios/package.json b/packages/xo-server-transport-nagios/package.json index 50df94edc..7fdddec2a 100644 --- a/packages/xo-server-transport-nagios/package.json +++ b/packages/xo-server-transport-nagios/package.json @@ -24,7 +24,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/packages/xo-server-transport-slack/package.json b/packages/xo-server-transport-slack/package.json index 31f341ea7..ccc06cacc 100644 --- a/packages/xo-server-transport-slack/package.json +++ b/packages/xo-server-transport-slack/package.json @@ -25,7 +25,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/packages/xo-server-transport-xmpp/package.json b/packages/xo-server-transport-xmpp/package.json index da703b5cf..59f8e7c24 100644 --- a/packages/xo-server-transport-xmpp/package.json +++ b/packages/xo-server-transport-xmpp/package.json @@ -25,7 +25,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/packages/xo-server-usage-report/package.json b/packages/xo-server-usage-report/package.json index 0f2293c7e..e17e002a5 100644 --- a/packages/xo-server-usage-report/package.json +++ b/packages/xo-server-usage-report/package.json @@ -25,7 +25,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "dist/", "images/", diff --git a/packages/xo-server-web-hooks/package.json b/packages/xo-server-web-hooks/package.json index 71ddb0241..94206f266 100644 --- a/packages/xo-server-web-hooks/package.json +++ b/packages/xo-server-web-hooks/package.json @@ -25,7 +25,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/packages/xo-vmdk-to-vhd/package.json b/packages/xo-vmdk-to-vhd/package.json index fc6c7b493..8eefd1ee4 100644 --- a/packages/xo-vmdk-to-vhd/package.json +++ b/packages/xo-vmdk-to-vhd/package.json @@ -17,7 +17,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/packages/xo-web/package.json b/packages/xo-web/package.json index 199c6ed6b..f490bb348 100644 --- a/packages/xo-web/package.json +++ b/packages/xo-web/package.json @@ -23,7 +23,6 @@ }, "preferGlobal": false, "main": "dist/", - "bin": {}, "files": [ "dist/" ], diff --git a/scripts/normalize-packages b/scripts/normalize-packages index b7dd6aebc..b7e669282 100755 --- a/scripts/normalize-packages +++ b/scripts/normalize-packages @@ -5,6 +5,12 @@ const isEmpty = require('lodash/isEmpty') const sortedObject = require('sorted-object') const { getPackages, readFile, writeFile, unlink } = require('./utils') +const deleteIfEmpty = (object, property) => { + if (isEmpty(object[property])) { + delete object[property] + } +} + const deleteProperties = (object, property, properties) => { const nestedObject = object[property] if (nestedObject === undefined) { @@ -13,9 +19,7 @@ const deleteProperties = (object, property, properties) => { properties.forEach(property => { delete nestedObject[property] }) - if (isEmpty(object[property])) { - delete object[property] - } + deleteIfEmpty(object, property) } const generateReadme = require('handlebars').compile(require('fs').readFileSync(`${__dirname}/README.md.tpl`, 'utf8')) @@ -57,6 +61,7 @@ require('exec-promise')(() => delete pkg.standard delete pkg['lint-staged'] + deleteIfEmpty(pkg, 'bin') deleteProperties(pkg, 'config', ['commitizen']) deleteProperties(pkg, 'devDependencies', [ 'babel-7-jest',