diff --git a/package-lock.json b/package-lock.json index 66c8225..35425b5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "torrent-clean", - "version": "1.4.0", + "version": "1.4.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -112,9 +112,9 @@ } }, "acorn": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.0.0.tgz", - "integrity": "sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz", + "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==", "dev": true }, "acorn-jsx": { @@ -625,9 +625,9 @@ } }, "enquirer": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.1.tgz", - "integrity": "sha512-7slmHsJY+mvnIrzD0Z0FfTFLmVJuIzRNCW72X9s35BshOoC+MI4jLJ8aPyAC/BelAirXBZB+Mu1wSqP0wpW4Kg==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.2.tgz", + "integrity": "sha512-PLhTMPUXlnaIv9D3Cq3/Zr1xb7soeDDgunobyCmYLUG19n24dvC8i+ZZgm2DekGpDnx7JvFSHV7lxfM58PMtbA==", "requires": { "ansi-colors": "^3.2.1" }, @@ -683,9 +683,9 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.4.0.tgz", - "integrity": "sha512-WTVEzK3lSFoXUovDHEbkJqCVPEPwbhCq4trDktNI6ygs7aO41d4cDT0JFAT5MivzZeVLWlg7vHL+bgrQv/t3vA==", + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.5.1.tgz", + "integrity": "sha512-32h99BoLYStT1iq1v2P9uwpyznQ4M2jRiFB6acitKz52Gqn+vPaMDUTB1bYi1WN4Nquj2w+t+bimYUG83DC55A==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -891,9 +891,9 @@ } }, "eslint-plugin-prettier": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.0.tgz", - "integrity": "sha512-XWX2yVuwVNLOUhQijAkXz+rMPPoCr7WFiAl8ig6I7Xn+pPVhDhzg4DxHpmbeb0iqjO9UronEA3Tb09ChnFVHHA==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.1.tgz", + "integrity": "sha512-A+TZuHZ0KU0cnn56/9mfR7/KjUJ9QNVXUhwvRFSR7PGPe0zQR6PTkmyqg1AtUUEOzTqeRsUwyKFh0oVZKVCrtA==", "dev": true, "requires": { "prettier-linter-helpers": "^1.0.0" @@ -1149,9 +1149,9 @@ } }, "glob-parent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz", - "integrity": "sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", + "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", "dev": true, "requires": { "is-glob": "^4.0.1" diff --git a/package.json b/package.json index 4a84e63..3e7b0e4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "torrent-clean", - "version": "1.4.0", + "version": "1.4.1", "description": "Removes files that are not specified in selected torrent file", "author": "Nikolay Borzov ", "license": "MIT", @@ -25,7 +25,7 @@ "chalk": "^2.4.2", "cosmiconfig": "^5.2.1", "delete-empty": "^3.0.0", - "enquirer": "^2.3.1", + "enquirer": "^2.3.2", "memory-chunk-store": "^1.3.0", "minimist": "^1.2.0", "recursive-readdir": "^2.2.2", @@ -33,12 +33,12 @@ }, "devDependencies": { "babel-eslint": "^10.0.3", - "eslint": "^6.4.0", + "eslint": "^6.5.1", "eslint-config-prettier": "^6.3.0", "eslint-config-standard": "^14.1.0", "eslint-plugin-import": "^2.18.2", "eslint-plugin-node": "^10.0.0", - "eslint-plugin-prettier": "^3.1.0", + "eslint-plugin-prettier": "^3.1.1", "eslint-plugin-promise": "^4.2.1", "eslint-plugin-standard": "^4.0.1", "prettier": "^1.18.2" diff --git a/src/config-loader.js b/src/config-loader.js index db80ed2..cc5a051 100644 --- a/src/config-loader.js +++ b/src/config-loader.js @@ -41,7 +41,11 @@ function loadConfig(searchFrom) { .reverse() .reduce(merge, {}) - mergedConfig.ignore = [...IGNORE_GLOBS, ...mergedConfig.ignore] + if (mergedConfig.ignore) { + mergedConfig.ignore = [...IGNORE_GLOBS, ...mergedConfig.ignore] + } else { + mergedConfig.ignore = IGNORE_GLOBS + } return mergedConfig }