From ac2a3f76f3da82c98b69a71a3f823f1d663bc2b4 Mon Sep 17 00:00:00 2001 From: Hugo Dias Date: Thu, 19 Nov 2020 10:06:00 +0000 Subject: [PATCH] fix: clean deps and more (#677) - remove error-handler, our yargs fail handler is better - remove rimraf - remove pify - update all the deps except webpack Considerable amount of dependencies were updated there a small chance of something breaking!! BREAKING CHANGE: Update all the deps except webpack. --- cmds/lint.js | 3 +- cmds/publish-rc.js | 3 +- cmds/release.js | 3 +- cmds/test-dependant.js | 3 +- cmds/update-last-successful-build.js | 3 +- cmds/update-rc.js | 3 +- cmds/update-release-branch-lockfiles.js | 3 +- package.json | 62 ++++++++++++------------- src/build/index.js | 4 +- src/docs/index.js | 4 +- src/error-handler.js | 15 ------ src/release/github.js | 4 +- test/lint.js | 4 +- 13 files changed, 44 insertions(+), 70 deletions(-) delete mode 100644 src/error-handler.js diff --git a/cmds/lint.js b/cmds/lint.js index d9c6b8a0b..15644488f 100644 --- a/cmds/lint.js +++ b/cmds/lint.js @@ -13,7 +13,6 @@ module.exports = { }, handler (argv) { const lint = require('../src/lint') - const onError = require('../src/error-handler') - lint(argv).catch(onError) + return lint(argv) } } diff --git a/cmds/publish-rc.js b/cmds/publish-rc.js index 390042011..eb931e9ef 100644 --- a/cmds/publish-rc.js +++ b/cmds/publish-rc.js @@ -37,7 +37,6 @@ module.exports = { }, handler (argv) { const cmd = require('../src/publish-rc') - const onError = require('../src/error-handler') - cmd(argv).catch(onError) + return cmd(argv) } } diff --git a/cmds/release.js b/cmds/release.js index c9215b7c8..b88aebb5c 100644 --- a/cmds/release.js +++ b/cmds/release.js @@ -104,7 +104,6 @@ module.exports = { }, handler (argv) { const release = require('../src/release') - const onError = require('../src/error-handler') - release(argv).catch(onError) + return release(argv) } } diff --git a/cmds/test-dependant.js b/cmds/test-dependant.js index a6aec65e7..b5e8659b1 100644 --- a/cmds/test-dependant.js +++ b/cmds/test-dependant.js @@ -37,7 +37,6 @@ module.exports = { }, handler (argv) { const cmd = require('../src/test-dependant') - const onError = require('../src/error-handler') - cmd(argv).catch(onError) + return cmd(argv) } } diff --git a/cmds/update-last-successful-build.js b/cmds/update-last-successful-build.js index ef5102248..2a38c45b4 100644 --- a/cmds/update-last-successful-build.js +++ b/cmds/update-last-successful-build.js @@ -22,7 +22,6 @@ module.exports = { }, handler (argv) { const cmd = require('../src/update-last-successful-build') - const onError = require('../src/error-handler') - cmd(argv).catch(onError) + return cmd(argv) } } diff --git a/cmds/update-rc.js b/cmds/update-rc.js index 5c471bb66..9b0de6b95 100644 --- a/cmds/update-rc.js +++ b/cmds/update-rc.js @@ -27,7 +27,6 @@ module.exports = { }, handler (argv) { const cmd = require('../src/update-rc') - const onError = require('../src/error-handler') - cmd(argv).catch(onError) + return cmd(argv) } } diff --git a/cmds/update-release-branch-lockfiles.js b/cmds/update-release-branch-lockfiles.js index 263280d5e..e1289a4b4 100644 --- a/cmds/update-release-branch-lockfiles.js +++ b/cmds/update-release-branch-lockfiles.js @@ -21,7 +21,6 @@ module.exports = { }, handler (argv) { const cmd = require('../src/update-release-branch-lockfiles') - const onError = require('../src/error-handler') - cmd(argv).catch(onError) + return cmd(argv) } } diff --git a/package.json b/package.json index 8412f89d7..b0f894a20 100644 --- a/package.json +++ b/package.json @@ -42,14 +42,14 @@ }, "dependencies": { "@achingbrain/dependency-check": "^4.1.0", - "@babel/cli": "^7.10.1", - "@babel/core": "^7.10.2", - "@babel/plugin-transform-regenerator": "^7.10.1", - "@babel/plugin-transform-runtime": "^7.10.1", - "@babel/preset-env": "^7.10.2", - "@babel/preset-typescript": "^7.10.1", - "@babel/register": "^7.10.1", - "@babel/runtime": "^7.10.2", + "@babel/cli": "^7.12.1", + "@babel/core": "^7.12.3", + "@babel/plugin-transform-regenerator": "^7.12.1", + "@babel/plugin-transform-runtime": "^7.12.1", + "@babel/preset-env": "^7.12.1", + "@babel/preset-typescript": "^7.12.1", + "@babel/register": "^7.12.1", + "@babel/runtime": "^7.12.5", "@commitlint/cli": "^11.0.0", "@commitlint/config-conventional": "^11.0.0", "@commitlint/lint": "^11.0.0", @@ -59,62 +59,58 @@ "@electron/get": "^1.10.0", "@polka/send-type": "^0.5.2", "@types/mocha": "^8.0.4", - "@types/node": "^14.14.7", + "@types/node": "^14.14.8", "aegir-typedoc-theme": "^0.1.0", - "babel-loader": "^8.0.5", - "buffer": "^5.6.0", + "babel-loader": "^8.2.1", + "buffer": "^6.0.2", "bytes": "^3.1.0", - "camelcase": "^6.0.0", + "camelcase": "^6.2.0", "chai": "^4.2.0", "chai-as-promised": "^7.1.1", "chai-subset": "^1.6.0", "chalk": "^4.1.0", - "codecov": "^3.6.3", - "conventional-changelog": "^3.1.18", - "conventional-github-releaser": "^3.1.3", + "conventional-changelog": "^3.1.24", + "conventional-github-releaser": "^3.1.5", "cors": "^2.8.5", "cosmiconfig": "^7.0.0", "dirty-chai": "^2.0.1", - "documentation": "^13.0.1", - "electron-mocha": "^8.2.0", + "electron-mocha": "^9.3.2", "eslint": "^7.11.0", "eslint-config-ipfs": "^0.1.0", - "execa": "^4.0.0", + "execa": "^4.1.0", "extract-zip": "^2.0.1", "findup-sync": "^4.0.0", "fs-extra": "^9.0.1", - "gh-pages": "^3.0.0", - "git-authors-cli": "^1.0.27", + "gh-pages": "^3.1.0", + "git-authors-cli": "^1.0.31", "git-validate": "^2.2.4", "globby": "^11.0.1", - "ipfs-utils": "^4.0.0", - "it-glob": "~0.0.8", + "ipfs-utils": "^5.0.0", + "it-glob": "~0.0.10", "json-loader": "~0.5.7", - "karma": "^5.1.0", + "karma": "^5.2.3", "karma-chrome-launcher": "^3.1.0", "karma-cli": "^2.0.0", - "karma-firefox-launcher": "^1.3.0", + "karma-firefox-launcher": "^2.1.0", "karma-mocha": "^2.0.1", "karma-mocha-reporter": "^2.2.5", "karma-mocha-webworker": "^1.3.0", - "karma-sourcemap-loader": "~0.3.7", + "karma-sourcemap-loader": "~0.3.8", "karma-webpack": "4.0.2", "listr": "~0.14.2", "merge-options": "^3.0.3", - "mocha": "^8.0.1", + "mocha": "^8.2.1", "npm-package-json-lint": "^5.1.0", "nyc": "^15.1.0", "ora": "^5.1.0", "p-map": "^4.0.0", "pascalcase": "^1.0.0", - "pify": "^5.0.0", "polka": "^0.5.2", "premove": "^3.0.1", "prompt-promise": "^1.0.3", "read-pkg-up": "^7.0.1", - "rimraf": "^3.0.1", "semver": "^7.3.2", - "simple-git": "^2.7.0", + "simple-git": "^2.22.0", "strip-bom": "^4.0.0", "strip-json-comments": "^3.1.1", "terser-webpack-plugin": "^3.0.5", @@ -125,14 +121,14 @@ "webpack-bundle-analyzer": "^3.7.0", "webpack-cli": "^3.3.10", "webpack-merge": "^4.2.2", - "yargs": "^16.1.0", + "yargs": "^16.1.1", "yargs-parser": "^20.2.3" }, "devDependencies": { - "electron": "^9.0.4", - "iso-url": "^0.4.7", + "electron": "^11.0.1", + "iso-url": "^1.0.0", "mock-require": "^3.0.2", - "sinon": "^9.0.2" + "sinon": "^9.2.1" }, "engines": { "node": ">=10.0.0", diff --git a/src/build/index.js b/src/build/index.js index 28fb847e4..df81d7c9f 100644 --- a/src/build/index.js +++ b/src/build/index.js @@ -5,7 +5,7 @@ const path = require('path') const fs = require('fs') const bytes = require('bytes') const execa = require('execa') -const rimraf = require('rimraf') +const { premove: del } = require('premove') const { fromAegir, gzipSize, pkg, hasTsconfig } = require('./../utils') const userConfig = require('../config/user') const tsCmd = require('../ts') @@ -22,7 +22,7 @@ module.exports = async (argv) => { : [] // Clean dist - rimraf.sync(path.join(process.cwd(), 'dist')) + await del(path.join(process.cwd(), 'dist')) // Run webpack const webpack = await execa('webpack-cli', [ diff --git a/src/docs/index.js b/src/docs/index.js index 17bb9ca25..c7fd73b41 100644 --- a/src/docs/index.js +++ b/src/docs/index.js @@ -2,7 +2,7 @@ const Listr = require('listr') const chalk = require('chalk') -const { premove: remove } = require('premove') +const { premove: del } = require('premove') const { getListrConfig, publishDocs, hasTsconfig } = require('../utils') const tsCmd = require('../ts') @@ -10,7 +10,7 @@ const TASKS = new Listr( [ { title: 'Clean ./docs', - task: () => remove('docs') + task: () => del('docs') }, { title: 'Generating documentation', diff --git a/src/error-handler.js b/src/error-handler.js deleted file mode 100644 index f1f3da22f..000000000 --- a/src/error-handler.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict' - -const chalk = require('chalk') - -function onError (err) { - if (!err) { - return - } - - console.log(chalk.red(err.message)) // eslint-disable-line no-console - console.log(chalk.gray(err.stack)) // eslint-disable-line no-console - process.exit(1) -} - -module.exports = onError diff --git a/src/release/github.js b/src/release/github.js index 3c1232f9a..6ef432721 100644 --- a/src/release/github.js +++ b/src/release/github.js @@ -1,10 +1,10 @@ 'use strict' const conventionalGithubReleaser = require('conventional-github-releaser') -const pify = require('pify') +const { promisify } = require('util') function github (opts) { - return pify(conventionalGithubReleaser)({ + return promisify(conventionalGithubReleaser)({ type: 'oauth', token: opts.ghtoken, url: 'https://api.github.com/' diff --git a/test/lint.js b/test/lint.js index efd2d34ca..eef772dc5 100644 --- a/test/lint.js +++ b/test/lint.js @@ -5,7 +5,7 @@ const lint = require('../src/lint') const { expect } = require('../utils/chai') const path = require('path') const fs = require('fs') -const rimraf = require('rimraf') +const { premove: del } = require('premove/sync') const TEMP_FOLDER = path.join(__dirname, '../node_modules/.temp-test') @@ -67,7 +67,7 @@ describe('lint', () => { after(() => { process.chdir(cwd) - rimraf.sync(TEMP_FOLDER) + del(TEMP_FOLDER) }) it('lint itself (aegir)', function () {