From 1aea051257f70c2a8a73b8e33c5b03e0427236b7 Mon Sep 17 00:00:00 2001 From: saintedlama Date: Sun, 20 Oct 2019 08:06:03 +0200 Subject: [PATCH] chore: removes shelljs dependency --- package-lock.json | 225 ---------------------------------------------- package.json | 11 +-- release.js | 27 +----- 3 files changed, 6 insertions(+), 257 deletions(-) diff --git a/package-lock.json b/package-lock.json index e052058..36c2647 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,12 +42,6 @@ "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==", "dev": true }, - "after-all-results": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/after-all-results/-/after-all-results-2.0.0.tgz", - "integrity": "sha1-asL8ICtQD4jaj09VMM+hAPTGotA=", - "dev": true - }, "ajv": { "version": "6.10.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", @@ -845,12 +839,6 @@ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", "dev": true }, - "faye-websocket": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz", - "integrity": "sha1-wUxbO/FNdBf/v9mQwKdJXNnzN7w=", - "dev": true - }, "figures": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", @@ -928,47 +916,12 @@ "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", "dev": true }, - "geocode-wifi": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/geocode-wifi/-/geocode-wifi-1.0.1.tgz", - "integrity": "sha1-Yt2EmtRwhoN7tQKwrhpKO4MzAfk=", - "dev": true, - "requires": { - "once": "^1.3.2" - } - }, - "geopkg": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/geopkg/-/geopkg-4.0.3.tgz", - "integrity": "sha1-32MPqnYnJhnOtOxhYyieRY8iW74=", - "dev": true, - "requires": { - "indent-string": "^2.0.0", - "minimist": "^1.1.3", - "npm-version-bump": "^1.0.0", - "opn": "^3.0.2", - "package-json-io": "^1.0.0", - "place-geo-marker": "0.0.5", - "printf": "^0.2.3", - "wifi-triangulate": "^1.1.1", - "wordwrap": "^1.0.0" - } - }, "get-stdin": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz", "integrity": "sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==", "dev": true }, - "git-state": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/git-state/-/git-state-2.5.2.tgz", - "integrity": "sha1-KCVCSsjzuy8Cs3RhVZ0tr+G9oEo=", - "dev": true, - "requires": { - "after-all-results": "^2.0.0" - } - }, "glob": { "version": "5.0.15", "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", @@ -1106,15 +1059,6 @@ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true }, - "indent-string": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", - "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", - "dev": true, - "requires": { - "repeating": "^2.0.0" - } - }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -1151,18 +1095,6 @@ "through": "^2.3.6" } }, - "interpret": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz", - "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==", - "dev": true - }, - "invert-kv": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", - "dev": true - }, "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", @@ -1321,15 +1253,6 @@ "object.assign": "^4.1.0" } }, - "lcid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", - "dev": true, - "requires": { - "invert-kv": "^1.0.0" - } - }, "levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", @@ -1455,21 +1378,6 @@ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", "dev": true }, - "node-uuid": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz", - "integrity": "sha1-09tNe1aBDZ5AMjQnZigq8HORcps=", - "dev": true - }, - "node-wifiscanner2": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/node-wifiscanner2/-/node-wifiscanner2-1.2.0.tgz", - "integrity": "sha1-ln+tDXV7Qwo5snGNQIy72ewetIA=", - "dev": true, - "requires": { - "os-locale": "^1.4.0" - } - }, "nopt": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", @@ -1502,17 +1410,6 @@ } } }, - "npm-version-bump": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/npm-version-bump/-/npm-version-bump-1.0.0.tgz", - "integrity": "sha1-Fw2/D9nBSUyfOJxRoCZvkhHZtoI=", - "dev": true, - "requires": { - "git-state": "^2.4.0", - "package-json-io": "^1.0.0", - "semver": "^5.0.1" - } - }, "number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", @@ -1602,15 +1499,6 @@ "mimic-fn": "^1.0.0" } }, - "opn": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/opn/-/opn-3.0.3.tgz", - "integrity": "sha1-ttmec5n3jWXDuq/+8fsojpuFJDo=", - "dev": true, - "requires": { - "object-assign": "^4.0.1" - } - }, "optimist": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", @@ -1649,15 +1537,6 @@ "wordwrap": "~1.0.0" } }, - "os-locale": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", - "dev": true, - "requires": { - "lcid": "^1.0.0" - } - }, "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", @@ -1688,12 +1567,6 @@ "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", "dev": true }, - "package-json-io": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/package-json-io/-/package-json-io-1.0.0.tgz", - "integrity": "sha1-b6eG7hZ8hZ5bRzx4dLazIIMSbAk=", - "dev": true - }, "parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -1866,16 +1739,6 @@ "find-up": "^2.1.0" } }, - "place-geo-marker": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/place-geo-marker/-/place-geo-marker-0.0.5.tgz", - "integrity": "sha1-ptmTwkMe0j7YTfuJDo73IpyHb+Q=", - "dev": true, - "requires": { - "opn": "^3.0.2", - "shoe": "0.0.15" - } - }, "plur": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/plur/-/plur-1.0.0.tgz", @@ -1899,12 +1762,6 @@ "plur": "^1.0.0" } }, - "printf": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/printf/-/printf-0.2.5.tgz", - "integrity": "sha1-xDjKLKM+OSdnHbSracDlL5NqTw8=", - "dev": true - }, "process-nextick-args": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", @@ -1977,15 +1834,6 @@ "util-deprecate": "^1.0.1" } }, - "rechoir": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", - "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", - "dev": true, - "requires": { - "resolve": "^1.1.6" - } - }, "regexpp": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", @@ -1998,15 +1846,6 @@ "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", "dev": true }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "dev": true, - "requires": { - "is-finite": "^1.0.0" - } - }, "require_optional": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz", @@ -2126,50 +1965,6 @@ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", "dev": true }, - "shelljs": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz", - "integrity": "sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==", - "dev": true, - "requires": { - "glob": "^7.0.0", - "interpret": "^1.0.0", - "rechoir": "^0.6.2" - }, - "dependencies": { - "glob": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - } - } - }, - "shoe": { - "version": "0.0.15", - "resolved": "https://registry.npmjs.org/shoe/-/shoe-0.0.15.tgz", - "integrity": "sha1-uu2PGn8I9TC2bwkUKH/KplsSRDo=", - "dev": true, - "requires": { - "sockjs": "0.3.7", - "sockjs-client": "*" - }, - "dependencies": { - "sockjs-client": { - "version": "0.0.0-unreleasable", - "bundled": true, - "dev": true - } - } - }, "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", @@ -2187,16 +1982,6 @@ "is-fullwidth-code-point": "^2.0.0" } }, - "sockjs": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.7.tgz", - "integrity": "sha1-KVDgWG2KnTBElYqDGt5o2xl3Scs=", - "dev": true, - "requires": { - "faye-websocket": "0.4.4", - "node-uuid": "1.3.3" - } - }, "source-map": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", @@ -2741,16 +2526,6 @@ "isexe": "^2.0.0" } }, - "wifi-triangulate": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/wifi-triangulate/-/wifi-triangulate-1.1.2.tgz", - "integrity": "sha1-/mtEL863C44jOzJBo3wxvMiKQ40=", - "dev": true, - "requires": { - "geocode-wifi": "^1.0.1", - "node-wifiscanner2": "^1.2.0" - } - }, "wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", diff --git a/package.json b/package.json index 66bffeb..a055916 100644 --- a/package.json +++ b/package.json @@ -38,20 +38,13 @@ }, "scripts": { "test": "standard && (tape \"test/test-*.js\" && node --harmony --harmony-proxies node_modules/tape/bin/tape \"test/test-*.js\") | tap-spec", - "cover": "node --harmony --harmony-proxies node_modules/istanbul/lib/cli.js cover node_modules/tape/bin/tape \"test/test-*.js\" --report html", - "geotag": "geopkg update" + "cover": "node --harmony --harmony-proxies node_modules/istanbul/lib/cli.js cover node_modules/tape/bin/tape \"test/test-*.js\" --report html" }, "devDependencies": { "concat-stream": "^2.0.0", - "geopkg": "^4.0.3", "istanbul": "^0.4.5", - "shelljs": "^0.8.3", "standard": "^14.3.1", "tap-spec": "^5.0.0", "tape": "^4.11.0" - }, - "coordinates": [ - 48.2091041, - 16.415049 - ] + } } diff --git a/release.js b/release.js index cfe7830..221c932 100644 --- a/release.js +++ b/release.js @@ -1,4 +1,4 @@ -var shell = require('shelljs') +const { execSync } = require('child_process') if (exec('git status --porcelain').stdout) { console.error('Git working directory not clean. Please commit all chances to release a new package to npm.') @@ -15,12 +15,6 @@ if (versionIncrements.indexOf(versionIncrement) < 0) { exec('npm test') -var geotag = execOptional('npm run geotag') - -if (geotag.code === 0) { - exec('git commit -m "Geotag package for release" package.json') -} - exec('npm version ' + versionIncrement) exec('git push') @@ -28,22 +22,9 @@ exec('git push --tags') exec('npm publish') function exec (cmd) { - var ret = shell.exec(cmd, { silent: true }) + var stdout = execSync(cmd) - if (ret.code !== 0) { - console.error(ret.stdout) - process.exit(1) + return { + stdout } - - return ret -} - -function execOptional (cmd) { - var ret = shell.exec(cmd, { silent: true }) - - if (ret.code !== 0) { - console.log(ret.stdout) - } - - return ret }