From 832ac7156b52a998e9539899f5aee69bb2584a75 Mon Sep 17 00:00:00 2001 From: raj pandey Date: Fri, 19 Apr 2024 16:36:53 +0530 Subject: [PATCH] fix: Handled the case when yes flag is passed for skipping the marketplace prompts --- package-lock.json | 62 ++++++++++++------- .../src/utils/marketplace-app-helper.ts | 2 + 2 files changed, 40 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7aee3d6802..6dbe0839bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1998,9 +1998,9 @@ } }, "node_modules/@oclif/plugin-plugins": { - "version": "5.0.9", - "resolved": "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-5.0.9.tgz", - "integrity": "sha512-uXmJ/Tz8XXuPWdbmoV7QIwKCjUkB9FcQeaKEYlWlWPDeGK92qkx+oHlEW4XfRwnWqGl/81fmJ0RdyCE6fStbmw==", + "version": "5.0.11", + "resolved": "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-5.0.11.tgz", + "integrity": "sha512-es+IMNI97Jw+EX25r9ejrOph9R/8FbNXmWrH/NnhUJ3lNDpeMPM8njP4ovHYJi2+ta2VTHDxhQFNRDlNnUiyOw==", "hasShrinkwrap": true, "dependencies": { "@oclif/core": "^3.26.2", @@ -2010,7 +2010,8 @@ "npm-package-arg": "^11.0.2", "npm-run-path": "^5.3.0", "semver": "^7.6.0", - "validate-npm-package-name": "^5.0.0" + "validate-npm-package-name": "^5.0.0", + "yarn": "^1.22.22" }, "engines": { "node": ">=18.0.0" @@ -5761,6 +5762,20 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "license": "ISC" }, + "node_modules/@oclif/plugin-plugins/node_modules/yarn": { + "version": "1.22.22", + "resolved": "https://registry.npmjs.org/yarn/-/yarn-1.22.22.tgz", + "integrity": "sha512-prL3kGtyG7o9Z9Sv8IPfBNrWTDmXB4Qbes8A9rEzt6wkJV8mUvoirjU0Mp3GGAU06Y0XQyA3/2/RQFVuK7MTfg==", + "hasInstallScript": true, + "license": "BSD-2-Clause", + "bin": { + "yarn": "bin/yarn.js", + "yarnpkg": "bin/yarn.js" + }, + "engines": { + "node": ">=4.0.0" + } + }, "node_modules/@oclif/plugin-warn-if-update-available": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/@oclif/plugin-warn-if-update-available/-/plugin-warn-if-update-available-2.1.1.tgz", @@ -7082,9 +7097,9 @@ "dev": true }, "node_modules/@types/tar": { - "version": "6.1.12", - "resolved": "https://registry.npmjs.org/@types/tar/-/tar-6.1.12.tgz", - "integrity": "sha512-FwbJPi9YuovB6ilnHrz8Y4pb0Fh6N7guFkbnlCl39ua893Qi5gkXui7LSDpTQMJCmA4z5f6SeSrTPQEWLdtFVw==", + "version": "6.1.13", + "resolved": "https://registry.npmjs.org/@types/tar/-/tar-6.1.13.tgz", + "integrity": "sha512-IznnlmU5f4WcGTh2ltRu/Ijpmk8wiWXfF0VA4s+HPjHZgvFggk1YaIkbo5krX/zUCzWF8N/l4+W/LNxnvAJ8nw==", "dev": true, "dependencies": { "@types/node": "*", @@ -8003,9 +8018,9 @@ } }, "node_modules/aws-sdk": { - "version": "2.1599.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1599.0.tgz", - "integrity": "sha512-jPb1LAN+s1TLTK+VR3TTJLr//sb3AhhT60Bm9jxB5G/fVeeRczXtBtixNpQ00gksQdkstILYLc9S6MuKMsksxA==", + "version": "2.1602.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1602.0.tgz", + "integrity": "sha512-DJ3JOqa8PHmwrZirIFbzpa4hlBvL/jz3RulNQL4FmzNX6IANiUKUTR4zw6tU9Sdt48YpsL0+xIyuBuxKmcLz7Q==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -8749,9 +8764,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001610", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001610.tgz", - "integrity": "sha512-QFutAY4NgaelojVMjY63o6XlZyORPaLfyMnsl3HgnWdJUcX6K0oaJymHjH8PT5Gk7sTm8rvC/c5COUQKXqmOMA==", + "version": "1.0.30001611", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001611.tgz", + "integrity": "sha512-19NuN1/3PjA3QI8Eki55N8my4LzfkMCRLgCVfrl/slbSAchQfV0+GwjPrK3rq37As4UCLlM/DHajbKkAqbv92Q==", "dev": true, "funding": [ { @@ -9570,17 +9585,16 @@ } }, "node_modules/contentstack": { - "version": "3.19.1", - "resolved": "https://registry.npmjs.org/contentstack/-/contentstack-3.19.1.tgz", - "integrity": "sha512-CL/4dkKUrCYalg9gf/rXLBkHZmd0ZKTaR8ImoJioye2bI9qNPX4e7sz5d11Stw4hUbboz+3XLWv83KTMgpzoqQ==", + "version": "3.19.2", + "resolved": "https://registry.npmjs.org/contentstack/-/contentstack-3.19.2.tgz", + "integrity": "sha512-AQNfixXaXcj8j/dncq4nMUIoljWNqO+kVLU1o+qGD9pqBiI/e+f2bn1DAqtE9Ona1k+rZnGjcXGi8bPHHyW2yA==", "dependencies": { "@contentstack/utils": "^1.3.3", - "@slack/bolt": "^3.17.1", "cheerio": "^1.0.0-rc.12", "es6-promise": "^4.1.1", "isomorphic-fetch": "^3.0.0", "localStorage": "1.0.4", - "qs": "^6.11.2" + "qs": "^6.12.1" }, "engines": { "node": ">= 10.14.2" @@ -10272,9 +10286,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.737", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.737.tgz", - "integrity": "sha512-QvLTxaLHKdy5YxvixAw/FfHq2eWLUL9KvsPjp0aHK1gI5d3EDuDgITkvj0nFO2c6zUY3ZqVAJQiBYyQP9tQpfw==", + "version": "1.4.744", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.744.tgz", + "integrity": "sha512-nAGcF0yeKKfrP13LMFr5U1eghfFSvFLg302VUFzWlcjPOnUYd52yU5x6PBYrujhNbc4jYmZFrGZFK+xasaEzVA==", "dev": true }, "node_modules/elegant-spinner": { @@ -10962,9 +10976,9 @@ } }, "node_modules/eslint-config-oclif-typescript/node_modules/eslint-plugin-mocha": { - "version": "10.4.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-10.4.2.tgz", - "integrity": "sha512-cur4dVYnSEWTBwdqIBQFxa/9siAhesu0TX+lbJ4ClE9j0eNMNe6BSx3vkFFNz6tGoveyMyELFXa30f3fvuAVDg==", + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-10.4.3.tgz", + "integrity": "sha512-emc4TVjq5Ht0/upR+psftuz6IBG5q279p+1dSRDeHf+NS9aaerBi3lXKo1SEzwC29hFIW21gO89CEWSvRsi8IQ==", "dev": true, "dependencies": { "eslint-utils": "^3.0.0", diff --git a/packages/contentstack-import/src/utils/marketplace-app-helper.ts b/packages/contentstack-import/src/utils/marketplace-app-helper.ts index e5cab282a8..b708bac4ad 100644 --- a/packages/contentstack-import/src/utils/marketplace-app-helper.ts +++ b/packages/contentstack-import/src/utils/marketplace-app-helper.ts @@ -103,6 +103,8 @@ export const getConfirmationToCreateApps = async (privateApps: any, config: Impo } } } + } else { + return Promise.resolve(true); } };