From 3a510f252fb301d58dae49dce99f09aae153a8dd Mon Sep 17 00:00:00 2001 From: Aman Kumar Date: Tue, 27 Feb 2024 12:14:38 +0530 Subject: [PATCH 1/7] fix: handle module not found error in migration error helper --- packages/contentstack-migration/src/utils/error-helper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/contentstack-migration/src/utils/error-helper.js b/packages/contentstack-migration/src/utils/error-helper.js index 86184b0c03..f1048eb743 100644 --- a/packages/contentstack-migration/src/utils/error-helper.js +++ b/packages/contentstack-migration/src/utils/error-helper.js @@ -51,7 +51,7 @@ module.exports = (errors) => { messages.push(`${fileErrorsMessage}${errorMessages}`); } - if (isEmpty(messages) && errors?.length) { + if (isEmpty(messages) && errors !== undefined && isEmpty(errorsByFile)) { console.error('Migration error---', errors); } else { console.log(messages.join('\n')); From 705a333ff855d49769622f9ac8c3d080d48c5844 Mon Sep 17 00:00:00 2001 From: shafeeqd959 Date: Wed, 28 Feb 2024 19:43:29 +0530 Subject: [PATCH 2/7] fixed referenced entries publish --- packages/contentstack-bulk-publish/package.json | 2 +- packages/contentstack-bulk-publish/src/consumer/publish.js | 1 + packages/contentstack/package.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/contentstack-bulk-publish/package.json b/packages/contentstack-bulk-publish/package.json index b075ce9fb3..9c5b992f84 100644 --- a/packages/contentstack-bulk-publish/package.json +++ b/packages/contentstack-bulk-publish/package.json @@ -1,7 +1,7 @@ { "name": "@contentstack/cli-cm-bulk-publish", "description": "Contentstack CLI plugin for bulk publish actions", - "version": "1.4.1", + "version": "1.4.2", "author": "Contentstack", "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { diff --git a/packages/contentstack-bulk-publish/src/consumer/publish.js b/packages/contentstack-bulk-publish/src/consumer/publish.js index 92d7c21c75..ae21d7ac0b 100644 --- a/packages/contentstack-bulk-publish/src/consumer/publish.js +++ b/packages/contentstack-bulk-publish/src/consumer/publish.js @@ -232,6 +232,7 @@ async function performBulkPublish(data, _config, queue) { if (bulkPublishObj.apiVersion) { if (!isNaN(bulkPublishObj.apiVersion) && bulkPublishObj.apiVersion === apiVersionForNRP) { payload['api_version'] = bulkPublishObj.apiVersion + payload.details.publish_with_reference = true; } else { if (bulkPublishObj.apiVersion !== '3') { // because 3 is the default value for api-version, and it exists for the purpose of display only console.log( diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json index 221ce0107d..cb5ec148bb 100755 --- a/packages/contentstack/package.json +++ b/packages/contentstack/package.json @@ -26,7 +26,7 @@ "@contentstack/cli-auth": "~1.3.17", "@contentstack/cli-cm-bootstrap": "~1.9.0", "@contentstack/cli-cm-branches": "~1.0.22", - "@contentstack/cli-cm-bulk-publish": "~1.4.1", + "@contentstack/cli-cm-bulk-publish": "~1.4.2", "@contentstack/cli-cm-export": "~1.11.0", "@contentstack/cli-cm-clone": "~1.10.1", "@contentstack/cli-cm-export-to-csv": "~1.7.0", From 6d746cb66e8d0ea22e33085462a37bde2d36f4e5 Mon Sep 17 00:00:00 2001 From: shafeeqd959 Date: Thu, 29 Feb 2024 12:10:45 +0530 Subject: [PATCH 3/7] bumped tmp package --- package-lock.json | 43 ++++++-------------- packages/contentstack-auth/package.json | 2 +- packages/contentstack-bootstrap/package.json | 2 +- packages/contentstack-bulk-publish/README.md | 2 +- packages/contentstack-config/package.json | 2 +- packages/contentstack-import/package.json | 2 +- packages/contentstack-seed/package.json | 2 +- packages/contentstack-utilities/package.json | 2 +- packages/contentstack/README.md | 14 +++---- packages/contentstack/package.json | 2 +- pnpm-lock.yaml | 39 +++++++++--------- 11 files changed, 47 insertions(+), 65 deletions(-) diff --git a/package-lock.json b/package-lock.json index fc11267db3..f86189fc35 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21269,28 +21269,11 @@ } }, "node_modules/tmp": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", - "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", - "dependencies": { - "rimraf": "^3.0.0" - }, + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", + "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", "engines": { - "node": ">=8.17.0" - } - }, - "node_modules/tmp/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": ">=14.14" } }, "node_modules/tmpl": { @@ -23986,7 +23969,7 @@ "@contentstack/cli-auth": "~1.3.17", "@contentstack/cli-cm-bootstrap": "~1.9.0", "@contentstack/cli-cm-branches": "~1.0.22", - "@contentstack/cli-cm-bulk-publish": "~1.4.1", + "@contentstack/cli-cm-bulk-publish": "~1.4.2", "@contentstack/cli-cm-clone": "~1.10.1", "@contentstack/cli-cm-export": "~1.11.0", "@contentstack/cli-cm-export-to-csv": "~1.7.0", @@ -24036,7 +24019,7 @@ "rimraf": "^2.7.1", "shelljs": "^0.8.4", "sinon": "^15.0.1", - "tmp": "^0.2.1", + "tmp": "^0.2.2", "ts-node": "^10.9.1", "tslib": "^2.4.1", "typescript": "^4.9.3" @@ -24340,7 +24323,7 @@ "oclif": "^3.8.1", "rimraf": "^2.7.1", "sinon": "^15.0.1", - "tmp": "^0.2.1", + "tmp": "^0.2.2", "ts-node": "^10.9.1", "typescript": "^4.9.3" }, @@ -24381,7 +24364,7 @@ "nyc": "^15.1.0", "oclif": "^3.8.1", "rimraf": "^2.7.1", - "tmp": "^0.2.1", + "tmp": "^0.2.2", "ts-node": "^8.10.2", "typescript": "^4.9.3" }, @@ -24490,7 +24473,7 @@ }, "packages/contentstack-bulk-publish": { "name": "@contentstack/cli-cm-bulk-publish", - "version": "1.4.1", + "version": "1.4.2", "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.2.16", @@ -24769,7 +24752,7 @@ "oclif": "^3.8.1", "rimraf": "^2.7.1", "sinon": "^15.0.1", - "tmp": "^0.2.1", + "tmp": "^0.2.2", "ts-node": "^10.9.1", "typescript": "^4.9.3" }, @@ -25556,7 +25539,7 @@ "oclif": "^3.8.1", "rimraf": "^2.7.1", "sinon": "^11.1.1", - "tmp": "^0.2.1", + "tmp": "^0.2.2", "ts-node": "^10.9.1", "typescript": "^4.9.3" }, @@ -25997,7 +25980,7 @@ "inquirer": "8.2.4", "mkdirp": "^1.0.4", "tar": "^6.1.13", - "tmp": "^0.2.1", + "tmp": "^0.2.2", "tslib": "^2.4.1" }, "devDependencies": { @@ -26124,7 +26107,7 @@ "nyc": "^15.1.0", "rimraf": "^2.7.1", "sinon": "^15.0.1", - "tmp": "^0.2.1", + "tmp": "^0.2.2", "ts-node": "^10.9.1", "tslib": "^1.13.0", "typescript": "^4.9.3" diff --git a/packages/contentstack-auth/package.json b/packages/contentstack-auth/package.json index 448f3a0c16..4dc695b58b 100644 --- a/packages/contentstack-auth/package.json +++ b/packages/contentstack-auth/package.json @@ -50,7 +50,7 @@ "oclif": "^3.8.1", "rimraf": "^2.7.1", "sinon": "^15.0.1", - "tmp": "^0.2.1", + "tmp": "^0.2.2", "ts-node": "^10.9.1", "typescript": "^4.9.3" }, diff --git a/packages/contentstack-bootstrap/package.json b/packages/contentstack-bootstrap/package.json index 6ab12662ce..af348f79b1 100644 --- a/packages/contentstack-bootstrap/package.json +++ b/packages/contentstack-bootstrap/package.json @@ -39,7 +39,7 @@ "nyc": "^15.1.0", "oclif": "^3.8.1", "rimraf": "^2.7.1", - "tmp": "^0.2.1", + "tmp": "^0.2.2", "ts-node": "^8.10.2", "typescript": "^4.9.3" }, diff --git a/packages/contentstack-bulk-publish/README.md b/packages/contentstack-bulk-publish/README.md index 687d378b30..171e187380 100644 --- a/packages/contentstack-bulk-publish/README.md +++ b/packages/contentstack-bulk-publish/README.md @@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-cm-bulk-publish $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-bulk-publish/1.4.1 darwin-arm64 node-v20.8.0 +@contentstack/cli-cm-bulk-publish/1.4.2 darwin-arm64 node-v20.8.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-config/package.json b/packages/contentstack-config/package.json index 50b85a6931..bd47939765 100644 --- a/packages/contentstack-config/package.json +++ b/packages/contentstack-config/package.json @@ -48,7 +48,7 @@ "oclif": "^3.8.1", "rimraf": "^2.7.1", "sinon": "^15.0.1", - "tmp": "^0.2.1", + "tmp": "^0.2.2", "ts-node": "^10.9.1", "typescript": "^4.9.3" }, diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json index dba8271dfc..84de150149 100644 --- a/packages/contentstack-import/package.json +++ b/packages/contentstack-import/package.json @@ -46,7 +46,7 @@ "oclif": "^3.8.1", "rimraf": "^2.7.1", "sinon": "^11.1.1", - "tmp": "^0.2.1", + "tmp": "^0.2.2", "ts-node": "^10.9.1", "typescript": "^4.9.3" }, diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json index 29aa4985c6..67f53fd701 100644 --- a/packages/contentstack-seed/package.json +++ b/packages/contentstack-seed/package.json @@ -11,7 +11,7 @@ "inquirer": "8.2.4", "mkdirp": "^1.0.4", "tar": "^6.1.13", - "tmp": "^0.2.1", + "tmp": "^0.2.2", "tslib": "^2.4.1" }, "devDependencies": { diff --git a/packages/contentstack-utilities/package.json b/packages/contentstack-utilities/package.json index 81e7600b43..00b4686f63 100644 --- a/packages/contentstack-utilities/package.json +++ b/packages/contentstack-utilities/package.json @@ -78,7 +78,7 @@ "nyc": "^15.1.0", "rimraf": "^2.7.1", "sinon": "^15.0.1", - "tmp": "^0.2.1", + "tmp": "^0.2.2", "ts-node": "^10.9.1", "tslib": "^1.13.0", "typescript": "^4.9.3" diff --git a/packages/contentstack/README.md b/packages/contentstack/README.md index 463eaafcaa..8da7868e96 100644 --- a/packages/contentstack/README.md +++ b/packages/contentstack/README.md @@ -3518,7 +3518,7 @@ EXAMPLES $ csdx plugins ``` -_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.1.10/src/commands/plugins/index.ts)_ +_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.1.17/src/commands/plugins/index.ts)_ ## `csdx plugins:install PLUGIN...` @@ -3587,7 +3587,7 @@ EXAMPLES $ csdx plugins:inspect myplugin ``` -_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.1.10/src/commands/plugins/inspect.ts)_ +_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.1.17/src/commands/plugins/inspect.ts)_ ## `csdx plugins:install PLUGIN...` @@ -3631,7 +3631,7 @@ EXAMPLES $ csdx plugins:install someuser/someplugin ``` -_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.1.10/src/commands/plugins/install.ts)_ +_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.1.17/src/commands/plugins/install.ts)_ ## `csdx plugins:link PLUGIN` @@ -3661,7 +3661,7 @@ EXAMPLES $ csdx plugins:link myplugin ``` -_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.1.10/src/commands/plugins/link.ts)_ +_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.1.17/src/commands/plugins/link.ts)_ ## `csdx plugins:uninstall PLUGIN...` @@ -3698,7 +3698,7 @@ USAGE $ csdx plugins:reset ``` -_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.1.10/src/commands/plugins/reset.ts)_ +_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.1.17/src/commands/plugins/reset.ts)_ ## `csdx plugins:uninstall PLUGIN...` @@ -3726,7 +3726,7 @@ EXAMPLES $ csdx plugins:uninstall myplugin ``` -_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.1.10/src/commands/plugins/uninstall.ts)_ +_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.1.17/src/commands/plugins/uninstall.ts)_ ## `csdx plugins:uninstall PLUGIN...` @@ -3770,7 +3770,7 @@ DESCRIPTION Update installed plugins. ``` -_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.1.10/src/commands/plugins/update.ts)_ +_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.1.17/src/commands/plugins/update.ts)_ ## `csdx tokens` diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json index cb5ec148bb..97feb74e86 100755 --- a/packages/contentstack/package.json +++ b/packages/contentstack/package.json @@ -73,7 +73,7 @@ "rimraf": "^2.7.1", "shelljs": "^0.8.4", "sinon": "^15.0.1", - "tmp": "^0.2.1", + "tmp": "^0.2.2", "ts-node": "^10.9.1", "tslib": "^2.4.1", "typescript": "^4.9.3" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 430b983d3c..44755646b8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,7 +14,7 @@ importers: '@contentstack/cli-auth': ~1.3.17 '@contentstack/cli-cm-bootstrap': ~1.9.0 '@contentstack/cli-cm-branches': ~1.0.22 - '@contentstack/cli-cm-bulk-publish': ~1.4.1 + '@contentstack/cli-cm-bulk-publish': ~1.4.2 '@contentstack/cli-cm-clone': ~1.10.1 '@contentstack/cli-cm-export': ~1.11.0 '@contentstack/cli-cm-export-to-csv': ~1.7.0 @@ -57,7 +57,7 @@ importers: shelljs: ^0.8.4 short-uuid: ^4.2.2 sinon: ^15.0.1 - tmp: ^0.2.1 + tmp: ^0.2.2 ts-node: ^10.9.1 tslib: ^2.4.1 typescript: ^4.9.3 @@ -114,7 +114,7 @@ importers: rimraf: 2.7.1 shelljs: 0.8.5 sinon: 15.2.0 - tmp: 0.2.1 + tmp: 0.2.3 ts-node: 10.9.2_ogreqof3k35xezedraj6pnd45y tslib: 2.6.2 typescript: 4.9.5 @@ -211,7 +211,7 @@ importers: oclif: ^3.8.1 rimraf: ^2.7.1 sinon: ^15.0.1 - tmp: ^0.2.1 + tmp: ^0.2.2 ts-node: ^10.9.1 typescript: ^4.9.3 winston: ^3.7.2 @@ -243,7 +243,7 @@ importers: oclif: 3.17.2_ogreqof3k35xezedraj6pnd45y rimraf: 2.7.1 sinon: 15.2.0 - tmp: 0.2.1 + tmp: 0.2.3 ts-node: 10.9.2_ogreqof3k35xezedraj6pnd45y typescript: 4.9.5 @@ -269,7 +269,7 @@ importers: oclif: ^3.8.1 rimraf: ^2.7.1 tar: ^6.1.13 - tmp: ^0.2.1 + tmp: ^0.2.2 ts-node: ^8.10.2 typescript: ^4.9.3 dependencies: @@ -294,7 +294,7 @@ importers: nyc: 15.1.0 oclif: 3.17.2_ogreqof3k35xezedraj6pnd45y rimraf: 2.7.1 - tmp: 0.2.1 + tmp: 0.2.3 ts-node: 8.10.2_typescript@4.9.5 typescript: 4.9.5 @@ -544,7 +544,7 @@ importers: oclif: ^3.8.1 rimraf: ^2.7.1 sinon: ^15.0.1 - tmp: ^0.2.1 + tmp: ^0.2.2 ts-node: ^10.9.1 typescript: ^4.9.3 winston: ^3.7.2 @@ -575,7 +575,7 @@ importers: oclif: 3.17.2_ogreqof3k35xezedraj6pnd45y rimraf: 2.7.1 sinon: 15.2.0 - tmp: 0.2.1 + tmp: 0.2.3 ts-node: 10.9.2_ogreqof3k35xezedraj6pnd45y typescript: 4.9.5 @@ -766,7 +766,7 @@ importers: promise-limit: ^2.7.0 rimraf: ^2.7.1 sinon: ^11.1.1 - tmp: ^0.2.1 + tmp: ^0.2.2 ts-node: ^10.9.1 tslib: ^2.4.1 typescript: ^4.9.3 @@ -813,7 +813,7 @@ importers: oclif: 3.17.2_vk2nahlbg3l2zm6o274jd7fsaa rimraf: 2.7.1 sinon: 11.1.2 - tmp: 0.2.1 + tmp: 0.2.3 ts-node: 10.9.2_ogreqof3k35xezedraj6pnd45y typescript: 4.9.5 @@ -1010,7 +1010,7 @@ importers: mkdirp: ^1.0.4 oclif: ^3.8.1 tar: ^6.1.13 - tmp: ^0.2.1 + tmp: ^0.2.2 ts-jest: ^29.0.5 ts-node: ^8.10.2 tslib: ^2.4.1 @@ -1022,7 +1022,7 @@ importers: inquirer: 8.2.4 mkdirp: 1.0.4 tar: 6.2.0 - tmp: 0.2.1 + tmp: 0.2.3 tslib: 2.6.2 devDependencies: '@oclif/plugin-help': 5.2.20_ogreqof3k35xezedraj6pnd45y @@ -1084,7 +1084,7 @@ importers: rimraf: ^2.7.1 rxjs: ^6.6.7 sinon: ^15.0.1 - tmp: ^0.2.1 + tmp: ^0.2.2 traverse: ^0.6.7 ts-node: ^10.9.1 tslib: ^1.13.0 @@ -1139,7 +1139,7 @@ importers: nyc: 15.1.0 rimraf: 2.7.1 sinon: 15.2.0 - tmp: 0.2.1 + tmp: 0.2.3 ts-node: 10.9.2_ogreqof3k35xezedraj6pnd45y tslib: 1.14.1 typescript: 4.9.5 @@ -12429,6 +12429,7 @@ packages: hasBin: true dependencies: glob: 7.2.3 + dev: true /rimraf/5.0.5: resolution: {integrity: sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==} @@ -13246,11 +13247,9 @@ packages: dependencies: os-tmpdir: 1.0.2 - /tmp/0.2.1: - resolution: {integrity: sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==} - engines: {node: '>=8.17.0'} - dependencies: - rimraf: 3.0.2 + /tmp/0.2.3: + resolution: {integrity: sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==} + engines: {node: '>=14.14'} /tmpl/1.0.5: resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==} From cfb744851ef617a03dbae68cc81c64a398d18b61 Mon Sep 17 00:00:00 2001 From: Aravind Kumar Date: Thu, 29 Feb 2024 12:24:59 +0530 Subject: [PATCH 4/7] Update jira.yml From 8e97ea0ebd01a36f5f9dc6c47549bf52e149d8e6 Mon Sep 17 00:00:00 2001 From: Antony Date: Fri, 1 Mar 2024 10:32:30 +0530 Subject: [PATCH 5/7] Fix: Audit group field removal issue fix --- package-lock.json | 283 ++++++------------ .../contentstack-audit/src/config/index.ts | 2 +- .../contentstack-import/src/config/index.ts | 9 +- .../src/import/module-importer.ts | 10 +- .../src/types/default-config.ts | 9 + 5 files changed, 107 insertions(+), 206 deletions(-) diff --git a/package-lock.json b/package-lock.json index c5b2f963ba..d6c93e57cd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -176,9 +176,9 @@ } }, "node_modules/@babel/core": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz", - "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.0.tgz", + "integrity": "sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", @@ -186,11 +186,11 @@ "@babel/generator": "^7.23.6", "@babel/helper-compilation-targets": "^7.23.6", "@babel/helper-module-transforms": "^7.23.3", - "@babel/helpers": "^7.23.9", - "@babel/parser": "^7.23.9", - "@babel/template": "^7.23.9", - "@babel/traverse": "^7.23.9", - "@babel/types": "^7.23.9", + "@babel/helpers": "^7.24.0", + "@babel/parser": "^7.24.0", + "@babel/template": "^7.24.0", + "@babel/traverse": "^7.24.0", + "@babel/types": "^7.24.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -356,9 +356,9 @@ } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz", - "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz", + "integrity": "sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==", "dev": true, "engines": { "node": ">=6.9.0" @@ -416,14 +416,14 @@ } }, "node_modules/@babel/helpers": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.9.tgz", - "integrity": "sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.0.tgz", + "integrity": "sha512-ulDZdc0Aj5uLc5nETsa7EPx2L7rM0YJM8r7ck7U73AXi7qOV44IHHRAYZHY6iU1rr3C5N4NtTmMRUJP6kwCWeA==", "dev": true, "dependencies": { - "@babel/template": "^7.23.9", - "@babel/traverse": "^7.23.9", - "@babel/types": "^7.23.9" + "@babel/template": "^7.24.0", + "@babel/traverse": "^7.24.0", + "@babel/types": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -515,9 +515,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz", - "integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.0.tgz", + "integrity": "sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -704,9 +704,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.9.tgz", - "integrity": "sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.0.tgz", + "integrity": "sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==", "dev": true, "dependencies": { "regenerator-runtime": "^0.14.0" @@ -716,23 +716,23 @@ } }, "node_modules/@babel/template": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.23.9.tgz", - "integrity": "sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz", + "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==", "dev": true, "dependencies": { "@babel/code-frame": "^7.23.5", - "@babel/parser": "^7.23.9", - "@babel/types": "^7.23.9" + "@babel/parser": "^7.24.0", + "@babel/types": "^7.24.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.9.tgz", - "integrity": "sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.0.tgz", + "integrity": "sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==", "dev": true, "dependencies": { "@babel/code-frame": "^7.23.5", @@ -741,8 +741,8 @@ "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.23.9", - "@babel/types": "^7.23.9", + "@babel/parser": "^7.24.0", + "@babel/types": "^7.24.0", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -760,9 +760,9 @@ } }, "node_modules/@babel/types": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz", - "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz", + "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==", "dev": true, "dependencies": { "@babel/helper-string-parser": "^7.23.4", @@ -1648,9 +1648,9 @@ } }, "node_modules/@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", "dev": true, "engines": { "node": ">=6.0.0" @@ -2068,9 +2068,9 @@ } }, "node_modules/@oclif/plugin-plugins": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-4.2.5.tgz", - "integrity": "sha512-BnTXuoqG519WIhBd1y+GERq4LdB75cjiD+mN2/xS8mhnQbMxcPahnTWB8l5dhk+CXTkRv6q5nL/ovdRqHkZJHg==", + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-4.2.6.tgz", + "integrity": "sha512-HdPWRQYI4wsTcqRJFvEGFalgX1q7y0oeCKdZtMI6Wl1PsALloYlbbQ1rl1jqk3YFbHjyEWud34gccOdXLl3UAA==", "dependencies": { "@oclif/core": "^3.10.2", "chalk": "^5.3.0", @@ -2825,9 +2825,9 @@ } }, "node_modules/@slack/logger/node_modules/@types/node": { - "version": "20.11.21", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.21.tgz", - "integrity": "sha512-/ySDLGscFPNasfqStUuWWPfL78jompfIoVzLJPVVAHBh6rpG68+pI2Gk+fNLeI8/f1yPYL4s46EleVIc20F1Ow==", + "version": "20.11.24", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz", + "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==", "dependencies": { "undici-types": "~5.26.4" } @@ -4450,9 +4450,9 @@ } }, "node_modules/aws-sdk": { - "version": "2.1567.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1567.0.tgz", - "integrity": "sha512-5irUeMggUkQBARXtm3YN4E/lffEN51uIw+D7cD0+d8e2rhhJL/DTphP8cdx22xr+uOfOyRjx9SjSwHvack2B9Q==", + "version": "2.1569.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1569.0.tgz", + "integrity": "sha512-9puKjesHKOjAYPqFurW/9nv3qhQ+STu3bVa5PN158SCeZPE6NsxZIWnHLglJvKU7N8UXJo1aJHmKDUGrsS7rXw==", "dev": true, "dependencies": { "buffer": "4.9.2", @@ -4767,12 +4767,12 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, "node_modules/body-parser": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", + "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", "dependencies": { "bytes": "3.1.2", - "content-type": "~1.0.4", + "content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", @@ -4780,7 +4780,7 @@ "iconv-lite": "0.4.24", "on-finished": "2.4.1", "qs": "6.11.0", - "raw-body": "2.5.1", + "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" }, @@ -4816,20 +4816,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/body-parser/node_modules/raw-body": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", - "dependencies": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -6560,9 +6546,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.685", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.685.tgz", - "integrity": "sha512-yDYeobbTEe4TNooEzOQO6xFqg9XnAkVy2Lod1C1B2it8u47JNLYvl9nLDWBamqUakWB8Jc1hhS1uHUNYTNQdfw==", + "version": "1.4.689", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.689.tgz", + "integrity": "sha512-GatzRKnGPS1go29ep25reM94xxd1Wj8ritU0yRhCJ/tr1Bg8gKnm6R9O/yPOhGQBoLMZ9ezfrpghNaTw97C/PQ==", "dev": true }, "node_modules/elegant-spinner": { @@ -6698,17 +6684,17 @@ } }, "node_modules/es-abstract": { - "version": "1.22.4", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.4.tgz", - "integrity": "sha512-vZYJlk2u6qHYxBOTjAeg7qUxHdNfih64Uu2J8QqWgXZ2cri0ZpJAkzDUK/q593+mvKwlxyaxr6F1Q+3LKoQRgg==", + "version": "1.22.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.5.tgz", + "integrity": "sha512-oW69R+4q2wG+Hc3KZePPZxOiisRIqfKBVo/HLx94QcJeWGU/8sZhCvc829rd1kS366vlJbzBfXf9yWwf0+Ko7w==", "dependencies": { "array-buffer-byte-length": "^1.0.1", "arraybuffer.prototype.slice": "^1.0.3", - "available-typed-arrays": "^1.0.6", + "available-typed-arrays": "^1.0.7", "call-bind": "^1.0.7", "es-define-property": "^1.0.0", "es-errors": "^1.3.0", - "es-set-tostringtag": "^2.0.2", + "es-set-tostringtag": "^2.0.3", "es-to-primitive": "^1.2.1", "function.prototype.name": "^1.1.6", "get-intrinsic": "^1.2.4", @@ -6716,15 +6702,15 @@ "globalthis": "^1.0.3", "gopd": "^1.0.1", "has-property-descriptors": "^1.0.2", - "has-proto": "^1.0.1", + "has-proto": "^1.0.3", "has-symbols": "^1.0.3", "hasown": "^2.0.1", "internal-slot": "^1.0.7", "is-array-buffer": "^3.0.4", "is-callable": "^1.2.7", - "is-negative-zero": "^2.0.2", + "is-negative-zero": "^2.0.3", "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.2", + "is-shared-array-buffer": "^1.0.3", "is-string": "^1.0.7", "is-typed-array": "^1.1.13", "is-weakref": "^1.0.2", @@ -6737,10 +6723,10 @@ "string.prototype.trim": "^1.2.8", "string.prototype.trimend": "^1.0.7", "string.prototype.trimstart": "^1.0.7", - "typed-array-buffer": "^1.0.1", - "typed-array-byte-length": "^1.0.0", - "typed-array-byte-offset": "^1.0.0", - "typed-array-length": "^1.0.4", + "typed-array-buffer": "^1.0.2", + "typed-array-byte-length": "^1.0.1", + "typed-array-byte-offset": "^1.0.2", + "typed-array-length": "^1.0.5", "unbox-primitive": "^1.0.2", "which-typed-array": "^1.1.14" }, @@ -8103,13 +8089,13 @@ "dev": true }, "node_modules/express": { - "version": "4.18.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", - "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", + "version": "4.18.3", + "resolved": "https://registry.npmjs.org/express/-/express-4.18.3.tgz", + "integrity": "sha512-6VyCijWQ+9O7WuVMTRBTl+cjNNIzD5cY5mQ1WM8r/LEkI2u8EYpOotESNwzNlyCn3g+dmjKYI6BmNneSr/FSRw==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.1", + "body-parser": "1.20.2", "content-disposition": "0.5.4", "content-type": "~1.0.4", "cookie": "0.5.0", @@ -20364,11 +20350,11 @@ } }, "node_modules/side-channel": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.5.tgz", - "integrity": "sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", "dependencies": { - "call-bind": "^1.0.6", + "call-bind": "^1.0.7", "es-errors": "^1.3.0", "get-intrinsic": "^1.2.4", "object-inspect": "^1.13.1" @@ -21508,108 +21494,11 @@ } }, "node_modules/tmp": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.2.tgz", - "integrity": "sha512-ETcvHhaIc9J2MDEAH6N67j9bvBvu/3Gb764qaGhwtFvjtvhegqoqSpofgeyq1Sc24mW5pdyUDs9HP5j3ehkxRw==", - "dependencies": { - "rimraf": "^5.0.5" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/tmp/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/tmp/node_modules/foreground-child": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", - "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", - "dependencies": { - "cross-spawn": "^7.0.0", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/tmp/node_modules/glob": { - "version": "10.3.10", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", - "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^2.3.5", - "minimatch": "^9.0.1", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", - "path-scurry": "^1.10.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/tmp/node_modules/minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/tmp/node_modules/minipass": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", - "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/tmp/node_modules/rimraf": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz", - "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==", - "dependencies": { - "glob": "^10.3.7" - }, - "bin": { - "rimraf": "dist/esm/bin.mjs" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/tmp/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", + "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": ">=14.14" } }, "node_modules/tmpl": { @@ -24466,9 +24355,9 @@ "dev": true }, "packages/contentstack-audit/node_modules/@types/node": { - "version": "20.11.21", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.21.tgz", - "integrity": "sha512-/ySDLGscFPNasfqStUuWWPfL78jompfIoVzLJPVVAHBh6rpG68+pI2Gk+fNLeI8/f1yPYL4s46EleVIc20F1Ow==", + "version": "20.11.24", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz", + "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==", "dev": true, "dependencies": { "undici-types": "~5.26.4" @@ -26075,9 +25964,9 @@ "dev": true }, "packages/contentstack-launch/node_modules/@types/node": { - "version": "16.18.84", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.84.tgz", - "integrity": "sha512-mtn6ixzrUK5IMf6gyyMVUsm0TIeF3IYpUr3i0HHTuPJVbdZ6kc93poZ+wCkFNtxXoP/tyGrdVPOL6/WqGXjfXw==", + "version": "16.18.86", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.86.tgz", + "integrity": "sha512-QMvdZf+ZTSiv7gspwhqbfB7Y5DmbYgCsUnakS8Ul9uRbJQehDKaM7SL+GbcDS003Lh7VK4YlelHsRm9HCv26eA==", "dev": true }, "packages/contentstack-launch/node_modules/acorn": { diff --git a/packages/contentstack-audit/src/config/index.ts b/packages/contentstack-audit/src/config/index.ts index e5f2eea755..92028f9c40 100644 --- a/packages/contentstack-audit/src/config/index.ts +++ b/packages/contentstack-audit/src/config/index.ts @@ -1,7 +1,7 @@ const config = { showTerminalOutput: true, skipRefs: ['sys_assets'], - skipFieldTypes: ['taxonomy'], + skipFieldTypes: ['taxonomy', 'group'], modules: ['content-types', 'global-fields', 'entries'], 'fix-fields': ['reference', 'global_field', 'json:rte', 'json:extension', 'blocks', 'group'], moduleConfig: { diff --git a/packages/contentstack-import/src/config/index.ts b/packages/contentstack-import/src/config/index.ts index 3ce1294bae..a2a754daa3 100644 --- a/packages/contentstack-import/src/config/index.ts +++ b/packages/contentstack-import/src/config/index.ts @@ -148,7 +148,7 @@ const config: DefaultConfig = { taxonomies: { dirName: 'taxonomies', fileName: 'taxonomies.json', - } + }, }, languagesCode: [ 'af-za', @@ -388,6 +388,13 @@ const config: DefaultConfig = { // useBackedupDir: '', // backupConcurrency: 10, onlyTSModules: ['taxonomies'], + auditConfig: { + noLog: false, // Skip logs printing on terminal + skipConfirm: true, // Skip confirmation if any + returnResponse: true, // On process completion should return config used in the command + noTerminalOutput: false, // Skip final audit table output on terminal + config: { basePath: '' }, // To overwrite any build-in config. And this config is equal to --config flag. + } }; export default config; diff --git a/packages/contentstack-import/src/import/module-importer.ts b/packages/contentstack-import/src/import/module-importer.ts index 476d0949e8..599e41447f 100755 --- a/packages/contentstack-import/src/import/module-importer.ts +++ b/packages/contentstack-import/src/import/module-importer.ts @@ -115,13 +115,9 @@ class ModuleImporter { */ async auditImportData(logger: Logger) { const basePath = resolve(this.importConfig.backupDir, 'logs', 'audit'); - const auditConfig = { - noLog: false, // Skip logs printing on terminal - skipConfirm: true, // Skip confirmation if any - returnResponse: true, // On process completion should return config used in the command - noTerminalOutput: false, // Skip final audit table output on terminal - config: { basePath }, // To overwrite any build-in config. This config is equal to --config flag. - }; + const auditConfig = this.importConfig.auditConfig + auditConfig.config.basePath = basePath; + try { const args = [ '--data-dir', diff --git a/packages/contentstack-import/src/types/default-config.ts b/packages/contentstack-import/src/types/default-config.ts index 0b5358e647..17a7168a23 100644 --- a/packages/contentstack-import/src/types/default-config.ts +++ b/packages/contentstack-import/src/types/default-config.ts @@ -147,4 +147,13 @@ export default interface DefaultConfig { createBackupDir?: string; overwriteSupportedModules: string[]; onlyTSModules: string[]; + auditConfig?: { + noLog?: boolean; // Skip logs printing on terminal + skipConfirm?: boolean; // Skip confirmation if any + returnResponse?: boolean; // On process completion should return config used in the command + noTerminalOutput?: boolean; // Skip final audit table output on terminal + config?: { + basePath?: string + } & Record; // To overwrite any build-in config. And this config is equal to --config flag. + }; } From bda90c37f7d164744500c6a3d49d7debe02bd352 Mon Sep 17 00:00:00 2001 From: Antony Date: Fri, 1 Mar 2024 15:23:34 +0530 Subject: [PATCH 6/7] Version bump --- package-lock.json | 40 +++++++++++------------ packages/contentstack-audit/package.json | 2 +- packages/contentstack-clone/package.json | 2 +- packages/contentstack-import/package.json | 4 +-- packages/contentstack-seed/package.json | 2 +- packages/contentstack/package.json | 4 +-- pnpm-lock.yaml | 10 +++--- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index d6c93e57cd..1bc581df51 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,13 +28,13 @@ } }, "node_modules/@ampproject/remapping": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", - "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", "dev": true, "dependencies": { - "@jridgewell/gen-mapping": "^0.3.0", - "@jridgewell/trace-mapping": "^0.3.9" + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" }, "engines": { "node": ">=6.0.0" @@ -1626,14 +1626,14 @@ } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.4.tgz", - "integrity": "sha512-Oud2QPM5dHviZNn4y/WhhYKSXksv+1xLEIsNrAbGcFzUN3ubqWRFT5gwPchNc5NuzILOU4tPBDTZ4VwhL8Y7cw==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", "dev": true, "dependencies": { - "@jridgewell/set-array": "^1.0.1", + "@jridgewell/set-array": "^1.2.1", "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" + "@jridgewell/trace-mapping": "^0.3.24" }, "engines": { "node": ">=6.0.0" @@ -1662,9 +1662,9 @@ "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.23", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.23.tgz", - "integrity": "sha512-9/4foRoUKp8s96tSkh8DlAAc5A0Ty8vLXld+l9gjKKY6ckwI8G15f0hskGmuLZu78ZlGa1vtsfOa+lnB4vG6Jg==", + "version": "0.3.24", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.24.tgz", + "integrity": "sha512-+VaWXDa6+l6MhflBvVXjIEAzb59nQ2JUK3bwRp2zRpPtU+8TFRy9Gg/5oIcNlkEL5PGlBFGfemUVvIgLnTzq7Q==", "dev": true, "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", @@ -24231,7 +24231,7 @@ "version": "1.15.0", "license": "MIT", "dependencies": { - "@contentstack/cli-audit": "~1.4.0", + "@contentstack/cli-audit": "~1.4.1", "@contentstack/cli-auth": "~1.3.17", "@contentstack/cli-cm-bootstrap": "~1.9.0", "@contentstack/cli-cm-branches": "~1.0.22", @@ -24239,7 +24239,7 @@ "@contentstack/cli-cm-clone": "~1.10.1", "@contentstack/cli-cm-export": "~1.11.0", "@contentstack/cli-cm-export-to-csv": "~1.7.0", - "@contentstack/cli-cm-import": "~1.14.0", + "@contentstack/cli-cm-import": "~1.14.1", "@contentstack/cli-cm-migrate-rte": "~1.4.15", "@contentstack/cli-cm-seed": "~1.7.1", "@contentstack/cli-command": "~1.2.17", @@ -24296,7 +24296,7 @@ }, "packages/contentstack-audit": { "name": "@contentstack/cli-audit", - "version": "1.4.0", + "version": "1.4.1", "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.2.16", @@ -24772,7 +24772,7 @@ "dependencies": { "@colors/colors": "^1.5.0", "@contentstack/cli-cm-export": "~1.11.0", - "@contentstack/cli-cm-import": "~1.14.0", + "@contentstack/cli-cm-import": "~1.14.1", "@contentstack/cli-command": "~1.2.16", "@contentstack/cli-utilities": "~1.5.12", "async": "^3.2.4", @@ -25741,10 +25741,10 @@ }, "packages/contentstack-import": { "name": "@contentstack/cli-cm-import", - "version": "1.14.0", + "version": "1.14.1", "license": "MIT", "dependencies": { - "@contentstack/cli-audit": "~1.4.0", + "@contentstack/cli-audit": "~1.4.1", "@contentstack/cli-command": "~1.2.16", "@contentstack/cli-utilities": "~1.5.12", "@contentstack/management": "~1.15.3", @@ -26214,7 +26214,7 @@ "version": "1.7.1", "license": "MIT", "dependencies": { - "@contentstack/cli-cm-import": "~1.14.0", + "@contentstack/cli-cm-import": "~1.14.1", "@contentstack/cli-command": "~1.2.16", "@contentstack/cli-utilities": "~1.5.12", "inquirer": "8.2.4", diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json index a046c729a3..e28891ab3e 100644 --- a/packages/contentstack-audit/package.json +++ b/packages/contentstack-audit/package.json @@ -1,6 +1,6 @@ { "name": "@contentstack/cli-audit", - "version": "1.4.0", + "version": "1.4.1", "description": "Contentstack audit plugin", "author": "Contentstack CLI", "homepage": "https://github.com/contentstack/cli", diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json index 58ad391724..da3149642e 100644 --- a/packages/contentstack-clone/package.json +++ b/packages/contentstack-clone/package.json @@ -7,7 +7,7 @@ "dependencies": { "@colors/colors": "^1.5.0", "@contentstack/cli-cm-export": "~1.11.0", - "@contentstack/cli-cm-import": "~1.14.0", + "@contentstack/cli-cm-import": "~1.14.1", "@contentstack/cli-command": "~1.2.16", "@contentstack/cli-utilities": "~1.5.12", "async": "^3.2.4", diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json index 84de150149..e598338abf 100644 --- a/packages/contentstack-import/package.json +++ b/packages/contentstack-import/package.json @@ -1,11 +1,11 @@ { "name": "@contentstack/cli-cm-import", "description": "Contentstack CLI plugin to import content into stack", - "version": "1.14.0", + "version": "1.14.1", "author": "Contentstack", "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { - "@contentstack/cli-audit": "~1.4.0", + "@contentstack/cli-audit": "~1.4.1", "@contentstack/cli-command": "~1.2.16", "@contentstack/cli-utilities": "~1.5.12", "@contentstack/management": "~1.15.3", diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json index 67f53fd701..a4996b8a01 100644 --- a/packages/contentstack-seed/package.json +++ b/packages/contentstack-seed/package.json @@ -5,7 +5,7 @@ "author": "Contentstack", "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { - "@contentstack/cli-cm-import": "~1.14.0", + "@contentstack/cli-cm-import": "~1.14.1", "@contentstack/cli-command": "~1.2.16", "@contentstack/cli-utilities": "~1.5.12", "inquirer": "8.2.4", diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json index c854059281..fa5ce9aac7 100755 --- a/packages/contentstack/package.json +++ b/packages/contentstack/package.json @@ -22,7 +22,7 @@ "prepack": "pnpm compile && oclif manifest && oclif readme" }, "dependencies": { - "@contentstack/cli-audit": "~1.4.0", + "@contentstack/cli-audit": "~1.4.1", "@contentstack/cli-auth": "~1.3.17", "@contentstack/cli-cm-bootstrap": "~1.9.0", "@contentstack/cli-cm-branches": "~1.0.22", @@ -30,7 +30,7 @@ "@contentstack/cli-cm-export": "~1.11.0", "@contentstack/cli-cm-clone": "~1.10.1", "@contentstack/cli-cm-export-to-csv": "~1.7.0", - "@contentstack/cli-cm-import": "~1.14.0", + "@contentstack/cli-cm-import": "~1.14.1", "@contentstack/cli-cm-migrate-rte": "~1.4.15", "@contentstack/cli-cm-seed": "~1.7.1", "@contentstack/cli-command": "~1.2.17", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3d7472083f..82412fda06 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,7 +10,7 @@ importers: packages/contentstack: specifiers: - '@contentstack/cli-audit': ~1.4.0 + '@contentstack/cli-audit': ~1.4.1 '@contentstack/cli-auth': ~1.3.17 '@contentstack/cli-cm-bootstrap': ~1.9.0 '@contentstack/cli-cm-branches': ~1.0.22 @@ -18,7 +18,7 @@ importers: '@contentstack/cli-cm-clone': ~1.10.1 '@contentstack/cli-cm-export': ~1.11.0 '@contentstack/cli-cm-export-to-csv': ~1.7.0 - '@contentstack/cli-cm-import': ~1.14.0 + '@contentstack/cli-cm-import': ~1.14.1 '@contentstack/cli-cm-migrate-rte': ~1.4.15 '@contentstack/cli-cm-seed': ~1.7.1 '@contentstack/cli-command': ~1.2.17 @@ -424,7 +424,7 @@ importers: specifiers: '@colors/colors': ^1.5.0 '@contentstack/cli-cm-export': ~1.11.0 - '@contentstack/cli-cm-import': ~1.14.0 + '@contentstack/cli-cm-import': ~1.14.1 '@contentstack/cli-command': ~1.2.16 '@contentstack/cli-utilities': ~1.5.12 '@oclif/test': ^2.5.6 @@ -730,7 +730,7 @@ importers: packages/contentstack-import: specifiers: - '@contentstack/cli-audit': ~1.4.0 + '@contentstack/cli-audit': ~1.4.1 '@contentstack/cli-command': ~1.2.16 '@contentstack/cli-utilities': ~1.5.12 '@contentstack/management': ~1.15.3 @@ -990,7 +990,7 @@ importers: packages/contentstack-seed: specifiers: - '@contentstack/cli-cm-import': ~1.14.0 + '@contentstack/cli-cm-import': ~1.14.1 '@contentstack/cli-command': ~1.2.16 '@contentstack/cli-utilities': ~1.5.12 '@oclif/plugin-help': ^5.1.19 From e025d792bbd5938c9835b1c6b93099c28998281e Mon Sep 17 00:00:00 2001 From: Antony Date: Mon, 4 Mar 2024 11:22:25 +0530 Subject: [PATCH 7/7] Audit fix log sequence issue fix --- .../src/audit-base-command.ts | 21 ++++++++- .../contentstack-audit/src/messages/index.ts | 18 +++++--- .../contentstack-audit/src/modules/entries.ts | 18 ++++---- .../contentstack-audit/src/types/utils.ts | 5 ++- packages/contentstack-audit/src/util/log.ts | 43 +++++++++++++------ .../test/unit/util/log.test.ts | 2 +- 6 files changed, 73 insertions(+), 34 deletions(-) diff --git a/packages/contentstack-audit/src/audit-base-command.ts b/packages/contentstack-audit/src/audit-base-command.ts index 2674927a53..e2f19b6aa8 100644 --- a/packages/contentstack-audit/src/audit-base-command.ts +++ b/packages/contentstack-audit/src/audit-base-command.ts @@ -83,7 +83,13 @@ export abstract class AuditBaseCommand extends BaseCommand): string { - if (!msg) return ''; + const transfer = memoize(function (msg: string, args: Record) { + if (!msg) return ''; + + for (const key of Object.keys(args)) { + const escapedKey = key.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); + msg = msg.replace(new RegExp(`{${escapedKey}}`, 'g'), args[key] || escapedKey); + } - for (const key of Object.keys(args)) { - const escapedKey = key.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); - msg = msg.replace(new RegExp(`{${escapedKey}}`, 'g'), args[key]); - } + return msg; + }); - return msg; + return transfer(msg, args); } export default messages; diff --git a/packages/contentstack-audit/src/modules/entries.ts b/packages/contentstack-audit/src/modules/entries.ts index a54185af8c..87082a369c 100644 --- a/packages/contentstack-audit/src/modules/entries.ts +++ b/packages/contentstack-audit/src/modules/entries.ts @@ -35,6 +35,7 @@ import { ExtensionOrAppFieldDataType, EntryExtensionOrAppFieldDataType, } from '../types'; +import { print } from '../util'; import GlobalField from './global-fields'; import { MarketplaceAppsInstallationData } from '../types/extension'; @@ -106,14 +107,13 @@ export default class Entries { } this.lookForReference([{ locale: code, uid, name: title }], ctSchema, this.entries[entryUid]); - this.log( - $t(auditMsg.SCAN_ENTRY_SUCCESS_MSG, { - title, - local: code, - module: this.config.moduleConfig.entries.name, - }), - 'info', - ); + const message = $t(auditMsg.SCAN_ENTRY_SUCCESS_MSG, { + title, + local: code, + module: this.config.moduleConfig.entries.name, + }); + this.log(message, 'hidden'); + print([{ message: `info: ${message}`, color: 'green' }]); } if (this.fix) { @@ -122,7 +122,7 @@ export default class Entries { } } } - this.log('', 'info'); // Adding empty line + // this.log('', 'info'); // Adding empty line this.removeEmptyVal(); diff --git a/packages/contentstack-audit/src/types/utils.ts b/packages/contentstack-audit/src/types/utils.ts index c0940db196..b7a09306c5 100644 --- a/packages/contentstack-audit/src/types/utils.ts +++ b/packages/contentstack-audit/src/types/utils.ts @@ -5,7 +5,8 @@ import config from "../config"; type LogFn = ( message: string | any, - logType?: LoggerType | PrintOptions | undefined + logType?: LoggerType | PrintOptions | undefined, + skipCredentialCheck?: boolean, ) => void; type ExitFn = (code?: number | undefined) => void; @@ -20,7 +21,7 @@ type ConfigType = { Record; export { LogFn, ExitFn, Partial, ConfigType }; -export type LoggerType = "info" | "warn" | "error" | "debug"; +export type LoggerType = "info" | "warn" | "error" | "debug" | 'hidden'; export type PrintType = { message: string; diff --git a/packages/contentstack-audit/src/util/log.ts b/packages/contentstack-audit/src/util/log.ts index 6414297788..8518d88530 100755 --- a/packages/contentstack-audit/src/util/log.ts +++ b/packages/contentstack-audit/src/util/log.ts @@ -27,6 +27,7 @@ export default class Logger { private infoLogger!: winston.Logger; private errorLogger!: winston.Logger; private config!: Record; + private hiddenInfoLogger!: winston.Logger; get loggerOptions(): winston.transports.FileTransportOptions { return { @@ -41,6 +42,7 @@ export default class Logger { this.config = config; this.infoLogger = this.getLoggerInstance('info'); this.errorLogger = this.getLoggerInstance('error'); + this.hiddenInfoLogger = this.getLoggerInstance('hidden'); } /** @@ -55,24 +57,30 @@ export default class Logger { const consoleOptions: winston.transports.ConsoleTransportOptions = { format: winston.format.combine(winston.format.simple(), winston.format.colorize({ all: true })), }; + const isHidden = logType === 'hidden'; + logType = logType === 'hidden' ? 'info' : logType; if (logType === 'error') { consoleOptions.level = logType; } - const filename = normalize(resolve(this.config.basePath, 'logs', `${logType}.log`)).replace( - /^(\.\.(\/|\\|$))+/, - '', - ); + const filename = normalize( + resolve(this.config.basePath, 'logs', `${logType}.log`), + ).replace(/^(\.\.(\/|\\|$))+/, ''); + const transports: winston.transport[] = [ + new winston.transports.File({ + ...this.loggerOptions, + level: logType, + filename, + }), + ]; + + if (!isHidden) { + transports.push(new winston.transports.Console(consoleOptions)); + } + const loggerOptions: winston.LoggerOptions = { - transports: [ - new winston.transports.File({ - ...this.loggerOptions, - level: logType, - filename, - }), - new winston.transports.Console(consoleOptions), - ], + transports, levels: customLevels.levels, }; @@ -91,8 +99,12 @@ export default class Logger { * @param {LoggerType | PrintOptions | undefined} [logType] - The `logType` parameter is an optional * parameter that specifies the type of log. It can be one of the following values: */ - log(message: string | any, logType?: LoggerType | PrintOptions | undefined): void { - const logString = this.returnString(message); + log( + message: string | any, + logType?: LoggerType | PrintOptions | undefined, + skipCredentialCheck: boolean = false, + ): void { + const logString = skipCredentialCheck ? message : this.returnString(message); switch (logType) { case 'info': @@ -103,6 +115,9 @@ export default class Logger { case 'error': this.errorLogger.error(logString); break; + case 'hidden': + this.hiddenInfoLogger.log('info', logString); + break; default: ux.print(logString, logType || {}); break; diff --git a/packages/contentstack-audit/test/unit/util/log.test.ts b/packages/contentstack-audit/test/unit/util/log.test.ts index 527c8abd0f..03cd2bb19f 100644 --- a/packages/contentstack-audit/test/unit/util/log.test.ts +++ b/packages/contentstack-audit/test/unit/util/log.test.ts @@ -26,7 +26,7 @@ describe('Log utility', () => { const logSpy = sinon.spy(winston, 'createLogger'); const logger = new Logger({ basePath: resolve(__dirname, '..', 'mock') }); - expect(logSpy.callCount).to.be.equals(2); + expect(logSpy.callCount).to.be.equals(3); expect(Object.getPrototypeOf(logger)).has.ownProperty('log'); }); });