diff --git a/.changeset/blue-carrots-remember.md b/.changeset/blue-carrots-remember.md new file mode 100644 index 000000000..bf9bbc2bf --- /dev/null +++ b/.changeset/blue-carrots-remember.md @@ -0,0 +1,8 @@ +--- +"@smartthings/cli": patch +"@smartthings/cli-lib": patch +--- + +- shutdown logger before Node exits +- update @oclif deps to latest +- replace process exits with command errors diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 28d605637..50a981e31 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -65,5 +65,6 @@ jobs: with: name: ${{ steps.cli-metadata.outputs.version }} tag_name: ${{ steps.cli-metadata.outputs.tag }} + generate_release_notes: true prerelease: true files: packages/cli/dist_bin/assets/* diff --git a/package-lock.json b/package-lock.json index ba1e66c8e..4a8eb2ee4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -83,18 +83,6 @@ "url": "https://opencollective.com/babel" } }, - "node_modules/@babel/core/node_modules/@babel/parser": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.0.tgz", - "integrity": "sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw==", - "dev": true, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/@babel/core/node_modules/json5": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", @@ -383,9 +371,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.16.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.8.tgz", - "integrity": "sha512-i7jDUfrVBWc+7OKcBzEe5n7fbv3i2fWtxKzzCvOjnzSxMfWMigAhtfJ7qzZNGFNMsCCd67+uz553dYKWXPvCKw==", + "version": "7.17.10", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.10.tgz", + "integrity": "sha512-n2Q6i+fnJqzOaq2VkdXxy2TCPCWQZHiCo0XqmrCvDWcZQKRyZzYi4Z0yxlBuN0w+r2ZHmre+Q087DSrw3pbJDQ==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -602,18 +590,6 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/traverse/node_modules/@babel/parser": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.0.tgz", - "integrity": "sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw==", - "dev": true, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/@babel/traverse/node_modules/globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", @@ -624,9 +600,9 @@ } }, "node_modules/@babel/types": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz", - "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==", + "version": "7.17.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz", + "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==", "dev": true, "dependencies": { "@babel/helper-validator-identifier": "^7.16.7", @@ -3023,9 +2999,9 @@ } }, "node_modules/@oclif/core": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@oclif/core/-/core-1.7.0.tgz", - "integrity": "sha512-I4q4qgtnNG7ef4sBDrJhwADdi7RExQV7LnflnXaWZZDiUoqF9AdOjC4jjx40MK0rRrCehCUtPNZBcr3WmxuS4Q==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@oclif/core/-/core-1.9.0.tgz", + "integrity": "sha512-duvlaRQf4JM+mKuwwos1DNa/Q9x6tnF3khV5RU0fy5hhETF7THlTmxioKlIvKMyQDVpySqtZXZ0OKHeCi2EWuQ==", "dependencies": { "@oclif/linewrap": "^1.0.0", "@oclif/screen": "^3.0.2", @@ -3035,7 +3011,7 @@ "chalk": "^4.1.2", "clean-stack": "^3.0.1", "cli-progress": "^3.10.0", - "debug": "^4.3.3", + "debug": "^4.3.4", "ejs": "^3.1.6", "fs-extra": "^9.1.0", "get-package-type": "^0.1.0", @@ -3044,11 +3020,10 @@ "indent-string": "^4.0.0", "is-wsl": "^2.2.0", "js-yaml": "^3.14.1", - "lodash": "^4.17.21", "natural-orderby": "^2.0.3", "object-treeify": "^1.1.33", "password-prompt": "^1.1.2", - "semver": "^7.3.5", + "semver": "^7.3.7", "string-width": "^4.2.3", "strip-ansi": "^6.0.1", "supports-color": "^8.1.1", @@ -3126,13 +3101,13 @@ "integrity": "sha512-Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw==" }, "node_modules/@oclif/plugin-autocomplete": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@oclif/plugin-autocomplete/-/plugin-autocomplete-1.2.0.tgz", - "integrity": "sha512-Y64uhbhQLcLms2N6kvoIb40s2czOECeMzGs0ATf/3kNojY2nsYaQ0mI6PghQs/JgpVg4DnZOJivleYBr+XPn7Q==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@oclif/plugin-autocomplete/-/plugin-autocomplete-1.3.0.tgz", + "integrity": "sha512-N2DRWKvuSXTGuaYf4buRbRfh5yNybb1cjQmPl9viY0BIqTwZgtQdzSD6ZSOkwda51RbGcQomYcc/h8T+ZFAkMQ==", "dependencies": { - "@oclif/core": "^1.2.0", + "@oclif/core": "^1.7.0", "chalk": "^4.1.0", - "debug": "^4.0.0", + "debug": "^4.3.4", "fs-extra": "^9.0.1" }, "engines": { @@ -6493,9 +6468,9 @@ } }, "node_modules/debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dependencies": { "ms": "2.1.2" }, @@ -9531,9 +9506,9 @@ } }, "node_modules/is-core-module": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz", - "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==", + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", + "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", "dependencies": { "has": "^1.0.3" }, @@ -13308,26 +13283,25 @@ } }, "node_modules/pkg": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/pkg/-/pkg-5.6.0.tgz", - "integrity": "sha512-mHrAVSQWmHA41RnUmRpC7pK9lNnMfdA16CF3cqOI22a8LZxOQzF7M8YWtA2nfs+d7I0MTDXOtkDsAsFXeCpYjg==", + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/pkg/-/pkg-5.7.0.tgz", + "integrity": "sha512-PTiAjNq/CGAtK5qUBR6pjheqnipTFjeecgSgIKEcAOJA4GpmZeOZC8pMOoT0rfes5vHsmcFo7wbSRTAmXQurrg==", "dev": true, "dependencies": { - "@babel/parser": "7.16.2", - "@babel/types": "7.16.0", + "@babel/parser": "7.17.10", + "@babel/types": "7.17.10", "chalk": "^4.1.2", "escodegen": "^2.0.0", "fs-extra": "^9.1.0", - "globby": "^11.0.4", + "globby": "^11.1.0", "into-stream": "^6.0.0", - "minimist": "^1.2.5", + "is-core-module": "2.9.0", + "minimist": "^1.2.6", "multistream": "^4.1.0", - "pkg-fetch": "3.3.0", + "pkg-fetch": "3.4.1", "prebuild-install": "6.1.4", - "progress": "^2.0.3", - "resolve": "^1.20.0", - "stream-meter": "^1.0.4", - "tslib": "2.3.1" + "resolve": "^1.22.0", + "stream-meter": "^1.0.4" }, "bin": { "pkg": "lib-es5/bin.js" @@ -13353,9 +13327,9 @@ } }, "node_modules/pkg-fetch": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.3.0.tgz", - "integrity": "sha512-xJnIZ1KP+8rNN+VLafwu4tEeV4m8IkFBDdCFqmAJz9K1aiXEtbARmdbEe6HlXWGSVuShSHjFXpfkKRkDBQ5kiA==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.4.1.tgz", + "integrity": "sha512-fS4cdayCa1r4jHkOKGPJKnS9PEs6OWZst+s+m0+CmhmPZObMnxoRnf9T9yUWl+lzM2b5aJF7cnQIySCT7Hq8Dg==", "dev": true, "dependencies": { "chalk": "^4.1.2", @@ -13407,31 +13381,6 @@ "node": ">= 10.0.0" } }, - "node_modules/pkg/node_modules/@babel/parser": { - "version": "7.16.2", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.2.tgz", - "integrity": "sha512-RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw==", - "dev": true, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/pkg/node_modules/@babel/types": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.0.tgz", - "integrity": "sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.15.7", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/pkg/node_modules/fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -13459,6 +13408,12 @@ "graceful-fs": "^4.1.6" } }, + "node_modules/pkg/node_modules/minimist": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", + "dev": true + }, "node_modules/pkg/node_modules/universalify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", @@ -14299,11 +14254,11 @@ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" }, "node_modules/resolve": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.21.0.tgz", - "integrity": "sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==", + "version": "1.22.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", + "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", "dependencies": { - "is-core-module": "^2.8.0", + "is-core-module": "^2.8.1", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -17607,14 +17562,14 @@ }, "packages/cli": { "name": "@smartthings/cli", - "version": "1.0.0-beta.6", + "version": "1.0.0-beta.7", "license": "Apache-2.0", "dependencies": { - "@oclif/core": "^1.7.0", - "@oclif/plugin-autocomplete": "^1.2.0", + "@oclif/core": "^1.9.0", + "@oclif/plugin-autocomplete": "^1.3.0", "@oclif/plugin-not-found": "^2.3.1", "@oclif/plugin-plugins": "^2.1.0", - "@smartthings/cli-lib": "^1.0.0-beta.5", + "@smartthings/cli-lib": "^1.0.0-beta.7", "@smartthings/core-sdk": "^4.0.0", "@smartthings/plugin-cli-edge": "^1.13.0", "aws-sdk": "^2.1106.0", @@ -17642,7 +17597,7 @@ "jest": "^27.5.1", "jest-extended": "^0.11.5", "oclif": "^3.0.1", - "pkg": "^5.6.0", + "pkg": "^5.7.0", "rimraf": "^3.0.2", "ts-jest": "^27.1.4", "ts-node": "^10.5.0", @@ -17655,11 +17610,11 @@ }, "packages/lib": { "name": "@smartthings/cli-lib", - "version": "1.0.0-beta.6", + "version": "1.0.0-beta.7", "license": "Apache-2.0", "dependencies": { "@log4js-node/log4js-api": "^1.0.2", - "@oclif/core": "^1.7.0", + "@oclif/core": "^1.9.0", "@smartthings/core-sdk": "^4.0.0", "@types/eventsource": "^1.1.8", "axios": "^0.21.4", @@ -17692,6 +17647,7 @@ "eslint-plugin-jest": "^26.1.3", "jest": "^27.5.1", "jest-extended": "^0.11.5", + "log4js": "6.3.0", "mock-stdin": "^1.0.0", "oclif": "^3.0.1", "rimraf": "^3.0.2", @@ -17782,12 +17738,6 @@ "semver": "^6.3.0" }, "dependencies": { - "@babel/parser": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.0.tgz", - "integrity": "sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw==", - "dev": true - }, "json5": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", @@ -18007,9 +17957,9 @@ } }, "@babel/parser": { - "version": "7.16.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.8.tgz", - "integrity": "sha512-i7jDUfrVBWc+7OKcBzEe5n7fbv3i2fWtxKzzCvOjnzSxMfWMigAhtfJ7qzZNGFNMsCCd67+uz553dYKWXPvCKw==", + "version": "7.17.10", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.10.tgz", + "integrity": "sha512-n2Q6i+fnJqzOaq2VkdXxy2TCPCWQZHiCo0XqmrCvDWcZQKRyZzYi4Z0yxlBuN0w+r2ZHmre+Q087DSrw3pbJDQ==", "dev": true }, "@babel/plugin-syntax-async-generators": { @@ -18166,12 +18116,6 @@ "globals": "^11.1.0" }, "dependencies": { - "@babel/parser": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.0.tgz", - "integrity": "sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw==", - "dev": true - }, "globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", @@ -18181,9 +18125,9 @@ } }, "@babel/types": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz", - "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==", + "version": "7.17.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz", + "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.16.7", @@ -20146,9 +20090,9 @@ } }, "@oclif/core": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@oclif/core/-/core-1.7.0.tgz", - "integrity": "sha512-I4q4qgtnNG7ef4sBDrJhwADdi7RExQV7LnflnXaWZZDiUoqF9AdOjC4jjx40MK0rRrCehCUtPNZBcr3WmxuS4Q==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@oclif/core/-/core-1.9.0.tgz", + "integrity": "sha512-duvlaRQf4JM+mKuwwos1DNa/Q9x6tnF3khV5RU0fy5hhETF7THlTmxioKlIvKMyQDVpySqtZXZ0OKHeCi2EWuQ==", "requires": { "@oclif/linewrap": "^1.0.0", "@oclif/screen": "^3.0.2", @@ -20158,7 +20102,7 @@ "chalk": "^4.1.2", "clean-stack": "^3.0.1", "cli-progress": "^3.10.0", - "debug": "^4.3.3", + "debug": "^4.3.4", "ejs": "^3.1.6", "fs-extra": "^9.1.0", "get-package-type": "^0.1.0", @@ -20167,11 +20111,10 @@ "indent-string": "^4.0.0", "is-wsl": "^2.2.0", "js-yaml": "^3.14.1", - "lodash": "^4.17.21", "natural-orderby": "^2.0.3", "object-treeify": "^1.1.33", "password-prompt": "^1.1.2", - "semver": "^7.3.5", + "semver": "^7.3.7", "string-width": "^4.2.3", "strip-ansi": "^6.0.1", "supports-color": "^8.1.1", @@ -20231,13 +20174,13 @@ "integrity": "sha512-Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw==" }, "@oclif/plugin-autocomplete": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@oclif/plugin-autocomplete/-/plugin-autocomplete-1.2.0.tgz", - "integrity": "sha512-Y64uhbhQLcLms2N6kvoIb40s2czOECeMzGs0ATf/3kNojY2nsYaQ0mI6PghQs/JgpVg4DnZOJivleYBr+XPn7Q==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@oclif/plugin-autocomplete/-/plugin-autocomplete-1.3.0.tgz", + "integrity": "sha512-N2DRWKvuSXTGuaYf4buRbRfh5yNybb1cjQmPl9viY0BIqTwZgtQdzSD6ZSOkwda51RbGcQomYcc/h8T+ZFAkMQ==", "requires": { - "@oclif/core": "^1.2.0", + "@oclif/core": "^1.7.0", "chalk": "^4.1.0", - "debug": "^4.0.0", + "debug": "^4.3.4", "fs-extra": "^9.0.1" }, "dependencies": { @@ -20586,11 +20529,11 @@ "@smartthings/cli": { "version": "file:packages/cli", "requires": { - "@oclif/core": "^1.7.0", - "@oclif/plugin-autocomplete": "^1.2.0", + "@oclif/core": "^1.9.0", + "@oclif/plugin-autocomplete": "^1.3.0", "@oclif/plugin-not-found": "^2.3.1", "@oclif/plugin-plugins": "^2.1.0", - "@smartthings/cli-lib": "^1.0.0-beta.5", + "@smartthings/cli-lib": "^1.0.0-beta.7", "@smartthings/cli-testlib": "^1.0.0-beta.4", "@smartthings/core-sdk": "^4.0.0", "@smartthings/plugin-cli-edge": "^1.13.0", @@ -20613,7 +20556,7 @@ "js-yaml": "^4.1.0", "log4js": "6.3.0", "oclif": "^3.0.1", - "pkg": "^5.6.0", + "pkg": "^5.7.0", "rimraf": "^3.0.2", "ts-jest": "^27.1.4", "ts-node": "^10.5.0", @@ -20624,7 +20567,7 @@ "version": "file:packages/lib", "requires": { "@log4js-node/log4js-api": "^1.0.2", - "@oclif/core": "^1.7.0", + "@oclif/core": "^1.9.0", "@smartthings/core-sdk": "^4.0.0", "@types/cli-table": "^0.3.0", "@types/eventsource": "^1.1.8", @@ -20652,6 +20595,7 @@ "jest-extended": "^0.11.5", "js-yaml": "^4.1.0", "lodash.at": "^4.6.0", + "log4js": "6.3.0", "mock-stdin": "^1.0.0", "oclif": "^3.0.1", "open": "^8.4.0", @@ -23012,9 +22956,9 @@ "integrity": "sha512-eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w==" }, "debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "requires": { "ms": "2.1.2" } @@ -25352,9 +25296,9 @@ } }, "is-core-module": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz", - "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==", + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", + "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", "requires": { "has": "^1.0.3" } @@ -28274,44 +28218,27 @@ "dev": true }, "pkg": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/pkg/-/pkg-5.6.0.tgz", - "integrity": "sha512-mHrAVSQWmHA41RnUmRpC7pK9lNnMfdA16CF3cqOI22a8LZxOQzF7M8YWtA2nfs+d7I0MTDXOtkDsAsFXeCpYjg==", + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/pkg/-/pkg-5.7.0.tgz", + "integrity": "sha512-PTiAjNq/CGAtK5qUBR6pjheqnipTFjeecgSgIKEcAOJA4GpmZeOZC8pMOoT0rfes5vHsmcFo7wbSRTAmXQurrg==", "dev": true, "requires": { - "@babel/parser": "7.16.2", - "@babel/types": "7.16.0", + "@babel/parser": "7.17.10", + "@babel/types": "7.17.10", "chalk": "^4.1.2", "escodegen": "^2.0.0", "fs-extra": "^9.1.0", - "globby": "^11.0.4", + "globby": "^11.1.0", "into-stream": "^6.0.0", - "minimist": "^1.2.5", + "is-core-module": "2.9.0", + "minimist": "^1.2.6", "multistream": "^4.1.0", - "pkg-fetch": "3.3.0", + "pkg-fetch": "3.4.1", "prebuild-install": "6.1.4", - "progress": "^2.0.3", - "resolve": "^1.20.0", - "stream-meter": "^1.0.4", - "tslib": "2.3.1" + "resolve": "^1.22.0", + "stream-meter": "^1.0.4" }, "dependencies": { - "@babel/parser": { - "version": "7.16.2", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.2.tgz", - "integrity": "sha512-RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw==", - "dev": true - }, - "@babel/types": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.0.tgz", - "integrity": "sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.15.7", - "to-fast-properties": "^2.0.0" - } - }, "fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -28334,6 +28261,12 @@ "universalify": "^2.0.0" } }, + "minimist": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", + "dev": true + }, "universalify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", @@ -28351,9 +28284,9 @@ } }, "pkg-fetch": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.3.0.tgz", - "integrity": "sha512-xJnIZ1KP+8rNN+VLafwu4tEeV4m8IkFBDdCFqmAJz9K1aiXEtbARmdbEe6HlXWGSVuShSHjFXpfkKRkDBQ5kiA==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.4.1.tgz", + "integrity": "sha512-fS4cdayCa1r4jHkOKGPJKnS9PEs6OWZst+s+m0+CmhmPZObMnxoRnf9T9yUWl+lzM2b5aJF7cnQIySCT7Hq8Dg==", "dev": true, "requires": { "chalk": "^4.1.2", @@ -29023,11 +28956,11 @@ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" }, "resolve": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.21.0.tgz", - "integrity": "sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==", + "version": "1.22.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", + "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", "requires": { - "is-core-module": "^2.8.0", + "is-core-module": "^2.8.1", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" } diff --git a/packages/cli/bin/dev b/packages/cli/bin/dev index bbc3f51d5..8f1f65988 100755 --- a/packages/cli/bin/dev +++ b/packages/cli/bin/dev @@ -1,6 +1,7 @@ #!/usr/bin/env node const oclif = require('@oclif/core') +const log4js = require('log4js') const path = require('path') const project = path.join(__dirname, '..', 'tsconfig.json') @@ -14,4 +15,7 @@ require('ts-node').register({project}) oclif.settings.debug = true; // Start the CLI -oclif.run().then(oclif.flush).catch(oclif.Errors.handle) +oclif.run() + .then(oclif.flush) + .catch(oclif.Errors.handle) + .finally(log4js.shutdown) diff --git a/packages/cli/bin/run b/packages/cli/bin/run index a7635de86..4e197af85 100755 --- a/packages/cli/bin/run +++ b/packages/cli/bin/run @@ -1,5 +1,9 @@ #!/usr/bin/env node const oclif = require('@oclif/core') +const log4js = require('log4js') -oclif.run().then(require('@oclif/core/flush')).catch(require('@oclif/core/handle')) +oclif.run() + .then(oclif.flush) + .catch(oclif.Errors.handle) + .finally(log4js.shutdown) diff --git a/packages/cli/package.json b/packages/cli/package.json index 3cdbd248e..96608cddf 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -67,8 +67,8 @@ ] }, "dependencies": { - "@oclif/core": "^1.7.0", - "@oclif/plugin-autocomplete": "^1.2.0", + "@oclif/core": "^1.9.0", + "@oclif/plugin-autocomplete": "^1.3.0", "@oclif/plugin-not-found": "^2.3.1", "@oclif/plugin-plugins": "^2.1.0", "@smartthings/cli-lib": "^1.0.0-beta.7", @@ -96,7 +96,7 @@ "jest": "^27.5.1", "jest-extended": "^0.11.5", "oclif": "^3.0.1", - "pkg": "^5.6.0", + "pkg": "^5.7.0", "rimraf": "^3.0.2", "ts-jest": "^27.1.4", "ts-node": "^10.5.0", diff --git a/packages/cli/src/commands/schema/create.ts b/packages/cli/src/commands/schema/create.ts index 8c50a4ffd..121fc16b2 100644 --- a/packages/cli/src/commands/schema/create.ts +++ b/packages/cli/src/commands/schema/create.ts @@ -40,9 +40,7 @@ export default class SchemaAppCreateCommand extends APICommand