diff --git a/ftp/ftp-deploy.js b/ftp/ftp-deploy.js index 0b23da6..518b201 100644 --- a/ftp/ftp-deploy.js +++ b/ftp/ftp-deploy.js @@ -6,7 +6,7 @@ const events = require("events"); const Promise = require("bluebird"); const fs = require("fs"); -var PromiseFtp = require("promise-ftp"); +var PromiseFtp = require("@dllcnx/promise-ftp"); var PromiseSftp = require("ssh2-sftp-client"); const lib = require("./lib"); diff --git a/package-lock.json b/package-lock.json index 923d3a9..67693d7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,14 +1,15 @@ { - "name": "@dllcn/auto-deploy", + "name": "@dllcnx/auto-deploy", "version": "2.0.4", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "@dllcn/auto-deploy", + "name": "@dllcnx/auto-deploy", "version": "2.0.4", "license": "ISC", "dependencies": { + "@dllcnx/promise-ftp": "^1.3.6", "bluebird": "^3.7.2", "chalk": "^4.0.0", "compressing2": "^1.5.1", @@ -16,7 +17,6 @@ "minimatch": "5.0.1", "node-ssh": "^10.0.2", "ora": "^4.0.4", - "promise-ftp": "^1.3.5", "read": "^1.0.7", "shelljs": "^0.8.4", "ssh2-sftp-client": "^7.2.1", @@ -29,39 +29,39 @@ "mocha": "^9.1.3" } }, - "node_modules/@icetee/ftp": { - "version": "0.3.15", - "resolved": "https://registry.npmjs.org/@icetee/ftp/-/ftp-0.3.15.tgz", - "integrity": "sha512-RxSa9VjcDWgWCYsaLdZItdCnJj7p4LxggaEk+Y3MP0dHKoxez8ioG07DVekVbZZqccsrL+oPB/N9AzVPxj4blg==", + "node_modules/@dllcnx/promise-ftp": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/@dllcnx/promise-ftp/-/promise-ftp-1.3.6.tgz", + "integrity": "sha512-zLYSoOICE/SwvNMcbQYvJPzT+zGGJbryISxXgAH1HnI9HIne8BL52HBdWjUZgnwumgBW5cPm6poV4dgRLV3fgA==", "dependencies": { - "readable-stream": "1.1.x", - "xregexp": "2.0.0" + "@icetee/ftp": "^1.0.8", + "bluebird": "2.x", + "promise-ftp-common": "^1.1.5" }, "engines": { - "node": ">=0.8.0" + "iojs": "*", + "node": ">=0.11.13" + }, + "peerDependencies": { + "promise-ftp-common": "^1.1.5" } }, - "node_modules/@icetee/ftp/node_modules/isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==" + "node_modules/@dllcnx/promise-ftp/node_modules/bluebird": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz", + "integrity": "sha512-UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ==" }, - "node_modules/@icetee/ftp/node_modules/readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==", + "node_modules/@icetee/ftp": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@icetee/ftp/-/ftp-1.0.8.tgz", + "integrity": "sha512-zXaOXs5DDqmbLKJY4EiR6YP74FJR7nBFdkk7tkmTJFcPAAMUScJJFP5Xl0LDOErsfbXklulzRN527YRWMSUtvA==", "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" + "xregexp": "^3.2.0" + }, + "engines": { + "node": ">=6.4.0" } }, - "node_modules/@icetee/ftp/node_modules/string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==" - }, "node_modules/@ungap/promise-all-settled": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", @@ -1841,33 +1841,11 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, - "node_modules/promise-ftp": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/promise-ftp/-/promise-ftp-1.3.5.tgz", - "integrity": "sha512-v368jPSqzmjjKDIyggulC+dRFcpAOEX7aFdEWkFYQp8Ao3P2N4Y6XnFFdKgK7PtkylwvGQkZR/65HZuzmq0V7A==", - "dependencies": { - "@icetee/ftp": "^0.3.15", - "bluebird": "2.x", - "promise-ftp-common": "^1.1.5" - }, - "engines": { - "iojs": "*", - "node": ">=0.11.13" - }, - "peerDependencies": { - "promise-ftp-common": "^1.1.5" - } - }, "node_modules/promise-ftp-common": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/promise-ftp-common/-/promise-ftp-common-1.1.5.tgz", "integrity": "sha512-a84F/zM2Z0Ry/ht3nXfV6Ze7BISOQlWrct/YObrluJn8qy2LVeeQ+IJ7jD4bkmM0N2xfXYy5nurz4L1KEj+rJg==" }, - "node_modules/promise-ftp/node_modules/bluebird": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz", - "integrity": "sha512-UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ==" - }, "node_modules/promise-retry": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", @@ -2435,12 +2413,9 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "node_modules/xregexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz", - "integrity": "sha512-xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA==", - "engines": { - "node": "*" - } + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-3.2.0.tgz", + "integrity": "sha512-tWodXkrdYZPGadukpkmhKAbyp37CV5ZiFHacIVPhRZ4/sSt7qtOYHLv2dAqcPN0mBsViY2Qai9JkO7v2TBP6hg==" }, "node_modules/xtend": { "version": "4.0.2", @@ -2619,38 +2594,31 @@ } }, "dependencies": { - "@icetee/ftp": { - "version": "0.3.15", - "resolved": "https://registry.npmjs.org/@icetee/ftp/-/ftp-0.3.15.tgz", - "integrity": "sha512-RxSa9VjcDWgWCYsaLdZItdCnJj7p4LxggaEk+Y3MP0dHKoxez8ioG07DVekVbZZqccsrL+oPB/N9AzVPxj4blg==", + "@dllcnx/promise-ftp": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/@dllcnx/promise-ftp/-/promise-ftp-1.3.6.tgz", + "integrity": "sha512-zLYSoOICE/SwvNMcbQYvJPzT+zGGJbryISxXgAH1HnI9HIne8BL52HBdWjUZgnwumgBW5cPm6poV4dgRLV3fgA==", "requires": { - "readable-stream": "1.1.x", - "xregexp": "2.0.0" + "@icetee/ftp": "^1.0.8", + "bluebird": "2.x", + "promise-ftp-common": "^1.1.5" }, "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==" - }, - "readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==" + "bluebird": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz", + "integrity": "sha512-UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ==" } } }, + "@icetee/ftp": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@icetee/ftp/-/ftp-1.0.8.tgz", + "integrity": "sha512-zXaOXs5DDqmbLKJY4EiR6YP74FJR7nBFdkk7tkmTJFcPAAMUScJJFP5Xl0LDOErsfbXklulzRN527YRWMSUtvA==", + "requires": { + "xregexp": "^3.2.0" + } + }, "@ungap/promise-all-settled": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", @@ -4005,23 +3973,6 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, - "promise-ftp": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/promise-ftp/-/promise-ftp-1.3.5.tgz", - "integrity": "sha512-v368jPSqzmjjKDIyggulC+dRFcpAOEX7aFdEWkFYQp8Ao3P2N4Y6XnFFdKgK7PtkylwvGQkZR/65HZuzmq0V7A==", - "requires": { - "@icetee/ftp": "^0.3.15", - "bluebird": "2.x", - "promise-ftp-common": "^1.1.5" - }, - "dependencies": { - "bluebird": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz", - "integrity": "sha512-UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ==" - } - } - }, "promise-ftp-common": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/promise-ftp-common/-/promise-ftp-common-1.1.5.tgz", @@ -4464,9 +4415,9 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "xregexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz", - "integrity": "sha512-xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA==" + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-3.2.0.tgz", + "integrity": "sha512-tWodXkrdYZPGadukpkmhKAbyp37CV5ZiFHacIVPhRZ4/sSt7qtOYHLv2dAqcPN0mBsViY2Qai9JkO7v2TBP6hg==" }, "xtend": { "version": "4.0.2", diff --git a/package.json b/package.json index bea5133..46f6af9 100644 --- a/package.json +++ b/package.json @@ -21,16 +21,16 @@ }, "homepage": "https://github.com/KeiferJu/auto-deploy#readme", "dependencies": { + "@dllcnx/promise-ftp": "^1.3.6", + "bluebird": "^3.7.2", "chalk": "^4.0.0", "compressing2": "^1.5.1", "inquirer": "^7.1.0", + "minimatch": "5.0.1", "node-ssh": "^10.0.2", "ora": "^4.0.4", - "shelljs": "^0.8.4", - "bluebird": "^3.7.2", - "minimatch": "5.0.1", - "promise-ftp": "^1.3.5", "read": "^1.0.7", + "shelljs": "^0.8.4", "ssh2-sftp-client": "^7.2.1", "upath": "^2.0.1" },