From ea89e9763a4a2a3d43d4e84d7e0274283d4eaf63 Mon Sep 17 00:00:00 2001 From: Antony Date: Thu, 7 Dec 2023 17:10:32 +0530 Subject: [PATCH 01/11] Fix: Entry import fails if JSON RTE has a reference inside the table, Extension UID mapper fix --- .../src/import/modules/entries.ts | 15 ++- .../src/import/modules/extensions.ts | 7 +- .../contentstack-import/src/types/entries.ts | 9 ++ .../contentstack-import/src/types/index.ts | 2 + .../src/utils/entries-helper.ts | 91 ++++++++++++++----- 5 files changed, 90 insertions(+), 34 deletions(-) create mode 100644 packages/contentstack-import/src/types/entries.ts diff --git a/packages/contentstack-import/src/import/modules/entries.ts b/packages/contentstack-import/src/import/modules/entries.ts index 6bb3d0a5b7..c26ff4af33 100644 --- a/packages/contentstack-import/src/import/modules/entries.ts +++ b/packages/contentstack-import/src/import/modules/entries.ts @@ -7,7 +7,7 @@ import * as path from 'path'; import { isEmpty, values, cloneDeep, find, indexOf, forEach } from 'lodash'; -import { ContentType, FsUtility } from '@contentstack/cli-utilities'; +import { FsUtility } from '@contentstack/cli-utilities'; import { fsUtil, log, @@ -125,7 +125,7 @@ export default class EntriesImport extends BaseClass { await fileHelper.writeLargeFile(path.join(this.entriesMapperPath, 'uid-mapping.json'), this.entriesUidMapper); // TBD: manages mapper in one file, should find an alternative fsUtil.writeFile(path.join(this.entriesMapperPath, 'failed-entries.json'), this.failedEntries); - if (this.autoCreatedEntries.length > 0) { + if (this.autoCreatedEntries?.length > 0) { log(this.importConfig, 'Removing entries from master language which got created by default', 'info'); await this.removeAutoCreatedEntries().catch((error) => { log( @@ -528,8 +528,7 @@ export default class EntriesImport extends BaseClass { async replaceEntriesHandler({ apiParams, - element: entry, - isLastRequest, + element: entry }: { apiParams: ApiOptions; element: Record; @@ -785,13 +784,13 @@ export default class EntriesImport extends BaseClass { const contentType: any = find(cTs, { uid: cTUid }); if (contentType.field_rules) { const fieldDatatypeMap: { [key: string]: string } = {}; - for (let i = 0; i < contentType.schema.length; i++) { + for (let i = 0; i < contentType.schema?.length; i++) { const field = contentType.schema[i].uid; fieldDatatypeMap[field] = contentType.schema[i].data_type; } - let fieldRuleLength = contentType.field_rules.length; + let fieldRuleLength = contentType.field_rules?.length; for (let k = 0; k < fieldRuleLength; k++) { - let fieldRuleConditionLength = contentType.field_rules[k].conditions.length; + let fieldRuleConditionLength = contentType.field_rules[k].conditions?.length; for (let i = 0; i < fieldRuleConditionLength; i++) { if (fieldDatatypeMap[contentType.field_rules[k].conditions[i].operand_field] === 'reference') { let fieldRulesValue = contentType.field_rules[k].conditions[i].value; @@ -905,7 +904,7 @@ export default class EntriesImport extends BaseClass { locales: [], entryUid: this.entriesUidMapper[entry.uid], }; - if (entry.publish_details && entry.publish_details.length > 0) { + if (entry.publish_details && entry.publish_details?.length > 0) { forEach(entry.publish_details, (pubObject) => { if ( this.envs.hasOwnProperty(pubObject.environment) && diff --git a/packages/contentstack-import/src/import/modules/extensions.ts b/packages/contentstack-import/src/import/modules/extensions.ts index 22ce73dbb9..1b28c199a8 100644 --- a/packages/contentstack-import/src/import/modules/extensions.ts +++ b/packages/contentstack-import/src/import/modules/extensions.ts @@ -83,7 +83,12 @@ export default class ImportExtensions extends BaseClass { return; } - const apiContent = values(this.extensions); + const apiContent = []; + + for (const [uid, content] of Object.entries(this.extensions)) { + (content as Record).uid = uid; + apiContent.push(content); + } const onSuccess = ({ response, apiData: { uid, title } = { uid: null, title: '' } }: any) => { this.extSuccess.push(response); diff --git a/packages/contentstack-import/src/types/entries.ts b/packages/contentstack-import/src/types/entries.ts new file mode 100644 index 0000000000..fc2ee1c616 --- /dev/null +++ b/packages/contentstack-import/src/types/entries.ts @@ -0,0 +1,9 @@ +type EntryJsonRTEFieldDataType = { + uid?: string; + type?: string; + text?: string; + attrs?: { 'entry-uid'?: string; type?: string } & Record; + children?: EntryJsonRTEFieldDataType[]; +}; + +export { EntryJsonRTEFieldDataType }; diff --git a/packages/contentstack-import/src/types/index.ts b/packages/contentstack-import/src/types/index.ts index bf612e188b..d9a74984d1 100644 --- a/packages/contentstack-import/src/types/index.ts +++ b/packages/contentstack-import/src/types/index.ts @@ -104,3 +104,5 @@ export interface TermsConfig{ export { default as DefaultConfig } from './default-config'; export { default as ImportConfig } from './import-config'; + +export * from './entries' \ No newline at end of file diff --git a/packages/contentstack-import/src/utils/entries-helper.ts b/packages/contentstack-import/src/utils/entries-helper.ts index a94ae3d8da..6cf2b196d8 100644 --- a/packages/contentstack-import/src/utils/entries-helper.ts +++ b/packages/contentstack-import/src/utils/entries-helper.ts @@ -1,12 +1,15 @@ /** * Entries lookup */ +// FIXME refactor the complete file/code after discussed with the team import * as path from 'path'; import * as _ from 'lodash'; import config from '../config'; import * as fileHelper from './file-helper'; +import { EntryJsonRTEFieldDataType } from '../types/entries'; + // update references in entry object export const lookupEntries = function ( data: { @@ -25,7 +28,7 @@ export const lookupEntries = function ( let preserveStackVersion = config.preserveStackVersion; function gatherJsonRteEntryIds(jsonRteData: any) { - jsonRteData.children.forEach((element: any) => { + jsonRteData.children?.forEach((element: any) => { if (element.type) { switch (element.type) { default: { @@ -35,7 +38,7 @@ export const lookupEntries = function ( break; } case 'reference': { - if (Object.keys(element.attrs).length > 0 && element.attrs.type === 'entry') { + if (Object.keys(element.attrs)?.length > 0 && element.attrs.type === 'entry') { if (uids.indexOf(element.attrs['entry-uid']) === -1) { uids.push(element.attrs['entry-uid']); } @@ -52,13 +55,13 @@ export const lookupEntries = function ( const update = function (_parent: any, form_id: string, updateEntry: any) { let _entry = updateEntry; - let len = _parent.length; + let len = _parent?.length; for (let j = 0; j < len; j++) { if (_entry && _parent[j]) { if (j === len - 1 && _entry[_parent[j]]) { if (form_id !== '_assets') { - if (_entry[_parent[j]].length) { + if (_entry[_parent[j]]?.length) { _entry[_parent[j]].forEach((item: any, idx: any) => { if (typeof item.uid === 'string' && item._content_type_uid) { uids.push(item.uid); @@ -75,18 +78,18 @@ export const lookupEntries = function ( } } else if (Array.isArray(_entry[_parent[j]])) { for (const element of _entry[_parent[j]]) { - if (element.uid.length) { + if (element.uid?.length) { uids.push(element.uid); } } - } else if (_entry[_parent[j]].uid.length) { + } else if (_entry[_parent[j]].uid?.length) { uids.push(_entry[_parent[j]].uid); } } else { _entry = _entry[_parent[j]]; let _keys = _.clone(_parent).splice(j + 1, len); if (Array.isArray(_entry)) { - for (let i = 0, _i = _entry.length; i < _i; i++) { + for (let i = 0, _i = _entry?.length; i < _i; i++) { update(_keys, form_id, _entry[i]); } } else if (!(_entry instanceof Object)) { @@ -96,6 +99,7 @@ export const lookupEntries = function ( } } }; + const find = function (schema: any = [], _entry: any) { for (let i = 0, _i = schema?.length; i < _i; i++) { switch (schema[i].data_type) { @@ -120,7 +124,7 @@ export const lookupEntries = function ( parent.pop(); break; case 'blocks': - for (let j = 0, _j = schema[i].blocks.length; j < _j; j++) { + for (let j = 0, _j = schema[i].blocks?.length; j < _j; j++) { parent.push(schema[i].uid); parent.push(schema[i].blocks[j].uid); find(schema[i].blocks[j].schema, _entry); @@ -143,7 +147,7 @@ export const lookupEntries = function ( case 'blocks': { if (entry[element.uid]) { if (element.multiple) { - entry[element.uid].forEach((e: any) => { + entry[element.uid]?.forEach((e: any) => { let key = Object.keys(e).pop(); let subBlock = element.blocks.filter((e: any) => e.uid === key).pop(); findEntryIdsFromJsonRte(e[key], subBlock.schema); @@ -156,7 +160,7 @@ export const lookupEntries = function ( case 'group': { if (entry[element.uid]) { if (element.multiple) { - entry[element.uid].forEach((e: any) => { + entry[element.uid]?.forEach((e: any) => { findEntryIdsFromJsonRte(e, element.schema); }); } else { @@ -168,7 +172,7 @@ export const lookupEntries = function ( case 'json': { if (entry[element.uid] && element.field_metadata.rich_text_type) { if (element.multiple) { - entry[element.uid].forEach((jsonRteData: any) => { + entry[element.uid]?.forEach((jsonRteData: any) => { gatherJsonRteEntryIds(jsonRteData); }); } else { @@ -195,6 +199,9 @@ export const lookupEntries = function ( let entry = JSON.stringify(data.entry); uids.forEach(function (uid: any) { if (mappedUids.hasOwnProperty(uid)) { + // NOTE g: matches the pattern multiple times + // NOTE i: makes the regex case insensitive + // NOTE m: enables multi-line mode. Where ^ and $ match the start and end of the entire string. Without this, multi-line strings match the beginning and end of each line. entry = entry.replace(new RegExp(uid, 'img'), mappedUids[uid]); mapped.push(uid); } else { @@ -262,7 +269,7 @@ export const removeUidsFromJsonRteFields = ( if (element.multiple) { entry[element.uid] = entry[element.uid].map((e: any) => { let key = Object.keys(e).pop(); - let subBlock = element.blocks.filter((block: any) => block.uid === key).pop(); + let subBlock = element.blocks?.filter((block: any) => block.uid === key).pop(); e[key] = removeUidsFromJsonRteFields(e[key], subBlock.schema); return e; }); @@ -320,7 +327,7 @@ export const removeUidsFromJsonRteFields = ( }; function removeUidsFromChildren(children: Record[] | any) { - if (children.length && children.length > 0) { + if (children?.length && children.length > 0) { return children.map((child: any) => { if (child.type && child.type.length > 0) { delete child.uid; // remove uid @@ -356,7 +363,7 @@ export const removeEntryRefsFromJSONRTE = (entry: Record, ctSchema: if (element.multiple) { entry[element.uid] = entry[element.uid].map((e: any) => { let key = Object.keys(e).pop(); - let subBlock = element.blocks.filter((block: any) => block.uid === key).pop(); + let subBlock = element.blocks?.filter((block: any) => block.uid === key).pop(); e[key] = removeEntryRefsFromJSONRTE(e[key], subBlock.schema); return e; }); @@ -382,10 +389,12 @@ export const removeEntryRefsFromJSONRTE = (entry: Record, ctSchema: const structuredPTag = '{"type":"p","attrs":{},"children":[{"text":""}]}'; if (entry[element.uid] && element.field_metadata.rich_text_type) { if (element.multiple) { + entry[element.uid] = entry[element.uid].map(removeReferenceInJsonRTE); + entry[element.uid] = entry[element.uid].map((jsonRteData: any) => { // repeated code from else block, will abstract later - let entryReferences = jsonRteData.children.filter((e: any) => doEntryReferencesExist(e)); - if (entryReferences.length > 0) { + let entryReferences = jsonRteData.children?.filter((e: any) => doEntryReferencesExist(e)); + if (entryReferences?.length > 0) { jsonRteData.children = jsonRteData.children.filter((e: any) => !doEntryReferencesExist(e)); if (jsonRteData.children.length === 0) { // empty children array are no longer acceptable by the API, a default structure must be there @@ -397,10 +406,12 @@ export const removeEntryRefsFromJSONRTE = (entry: Record, ctSchema: } }); } else { - let entryReferences = entry[element.uid].children.filter((e: any) => doEntryReferencesExist(e)); - if (entryReferences.length > 0) { + // NOTE Clean up all the reference + entry[element.uid] = removeReferenceInJsonRTE(entry[element.uid]); + let entryReferences = entry[element.uid].children?.filter((e: any) => doEntryReferencesExist(e)); + if (entryReferences?.length > 0) { entry[element.uid].children = entry[element.uid].children.filter((e: any) => !doEntryReferencesExist(e)); - if (entry[element.uid].children.length === 0) { + if (entry[element.uid].children?.length === 0) { entry[element.uid].children.push(JSON.parse(structuredPTag)); } } @@ -414,10 +425,7 @@ export const removeEntryRefsFromJSONRTE = (entry: Record, ctSchema: }; function doEntryReferencesExist(element: Record[] | any): boolean { - // checks if the children of p element contain any references - // only checking one level deep, not recursive - - if (element.length) { + if (element?.length) { for (const item of element) { if ((item.type === 'p' || item.type === 'a' || item.type === 'span') && item.children && item.children.length > 0) { return doEntryReferencesExist(item.children); @@ -456,7 +464,7 @@ export const restoreJsonRteEntryRefs = ( if (element.multiple && Array.isArray(entry[element.uid])) { entry[element.uid] = entry[element.uid].map((e: any, eIndex: number) => { let key = Object.keys(e).pop(); - let subBlock = element.blocks.filter((block: any) => block.uid === key).pop(); + let subBlock = element.blocks?.filter((block: any) => block.uid === key).pop(); let sourceStackElement = sourceStackEntry[element.uid][eIndex][key]; e[key] = restoreJsonRteEntryRefs(e[key], sourceStackElement, subBlock.schema, { mappedAssetUids, @@ -512,7 +520,7 @@ export const restoreJsonRteEntryRefs = ( return e; }); - if (entryRefs.length > 0) { + if (entryRefs?.length > 0) { entryRefs.forEach((entryRef: any) => { field.children.splice(entryRef.index, 0, entryRef.value); }); @@ -597,3 +605,36 @@ function resolveAssetRefsInEntryRefsForJsonRte(jsonRteChild: any, mappedAssetUid return jsonRteChild; } + +/** + * The function removes references from a JSON RTE (Rich Text Editor) object. + * @param {EntryJsonRTEFieldDataType} jsonRTE - The parameter `jsonRTE` is of type + * `EntryJsonRTEFieldDataType`. It represents a JSON object that contains rich text content. The + * function `removeReferenceInJsonRTE` takes this JSON object as input and removes any references + * present in the content. It recursively traverses the JSON + * @returns the modified `jsonRTE` object after removing any references in the JSON RTE. + */ +function removeReferenceInJsonRTE(jsonRTE: EntryJsonRTEFieldDataType): EntryJsonRTEFieldDataType { + // NOTE Other possible reference logic will be added related to JSON RTE (Ex missing assets, extensions etc.,) + if (jsonRTE?.children && Array.isArray(jsonRTE.children)) { + jsonRTE.children = jsonRTE?.children?.map((child) => { + const { children, attrs, type } = child; + + if (type === 'reference' && attrs?.['entry-uid']) { + child = { + type: 'p', + attrs: {}, + children: [{ text: '' }], + }; + } + + if (!_.isEmpty(children)) { + return removeReferenceInJsonRTE(child); + } + + return child; + }); + } + + return jsonRTE; +} \ No newline at end of file From 0f91ae7fd131817bb9c204514d55f23169fae513 Mon Sep 17 00:00:00 2001 From: Antony Date: Thu, 7 Dec 2023 17:44:28 +0530 Subject: [PATCH 02/11] fix: vulnerabilities fix --- package-lock.json | 1972 ++++++++++----------- packages/contentstack-audit/package.json | 2 +- packages/contentstack-launch/package.json | 4 +- packages/contentstack/package.json | 4 +- pnpm-lock.yaml | 300 ++-- 5 files changed, 1043 insertions(+), 1239 deletions(-) diff --git a/package-lock.json b/package-lock.json index c9bb2db9a1..9db7a05ea8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2092,25 +2092,85 @@ } }, "node_modules/@oclif/plugin-plugins": { - "version": "3.8.4", - "resolved": "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-3.8.4.tgz", - "integrity": "sha512-msar390ub3aCohh4ZsbbS/mKobmF3p/BUd3J1WQ62XE9UDbrzkhVAowf3fsmgSSYCQxMwgGokJwj24O6ZpW+6w==", + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-4.1.9.tgz", + "integrity": "sha512-7FS6LGkZXe8XSlDE3DCdnzVexXSdfLmNtNqKjYdxS6oBKuKsOplvkQy9ptB0rlKkOTlar3tr/5W97dfDZYEpVA==", "dependencies": { - "@oclif/core": "^2.15.0", - "chalk": "^4.1.2", + "@oclif/core": "^3.10.2", + "chalk": "^5.3.0", "debug": "^4.3.4", - "http-call": "^5.2.2", - "load-json-file": "^5.3.0", - "npm": "9.8.1", + "npm": "10.2.3", "npm-run-path": "^4.0.1", "semver": "^7.5.4", "shelljs": "^0.8.5", - "tslib": "^2.6.2", "validate-npm-package-name": "^5.0.0", "yarn": "^1.22.18" }, "engines": { - "node": ">=16" + "node": ">=18.0.0" + } + }, + "node_modules/@oclif/plugin-plugins/node_modules/@oclif/core": { + "version": "3.13.2", + "resolved": "https://registry.npmjs.org/@oclif/core/-/core-3.13.2.tgz", + "integrity": "sha512-YUXT4cG8HPyNAK5PzNotWXarHq9ejHFvY048g2BbpXlo2W//OZp2fmEYKPw79/FAtof2rhftotjTiEW8a56bHQ==", + "dependencies": { + "ansi-escapes": "^4.3.2", + "ansi-styles": "^4.3.0", + "cardinal": "^2.1.1", + "chalk": "^4.1.2", + "clean-stack": "^3.0.1", + "cli-progress": "^3.12.0", + "color": "^4.2.3", + "debug": "^4.3.4", + "ejs": "^3.1.9", + "get-package-type": "^0.1.0", + "globby": "^11.1.0", + "hyperlinker": "^1.0.0", + "indent-string": "^4.0.0", + "is-wsl": "^2.2.0", + "js-yaml": "^3.14.1", + "natural-orderby": "^2.0.3", + "object-treeify": "^1.1.33", + "password-prompt": "^1.1.2", + "slice-ansi": "^4.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "supports-color": "^8.1.1", + "supports-hyperlinks": "^2.2.0", + "tsconfck": "^3.0.0", + "widest-line": "^3.1.0", + "wordwrap": "^1.0.0", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@oclif/plugin-plugins/node_modules/@oclif/core/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@oclif/plugin-plugins/node_modules/@oclif/core/node_modules/chalk/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" } }, "node_modules/@oclif/plugin-plugins/node_modules/builtins": { @@ -2121,6 +2181,81 @@ "semver": "^7.0.0" } }, + "node_modules/@oclif/plugin-plugins/node_modules/chalk": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", + "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", + "engines": { + "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@oclif/plugin-plugins/node_modules/color": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz", + "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==", + "dependencies": { + "color-convert": "^2.0.1", + "color-string": "^1.9.0" + }, + "engines": { + "node": ">=12.5.0" + } + }, + "node_modules/@oclif/plugin-plugins/node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@oclif/plugin-plugins/node_modules/tsconfck": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.0.0.tgz", + "integrity": "sha512-w3wnsIrJNi7avf4Zb0VjOoodoO0woEqGgZGQm+LHH9przdUI+XDKsWAXwxHA1DaRTjeuZNcregSzr7RaA8zG9A==", + "bin": { + "tsconfck": "bin/tsconfck.js" + }, + "engines": { + "node": "^18 || >=20" + }, + "peerDependencies": { + "typescript": "^5.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@oclif/plugin-plugins/node_modules/typescript": { + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", + "optional": true, + "peer": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, "node_modules/@oclif/plugin-plugins/node_modules/validate-npm-package-name": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz", @@ -5933,6 +6068,7 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, "dependencies": { "is-arrayish": "^0.2.1" } @@ -8771,6 +8907,7 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/http-call/-/http-call-5.3.0.tgz", "integrity": "sha512-ahwimsC23ICE4kPl9xTBjKB4inbRaeLyZeRunC/1Jy/Z6X8tv22MEAjK+KBOMSVLaqXPTTmd8638waVIKLGx2w==", + "dev": true, "dependencies": { "content-type": "^1.0.4", "debug": "^4.1.1", @@ -9823,7 +9960,8 @@ "node_modules/is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==" + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true }, "node_modules/is-binary-path": { "version": "2.1.0", @@ -10083,6 +10221,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz", "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -11469,7 +11608,8 @@ "node_modules/json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", @@ -11924,37 +12064,6 @@ "node": ">=0.10.0" } }, - "node_modules/load-json-file": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz", - "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==", - "dependencies": { - "graceful-fs": "^4.1.15", - "parse-json": "^4.0.0", - "pify": "^4.0.1", - "strip-bom": "^3.0.0", - "type-fest": "^0.3.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/load-json-file/node_modules/strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", - "engines": { - "node": ">=4" - } - }, - "node_modules/load-json-file/node_modules/type-fest": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz", - "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==", - "engines": { - "node": ">=6" - } - }, "node_modules/load-yaml-file": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/load-yaml-file/-/load-yaml-file-0.2.0.tgz", @@ -13563,9 +13672,9 @@ } }, "node_modules/npm": { - "version": "9.8.1", - "resolved": "https://registry.npmjs.org/npm/-/npm-9.8.1.tgz", - "integrity": "sha512-AfDvThQzsIXhYgk9zhbk5R+lh811lKkLAeQMMhSypf1BM7zUafeIIBzMzespeuVEJ0+LvY36oRQYf7IKLzU3rw==", + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/npm/-/npm-10.2.3.tgz", + "integrity": "sha512-GbUui/rHTl0mW8HhJSn4A0Xg89yCR3I9otgJT1i0z1QBPOVlgbh6rlcUTpHT8Gut9O1SJjWRUU0nEcAymhG2tQ==", "bundleDependencies": [ "@isaacs/string-locale-compare", "@npmcli/arborist", @@ -13575,6 +13684,7 @@ "@npmcli/package-json", "@npmcli/promise-spawn", "@npmcli/run-script", + "@sigstore/tuf", "abbrev", "archy", "cacache", @@ -13610,6 +13720,7 @@ "ms", "node-gyp", "nopt", + "normalize-package-data", "npm-audit-report", "npm-install-checks", "npm-package-arg", @@ -13625,8 +13736,9 @@ "qrcode-terminal", "read", "semver", - "sigstore", + "spdx-expression-parse", "ssri", + "strip-ansi", "supports-color", "tar", "text-table", @@ -13638,72 +13750,75 @@ ], "dependencies": { "@isaacs/string-locale-compare": "^1.1.0", - "@npmcli/arborist": "^6.3.0", - "@npmcli/config": "^6.2.1", + "@npmcli/arborist": "^7.2.1", + "@npmcli/config": "^8.0.1", "@npmcli/fs": "^3.1.0", "@npmcli/map-workspaces": "^3.0.4", - "@npmcli/package-json": "^4.0.1", - "@npmcli/promise-spawn": "^6.0.2", - "@npmcli/run-script": "^6.0.2", + "@npmcli/package-json": "^5.0.0", + "@npmcli/promise-spawn": "^7.0.0", + "@npmcli/run-script": "^7.0.2", + "@sigstore/tuf": "^2.1.0", "abbrev": "^2.0.0", "archy": "~1.0.0", - "cacache": "^17.1.3", + "cacache": "^18.0.0", "chalk": "^5.3.0", - "ci-info": "^3.8.0", + "ci-info": "^3.9.0", "cli-columns": "^4.0.0", "cli-table3": "^0.6.3", "columnify": "^1.6.0", "fastest-levenshtein": "^1.0.16", - "fs-minipass": "^3.0.2", - "glob": "^10.2.7", + "fs-minipass": "^3.0.3", + "glob": "^10.3.10", "graceful-fs": "^4.2.11", - "hosted-git-info": "^6.1.1", + "hosted-git-info": "^7.0.1", "ini": "^4.1.1", - "init-package-json": "^5.0.0", + "init-package-json": "^6.0.0", "is-cidr": "^4.0.2", "json-parse-even-better-errors": "^3.0.0", - "libnpmaccess": "^7.0.2", - "libnpmdiff": "^5.0.19", - "libnpmexec": "^6.0.3", - "libnpmfund": "^4.0.19", - "libnpmhook": "^9.0.3", - "libnpmorg": "^5.0.4", - "libnpmpack": "^5.0.19", - "libnpmpublish": "^7.5.0", - "libnpmsearch": "^6.0.2", - "libnpmteam": "^5.0.3", - "libnpmversion": "^4.0.2", - "make-fetch-happen": "^11.1.1", + "libnpmaccess": "^8.0.1", + "libnpmdiff": "^6.0.3", + "libnpmexec": "^7.0.3", + "libnpmfund": "^5.0.1", + "libnpmhook": "^10.0.0", + "libnpmorg": "^6.0.1", + "libnpmpack": "^6.0.3", + "libnpmpublish": "^9.0.1", + "libnpmsearch": "^7.0.0", + "libnpmteam": "^6.0.0", + "libnpmversion": "^5.0.1", + "make-fetch-happen": "^13.0.0", "minimatch": "^9.0.3", - "minipass": "^5.0.0", + "minipass": "^7.0.4", "minipass-pipeline": "^1.2.4", "ms": "^2.1.2", - "node-gyp": "^9.4.0", + "node-gyp": "^10.0.1", "nopt": "^7.2.0", + "normalize-package-data": "^6.0.0", "npm-audit-report": "^5.0.0", - "npm-install-checks": "^6.1.1", - "npm-package-arg": "^10.1.0", - "npm-pick-manifest": "^8.0.1", - "npm-profile": "^7.0.1", - "npm-registry-fetch": "^14.0.5", + "npm-install-checks": "^6.3.0", + "npm-package-arg": "^11.0.1", + "npm-pick-manifest": "^9.0.0", + "npm-profile": "^9.0.0", + "npm-registry-fetch": "^16.1.0", "npm-user-validate": "^2.0.0", "npmlog": "^7.0.1", "p-map": "^4.0.0", - "pacote": "^15.2.0", + "pacote": "^17.0.4", "parse-conflict-json": "^3.0.1", "proc-log": "^3.0.0", "qrcode-terminal": "^0.12.0", "read": "^2.1.0", "semver": "^7.5.4", - "sigstore": "^1.7.0", - "ssri": "^10.0.4", + "spdx-expression-parse": "^3.0.1", + "ssri": "^10.0.5", + "strip-ansi": "^6.0.1", "supports-color": "^9.4.0", - "tar": "^6.1.15", + "tar": "^6.2.0", "text-table": "~0.2.0", "tiny-relative-date": "^1.3.0", "treeverse": "^3.0.0", "validate-npm-package-name": "^5.0.0", - "which": "^3.0.1", + "which": "^4.0.0", "write-file-atomic": "^5.0.1" }, "bin": { @@ -13711,7 +13826,7 @@ "npx": "bin/npx-cli.js" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/npm-bundled": { @@ -14178,8 +14293,71 @@ "inBundle": true, "license": "ISC" }, + "node_modules/npm/node_modules/@npmcli/agent": { + "version": "2.2.0", + "inBundle": true, + "license": "ISC", + "dependencies": { + "agent-base": "^7.1.0", + "http-proxy-agent": "^7.0.0", + "https-proxy-agent": "^7.0.1", + "lru-cache": "^10.0.1", + "socks-proxy-agent": "^8.0.1" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/npm/node_modules/@npmcli/agent/node_modules/agent-base": { + "version": "7.1.0", + "inBundle": true, + "license": "MIT", + "dependencies": { + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/npm/node_modules/@npmcli/agent/node_modules/http-proxy-agent": { + "version": "7.0.0", + "inBundle": true, + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/npm/node_modules/@npmcli/agent/node_modules/https-proxy-agent": { + "version": "7.0.2", + "inBundle": true, + "license": "MIT", + "dependencies": { + "agent-base": "^7.0.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/npm/node_modules/@npmcli/agent/node_modules/socks-proxy-agent": { + "version": "8.0.2", + "inBundle": true, + "license": "MIT", + "dependencies": { + "agent-base": "^7.0.2", + "debug": "^4.3.4", + "socks": "^2.7.1" + }, + "engines": { + "node": ">= 14" + } + }, "node_modules/npm/node_modules/@npmcli/arborist": { - "version": "6.3.0", + "version": "7.2.1", "inBundle": true, "license": "ISC", "dependencies": { @@ -14187,33 +14365,33 @@ "@npmcli/fs": "^3.1.0", "@npmcli/installed-package-contents": "^2.0.2", "@npmcli/map-workspaces": "^3.0.2", - "@npmcli/metavuln-calculator": "^5.0.0", + "@npmcli/metavuln-calculator": "^7.0.0", "@npmcli/name-from-folder": "^2.0.0", "@npmcli/node-gyp": "^3.0.0", - "@npmcli/package-json": "^4.0.0", - "@npmcli/query": "^3.0.0", - "@npmcli/run-script": "^6.0.0", + "@npmcli/package-json": "^5.0.0", + "@npmcli/query": "^3.0.1", + "@npmcli/run-script": "^7.0.2", "bin-links": "^4.0.1", - "cacache": "^17.0.4", + "cacache": "^18.0.0", "common-ancestor-path": "^1.0.1", - "hosted-git-info": "^6.1.1", + "hosted-git-info": "^7.0.1", "json-parse-even-better-errors": "^3.0.0", "json-stringify-nice": "^1.1.4", "minimatch": "^9.0.0", "nopt": "^7.0.0", - "npm-install-checks": "^6.0.0", - "npm-package-arg": "^10.1.0", - "npm-pick-manifest": "^8.0.1", - "npm-registry-fetch": "^14.0.3", + "npm-install-checks": "^6.2.0", + "npm-package-arg": "^11.0.1", + "npm-pick-manifest": "^9.0.0", + "npm-registry-fetch": "^16.0.0", "npmlog": "^7.0.1", - "pacote": "^15.0.8", + "pacote": "^17.0.4", "parse-conflict-json": "^3.0.0", "proc-log": "^3.0.0", "promise-all-reject-late": "^1.0.0", "promise-call-limit": "^1.0.2", "read-package-json-fast": "^3.0.2", "semver": "^7.3.7", - "ssri": "^10.0.1", + "ssri": "^10.0.5", "treeverse": "^3.0.0", "walk-up-path": "^3.0.1" }, @@ -14221,11 +14399,11 @@ "arborist": "bin/index.js" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/@npmcli/config": { - "version": "6.2.1", + "version": "8.0.1", "inBundle": true, "license": "ISC", "dependencies": { @@ -14239,7 +14417,7 @@ "walk-up-path": "^3.0.1" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/@npmcli/disparity-colors": { @@ -14265,21 +14443,21 @@ } }, "node_modules/npm/node_modules/@npmcli/git": { - "version": "4.1.0", + "version": "5.0.3", "inBundle": true, "license": "ISC", "dependencies": { - "@npmcli/promise-spawn": "^6.0.0", - "lru-cache": "^7.4.4", - "npm-pick-manifest": "^8.0.0", + "@npmcli/promise-spawn": "^7.0.0", + "lru-cache": "^10.0.1", + "npm-pick-manifest": "^9.0.0", "proc-log": "^3.0.0", "promise-inflight": "^1.0.1", "promise-retry": "^2.0.1", "semver": "^7.3.5", - "which": "^3.0.0" + "which": "^4.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/@npmcli/installed-package-contents": { @@ -14312,17 +14490,17 @@ } }, "node_modules/npm/node_modules/@npmcli/metavuln-calculator": { - "version": "5.0.1", + "version": "7.0.0", "inBundle": true, "license": "ISC", "dependencies": { - "cacache": "^17.0.0", + "cacache": "^18.0.0", "json-parse-even-better-errors": "^3.0.0", - "pacote": "^15.0.0", + "pacote": "^17.0.0", "semver": "^7.3.5" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/@npmcli/name-from-folder": { @@ -14342,35 +14520,35 @@ } }, "node_modules/npm/node_modules/@npmcli/package-json": { - "version": "4.0.1", + "version": "5.0.0", "inBundle": true, "license": "ISC", "dependencies": { - "@npmcli/git": "^4.1.0", + "@npmcli/git": "^5.0.0", "glob": "^10.2.2", - "hosted-git-info": "^6.1.1", + "hosted-git-info": "^7.0.0", "json-parse-even-better-errors": "^3.0.0", - "normalize-package-data": "^5.0.0", + "normalize-package-data": "^6.0.0", "proc-log": "^3.0.0", "semver": "^7.5.3" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/@npmcli/promise-spawn": { - "version": "6.0.2", + "version": "7.0.0", "inBundle": true, "license": "ISC", "dependencies": { - "which": "^3.0.0" + "which": "^4.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/@npmcli/query": { - "version": "3.0.0", + "version": "3.0.1", "inBundle": true, "license": "ISC", "dependencies": { @@ -14381,18 +14559,18 @@ } }, "node_modules/npm/node_modules/@npmcli/run-script": { - "version": "6.0.2", + "version": "7.0.2", "inBundle": true, "license": "ISC", "dependencies": { "@npmcli/node-gyp": "^3.0.0", - "@npmcli/promise-spawn": "^6.0.0", - "node-gyp": "^9.0.0", + "@npmcli/promise-spawn": "^7.0.0", + "node-gyp": "^10.0.0", "read-package-json-fast": "^3.0.0", - "which": "^3.0.0" + "which": "^4.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/@pkgjs/parseargs": { @@ -14404,52 +14582,68 @@ "node": ">=14" } }, + "node_modules/npm/node_modules/@sigstore/bundle": { + "version": "2.1.0", + "inBundle": true, + "license": "Apache-2.0", + "dependencies": { + "@sigstore/protobuf-specs": "^0.2.1" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, "node_modules/npm/node_modules/@sigstore/protobuf-specs": { - "version": "0.1.0", + "version": "0.2.1", "inBundle": true, "license": "Apache-2.0", "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/npm/node_modules/@sigstore/tuf": { - "version": "1.0.2", + "node_modules/npm/node_modules/@sigstore/sign": { + "version": "2.1.0", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@sigstore/protobuf-specs": "^0.1.0", - "tuf-js": "^1.1.7" + "@sigstore/bundle": "^2.1.0", + "@sigstore/protobuf-specs": "^0.2.1", + "make-fetch-happen": "^13.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/npm/node_modules/@tootallnate/once": { - "version": "2.0.0", + "node_modules/npm/node_modules/@sigstore/tuf": { + "version": "2.1.0", "inBundle": true, - "license": "MIT", + "license": "Apache-2.0", + "dependencies": { + "@sigstore/protobuf-specs": "^0.2.1", + "tuf-js": "^2.1.0" + }, "engines": { - "node": ">= 10" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/@tufjs/canonical-json": { - "version": "1.0.0", + "version": "2.0.0", "inBundle": true, "license": "MIT", "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/@tufjs/models": { - "version": "1.0.4", + "version": "2.0.0", "inBundle": true, "license": "MIT", "dependencies": { - "@tufjs/canonical-json": "1.0.0", - "minimatch": "^9.0.0" + "@tufjs/canonical-json": "2.0.0", + "minimatch": "^9.0.3" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/abbrev": { @@ -14471,30 +14665,6 @@ "node": ">=6.5" } }, - "node_modules/npm/node_modules/agent-base": { - "version": "6.0.2", - "inBundle": true, - "license": "MIT", - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/npm/node_modules/agentkeepalive": { - "version": "4.3.0", - "inBundle": true, - "license": "MIT", - "dependencies": { - "debug": "^4.1.0", - "depd": "^2.0.0", - "humanize-ms": "^1.2.1" - }, - "engines": { - "node": ">= 8.0.0" - } - }, "node_modules/npm/node_modules/aggregate-error": { "version": "3.1.0", "inBundle": true, @@ -14540,7 +14710,7 @@ "license": "MIT" }, "node_modules/npm/node_modules/are-we-there-yet": { - "version": "4.0.0", + "version": "4.0.1", "inBundle": true, "license": "ISC", "dependencies": { @@ -14576,7 +14746,7 @@ "license": "MIT" }, "node_modules/npm/node_modules/bin-links": { - "version": "4.0.2", + "version": "4.0.3", "inBundle": true, "license": "ISC", "dependencies": { @@ -14637,15 +14807,15 @@ } }, "node_modules/npm/node_modules/cacache": { - "version": "17.1.3", + "version": "18.0.0", "inBundle": true, "license": "ISC", "dependencies": { "@npmcli/fs": "^3.1.0", "fs-minipass": "^3.0.0", "glob": "^10.2.2", - "lru-cache": "^7.7.1", - "minipass": "^5.0.0", + "lru-cache": "^10.0.1", + "minipass": "^7.0.3", "minipass-collect": "^1.0.2", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", @@ -14655,7 +14825,7 @@ "unique-filename": "^3.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/chalk": { @@ -14678,7 +14848,7 @@ } }, "node_modules/npm/node_modules/ci-info": { - "version": "3.8.0", + "version": "3.9.0", "funding": [ { "type": "github", @@ -14745,7 +14915,7 @@ } }, "node_modules/npm/node_modules/cmd-shim": { - "version": "6.0.1", + "version": "6.0.2", "inBundle": true, "license": "ISC", "engines": { @@ -14793,11 +14963,6 @@ "inBundle": true, "license": "ISC" }, - "node_modules/npm/node_modules/concat-map": { - "version": "0.0.1", - "inBundle": true, - "license": "MIT" - }, "node_modules/npm/node_modules/console-control-strings": { "version": "1.1.0", "inBundle": true, @@ -14878,14 +15043,6 @@ "inBundle": true, "license": "MIT" }, - "node_modules/npm/node_modules/depd": { - "version": "2.0.0", - "inBundle": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/npm/node_modules/diff": { "version": "5.1.0", "inBundle": true, @@ -14971,21 +15128,16 @@ } }, "node_modules/npm/node_modules/fs-minipass": { - "version": "3.0.2", + "version": "3.0.3", "inBundle": true, "license": "ISC", "dependencies": { - "minipass": "^5.0.0" + "minipass": "^7.0.3" }, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/npm/node_modules/fs.realpath": { - "version": "1.0.0", - "inBundle": true, - "license": "ISC" - }, "node_modules/npm/node_modules/function-bind": { "version": "1.1.1", "inBundle": true, @@ -15010,18 +15162,18 @@ } }, "node_modules/npm/node_modules/glob": { - "version": "10.2.7", + "version": "10.3.10", "inBundle": true, "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^2.0.3", + "jackspeak": "^2.3.5", "minimatch": "^9.0.1", - "minipass": "^5.0.0 || ^6.0.2", - "path-scurry": "^1.7.0" + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" }, "bin": { - "glob": "dist/cjs/src/bin.js" + "glob": "dist/esm/bin.mjs" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -15052,14 +15204,14 @@ "license": "ISC" }, "node_modules/npm/node_modules/hosted-git-info": { - "version": "6.1.1", + "version": "7.0.1", "inBundle": true, "license": "ISC", "dependencies": { - "lru-cache": "^7.5.1" + "lru-cache": "^10.0.1" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/http-cache-semantics": { @@ -15067,39 +15219,6 @@ "inBundle": true, "license": "BSD-2-Clause" }, - "node_modules/npm/node_modules/http-proxy-agent": { - "version": "5.0.0", - "inBundle": true, - "license": "MIT", - "dependencies": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/npm/node_modules/https-proxy-agent": { - "version": "5.0.1", - "inBundle": true, - "license": "MIT", - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/npm/node_modules/humanize-ms": { - "version": "1.2.1", - "inBundle": true, - "license": "MIT", - "dependencies": { - "ms": "^2.0.0" - } - }, "node_modules/npm/node_modules/iconv-lite": { "version": "0.6.3", "inBundle": true, @@ -15158,20 +15277,6 @@ "node": ">=8" } }, - "node_modules/npm/node_modules/inflight": { - "version": "1.0.6", - "inBundle": true, - "license": "ISC", - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/npm/node_modules/inherits": { - "version": "2.0.4", - "inBundle": true, - "license": "ISC" - }, "node_modules/npm/node_modules/ini": { "version": "4.1.1", "inBundle": true, @@ -15181,20 +15286,20 @@ } }, "node_modules/npm/node_modules/init-package-json": { - "version": "5.0.0", + "version": "6.0.0", "inBundle": true, "license": "ISC", "dependencies": { - "npm-package-arg": "^10.0.0", + "npm-package-arg": "^11.0.0", "promzard": "^1.0.0", "read": "^2.0.0", - "read-package-json": "^6.0.0", + "read-package-json": "^7.0.0", "semver": "^7.3.5", "validate-npm-package-license": "^3.0.4", "validate-npm-package-name": "^5.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/ip": { @@ -15222,7 +15327,7 @@ } }, "node_modules/npm/node_modules/is-core-module": { - "version": "2.12.1", + "version": "2.13.0", "inBundle": true, "license": "MIT", "dependencies": { @@ -15251,7 +15356,7 @@ "license": "ISC" }, "node_modules/npm/node_modules/jackspeak": { - "version": "2.2.1", + "version": "2.3.6", "inBundle": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -15302,47 +15407,47 @@ "license": "MIT" }, "node_modules/npm/node_modules/libnpmaccess": { - "version": "7.0.2", + "version": "8.0.1", "inBundle": true, "license": "ISC", "dependencies": { - "npm-package-arg": "^10.1.0", - "npm-registry-fetch": "^14.0.3" + "npm-package-arg": "^11.0.1", + "npm-registry-fetch": "^16.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/libnpmdiff": { - "version": "5.0.19", + "version": "6.0.3", "inBundle": true, "license": "ISC", "dependencies": { - "@npmcli/arborist": "^6.3.0", + "@npmcli/arborist": "^7.2.1", "@npmcli/disparity-colors": "^3.0.0", "@npmcli/installed-package-contents": "^2.0.2", "binary-extensions": "^2.2.0", "diff": "^5.1.0", "minimatch": "^9.0.0", - "npm-package-arg": "^10.1.0", - "pacote": "^15.0.8", - "tar": "^6.1.13" + "npm-package-arg": "^11.0.1", + "pacote": "^17.0.4", + "tar": "^6.2.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/libnpmexec": { - "version": "6.0.3", + "version": "7.0.3", "inBundle": true, "license": "ISC", "dependencies": { - "@npmcli/arborist": "^6.3.0", - "@npmcli/run-script": "^6.0.0", + "@npmcli/arborist": "^7.2.1", + "@npmcli/run-script": "^7.0.2", "ci-info": "^3.7.1", - "npm-package-arg": "^10.1.0", + "npm-package-arg": "^11.0.1", "npmlog": "^7.0.1", - "pacote": "^15.0.8", + "pacote": "^17.0.4", "proc-log": "^3.0.0", "read": "^2.0.0", "read-package-json-fast": "^3.0.2", @@ -15350,145 +15455,141 @@ "walk-up-path": "^3.0.1" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/libnpmfund": { - "version": "4.0.19", + "version": "5.0.1", "inBundle": true, "license": "ISC", "dependencies": { - "@npmcli/arborist": "^6.3.0" + "@npmcli/arborist": "^7.2.1" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/libnpmhook": { - "version": "9.0.3", + "version": "10.0.0", "inBundle": true, "license": "ISC", "dependencies": { "aproba": "^2.0.0", - "npm-registry-fetch": "^14.0.3" + "npm-registry-fetch": "^16.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/libnpmorg": { - "version": "5.0.4", + "version": "6.0.1", "inBundle": true, "license": "ISC", "dependencies": { "aproba": "^2.0.0", - "npm-registry-fetch": "^14.0.3" + "npm-registry-fetch": "^16.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/libnpmpack": { - "version": "5.0.19", + "version": "6.0.3", "inBundle": true, "license": "ISC", "dependencies": { - "@npmcli/arborist": "^6.3.0", - "@npmcli/run-script": "^6.0.0", - "npm-package-arg": "^10.1.0", - "pacote": "^15.0.8" + "@npmcli/arborist": "^7.2.1", + "@npmcli/run-script": "^7.0.2", + "npm-package-arg": "^11.0.1", + "pacote": "^17.0.4" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/libnpmpublish": { - "version": "7.5.0", + "version": "9.0.1", "inBundle": true, "license": "ISC", "dependencies": { "ci-info": "^3.6.1", - "normalize-package-data": "^5.0.0", - "npm-package-arg": "^10.1.0", - "npm-registry-fetch": "^14.0.3", + "normalize-package-data": "^6.0.0", + "npm-package-arg": "^11.0.1", + "npm-registry-fetch": "^16.0.0", "proc-log": "^3.0.0", "semver": "^7.3.7", - "sigstore": "^1.4.0", - "ssri": "^10.0.1" + "sigstore": "^2.1.0", + "ssri": "^10.0.5" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/libnpmsearch": { - "version": "6.0.2", + "version": "7.0.0", "inBundle": true, "license": "ISC", "dependencies": { - "npm-registry-fetch": "^14.0.3" + "npm-registry-fetch": "^16.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/libnpmteam": { - "version": "5.0.3", + "version": "6.0.0", "inBundle": true, "license": "ISC", "dependencies": { "aproba": "^2.0.0", - "npm-registry-fetch": "^14.0.3" + "npm-registry-fetch": "^16.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/libnpmversion": { - "version": "4.0.2", + "version": "5.0.1", "inBundle": true, "license": "ISC", "dependencies": { - "@npmcli/git": "^4.0.1", - "@npmcli/run-script": "^6.0.0", + "@npmcli/git": "^5.0.3", + "@npmcli/run-script": "^7.0.2", "json-parse-even-better-errors": "^3.0.0", "proc-log": "^3.0.0", "semver": "^7.3.7" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/lru-cache": { - "version": "7.18.3", + "version": "10.0.1", "inBundle": true, "license": "ISC", "engines": { - "node": ">=12" + "node": "14 || >=16.14" } }, "node_modules/npm/node_modules/make-fetch-happen": { - "version": "11.1.1", + "version": "13.0.0", "inBundle": true, "license": "ISC", "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", + "@npmcli/agent": "^2.0.0", + "cacache": "^18.0.0", "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^5.0.0", + "minipass": "^7.0.2", "minipass-fetch": "^3.0.0", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", "negotiator": "^0.6.3", "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", "ssri": "^10.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/minimatch": { @@ -15506,11 +15607,11 @@ } }, "node_modules/npm/node_modules/minipass": { - "version": "5.0.0", + "version": "7.0.4", "inBundle": true, "license": "ISC", "engines": { - "node": ">=8" + "node": ">=16 || 14 >=14.17" } }, "node_modules/npm/node_modules/minipass-collect": { @@ -15536,11 +15637,11 @@ } }, "node_modules/npm/node_modules/minipass-fetch": { - "version": "3.0.3", + "version": "3.0.4", "inBundle": true, "license": "MIT", "dependencies": { - "minipass": "^5.0.0", + "minipass": "^7.0.3", "minipass-sized": "^1.0.3", "minizlib": "^2.1.2" }, @@ -15693,161 +15794,26 @@ } }, "node_modules/npm/node_modules/node-gyp": { - "version": "9.4.0", + "version": "10.0.1", "inBundle": true, "license": "MIT", "dependencies": { "env-paths": "^2.2.0", "exponential-backoff": "^3.1.1", - "glob": "^7.1.4", + "glob": "^10.3.10", "graceful-fs": "^4.2.6", - "make-fetch-happen": "^11.0.3", - "nopt": "^6.0.0", - "npmlog": "^6.0.0", - "rimraf": "^3.0.2", + "make-fetch-happen": "^13.0.0", + "nopt": "^7.0.0", + "proc-log": "^3.0.0", "semver": "^7.3.5", "tar": "^6.1.2", - "which": "^2.0.2" + "which": "^4.0.0" }, "bin": { "node-gyp": "bin/node-gyp.js" }, "engines": { - "node": "^12.13 || ^14.13 || >=16" - } - }, - "node_modules/npm/node_modules/node-gyp/node_modules/abbrev": { - "version": "1.1.1", - "inBundle": true, - "license": "ISC" - }, - "node_modules/npm/node_modules/node-gyp/node_modules/are-we-there-yet": { - "version": "3.0.1", - "inBundle": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/npm/node_modules/node-gyp/node_modules/brace-expansion": { - "version": "1.1.11", - "inBundle": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/npm/node_modules/node-gyp/node_modules/gauge": { - "version": "4.0.4", - "inBundle": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/npm/node_modules/node-gyp/node_modules/glob": { - "version": "7.2.3", - "inBundle": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/npm/node_modules/node-gyp/node_modules/minimatch": { - "version": "3.1.2", - "inBundle": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/npm/node_modules/node-gyp/node_modules/nopt": { - "version": "6.0.0", - "inBundle": true, - "license": "ISC", - "dependencies": { - "abbrev": "^1.0.0" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/npm/node_modules/node-gyp/node_modules/npmlog": { - "version": "6.0.2", - "inBundle": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/npm/node_modules/node-gyp/node_modules/readable-stream": { - "version": "3.6.2", - "inBundle": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/npm/node_modules/node-gyp/node_modules/signal-exit": { - "version": "3.0.7", - "inBundle": true, - "license": "ISC" - }, - "node_modules/npm/node_modules/node-gyp/node_modules/which": { - "version": "2.0.2", - "inBundle": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/nopt": { @@ -15865,17 +15831,17 @@ } }, "node_modules/npm/node_modules/normalize-package-data": { - "version": "5.0.0", + "version": "6.0.0", "inBundle": true, "license": "BSD-2-Clause", "dependencies": { - "hosted-git-info": "^6.0.0", + "hosted-git-info": "^7.0.0", "is-core-module": "^2.8.1", "semver": "^7.3.5", "validate-npm-package-license": "^3.0.4" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/npm-audit-report": { @@ -15898,7 +15864,7 @@ } }, "node_modules/npm/node_modules/npm-install-checks": { - "version": "6.1.1", + "version": "6.3.0", "inBundle": true, "license": "BSD-2-Clause", "dependencies": { @@ -15917,21 +15883,21 @@ } }, "node_modules/npm/node_modules/npm-package-arg": { - "version": "10.1.0", + "version": "11.0.1", "inBundle": true, "license": "ISC", "dependencies": { - "hosted-git-info": "^6.0.0", + "hosted-git-info": "^7.0.0", "proc-log": "^3.0.0", "semver": "^7.3.5", "validate-npm-package-name": "^5.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/npm-packlist": { - "version": "7.0.4", + "version": "8.0.0", "inBundle": true, "license": "ISC", "dependencies": { @@ -15942,46 +15908,46 @@ } }, "node_modules/npm/node_modules/npm-pick-manifest": { - "version": "8.0.1", + "version": "9.0.0", "inBundle": true, "license": "ISC", "dependencies": { "npm-install-checks": "^6.0.0", "npm-normalize-package-bin": "^3.0.0", - "npm-package-arg": "^10.0.0", + "npm-package-arg": "^11.0.0", "semver": "^7.3.5" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/npm-profile": { - "version": "7.0.1", + "version": "9.0.0", "inBundle": true, "license": "ISC", "dependencies": { - "npm-registry-fetch": "^14.0.0", + "npm-registry-fetch": "^16.0.0", "proc-log": "^3.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/npm-registry-fetch": { - "version": "14.0.5", + "version": "16.1.0", "inBundle": true, "license": "ISC", "dependencies": { - "make-fetch-happen": "^11.0.0", - "minipass": "^5.0.0", + "make-fetch-happen": "^13.0.0", + "minipass": "^7.0.2", "minipass-fetch": "^3.0.0", "minipass-json-stream": "^1.0.1", "minizlib": "^2.1.2", - "npm-package-arg": "^10.0.0", + "npm-package-arg": "^11.0.0", "proc-log": "^3.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/npm-user-validate": { @@ -16006,14 +15972,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/npm/node_modules/once": { - "version": "1.4.0", - "inBundle": true, - "license": "ISC", - "dependencies": { - "wrappy": "1" - } - }, "node_modules/npm/node_modules/p-map": { "version": "4.0.0", "inBundle": true, @@ -16029,26 +15987,26 @@ } }, "node_modules/npm/node_modules/pacote": { - "version": "15.2.0", + "version": "17.0.4", "inBundle": true, "license": "ISC", "dependencies": { - "@npmcli/git": "^4.0.0", + "@npmcli/git": "^5.0.0", "@npmcli/installed-package-contents": "^2.0.1", - "@npmcli/promise-spawn": "^6.0.1", - "@npmcli/run-script": "^6.0.0", - "cacache": "^17.0.0", + "@npmcli/promise-spawn": "^7.0.0", + "@npmcli/run-script": "^7.0.0", + "cacache": "^18.0.0", "fs-minipass": "^3.0.0", - "minipass": "^5.0.0", - "npm-package-arg": "^10.0.0", - "npm-packlist": "^7.0.0", - "npm-pick-manifest": "^8.0.0", - "npm-registry-fetch": "^14.0.0", + "minipass": "^7.0.2", + "npm-package-arg": "^11.0.0", + "npm-packlist": "^8.0.0", + "npm-pick-manifest": "^9.0.0", + "npm-registry-fetch": "^16.0.0", "proc-log": "^3.0.0", "promise-retry": "^2.0.1", - "read-package-json": "^6.0.0", + "read-package-json": "^7.0.0", "read-package-json-fast": "^3.0.0", - "sigstore": "^1.3.0", + "sigstore": "^2.0.0", "ssri": "^10.0.0", "tar": "^6.1.11" }, @@ -16056,7 +16014,7 @@ "pacote": "lib/bin.js" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/parse-conflict-json": { @@ -16072,14 +16030,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/npm/node_modules/path-is-absolute": { - "version": "1.0.1", - "inBundle": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/npm/node_modules/path-key": { "version": "3.1.1", "inBundle": true, @@ -16089,12 +16039,12 @@ } }, "node_modules/npm/node_modules/path-scurry": { - "version": "1.9.2", + "version": "1.10.1", "inBundle": true, "license": "BlueOak-1.0.0", "dependencies": { - "lru-cache": "^9.1.1", - "minipass": "^5.0.0 || ^6.0.2" + "lru-cache": "^9.1.1 || ^10.0.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -16103,14 +16053,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/npm/node_modules/path-scurry/node_modules/lru-cache": { - "version": "9.1.1", - "inBundle": true, - "license": "ISC", - "engines": { - "node": "14 || >=16.14" - } - }, "node_modules/npm/node_modules/postcss-selector-parser": { "version": "6.0.13", "inBundle": true, @@ -16210,17 +16152,17 @@ } }, "node_modules/npm/node_modules/read-package-json": { - "version": "6.0.4", + "version": "7.0.0", "inBundle": true, "license": "ISC", "dependencies": { "glob": "^10.2.2", "json-parse-even-better-errors": "^3.0.0", - "normalize-package-data": "^5.0.0", + "normalize-package-data": "^6.0.0", "npm-normalize-package-bin": "^3.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/read-package-json-fast": { @@ -16236,14 +16178,15 @@ } }, "node_modules/npm/node_modules/readable-stream": { - "version": "4.4.0", + "version": "4.4.2", "inBundle": true, "license": "MIT", "dependencies": { "abort-controller": "^3.0.0", "buffer": "^6.0.3", "events": "^3.3.0", - "process": "^0.11.10" + "process": "^0.11.10", + "string_decoder": "^1.3.0" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -16257,59 +16200,6 @@ "node": ">= 4" } }, - "node_modules/npm/node_modules/rimraf": { - "version": "3.0.2", - "inBundle": true, - "license": "ISC", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/npm/node_modules/rimraf/node_modules/brace-expansion": { - "version": "1.1.11", - "inBundle": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/npm/node_modules/rimraf/node_modules/glob": { - "version": "7.2.3", - "inBundle": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/npm/node_modules/rimraf/node_modules/minimatch": { - "version": "3.1.2", - "inBundle": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/npm/node_modules/safe-buffer": { "version": "5.2.1", "funding": [ @@ -16396,19 +16286,17 @@ } }, "node_modules/npm/node_modules/sigstore": { - "version": "1.7.0", + "version": "2.1.0", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@sigstore/protobuf-specs": "^0.1.0", - "@sigstore/tuf": "^1.0.1", - "make-fetch-happen": "^11.0.1" - }, - "bin": { - "sigstore": "bin/sigstore.js" + "@sigstore/bundle": "^2.1.0", + "@sigstore/protobuf-specs": "^0.2.1", + "@sigstore/sign": "^2.1.0", + "@sigstore/tuf": "^2.1.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/smart-buffer": { @@ -16433,19 +16321,6 @@ "npm": ">= 3.0.0" } }, - "node_modules/npm/node_modules/socks-proxy-agent": { - "version": "7.0.0", - "inBundle": true, - "license": "MIT", - "dependencies": { - "agent-base": "^6.0.2", - "debug": "^4.3.3", - "socks": "^2.6.2" - }, - "engines": { - "node": ">= 10" - } - }, "node_modules/npm/node_modules/spdx-correct": { "version": "3.2.0", "inBundle": true, @@ -16470,16 +16345,16 @@ } }, "node_modules/npm/node_modules/spdx-license-ids": { - "version": "3.0.13", + "version": "3.0.16", "inBundle": true, "license": "CC0-1.0" }, "node_modules/npm/node_modules/ssri": { - "version": "10.0.4", + "version": "10.0.5", "inBundle": true, "license": "ISC", "dependencies": { - "minipass": "^5.0.0" + "minipass": "^7.0.3" }, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" @@ -16555,7 +16430,7 @@ } }, "node_modules/npm/node_modules/tar": { - "version": "6.1.15", + "version": "6.2.0", "inBundle": true, "license": "ISC", "dependencies": { @@ -16592,6 +16467,14 @@ "node": ">=8" } }, + "node_modules/npm/node_modules/tar/node_modules/minipass": { + "version": "5.0.0", + "inBundle": true, + "license": "ISC", + "engines": { + "node": ">=8" + } + }, "node_modules/npm/node_modules/text-table": { "version": "0.2.0", "inBundle": true, @@ -16611,16 +16494,16 @@ } }, "node_modules/npm/node_modules/tuf-js": { - "version": "1.1.7", + "version": "2.1.0", "inBundle": true, "license": "MIT", "dependencies": { - "@tufjs/models": "1.0.4", + "@tufjs/models": "2.0.0", "debug": "^4.3.4", - "make-fetch-happen": "^11.1.1" + "make-fetch-happen": "^13.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/npm/node_modules/unique-filename": { @@ -16684,17 +16567,25 @@ } }, "node_modules/npm/node_modules/which": { - "version": "3.0.1", + "version": "4.0.0", "inBundle": true, "license": "ISC", "dependencies": { - "isexe": "^2.0.0" + "isexe": "^3.1.1" }, "bin": { "node-which": "bin/which.js" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm/node_modules/which/node_modules/isexe": { + "version": "3.1.1", + "inBundle": true, + "license": "ISC", + "engines": { + "node": ">=16" } }, "node_modules/npm/node_modules/wide-align": { @@ -16795,11 +16686,6 @@ "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, - "node_modules/npm/node_modules/wrappy": { - "version": "1.0.2", - "inBundle": true, - "license": "ISC" - }, "node_modules/npm/node_modules/write-file-atomic": { "version": "5.0.1", "inBundle": true, @@ -17583,6 +17469,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", + "dev": true, "dependencies": { "error-ex": "^1.3.1", "json-parse-better-errors": "^1.0.1" @@ -17835,6 +17722,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true, "engines": { "node": ">=6" } @@ -21046,6 +20934,7 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", + "dev": true, "dependencies": { "safe-buffer": "^5.0.1" }, @@ -22898,7 +22787,7 @@ "@oclif/core": "^2.9.3", "@oclif/plugin-help": "^5", "@oclif/plugin-not-found": "^2.4.0", - "@oclif/plugin-plugins": "^3.3.0", + "@oclif/plugin-plugins": "^4.1.9", "chalk": "^4.1.2", "debug": "^4.1.1", "figlet": "^1.5.2", @@ -22949,7 +22838,7 @@ "@contentstack/cli-command": "~1.2.16", "@contentstack/cli-utilities": "~1.5.8", "@oclif/plugin-help": "^5", - "@oclif/plugin-plugins": "^3.8.4", + "@oclif/plugin-plugins": "^4.1.9", "chalk": "^4.1.2", "fast-csv": "^4.3.6", "fs-extra": "^11.1.1", @@ -24914,7 +24803,7 @@ "@contentstack/cli-utilities": "~1.5.8", "@oclif/core": "^2.9.3", "@oclif/plugin-help": "^5", - "@oclif/plugin-plugins": "^3.3.0", + "@oclif/plugin-plugins": "^4.1.9", "@types/express": "^4.17.17", "@types/express-serve-static-core": "^4.17.34", "adm-zip": "^0.5.10", @@ -27328,7 +27217,7 @@ "@oclif/core": "^2.9.3", "@oclif/plugin-help": "^5", "@oclif/plugin-not-found": "^2.4.0", - "@oclif/plugin-plugins": "^3.3.0", + "@oclif/plugin-plugins": "^4.1.9", "@oclif/test": "^2.2.10", "@types/chai": "^4.2.18", "@types/inquirer": "^9.0.3", @@ -27392,7 +27281,7 @@ "@contentstack/cli-dev-dependencies": "^1.2.4", "@contentstack/cli-utilities": "~1.5.8", "@oclif/plugin-help": "^5", - "@oclif/plugin-plugins": "^3.8.4", + "@oclif/plugin-plugins": "^4.1.9", "@oclif/test": "^2.0.3", "@types/chai": "^4.3.5", "@types/fs-extra": "^11.0.2", @@ -29019,7 +28908,7 @@ "@contentstack/cli-utilities": "~1.5.8", "@oclif/core": "^2.9.3", "@oclif/plugin-help": "^5", - "@oclif/plugin-plugins": "^3.3.0", + "@oclif/plugin-plugins": "^4.1.9", "@oclif/test": "^2.3.6", "@types/adm-zip": "^0.5.0", "@types/chai": "^4", @@ -31221,24 +31110,76 @@ } }, "@oclif/plugin-plugins": { - "version": "3.8.4", - "resolved": "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-3.8.4.tgz", - "integrity": "sha512-msar390ub3aCohh4ZsbbS/mKobmF3p/BUd3J1WQ62XE9UDbrzkhVAowf3fsmgSSYCQxMwgGokJwj24O6ZpW+6w==", + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-4.1.9.tgz", + "integrity": "sha512-7FS6LGkZXe8XSlDE3DCdnzVexXSdfLmNtNqKjYdxS6oBKuKsOplvkQy9ptB0rlKkOTlar3tr/5W97dfDZYEpVA==", "requires": { - "@oclif/core": "^2.15.0", - "chalk": "^4.1.2", + "@oclif/core": "^3.10.2", + "chalk": "^5.3.0", "debug": "^4.3.4", - "http-call": "^5.2.2", - "load-json-file": "^5.3.0", - "npm": "9.8.1", + "npm": "10.2.3", "npm-run-path": "^4.0.1", "semver": "^7.5.4", "shelljs": "^0.8.5", - "tslib": "^2.6.2", "validate-npm-package-name": "^5.0.0", "yarn": "^1.22.18" }, "dependencies": { + "@oclif/core": { + "version": "3.13.2", + "resolved": "https://registry.npmjs.org/@oclif/core/-/core-3.13.2.tgz", + "integrity": "sha512-YUXT4cG8HPyNAK5PzNotWXarHq9ejHFvY048g2BbpXlo2W//OZp2fmEYKPw79/FAtof2rhftotjTiEW8a56bHQ==", + "requires": { + "ansi-escapes": "^4.3.2", + "ansi-styles": "^4.3.0", + "cardinal": "^2.1.1", + "chalk": "^4.1.2", + "clean-stack": "^3.0.1", + "cli-progress": "^3.12.0", + "color": "^4.2.3", + "debug": "^4.3.4", + "ejs": "^3.1.9", + "get-package-type": "^0.1.0", + "globby": "^11.1.0", + "hyperlinker": "^1.0.0", + "indent-string": "^4.0.0", + "is-wsl": "^2.2.0", + "js-yaml": "^3.14.1", + "natural-orderby": "^2.0.3", + "object-treeify": "^1.1.33", + "password-prompt": "^1.1.2", + "slice-ansi": "^4.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "supports-color": "^8.1.1", + "supports-hyperlinks": "^2.2.0", + "tsconfck": "^3.0.0", + "widest-line": "^3.1.0", + "wordwrap": "^1.0.0", + "wrap-ansi": "^7.0.0" + }, + "dependencies": { + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "dependencies": { + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + } + } + }, "builtins": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz", @@ -31247,6 +31188,46 @@ "semver": "^7.0.0" } }, + "chalk": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", + "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==" + }, + "color": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz", + "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==", + "requires": { + "color-convert": "^2.0.1", + "color-string": "^1.9.0" + } + }, + "globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "requires": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + } + }, + "tsconfck": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.0.0.tgz", + "integrity": "sha512-w3wnsIrJNi7avf4Zb0VjOoodoO0woEqGgZGQm+LHH9przdUI+XDKsWAXwxHA1DaRTjeuZNcregSzr7RaA8zG9A==", + "requires": {} + }, + "typescript": { + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", + "optional": true, + "peer": true + }, "validate-npm-package-name": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz", @@ -34219,6 +34200,7 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, "requires": { "is-arrayish": "^0.2.1" } @@ -36342,6 +36324,7 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/http-call/-/http-call-5.3.0.tgz", "integrity": "sha512-ahwimsC23ICE4kPl9xTBjKB4inbRaeLyZeRunC/1Jy/Z6X8tv22MEAjK+KBOMSVLaqXPTTmd8638waVIKLGx2w==", + "dev": true, "requires": { "content-type": "^1.0.4", "debug": "^4.1.1", @@ -37152,7 +37135,8 @@ "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==" + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true }, "is-binary-path": { "version": "2.1.0", @@ -37328,7 +37312,8 @@ "is-retry-allowed": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz", - "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==" + "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==", + "dev": true }, "is-scoped": { "version": "2.1.0", @@ -38385,7 +38370,8 @@ "json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true }, "json-parse-even-better-errors": { "version": "2.3.1", @@ -38739,30 +38725,6 @@ } } }, - "load-json-file": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz", - "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==", - "requires": { - "graceful-fs": "^4.1.15", - "parse-json": "^4.0.0", - "pify": "^4.0.1", - "strip-bom": "^3.0.0", - "type-fest": "^0.3.0" - }, - "dependencies": { - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==" - }, - "type-fest": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz", - "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==" - } - } - }, "load-yaml-file": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/load-yaml-file/-/load-yaml-file-0.2.0.tgz", @@ -40070,77 +40032,80 @@ "dev": true }, "npm": { - "version": "9.8.1", - "resolved": "https://registry.npmjs.org/npm/-/npm-9.8.1.tgz", - "integrity": "sha512-AfDvThQzsIXhYgk9zhbk5R+lh811lKkLAeQMMhSypf1BM7zUafeIIBzMzespeuVEJ0+LvY36oRQYf7IKLzU3rw==", + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/npm/-/npm-10.2.3.tgz", + "integrity": "sha512-GbUui/rHTl0mW8HhJSn4A0Xg89yCR3I9otgJT1i0z1QBPOVlgbh6rlcUTpHT8Gut9O1SJjWRUU0nEcAymhG2tQ==", "requires": { "@isaacs/string-locale-compare": "^1.1.0", - "@npmcli/arborist": "^6.3.0", - "@npmcli/config": "^6.2.1", + "@npmcli/arborist": "^7.2.1", + "@npmcli/config": "^8.0.1", "@npmcli/fs": "^3.1.0", "@npmcli/map-workspaces": "^3.0.4", - "@npmcli/package-json": "^4.0.1", - "@npmcli/promise-spawn": "^6.0.2", - "@npmcli/run-script": "^6.0.2", + "@npmcli/package-json": "^5.0.0", + "@npmcli/promise-spawn": "^7.0.0", + "@npmcli/run-script": "^7.0.2", + "@sigstore/tuf": "^2.1.0", "abbrev": "^2.0.0", "archy": "~1.0.0", - "cacache": "^17.1.3", + "cacache": "^18.0.0", "chalk": "^5.3.0", - "ci-info": "^3.8.0", + "ci-info": "^3.9.0", "cli-columns": "^4.0.0", "cli-table3": "^0.6.3", "columnify": "^1.6.0", "fastest-levenshtein": "^1.0.16", - "fs-minipass": "^3.0.2", - "glob": "^10.2.7", + "fs-minipass": "^3.0.3", + "glob": "^10.3.10", "graceful-fs": "^4.2.11", - "hosted-git-info": "^6.1.1", + "hosted-git-info": "^7.0.1", "ini": "^4.1.1", - "init-package-json": "^5.0.0", + "init-package-json": "^6.0.0", "is-cidr": "^4.0.2", "json-parse-even-better-errors": "^3.0.0", - "libnpmaccess": "^7.0.2", - "libnpmdiff": "^5.0.19", - "libnpmexec": "^6.0.3", - "libnpmfund": "^4.0.19", - "libnpmhook": "^9.0.3", - "libnpmorg": "^5.0.4", - "libnpmpack": "^5.0.19", - "libnpmpublish": "^7.5.0", - "libnpmsearch": "^6.0.2", - "libnpmteam": "^5.0.3", - "libnpmversion": "^4.0.2", - "make-fetch-happen": "^11.1.1", + "libnpmaccess": "^8.0.1", + "libnpmdiff": "^6.0.3", + "libnpmexec": "^7.0.3", + "libnpmfund": "^5.0.1", + "libnpmhook": "^10.0.0", + "libnpmorg": "^6.0.1", + "libnpmpack": "^6.0.3", + "libnpmpublish": "^9.0.1", + "libnpmsearch": "^7.0.0", + "libnpmteam": "^6.0.0", + "libnpmversion": "^5.0.1", + "make-fetch-happen": "^13.0.0", "minimatch": "^9.0.3", - "minipass": "^5.0.0", + "minipass": "^7.0.4", "minipass-pipeline": "^1.2.4", "ms": "^2.1.2", - "node-gyp": "^9.4.0", + "node-gyp": "^10.0.1", "nopt": "^7.2.0", + "normalize-package-data": "^6.0.0", "npm-audit-report": "^5.0.0", - "npm-install-checks": "^6.1.1", - "npm-package-arg": "^10.1.0", - "npm-pick-manifest": "^8.0.1", - "npm-profile": "^7.0.1", - "npm-registry-fetch": "^14.0.5", + "npm-install-checks": "^6.3.0", + "npm-package-arg": "^11.0.1", + "npm-pick-manifest": "^9.0.0", + "npm-profile": "^9.0.0", + "npm-registry-fetch": "^16.1.0", "npm-user-validate": "^2.0.0", "npmlog": "^7.0.1", "p-map": "^4.0.0", - "pacote": "^15.2.0", + "pacote": "^17.0.4", "parse-conflict-json": "^3.0.1", "proc-log": "^3.0.0", "qrcode-terminal": "^0.12.0", "read": "^2.1.0", "semver": "^7.5.4", - "sigstore": "^1.7.0", - "ssri": "^10.0.4", + "spdx-expression-parse": "^3.0.1", + "ssri": "^10.0.5", + "strip-ansi": "^6.0.1", "supports-color": "^9.4.0", - "tar": "^6.1.15", + "tar": "^6.2.0", "text-table": "~0.2.0", "tiny-relative-date": "^1.3.0", "treeverse": "^3.0.0", "validate-npm-package-name": "^5.0.0", - "which": "^3.0.1", + "which": "^4.0.0", "write-file-atomic": "^5.0.1" }, "dependencies": { @@ -40191,47 +40156,92 @@ "version": "1.1.0", "bundled": true }, + "@npmcli/agent": { + "version": "2.2.0", + "bundled": true, + "requires": { + "agent-base": "^7.1.0", + "http-proxy-agent": "^7.0.0", + "https-proxy-agent": "^7.0.1", + "lru-cache": "^10.0.1", + "socks-proxy-agent": "^8.0.1" + }, + "dependencies": { + "agent-base": { + "version": "7.1.0", + "bundled": true, + "requires": { + "debug": "^4.3.4" + } + }, + "http-proxy-agent": { + "version": "7.0.0", + "bundled": true, + "requires": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + } + }, + "https-proxy-agent": { + "version": "7.0.2", + "bundled": true, + "requires": { + "agent-base": "^7.0.2", + "debug": "4" + } + }, + "socks-proxy-agent": { + "version": "8.0.2", + "bundled": true, + "requires": { + "agent-base": "^7.0.2", + "debug": "^4.3.4", + "socks": "^2.7.1" + } + } + } + }, "@npmcli/arborist": { - "version": "6.3.0", + "version": "7.2.1", "bundled": true, "requires": { "@isaacs/string-locale-compare": "^1.1.0", "@npmcli/fs": "^3.1.0", "@npmcli/installed-package-contents": "^2.0.2", "@npmcli/map-workspaces": "^3.0.2", - "@npmcli/metavuln-calculator": "^5.0.0", + "@npmcli/metavuln-calculator": "^7.0.0", "@npmcli/name-from-folder": "^2.0.0", "@npmcli/node-gyp": "^3.0.0", - "@npmcli/package-json": "^4.0.0", - "@npmcli/query": "^3.0.0", - "@npmcli/run-script": "^6.0.0", + "@npmcli/package-json": "^5.0.0", + "@npmcli/query": "^3.0.1", + "@npmcli/run-script": "^7.0.2", "bin-links": "^4.0.1", - "cacache": "^17.0.4", + "cacache": "^18.0.0", "common-ancestor-path": "^1.0.1", - "hosted-git-info": "^6.1.1", + "hosted-git-info": "^7.0.1", "json-parse-even-better-errors": "^3.0.0", "json-stringify-nice": "^1.1.4", "minimatch": "^9.0.0", "nopt": "^7.0.0", - "npm-install-checks": "^6.0.0", - "npm-package-arg": "^10.1.0", - "npm-pick-manifest": "^8.0.1", - "npm-registry-fetch": "^14.0.3", + "npm-install-checks": "^6.2.0", + "npm-package-arg": "^11.0.1", + "npm-pick-manifest": "^9.0.0", + "npm-registry-fetch": "^16.0.0", "npmlog": "^7.0.1", - "pacote": "^15.0.8", + "pacote": "^17.0.4", "parse-conflict-json": "^3.0.0", "proc-log": "^3.0.0", "promise-all-reject-late": "^1.0.0", "promise-call-limit": "^1.0.2", "read-package-json-fast": "^3.0.2", "semver": "^7.3.7", - "ssri": "^10.0.1", + "ssri": "^10.0.5", "treeverse": "^3.0.0", "walk-up-path": "^3.0.1" } }, "@npmcli/config": { - "version": "6.2.1", + "version": "8.0.1", "bundled": true, "requires": { "@npmcli/map-workspaces": "^3.0.2", @@ -40259,17 +40269,17 @@ } }, "@npmcli/git": { - "version": "4.1.0", + "version": "5.0.3", "bundled": true, "requires": { - "@npmcli/promise-spawn": "^6.0.0", - "lru-cache": "^7.4.4", - "npm-pick-manifest": "^8.0.0", + "@npmcli/promise-spawn": "^7.0.0", + "lru-cache": "^10.0.1", + "npm-pick-manifest": "^9.0.0", "proc-log": "^3.0.0", "promise-inflight": "^1.0.1", "promise-retry": "^2.0.1", "semver": "^7.3.5", - "which": "^3.0.0" + "which": "^4.0.0" } }, "@npmcli/installed-package-contents": { @@ -40291,12 +40301,12 @@ } }, "@npmcli/metavuln-calculator": { - "version": "5.0.1", + "version": "7.0.0", "bundled": true, "requires": { - "cacache": "^17.0.0", + "cacache": "^18.0.0", "json-parse-even-better-errors": "^3.0.0", - "pacote": "^15.0.0", + "pacote": "^17.0.0", "semver": "^7.3.5" } }, @@ -40309,41 +40319,41 @@ "bundled": true }, "@npmcli/package-json": { - "version": "4.0.1", + "version": "5.0.0", "bundled": true, "requires": { - "@npmcli/git": "^4.1.0", + "@npmcli/git": "^5.0.0", "glob": "^10.2.2", - "hosted-git-info": "^6.1.1", + "hosted-git-info": "^7.0.0", "json-parse-even-better-errors": "^3.0.0", - "normalize-package-data": "^5.0.0", + "normalize-package-data": "^6.0.0", "proc-log": "^3.0.0", "semver": "^7.5.3" } }, "@npmcli/promise-spawn": { - "version": "6.0.2", + "version": "7.0.0", "bundled": true, "requires": { - "which": "^3.0.0" + "which": "^4.0.0" } }, "@npmcli/query": { - "version": "3.0.0", + "version": "3.0.1", "bundled": true, "requires": { "postcss-selector-parser": "^6.0.10" } }, "@npmcli/run-script": { - "version": "6.0.2", + "version": "7.0.2", "bundled": true, "requires": { "@npmcli/node-gyp": "^3.0.0", - "@npmcli/promise-spawn": "^6.0.0", - "node-gyp": "^9.0.0", + "@npmcli/promise-spawn": "^7.0.0", + "node-gyp": "^10.0.0", "read-package-json-fast": "^3.0.0", - "which": "^3.0.0" + "which": "^4.0.0" } }, "@pkgjs/parseargs": { @@ -40351,32 +40361,44 @@ "bundled": true, "optional": true }, + "@sigstore/bundle": { + "version": "2.1.0", + "bundled": true, + "requires": { + "@sigstore/protobuf-specs": "^0.2.1" + } + }, "@sigstore/protobuf-specs": { - "version": "0.1.0", + "version": "0.2.1", "bundled": true }, - "@sigstore/tuf": { - "version": "1.0.2", + "@sigstore/sign": { + "version": "2.1.0", "bundled": true, "requires": { - "@sigstore/protobuf-specs": "^0.1.0", - "tuf-js": "^1.1.7" + "@sigstore/bundle": "^2.1.0", + "@sigstore/protobuf-specs": "^0.2.1", + "make-fetch-happen": "^13.0.0" } }, - "@tootallnate/once": { - "version": "2.0.0", - "bundled": true + "@sigstore/tuf": { + "version": "2.1.0", + "bundled": true, + "requires": { + "@sigstore/protobuf-specs": "^0.2.1", + "tuf-js": "^2.1.0" + } }, "@tufjs/canonical-json": { - "version": "1.0.0", + "version": "2.0.0", "bundled": true }, "@tufjs/models": { - "version": "1.0.4", + "version": "2.0.0", "bundled": true, "requires": { - "@tufjs/canonical-json": "1.0.0", - "minimatch": "^9.0.0" + "@tufjs/canonical-json": "2.0.0", + "minimatch": "^9.0.3" } }, "abbrev": { @@ -40390,22 +40412,6 @@ "event-target-shim": "^5.0.0" } }, - "agent-base": { - "version": "6.0.2", - "bundled": true, - "requires": { - "debug": "4" - } - }, - "agentkeepalive": { - "version": "4.3.0", - "bundled": true, - "requires": { - "debug": "^4.1.0", - "depd": "^2.0.0", - "humanize-ms": "^1.2.1" - } - }, "aggregate-error": { "version": "3.1.0", "bundled": true, @@ -40434,7 +40440,7 @@ "bundled": true }, "are-we-there-yet": { - "version": "4.0.0", + "version": "4.0.1", "bundled": true, "requires": { "delegates": "^1.0.0", @@ -40450,7 +40456,7 @@ "bundled": true }, "bin-links": { - "version": "4.0.2", + "version": "4.0.3", "bundled": true, "requires": { "cmd-shim": "^6.0.0", @@ -40486,14 +40492,14 @@ } }, "cacache": { - "version": "17.1.3", + "version": "18.0.0", "bundled": true, "requires": { "@npmcli/fs": "^3.1.0", "fs-minipass": "^3.0.0", "glob": "^10.2.2", - "lru-cache": "^7.7.1", - "minipass": "^5.0.0", + "lru-cache": "^10.0.1", + "minipass": "^7.0.3", "minipass-collect": "^1.0.2", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", @@ -40512,7 +40518,7 @@ "bundled": true }, "ci-info": { - "version": "3.8.0", + "version": "3.9.0", "bundled": true }, "cidr-regex": { @@ -40547,7 +40553,7 @@ "bundled": true }, "cmd-shim": { - "version": "6.0.1", + "version": "6.0.2", "bundled": true }, "color-convert": { @@ -40577,10 +40583,6 @@ "version": "1.0.1", "bundled": true }, - "concat-map": { - "version": "0.0.1", - "bundled": true - }, "console-control-strings": { "version": "1.1.0", "bundled": true @@ -40631,10 +40633,6 @@ "version": "1.0.0", "bundled": true }, - "depd": { - "version": "2.0.0", - "bundled": true - }, "diff": { "version": "5.1.0", "bundled": true @@ -40688,16 +40686,12 @@ } }, "fs-minipass": { - "version": "3.0.2", + "version": "3.0.3", "bundled": true, "requires": { - "minipass": "^5.0.0" + "minipass": "^7.0.3" } }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true - }, "function-bind": { "version": "1.1.1", "bundled": true @@ -40717,14 +40711,14 @@ } }, "glob": { - "version": "10.2.7", + "version": "10.3.10", "bundled": true, "requires": { "foreground-child": "^3.1.0", - "jackspeak": "^2.0.3", + "jackspeak": "^2.3.5", "minimatch": "^9.0.1", - "minipass": "^5.0.0 || ^6.0.2", - "path-scurry": "^1.7.0" + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" } }, "graceful-fs": { @@ -40743,40 +40737,16 @@ "bundled": true }, "hosted-git-info": { - "version": "6.1.1", + "version": "7.0.1", "bundled": true, "requires": { - "lru-cache": "^7.5.1" + "lru-cache": "^10.0.1" } }, "http-cache-semantics": { "version": "4.1.1", "bundled": true }, - "http-proxy-agent": { - "version": "5.0.0", - "bundled": true, - "requires": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - } - }, - "https-proxy-agent": { - "version": "5.0.1", - "bundled": true, - "requires": { - "agent-base": "6", - "debug": "4" - } - }, - "humanize-ms": { - "version": "1.2.1", - "bundled": true, - "requires": { - "ms": "^2.0.0" - } - }, "iconv-lite": { "version": "0.6.3", "bundled": true, @@ -40804,30 +40774,18 @@ "version": "4.0.0", "bundled": true }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "bundled": true - }, "ini": { "version": "4.1.1", "bundled": true }, "init-package-json": { - "version": "5.0.0", + "version": "6.0.0", "bundled": true, "requires": { - "npm-package-arg": "^10.0.0", + "npm-package-arg": "^11.0.0", "promzard": "^1.0.0", "read": "^2.0.0", - "read-package-json": "^6.0.0", + "read-package-json": "^7.0.0", "semver": "^7.3.5", "validate-npm-package-license": "^3.0.4", "validate-npm-package-name": "^5.0.0" @@ -40849,7 +40807,7 @@ } }, "is-core-module": { - "version": "2.12.1", + "version": "2.13.0", "bundled": true, "requires": { "has": "^1.0.3" @@ -40868,7 +40826,7 @@ "bundled": true }, "jackspeak": { - "version": "2.2.1", + "version": "2.3.6", "bundled": true, "requires": { "@isaacs/cliui": "^8.0.2", @@ -40896,38 +40854,38 @@ "bundled": true }, "libnpmaccess": { - "version": "7.0.2", + "version": "8.0.1", "bundled": true, "requires": { - "npm-package-arg": "^10.1.0", - "npm-registry-fetch": "^14.0.3" + "npm-package-arg": "^11.0.1", + "npm-registry-fetch": "^16.0.0" } }, "libnpmdiff": { - "version": "5.0.19", + "version": "6.0.3", "bundled": true, "requires": { - "@npmcli/arborist": "^6.3.0", + "@npmcli/arborist": "^7.2.1", "@npmcli/disparity-colors": "^3.0.0", "@npmcli/installed-package-contents": "^2.0.2", "binary-extensions": "^2.2.0", "diff": "^5.1.0", "minimatch": "^9.0.0", - "npm-package-arg": "^10.1.0", - "pacote": "^15.0.8", - "tar": "^6.1.13" + "npm-package-arg": "^11.0.1", + "pacote": "^17.0.4", + "tar": "^6.2.0" } }, "libnpmexec": { - "version": "6.0.3", + "version": "7.0.3", "bundled": true, "requires": { - "@npmcli/arborist": "^6.3.0", - "@npmcli/run-script": "^6.0.0", + "@npmcli/arborist": "^7.2.1", + "@npmcli/run-script": "^7.0.2", "ci-info": "^3.7.1", - "npm-package-arg": "^10.1.0", + "npm-package-arg": "^11.0.1", "npmlog": "^7.0.1", - "pacote": "^15.0.8", + "pacote": "^17.0.4", "proc-log": "^3.0.0", "read": "^2.0.0", "read-package-json-fast": "^3.0.2", @@ -40936,100 +40894,96 @@ } }, "libnpmfund": { - "version": "4.0.19", + "version": "5.0.1", "bundled": true, "requires": { - "@npmcli/arborist": "^6.3.0" + "@npmcli/arborist": "^7.2.1" } }, "libnpmhook": { - "version": "9.0.3", + "version": "10.0.0", "bundled": true, "requires": { "aproba": "^2.0.0", - "npm-registry-fetch": "^14.0.3" + "npm-registry-fetch": "^16.0.0" } }, "libnpmorg": { - "version": "5.0.4", + "version": "6.0.1", "bundled": true, "requires": { "aproba": "^2.0.0", - "npm-registry-fetch": "^14.0.3" + "npm-registry-fetch": "^16.0.0" } }, "libnpmpack": { - "version": "5.0.19", + "version": "6.0.3", "bundled": true, "requires": { - "@npmcli/arborist": "^6.3.0", - "@npmcli/run-script": "^6.0.0", - "npm-package-arg": "^10.1.0", - "pacote": "^15.0.8" + "@npmcli/arborist": "^7.2.1", + "@npmcli/run-script": "^7.0.2", + "npm-package-arg": "^11.0.1", + "pacote": "^17.0.4" } }, "libnpmpublish": { - "version": "7.5.0", + "version": "9.0.1", "bundled": true, "requires": { "ci-info": "^3.6.1", - "normalize-package-data": "^5.0.0", - "npm-package-arg": "^10.1.0", - "npm-registry-fetch": "^14.0.3", + "normalize-package-data": "^6.0.0", + "npm-package-arg": "^11.0.1", + "npm-registry-fetch": "^16.0.0", "proc-log": "^3.0.0", "semver": "^7.3.7", - "sigstore": "^1.4.0", - "ssri": "^10.0.1" + "sigstore": "^2.1.0", + "ssri": "^10.0.5" } }, "libnpmsearch": { - "version": "6.0.2", + "version": "7.0.0", "bundled": true, "requires": { - "npm-registry-fetch": "^14.0.3" + "npm-registry-fetch": "^16.0.0" } }, "libnpmteam": { - "version": "5.0.3", + "version": "6.0.0", "bundled": true, "requires": { "aproba": "^2.0.0", - "npm-registry-fetch": "^14.0.3" + "npm-registry-fetch": "^16.0.0" } }, "libnpmversion": { - "version": "4.0.2", + "version": "5.0.1", "bundled": true, "requires": { - "@npmcli/git": "^4.0.1", - "@npmcli/run-script": "^6.0.0", + "@npmcli/git": "^5.0.3", + "@npmcli/run-script": "^7.0.2", "json-parse-even-better-errors": "^3.0.0", "proc-log": "^3.0.0", "semver": "^7.3.7" } }, "lru-cache": { - "version": "7.18.3", + "version": "10.0.1", "bundled": true }, "make-fetch-happen": { - "version": "11.1.1", + "version": "13.0.0", "bundled": true, "requires": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", + "@npmcli/agent": "^2.0.0", + "cacache": "^18.0.0", "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^5.0.0", + "minipass": "^7.0.2", "minipass-fetch": "^3.0.0", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", "negotiator": "^0.6.3", "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", "ssri": "^10.0.0" } }, @@ -41041,7 +40995,7 @@ } }, "minipass": { - "version": "5.0.0", + "version": "7.0.4", "bundled": true }, "minipass-collect": { @@ -41061,11 +41015,11 @@ } }, "minipass-fetch": { - "version": "3.0.3", + "version": "3.0.4", "bundled": true, "requires": { "encoding": "^0.1.13", - "minipass": "^5.0.0", + "minipass": "^7.0.3", "minipass-sized": "^1.0.3", "minizlib": "^2.1.2" } @@ -41169,112 +41123,19 @@ "bundled": true }, "node-gyp": { - "version": "9.4.0", + "version": "10.0.1", "bundled": true, "requires": { "env-paths": "^2.2.0", "exponential-backoff": "^3.1.1", - "glob": "^7.1.4", + "glob": "^10.3.10", "graceful-fs": "^4.2.6", - "make-fetch-happen": "^11.0.3", - "nopt": "^6.0.0", - "npmlog": "^6.0.0", - "rimraf": "^3.0.2", + "make-fetch-happen": "^13.0.0", + "nopt": "^7.0.0", + "proc-log": "^3.0.0", "semver": "^7.3.5", "tar": "^6.1.2", - "which": "^2.0.2" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true - }, - "are-we-there-yet": { - "version": "3.0.1", - "bundled": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - } - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "gauge": { - "version": "4.0.4", - "bundled": true, - "requires": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - } - }, - "glob": { - "version": "7.2.3", - "bundled": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "minimatch": { - "version": "3.1.2", - "bundled": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "nopt": { - "version": "6.0.0", - "bundled": true, - "requires": { - "abbrev": "^1.0.0" - } - }, - "npmlog": { - "version": "6.0.2", - "bundled": true, - "requires": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - } - }, - "readable-stream": { - "version": "3.6.2", - "bundled": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - }, - "signal-exit": { - "version": "3.0.7", - "bundled": true - }, - "which": { - "version": "2.0.2", - "bundled": true, - "requires": { - "isexe": "^2.0.0" - } - } + "which": "^4.0.0" } }, "nopt": { @@ -41285,10 +41146,10 @@ } }, "normalize-package-data": { - "version": "5.0.0", + "version": "6.0.0", "bundled": true, "requires": { - "hosted-git-info": "^6.0.0", + "hosted-git-info": "^7.0.0", "is-core-module": "^2.8.1", "semver": "^7.3.5", "validate-npm-package-license": "^3.0.4" @@ -41306,7 +41167,7 @@ } }, "npm-install-checks": { - "version": "6.1.1", + "version": "6.3.0", "bundled": true, "requires": { "semver": "^7.1.1" @@ -41317,50 +41178,50 @@ "bundled": true }, "npm-package-arg": { - "version": "10.1.0", + "version": "11.0.1", "bundled": true, "requires": { - "hosted-git-info": "^6.0.0", + "hosted-git-info": "^7.0.0", "proc-log": "^3.0.0", "semver": "^7.3.5", "validate-npm-package-name": "^5.0.0" } }, "npm-packlist": { - "version": "7.0.4", + "version": "8.0.0", "bundled": true, "requires": { "ignore-walk": "^6.0.0" } }, "npm-pick-manifest": { - "version": "8.0.1", + "version": "9.0.0", "bundled": true, "requires": { "npm-install-checks": "^6.0.0", "npm-normalize-package-bin": "^3.0.0", - "npm-package-arg": "^10.0.0", + "npm-package-arg": "^11.0.0", "semver": "^7.3.5" } }, "npm-profile": { - "version": "7.0.1", + "version": "9.0.0", "bundled": true, "requires": { - "npm-registry-fetch": "^14.0.0", + "npm-registry-fetch": "^16.0.0", "proc-log": "^3.0.0" } }, "npm-registry-fetch": { - "version": "14.0.5", + "version": "16.1.0", "bundled": true, "requires": { - "make-fetch-happen": "^11.0.0", - "minipass": "^5.0.0", + "make-fetch-happen": "^13.0.0", + "minipass": "^7.0.2", "minipass-fetch": "^3.0.0", "minipass-json-stream": "^1.0.1", "minizlib": "^2.1.2", - "npm-package-arg": "^10.0.0", + "npm-package-arg": "^11.0.0", "proc-log": "^3.0.0" } }, @@ -41378,13 +41239,6 @@ "set-blocking": "^2.0.0" } }, - "once": { - "version": "1.4.0", - "bundled": true, - "requires": { - "wrappy": "1" - } - }, "p-map": { "version": "4.0.0", "bundled": true, @@ -41393,25 +41247,25 @@ } }, "pacote": { - "version": "15.2.0", + "version": "17.0.4", "bundled": true, "requires": { - "@npmcli/git": "^4.0.0", + "@npmcli/git": "^5.0.0", "@npmcli/installed-package-contents": "^2.0.1", - "@npmcli/promise-spawn": "^6.0.1", - "@npmcli/run-script": "^6.0.0", - "cacache": "^17.0.0", + "@npmcli/promise-spawn": "^7.0.0", + "@npmcli/run-script": "^7.0.0", + "cacache": "^18.0.0", "fs-minipass": "^3.0.0", - "minipass": "^5.0.0", - "npm-package-arg": "^10.0.0", - "npm-packlist": "^7.0.0", - "npm-pick-manifest": "^8.0.0", - "npm-registry-fetch": "^14.0.0", + "minipass": "^7.0.2", + "npm-package-arg": "^11.0.0", + "npm-packlist": "^8.0.0", + "npm-pick-manifest": "^9.0.0", + "npm-registry-fetch": "^16.0.0", "proc-log": "^3.0.0", "promise-retry": "^2.0.1", - "read-package-json": "^6.0.0", + "read-package-json": "^7.0.0", "read-package-json-fast": "^3.0.0", - "sigstore": "^1.3.0", + "sigstore": "^2.0.0", "ssri": "^10.0.0", "tar": "^6.1.11" } @@ -41425,26 +41279,16 @@ "just-diff-apply": "^5.2.0" } }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true - }, "path-key": { "version": "3.1.1", "bundled": true }, "path-scurry": { - "version": "1.9.2", + "version": "1.10.1", "bundled": true, "requires": { - "lru-cache": "^9.1.1", - "minipass": "^5.0.0 || ^6.0.2" - }, - "dependencies": { - "lru-cache": { - "version": "9.1.1", - "bundled": true - } + "lru-cache": "^9.1.1 || ^10.0.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" } }, "postcss-selector-parser": { @@ -41506,12 +41350,12 @@ "bundled": true }, "read-package-json": { - "version": "6.0.4", + "version": "7.0.0", "bundled": true, "requires": { "glob": "^10.2.2", "json-parse-even-better-errors": "^3.0.0", - "normalize-package-data": "^5.0.0", + "normalize-package-data": "^6.0.0", "npm-normalize-package-bin": "^3.0.0" } }, @@ -41524,55 +41368,20 @@ } }, "readable-stream": { - "version": "4.4.0", + "version": "4.4.2", "bundled": true, "requires": { "abort-controller": "^3.0.0", "buffer": "^6.0.3", "events": "^3.3.0", - "process": "^0.11.10" + "process": "^0.11.10", + "string_decoder": "^1.3.0" } }, "retry": { "version": "0.12.0", "bundled": true }, - "rimraf": { - "version": "3.0.2", - "bundled": true, - "requires": { - "glob": "^7.1.3" - }, - "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "glob": { - "version": "7.2.3", - "bundled": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "minimatch": { - "version": "3.1.2", - "bundled": true, - "requires": { - "brace-expansion": "^1.1.7" - } - } - } - }, "safe-buffer": { "version": "5.2.1", "bundled": true @@ -41618,12 +41427,13 @@ "bundled": true }, "sigstore": { - "version": "1.7.0", + "version": "2.1.0", "bundled": true, "requires": { - "@sigstore/protobuf-specs": "^0.1.0", - "@sigstore/tuf": "^1.0.1", - "make-fetch-happen": "^11.0.1" + "@sigstore/bundle": "^2.1.0", + "@sigstore/protobuf-specs": "^0.2.1", + "@sigstore/sign": "^2.1.0", + "@sigstore/tuf": "^2.1.0" } }, "smart-buffer": { @@ -41638,15 +41448,6 @@ "smart-buffer": "^4.2.0" } }, - "socks-proxy-agent": { - "version": "7.0.0", - "bundled": true, - "requires": { - "agent-base": "^6.0.2", - "debug": "^4.3.3", - "socks": "^2.6.2" - } - }, "spdx-correct": { "version": "3.2.0", "bundled": true, @@ -41668,14 +41469,14 @@ } }, "spdx-license-ids": { - "version": "3.0.13", + "version": "3.0.16", "bundled": true }, "ssri": { - "version": "10.0.4", + "version": "10.0.5", "bundled": true, "requires": { - "minipass": "^5.0.0" + "minipass": "^7.0.3" } }, "string_decoder": { @@ -41722,7 +41523,7 @@ "bundled": true }, "tar": { - "version": "6.1.15", + "version": "6.2.0", "bundled": true, "requires": { "chownr": "^2.0.0", @@ -41748,6 +41549,10 @@ } } } + }, + "minipass": { + "version": "5.0.0", + "bundled": true } } }, @@ -41764,12 +41569,12 @@ "bundled": true }, "tuf-js": { - "version": "1.1.7", + "version": "2.1.0", "bundled": true, "requires": { - "@tufjs/models": "1.0.4", + "@tufjs/models": "2.0.0", "debug": "^4.3.4", - "make-fetch-happen": "^11.1.1" + "make-fetch-happen": "^13.0.0" } }, "unique-filename": { @@ -41817,10 +41622,16 @@ } }, "which": { - "version": "3.0.1", + "version": "4.0.0", "bundled": true, "requires": { - "isexe": "^2.0.0" + "isexe": "^3.1.1" + }, + "dependencies": { + "isexe": { + "version": "3.1.1", + "bundled": true + } } }, "wide-align": { @@ -41878,10 +41689,6 @@ "strip-ansi": "^6.0.0" } }, - "wrappy": { - "version": "1.0.2", - "bundled": true - }, "write-file-atomic": { "version": "5.0.1", "bundled": true, @@ -42799,6 +42606,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", + "dev": true, "requires": { "error-ex": "^1.3.1", "json-parse-better-errors": "^1.0.1" @@ -42989,7 +42797,8 @@ "pify": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true }, "pirates": { "version": "4.0.6", @@ -45412,6 +45221,7 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", + "dev": true, "requires": { "safe-buffer": "^5.0.1" } diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json index 882a90c242..7075fa5c1f 100644 --- a/packages/contentstack-audit/package.json +++ b/packages/contentstack-audit/package.json @@ -21,7 +21,7 @@ "@contentstack/cli-command": "~1.2.16", "@contentstack/cli-utilities": "~1.5.8", "@oclif/plugin-help": "^5", - "@oclif/plugin-plugins": "^3.8.4", + "@oclif/plugin-plugins": "^4.1.9", "chalk": "^4.1.2", "fast-csv": "^4.3.6", "fs-extra": "^11.1.1", diff --git a/packages/contentstack-launch/package.json b/packages/contentstack-launch/package.json index 15d048ec25..662dcaee0f 100755 --- a/packages/contentstack-launch/package.json +++ b/packages/contentstack-launch/package.json @@ -22,7 +22,7 @@ "@contentstack/cli-utilities": "~1.5.8", "@oclif/core": "^2.9.3", "@oclif/plugin-help": "^5", - "@oclif/plugin-plugins": "^3.3.0", + "@oclif/plugin-plugins": "^4.1.9", "@types/express": "^4.17.17", "@types/express-serve-static-core": "^4.17.34", "adm-zip": "^0.5.10", @@ -105,4 +105,4 @@ "launch:deployments": "LNCH-DPLMNT" } } -} \ No newline at end of file +} diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json index 848e97ba60..848805a9e9 100755 --- a/packages/contentstack/package.json +++ b/packages/contentstack/package.json @@ -42,7 +42,7 @@ "@oclif/core": "^2.9.3", "@oclif/plugin-help": "^5", "@oclif/plugin-not-found": "^2.4.0", - "@oclif/plugin-plugins": "^3.3.0", + "@oclif/plugin-plugins": "^4.1.9", "chalk": "^4.1.2", "debug": "^4.1.1", "figlet": "^1.5.2", @@ -160,4 +160,4 @@ } }, "repository": "https://github.com/contentstack/cli" -} \ No newline at end of file +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 613d4c2157..c0d5503304 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -30,7 +30,7 @@ importers: '@oclif/core': ^2.9.3 '@oclif/plugin-help': ^5 '@oclif/plugin-not-found': ^2.4.0 - '@oclif/plugin-plugins': ^3.3.0 + '@oclif/plugin-plugins': ^4.1.9 '@oclif/test': ^2.2.10 '@types/chai': ^4.2.18 '@types/inquirer': ^9.0.3 @@ -84,7 +84,7 @@ importers: '@oclif/core': 2.15.0_4qcp7qp4jxxdgb4qbxgwox4hwq '@oclif/plugin-help': 5.2.14_4qcp7qp4jxxdgb4qbxgwox4hwq '@oclif/plugin-not-found': 2.4.0_4qcp7qp4jxxdgb4qbxgwox4hwq - '@oclif/plugin-plugins': 3.3.2_4qcp7qp4jxxdgb4qbxgwox4hwq + '@oclif/plugin-plugins': 4.1.10_typescript@4.9.5 chalk: 4.1.2 debug: 4.3.4 figlet: 1.6.0 @@ -125,7 +125,7 @@ importers: '@contentstack/cli-dev-dependencies': ^1.2.4 '@contentstack/cli-utilities': ~1.5.8 '@oclif/plugin-help': ^5 - '@oclif/plugin-plugins': ^3.8.4 + '@oclif/plugin-plugins': ^4.1.9 '@oclif/test': ^2.0.3 '@types/chai': ^4.3.5 '@types/fs-extra': ^11.0.2 @@ -154,7 +154,7 @@ importers: '@contentstack/cli-command': link:../contentstack-command '@contentstack/cli-utilities': link:../contentstack-utilities '@oclif/plugin-help': 5.2.20_eyayto62fyd4eo5o5fvolpu7d4 - '@oclif/plugin-plugins': 3.8.4_eyayto62fyd4eo5o5fvolpu7d4 + '@oclif/plugin-plugins': 4.1.10_typescript@5.2.2 chalk: 4.1.2 fast-csv: 4.3.6 fs-extra: 11.1.1 @@ -818,7 +818,7 @@ importers: '@contentstack/cli-utilities': ~1.5.8 '@oclif/core': ^2.9.3 '@oclif/plugin-help': ^5 - '@oclif/plugin-plugins': ^3.3.0 + '@oclif/plugin-plugins': ^4.1.9 '@oclif/test': ^2.3.6 '@types/adm-zip': ^0.5.0 '@types/chai': ^4 @@ -855,7 +855,7 @@ importers: '@contentstack/cli-utilities': link:../contentstack-utilities '@oclif/core': 2.9.4_npeoqfxwgl5njwqojmpesqhar4 '@oclif/plugin-help': 5.2.14_npeoqfxwgl5njwqojmpesqhar4 - '@oclif/plugin-plugins': 3.3.2_npeoqfxwgl5njwqojmpesqhar4 + '@oclif/plugin-plugins': 4.1.10_typescript@4.9.5 '@types/express': 4.17.17 '@types/express-serve-static-core': 4.17.35 adm-zip: 0.5.10 @@ -2808,6 +2808,76 @@ packages: - typescript dev: false + /@oclif/core/3.13.2_typescript@4.9.5: + resolution: {integrity: sha512-YUXT4cG8HPyNAK5PzNotWXarHq9ejHFvY048g2BbpXlo2W//OZp2fmEYKPw79/FAtof2rhftotjTiEW8a56bHQ==} + engines: {node: '>=18.0.0'} + dependencies: + ansi-escapes: 4.3.2 + ansi-styles: 4.3.0 + cardinal: 2.1.1 + chalk: 4.1.2 + clean-stack: 3.0.1 + cli-progress: 3.12.0 + color: 4.2.3 + debug: 4.3.4_supports-color@8.1.1 + ejs: 3.1.9 + get-package-type: 0.1.0 + globby: 11.1.0 + hyperlinker: 1.0.0 + indent-string: 4.0.0 + is-wsl: 2.2.0 + js-yaml: 3.14.1 + natural-orderby: 2.0.3 + object-treeify: 1.1.33 + password-prompt: 1.1.2 + slice-ansi: 4.0.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 + supports-color: 8.1.1 + supports-hyperlinks: 2.3.0 + tsconfck: 3.0.0_typescript@4.9.5 + widest-line: 3.1.0 + wordwrap: 1.0.0 + wrap-ansi: 7.0.0 + transitivePeerDependencies: + - typescript + dev: false + + /@oclif/core/3.13.2_typescript@5.2.2: + resolution: {integrity: sha512-YUXT4cG8HPyNAK5PzNotWXarHq9ejHFvY048g2BbpXlo2W//OZp2fmEYKPw79/FAtof2rhftotjTiEW8a56bHQ==} + engines: {node: '>=18.0.0'} + dependencies: + ansi-escapes: 4.3.2 + ansi-styles: 4.3.0 + cardinal: 2.1.1 + chalk: 4.1.2 + clean-stack: 3.0.1 + cli-progress: 3.12.0 + color: 4.2.3 + debug: 4.3.4_supports-color@8.1.1 + ejs: 3.1.9 + get-package-type: 0.1.0 + globby: 11.1.0 + hyperlinker: 1.0.0 + indent-string: 4.0.0 + is-wsl: 2.2.0 + js-yaml: 3.14.1 + natural-orderby: 2.0.3 + object-treeify: 1.1.33 + password-prompt: 1.1.2 + slice-ansi: 4.0.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 + supports-color: 8.1.1 + supports-hyperlinks: 2.3.0 + tsconfck: 3.0.0_typescript@5.2.2 + widest-line: 3.1.0 + wordwrap: 1.0.0 + wrap-ansi: 7.0.0 + transitivePeerDependencies: + - typescript + dev: false + /@oclif/plugin-help/5.2.14: resolution: {integrity: sha512-7hMLc6zqxeRfG4nvHHQPpbaBj60efM3ULFkCpHZkdLms/ezIkNo40F661QuraIjMP/NN+U6VSfBCGuPkRyxVkA==} engines: {node: '>=12.0.0'} @@ -2959,76 +3029,38 @@ packages: - typescript dev: true - /@oclif/plugin-plugins/3.3.2_4qcp7qp4jxxdgb4qbxgwox4hwq: - resolution: {integrity: sha512-UhgAjibtnU6xIc6P2n6FwbWooDgcl4q8Bu/oXgBW4i7Wnx1l4B+nbIdxCX9n3HM/66geylYQ1/Q08eiy7V+Dtw==} - engines: {node: '>=16'} - dependencies: - '@oclif/core': 2.15.0_4qcp7qp4jxxdgb4qbxgwox4hwq - chalk: 4.1.2 - debug: 4.3.4 - fs-extra: 9.1.0 - http-call: 5.3.0 - load-json-file: 5.3.0 - npm: 9.6.7 - npm-run-path: 4.0.1 - semver: 7.5.4 - shelljs: 0.8.5 - tslib: 2.6.2 - validate-npm-package-name: 5.0.0 - yarn: 1.22.19 - transitivePeerDependencies: - - '@swc/core' - - '@swc/wasm' - - '@types/node' - - supports-color - - typescript - dev: false - - /@oclif/plugin-plugins/3.3.2_npeoqfxwgl5njwqojmpesqhar4: - resolution: {integrity: sha512-UhgAjibtnU6xIc6P2n6FwbWooDgcl4q8Bu/oXgBW4i7Wnx1l4B+nbIdxCX9n3HM/66geylYQ1/Q08eiy7V+Dtw==} - engines: {node: '>=16'} + /@oclif/plugin-plugins/4.1.10_typescript@4.9.5: + resolution: {integrity: sha512-+tb9ME7J0Uje/XWxh60OBqkuysIValn+O70AAodWbHDTkQmmW+g50uEuyQUQW5iPKMeiZBVg9p+AhpT8d9R9jA==} + engines: {node: '>=18.0.0'} dependencies: - '@oclif/core': 2.15.0_npeoqfxwgl5njwqojmpesqhar4 - chalk: 4.1.2 + '@oclif/core': 3.13.2_typescript@4.9.5 + chalk: 5.3.0 debug: 4.3.4 - fs-extra: 9.1.0 - http-call: 5.3.0 - load-json-file: 5.3.0 - npm: 9.6.7 + npm: 10.2.3 npm-run-path: 4.0.1 semver: 7.5.4 shelljs: 0.8.5 - tslib: 2.6.2 validate-npm-package-name: 5.0.0 - yarn: 1.22.19 + yarn: 1.22.21 transitivePeerDependencies: - - '@swc/core' - - '@swc/wasm' - - '@types/node' - supports-color - typescript dev: false - /@oclif/plugin-plugins/3.8.4_eyayto62fyd4eo5o5fvolpu7d4: - resolution: {integrity: sha512-msar390ub3aCohh4ZsbbS/mKobmF3p/BUd3J1WQ62XE9UDbrzkhVAowf3fsmgSSYCQxMwgGokJwj24O6ZpW+6w==} - engines: {node: '>=16'} + /@oclif/plugin-plugins/4.1.10_typescript@5.2.2: + resolution: {integrity: sha512-+tb9ME7J0Uje/XWxh60OBqkuysIValn+O70AAodWbHDTkQmmW+g50uEuyQUQW5iPKMeiZBVg9p+AhpT8d9R9jA==} + engines: {node: '>=18.0.0'} dependencies: - '@oclif/core': 2.15.0_eyayto62fyd4eo5o5fvolpu7d4 - chalk: 4.1.2 + '@oclif/core': 3.13.2_typescript@5.2.2 + chalk: 5.3.0 debug: 4.3.4 - http-call: 5.3.0 - load-json-file: 5.3.0 - npm: 9.8.1 + npm: 10.2.3 npm-run-path: 4.0.1 semver: 7.5.4 shelljs: 0.8.5 - tslib: 2.6.2 validate-npm-package-name: 5.0.0 - yarn: 1.22.19 + yarn: 1.22.21 transitivePeerDependencies: - - '@swc/core' - - '@swc/wasm' - - '@types/node' - supports-color - typescript dev: false @@ -5155,6 +5187,11 @@ packages: ansi-styles: 4.3.0 supports-color: 7.2.0 + /chalk/5.3.0: + resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==} + engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} + dev: false + /char-regex/1.0.2: resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==} engines: {node: '>=10'} @@ -5399,6 +5436,14 @@ packages: color-string: 1.9.1 dev: false + /color/4.2.3: + resolution: {integrity: sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==} + engines: {node: '>=12.5.0'} + dependencies: + color-convert: 2.0.1 + color-string: 1.9.1 + dev: false + /colors/1.0.3: resolution: {integrity: sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw==} engines: {node: '>=0.1.90'} @@ -5979,6 +6024,7 @@ packages: resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==} dependencies: is-arrayish: 0.2.1 + dev: true /error/10.4.0: resolution: {integrity: sha512-YxIFEJuhgcICugOUvRx5th0UM+ActZ9sjY0QJmeVwsQdvosZ7kYzc9QqS0Da3R5iUmgU5meGIxh0xBeZpMVeLw==} @@ -7528,6 +7574,7 @@ packages: tunnel-agent: 0.6.0 transitivePeerDependencies: - supports-color + dev: true /http-errors/2.0.0: resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==} @@ -7819,6 +7866,7 @@ packages: /is-arrayish/0.2.1: resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} + dev: true /is-arrayish/0.3.2: resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==} @@ -7974,6 +8022,7 @@ packages: /is-retry-allowed/1.2.0: resolution: {integrity: sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==} engines: {node: '>=0.10.0'} + dev: true /is-scoped/2.1.0: resolution: {integrity: sha512-Cv4OpPTHAK9kHYzkzCrof3VJh7H/PrG2MBUMvvJebaaUMbqhm0YAtXnvh0I3Hnj2tMZWwrRROWLSgfJrKqWmlQ==} @@ -9011,6 +9060,7 @@ packages: /json-parse-better-errors/1.0.2: resolution: {integrity: sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==} + dev: true /json-parse-even-better-errors/2.3.1: resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==} @@ -9188,17 +9238,6 @@ packages: - zenObservable dev: false - /load-json-file/5.3.0: - resolution: {integrity: sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==} - engines: {node: '>=6'} - dependencies: - graceful-fs: 4.2.11 - parse-json: 4.0.0 - pify: 4.0.1 - strip-bom: 3.0.0 - type-fest: 0.3.1 - dev: false - /load-yaml-file/0.2.0: resolution: {integrity: sha512-OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw==} engines: {node: '>=6'} @@ -10292,82 +10331,9 @@ packages: dependencies: path-key: 3.1.1 - /npm/9.6.7: - resolution: {integrity: sha512-xwkU1hSZl6Qrkfw3fhxVmMfNWu0A67+aZZs5gz/LoehCeAPkVhQDB90Z2NFoPSI1KpfBWCJ6Bp28wXzv5U5/2g==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - hasBin: true - dev: false - bundledDependencies: - - '@isaacs/string-locale-compare' - - '@npmcli/arborist' - - '@npmcli/config' - - '@npmcli/map-workspaces' - - '@npmcli/package-json' - - '@npmcli/run-script' - - abbrev - - archy - - cacache - - chalk - - ci-info - - cli-columns - - cli-table3 - - columnify - - fastest-levenshtein - - fs-minipass - - glob - - graceful-fs - - hosted-git-info - - ini - - init-package-json - - is-cidr - - json-parse-even-better-errors - - libnpmaccess - - libnpmdiff - - libnpmexec - - libnpmfund - - libnpmhook - - libnpmorg - - libnpmpack - - libnpmpublish - - libnpmsearch - - libnpmteam - - libnpmversion - - make-fetch-happen - - minimatch - - minipass - - minipass-pipeline - - ms - - node-gyp - - nopt - - npm-audit-report - - npm-install-checks - - npm-package-arg - - npm-pick-manifest - - npm-profile - - npm-registry-fetch - - npm-user-validate - - npmlog - - p-map - - pacote - - parse-conflict-json - - proc-log - - qrcode-terminal - - read - - read-package-json - - read-package-json-fast - - semver - - ssri - - tar - - text-table - - tiny-relative-date - - treeverse - - validate-npm-package-name - - which - - write-file-atomic - - /npm/9.8.1: - resolution: {integrity: sha512-AfDvThQzsIXhYgk9zhbk5R+lh811lKkLAeQMMhSypf1BM7zUafeIIBzMzespeuVEJ0+LvY36oRQYf7IKLzU3rw==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + /npm/10.2.3: + resolution: {integrity: sha512-GbUui/rHTl0mW8HhJSn4A0Xg89yCR3I9otgJT1i0z1QBPOVlgbh6rlcUTpHT8Gut9O1SJjWRUU0nEcAymhG2tQ==} + engines: {node: ^18.17.0 || >=20.5.0} hasBin: true dev: false bundledDependencies: @@ -10379,6 +10345,7 @@ packages: - '@npmcli/package-json' - '@npmcli/promise-spawn' - '@npmcli/run-script' + - '@sigstore/tuf' - abbrev - archy - cacache @@ -10414,6 +10381,7 @@ packages: - ms - node-gyp - nopt + - normalize-package-data - npm-audit-report - npm-install-checks - npm-package-arg @@ -10429,8 +10397,9 @@ packages: - qrcode-terminal - read - semver - - sigstore + - spdx-expression-parse - ssri + - strip-ansi - supports-color - tar - text-table @@ -11148,6 +11117,7 @@ packages: dependencies: error-ex: 1.3.2 json-parse-better-errors: 1.0.2 + dev: true /parse-json/5.2.0: resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} @@ -11249,6 +11219,7 @@ packages: /pify/4.0.1: resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==} engines: {node: '>=6'} + dev: true /pirates/4.0.6: resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==} @@ -12419,6 +12390,7 @@ packages: /strip-bom/3.0.0: resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==} engines: {node: '>=4'} + dev: true /strip-bom/4.0.0: resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==} @@ -12903,6 +12875,32 @@ packages: yn: 3.1.1 dev: true + /tsconfck/3.0.0_typescript@4.9.5: + resolution: {integrity: sha512-w3wnsIrJNi7avf4Zb0VjOoodoO0woEqGgZGQm+LHH9przdUI+XDKsWAXwxHA1DaRTjeuZNcregSzr7RaA8zG9A==} + engines: {node: ^18 || >=20} + hasBin: true + peerDependencies: + typescript: ^5.0.0 + peerDependenciesMeta: + typescript: + optional: true + dependencies: + typescript: 4.9.5 + dev: false + + /tsconfck/3.0.0_typescript@5.2.2: + resolution: {integrity: sha512-w3wnsIrJNi7avf4Zb0VjOoodoO0woEqGgZGQm+LHH9przdUI+XDKsWAXwxHA1DaRTjeuZNcregSzr7RaA8zG9A==} + engines: {node: ^18 || >=20} + hasBin: true + peerDependencies: + typescript: ^5.0.0 + peerDependenciesMeta: + typescript: + optional: true + dependencies: + typescript: 5.2.2 + dev: false + /tslib/1.14.1: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} @@ -12947,6 +12945,7 @@ packages: resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==} dependencies: safe-buffer: 5.2.1 + dev: true /type-check/0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} @@ -12968,11 +12967,6 @@ packages: resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==} engines: {node: '>=10'} - /type-fest/0.3.1: - resolution: {integrity: sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==} - engines: {node: '>=6'} - dev: false - /type-fest/0.6.0: resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==} engines: {node: '>=8'} @@ -13631,8 +13625,8 @@ packages: yargs-parser: 21.1.1 dev: true - /yarn/1.22.19: - resolution: {integrity: sha512-/0V5q0WbslqnwP91tirOvldvYISzaqhClxzyUKXYxs07yUILIs5jx/k6CFe8bvKSkds5w+eiOqta39Wk3WxdcQ==} + /yarn/1.22.21: + resolution: {integrity: sha512-ynXaJsADJ9JiZ84zU25XkPGOvVMmZ5b7tmTSpKURYwgELdjucAOydqIOrOfTxVYcNXe91xvLZwcRh68SR3liCg==} engines: {node: '>=4.0.0'} hasBin: true requiresBuild: true From 9e6482eb01b5c0585f13f09a6144b42ed6373f6b Mon Sep 17 00:00:00 2001 From: Antony Date: Thu, 7 Dec 2023 18:53:05 +0530 Subject: [PATCH 03/11] Fix: Extension code change reverted --- .../contentstack-import/src/import/modules/extensions.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/contentstack-import/src/import/modules/extensions.ts b/packages/contentstack-import/src/import/modules/extensions.ts index 1b28c199a8..22ce73dbb9 100644 --- a/packages/contentstack-import/src/import/modules/extensions.ts +++ b/packages/contentstack-import/src/import/modules/extensions.ts @@ -83,12 +83,7 @@ export default class ImportExtensions extends BaseClass { return; } - const apiContent = []; - - for (const [uid, content] of Object.entries(this.extensions)) { - (content as Record).uid = uid; - apiContent.push(content); - } + const apiContent = values(this.extensions); const onSuccess = ({ response, apiData: { uid, title } = { uid: null, title: '' } }: any) => { this.extSuccess.push(response); From e91f23d1f1c58aa176c5b1ceff9136ae6b821876 Mon Sep 17 00:00:00 2001 From: Antony Date: Thu, 7 Dec 2023 22:02:21 +0530 Subject: [PATCH 04/11] Fix: Replace reference issue related fix --- .../src/utils/entries-helper.ts | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/packages/contentstack-import/src/utils/entries-helper.ts b/packages/contentstack-import/src/utils/entries-helper.ts index 6cf2b196d8..121a62b2e3 100644 --- a/packages/contentstack-import/src/utils/entries-helper.ts +++ b/packages/contentstack-import/src/utils/entries-helper.ts @@ -425,9 +425,16 @@ export const removeEntryRefsFromJSONRTE = (entry: Record, ctSchema: }; function doEntryReferencesExist(element: Record[] | any): boolean { + // checks if the children of p element contain any references + // only checking one level deep, not recursive + if (element?.length) { for (const item of element) { - if ((item.type === 'p' || item.type === 'a' || item.type === 'span') && item.children && item.children.length > 0) { + if ( + (item.type === 'p' || item.type === 'a' || item.type === 'span') && + item.children && + item.children.length > 0 + ) { return doEntryReferencesExist(item.children); } else if (isEntryRef(item)) { return true; @@ -438,7 +445,11 @@ function doEntryReferencesExist(element: Record[] | any): boolean { return true; } - if ((element.type === 'p' || element.type === 'a' || element.type === 'span') && element.children && element.children.length > 0) { + if ( + (element.type === 'p' || element.type === 'a' || element.type === 'span') && + element.children && + element.children.length > 0 + ) { return doEntryReferencesExist(element.children); } } @@ -532,7 +543,8 @@ export const restoreJsonRteEntryRefs = ( .map((e: any, index: number) => { return { index: index, value: e }; }) - .filter((e: any) => doEntryReferencesExist(e.value)) + // FIXME the current logic/commented code is not capable enough to find all the nested reference in the json RTE so removing it for time being + // .filter((e: any) => doEntryReferencesExist(e.value)) .map((e: any) => { setDirtyTrue(e.value); return e; From 0b8b60252ab6585a1c89e96c58fcf32e80b7c66e Mon Sep 17 00:00:00 2001 From: Antony Date: Thu, 7 Dec 2023 23:10:44 +0530 Subject: [PATCH 05/11] Fix: Reference mapper fixes on json rte --- .../src/import/modules/entries.ts | 1 + .../src/utils/entries-helper.ts | 96 +++++++++---------- 2 files changed, 46 insertions(+), 51 deletions(-) diff --git a/packages/contentstack-import/src/import/modules/entries.ts b/packages/contentstack-import/src/import/modules/entries.ts index c26ff4af33..4f2e1a5b0e 100644 --- a/packages/contentstack-import/src/import/modules/entries.ts +++ b/packages/contentstack-import/src/import/modules/entries.ts @@ -671,6 +671,7 @@ export default class EntriesImport extends BaseClass { if (this.jsonRteCTs.indexOf(cTUid) > -1) { // the entries stored in eSuccessFilePath, have the same uids as the entries from source data entry = restoreJsonRteEntryRefs(entry, sourceEntry, contentType.schema, { + uidMapper: this.entriesUidMapper, mappedAssetUids: this.assetUidMapper, mappedAssetUrls: this.assetUrlMapper, }); diff --git a/packages/contentstack-import/src/utils/entries-helper.ts b/packages/contentstack-import/src/utils/entries-helper.ts index 121a62b2e3..6e5b93b2d1 100644 --- a/packages/contentstack-import/src/utils/entries-helper.ts +++ b/packages/contentstack-import/src/utils/entries-helper.ts @@ -464,7 +464,7 @@ export const restoreJsonRteEntryRefs = ( entry: Record, sourceStackEntry: any, ctSchema: any = [], - { mappedAssetUids, mappedAssetUrls }: any, + { uidMapper, mappedAssetUids, mappedAssetUrls }: any, ) => { // let mappedAssetUids = fileHelper.readFileSync(this.mappedAssetUidPath) || {}; // let mappedAssetUrls = fileHelper.readFileSync(this.mappedAssetUrlPath) || {}; @@ -509,58 +509,21 @@ export const restoreJsonRteEntryRefs = ( case 'json': { if (entry[element.uid] && element.field_metadata.rich_text_type) { if (element.multiple && Array.isArray(entry[element.uid])) { - entry[element.uid] = entry[element.uid].map((field: any, index: number) => { - // i am facing a Maximum call stack exceeded issue, - // probably because of this loop operation - - let entryRefs = sourceStackEntry[element.uid][index].children - .map((e: any, i: number) => { - return { index: i, value: e }; - }) - .filter((e: any) => doEntryReferencesExist(e.value)) - .map((e: any) => { - // commenting the line below resolved the maximum call stack exceeded issue - // e.value = this.setDirtyTrue(e.value) - setDirtyTrue(e.value); - return e; - }) - .map((e: any) => { - // commenting the line below resolved the maximum call stack exceeded issue - // e.value = this.resolveAssetRefsInEntryRefsForJsonRte(e, mappedAssetUids, mappedAssetUrls) - resolveAssetRefsInEntryRefsForJsonRte(e.value, mappedAssetUids, mappedAssetUrls); - return e; - }); - - if (entryRefs?.length > 0) { - entryRefs.forEach((entryRef: any) => { - field.children.splice(entryRef.index, 0, entryRef.value); - }); - } - return field; + entry[element.uid] = sourceStackEntry[element.uid].map((field: any) => { + field = restoreReferenceInJsonRTE(field, uidMapper); + field.children = field.children.map((child: any) => { + setDirtyTrue(child); + resolveAssetRefsInEntryRefsForJsonRte(child, mappedAssetUids, mappedAssetUrls); + return child; + }); }); } else { - let entryRefs = sourceStackEntry[element.uid].children - .map((e: any, index: number) => { - return { index: index, value: e }; - }) - // FIXME the current logic/commented code is not capable enough to find all the nested reference in the json RTE so removing it for time being - // .filter((e: any) => doEntryReferencesExist(e.value)) - .map((e: any) => { - setDirtyTrue(e.value); - return e; - }) - .map((e: any) => { - resolveAssetRefsInEntryRefsForJsonRte(e.value, mappedAssetUids, mappedAssetUrls); - return e; - }); - - if (entryRefs.length > 0) { - entryRefs.forEach((entryRef: any) => { - if (!_.isEmpty(entry[element.uid]) && entry[element.uid].children) { - entry[element.uid].children.splice(entryRef.index, 0, entryRef.value); - } - }); - } + entry[element.uid] = restoreReferenceInJsonRTE(sourceStackEntry[element.uid], uidMapper); + entry[element.uid].children = entry[element.uid].children.map((child: any) => { + setDirtyTrue(child); + resolveAssetRefsInEntryRefsForJsonRte(child, mappedAssetUids, mappedAssetUrls); + return child; + }); } } break; @@ -649,4 +612,35 @@ function removeReferenceInJsonRTE(jsonRTE: EntryJsonRTEFieldDataType): EntryJson } return jsonRTE; +} + +function restoreReferenceInJsonRTE( + jsonRTE: EntryJsonRTEFieldDataType, + uidMapper: Record, +): EntryJsonRTEFieldDataType { + try { + if (jsonRTE?.children && Array.isArray(jsonRTE.children)) { + jsonRTE.children = jsonRTE?.children?.map((child, index) => { + const { children, attrs, type } = child; + + if (type === 'reference' && attrs?.['entry-uid']) { + jsonRTE.children[index] = child; + jsonRTE.children[index].attrs['entry-uid'] = uidMapper[child.attrs['entry-uid']]; + } + + if (!jsonRTE.children?.[index]) { + console.log(jsonRTE.children, child, index); + } + if (!_.isEmpty(children)) { + return restoreReferenceInJsonRTE(child, uidMapper); + } + + return child; + }); + } + + return jsonRTE; + } catch (error) { + console.log(error); + } } \ No newline at end of file From 3b2315a8218080e7145a8e67e27cbf4e4cd52997 Mon Sep 17 00:00:00 2001 From: Antony Date: Fri, 8 Dec 2023 08:42:29 +0530 Subject: [PATCH 06/11] Fix: Missing uid mapper added --- .../src/utils/entries-helper.ts | 56 ++++++++++--------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/packages/contentstack-import/src/utils/entries-helper.ts b/packages/contentstack-import/src/utils/entries-helper.ts index 6e5b93b2d1..440927f12f 100644 --- a/packages/contentstack-import/src/utils/entries-helper.ts +++ b/packages/contentstack-import/src/utils/entries-helper.ts @@ -466,8 +466,6 @@ export const restoreJsonRteEntryRefs = ( ctSchema: any = [], { uidMapper, mappedAssetUids, mappedAssetUrls }: any, ) => { - // let mappedAssetUids = fileHelper.readFileSync(this.mappedAssetUidPath) || {}; - // let mappedAssetUrls = fileHelper.readFileSync(this.mappedAssetUrlPath) || {}; for (const element of ctSchema) { switch (element.data_type) { case 'blocks': { @@ -478,6 +476,7 @@ export const restoreJsonRteEntryRefs = ( let subBlock = element.blocks?.filter((block: any) => block.uid === key).pop(); let sourceStackElement = sourceStackEntry[element.uid][eIndex][key]; e[key] = restoreJsonRteEntryRefs(e[key], sourceStackElement, subBlock.schema, { + uidMapper, mappedAssetUids, mappedAssetUrls, }); @@ -493,12 +492,17 @@ export const restoreJsonRteEntryRefs = ( if (element.multiple && Array.isArray(entry[element.uid])) { entry[element.uid] = entry[element.uid].map((e: any, eIndex: number) => { let sourceStackElement = sourceStackEntry[element.uid][eIndex]; - e = restoreJsonRteEntryRefs(e, sourceStackElement, element.schema, { mappedAssetUids, mappedAssetUrls }); + e = restoreJsonRteEntryRefs(e, sourceStackElement, element.schema, { + uidMapper, + mappedAssetUids, + mappedAssetUrls, + }); return e; }); } else { let sourceStackElement = sourceStackEntry[element.uid]; entry[element.uid] = restoreJsonRteEntryRefs(entry[element.uid], sourceStackElement, element.schema, { + uidMapper, mappedAssetUids, mappedAssetUrls, }); @@ -509,13 +513,15 @@ export const restoreJsonRteEntryRefs = ( case 'json': { if (entry[element.uid] && element.field_metadata.rich_text_type) { if (element.multiple && Array.isArray(entry[element.uid])) { - entry[element.uid] = sourceStackEntry[element.uid].map((field: any) => { - field = restoreReferenceInJsonRTE(field, uidMapper); - field.children = field.children.map((child: any) => { + entry[element.uid] = sourceStackEntry[element.uid].map((jsonRTE: any) => { + jsonRTE = restoreReferenceInJsonRTE(jsonRTE, uidMapper); + jsonRTE.children = jsonRTE.children.map((child: any) => { setDirtyTrue(child); resolveAssetRefsInEntryRefsForJsonRte(child, mappedAssetUids, mappedAssetUrls); return child; }); + + return jsonRTE; }); } else { entry[element.uid] = restoreReferenceInJsonRTE(sourceStackEntry[element.uid], uidMapper); @@ -618,29 +624,25 @@ function restoreReferenceInJsonRTE( jsonRTE: EntryJsonRTEFieldDataType, uidMapper: Record, ): EntryJsonRTEFieldDataType { - try { - if (jsonRTE?.children && Array.isArray(jsonRTE.children)) { - jsonRTE.children = jsonRTE?.children?.map((child, index) => { - const { children, attrs, type } = child; - - if (type === 'reference' && attrs?.['entry-uid']) { - jsonRTE.children[index] = child; - jsonRTE.children[index].attrs['entry-uid'] = uidMapper[child.attrs['entry-uid']]; - } + if (!uidMapper) { + console.log('test') + } + if (jsonRTE?.children && Array.isArray(jsonRTE.children)) { + jsonRTE.children = jsonRTE?.children?.map((child, index) => { + const { children, attrs, type } = child; - if (!jsonRTE.children?.[index]) { - console.log(jsonRTE.children, child, index); - } - if (!_.isEmpty(children)) { - return restoreReferenceInJsonRTE(child, uidMapper); - } + if (type === 'reference' && attrs?.['entry-uid']) { + jsonRTE.children[index] = child; + jsonRTE.children[index].attrs['entry-uid'] = uidMapper[child.attrs['entry-uid']]; + } - return child; - }); - } + if (!_.isEmpty(children)) { + return restoreReferenceInJsonRTE(child, uidMapper); + } - return jsonRTE; - } catch (error) { - console.log(error); + return child; + }); } + + return jsonRTE; } \ No newline at end of file From 97ff1177147cbc0c372bb5b2b03e0f069c2345e7 Mon Sep 17 00:00:00 2001 From: Antony Date: Fri, 8 Dec 2023 08:42:55 +0530 Subject: [PATCH 07/11] Code clean --- packages/contentstack-import/src/utils/entries-helper.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/contentstack-import/src/utils/entries-helper.ts b/packages/contentstack-import/src/utils/entries-helper.ts index 440927f12f..e4e98b64e4 100644 --- a/packages/contentstack-import/src/utils/entries-helper.ts +++ b/packages/contentstack-import/src/utils/entries-helper.ts @@ -624,9 +624,6 @@ function restoreReferenceInJsonRTE( jsonRTE: EntryJsonRTEFieldDataType, uidMapper: Record, ): EntryJsonRTEFieldDataType { - if (!uidMapper) { - console.log('test') - } if (jsonRTE?.children && Array.isArray(jsonRTE.children)) { jsonRTE.children = jsonRTE?.children?.map((child, index) => { const { children, attrs, type } = child; From 78d14d40bdbac225e000ba35556e19dc520c40b2 Mon Sep 17 00:00:00 2001 From: Antony Date: Fri, 8 Dec 2023 11:43:14 +0530 Subject: [PATCH 08/11] Code clean --- .../src/utils/entries-helper.ts | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/packages/contentstack-import/src/utils/entries-helper.ts b/packages/contentstack-import/src/utils/entries-helper.ts index e4e98b64e4..d775382655 100644 --- a/packages/contentstack-import/src/utils/entries-helper.ts +++ b/packages/contentstack-import/src/utils/entries-helper.ts @@ -516,8 +516,8 @@ export const restoreJsonRteEntryRefs = ( entry[element.uid] = sourceStackEntry[element.uid].map((jsonRTE: any) => { jsonRTE = restoreReferenceInJsonRTE(jsonRTE, uidMapper); jsonRTE.children = jsonRTE.children.map((child: any) => { - setDirtyTrue(child); - resolveAssetRefsInEntryRefsForJsonRte(child, mappedAssetUids, mappedAssetUrls); + child = setDirtyTrue(child); + child = resolveAssetRefsInEntryRefsForJsonRte(child, mappedAssetUids, mappedAssetUrls); return child; }); @@ -526,8 +526,8 @@ export const restoreJsonRteEntryRefs = ( } else { entry[element.uid] = restoreReferenceInJsonRTE(sourceStackEntry[element.uid], uidMapper); entry[element.uid].children = entry[element.uid].children.map((child: any) => { - setDirtyTrue(child); - resolveAssetRefsInEntryRefsForJsonRte(child, mappedAssetUids, mappedAssetUrls); + child = setDirtyTrue(child); + child = resolveAssetRefsInEntryRefsForJsonRte(child, mappedAssetUids, mappedAssetUrls); return child; }); } @@ -551,6 +551,7 @@ function setDirtyTrue(jsonRteChild: any) { jsonRteChild.children = jsonRteChild.children.map((subElement: any) => setDirtyTrue(subElement)); } } + return jsonRteChild; } @@ -620,6 +621,19 @@ function removeReferenceInJsonRTE(jsonRTE: EntryJsonRTEFieldDataType): EntryJson return jsonRTE; } +/** + * The function `restoreReferenceInJsonRTE` takes a JSON object `jsonRTE` and a mapping object + * `uidMapper`, and recursively replaces the `entry-uid` attribute values in any `reference` type + * elements with their corresponding values from the `uidMapper` object. + * @param {EntryJsonRTEFieldDataType} jsonRTE - The `jsonRTE` parameter is an object that represents a + * JSON structure. It contains a `children` property which is an array of objects. Each object + * represents a child element in the JSON structure and can have properties like `children`, `attrs`, + * and `type`. + * @param uidMapper - The `uidMapper` parameter is an object that maps entry UIDs to their + * corresponding restored UIDs. It is used to replace the `entry-uid` attribute in the JSON RTE with + * the restored UID. + * @returns the updated `jsonRTE` object with the restored references. + */ function restoreReferenceInJsonRTE( jsonRTE: EntryJsonRTEFieldDataType, uidMapper: Record, From 85b7c263bc3763a4b779ca6a96606190c0b26275 Mon Sep 17 00:00:00 2001 From: Antony Date: Fri, 8 Dec 2023 15:10:56 +0530 Subject: [PATCH 09/11] Fix: Cannot read properties of undefined (reading 'type') --- .../contentstack-import/src/commands/cm/stacks/import.ts | 1 - packages/contentstack-import/src/utils/entries-helper.ts | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/contentstack-import/src/commands/cm/stacks/import.ts b/packages/contentstack-import/src/commands/cm/stacks/import.ts index aa183229bc..d609efdbb1 100644 --- a/packages/contentstack-import/src/commands/cm/stacks/import.ts +++ b/packages/contentstack-import/src/commands/cm/stacks/import.ts @@ -132,7 +132,6 @@ export default class ImportCommand extends Command { 'success', ); } catch (error) { - trace(error, 'error', true); log({ data: backupDir } as ImportConfig, `Failed to import stack content - ${formatError(error)}`, 'error'); log( { data: backupDir } as ImportConfig, diff --git a/packages/contentstack-import/src/utils/entries-helper.ts b/packages/contentstack-import/src/utils/entries-helper.ts index d775382655..9880e76c63 100644 --- a/packages/contentstack-import/src/utils/entries-helper.ts +++ b/packages/contentstack-import/src/utils/entries-helper.ts @@ -38,7 +38,7 @@ export const lookupEntries = function ( break; } case 'reference': { - if (Object.keys(element.attrs)?.length > 0 && element.attrs.type === 'entry') { + if (Object.keys(element.attrs)?.length > 0 && element.attrs?.type === 'entry') { if (uids.indexOf(element.attrs['entry-uid']) === -1) { uids.push(element.attrs['entry-uid']); } @@ -457,7 +457,7 @@ function doEntryReferencesExist(element: Record[] | any): boolean { } function isEntryRef(element: any) { - return element.type === 'reference' && element.attrs.type === 'entry'; + return element.type === 'reference' && element.attrs?.type === 'entry'; } export const restoreJsonRteEntryRefs = ( @@ -557,7 +557,7 @@ function setDirtyTrue(jsonRteChild: any) { function resolveAssetRefsInEntryRefsForJsonRte(jsonRteChild: any, mappedAssetUids: any, mappedAssetUrls: any) { if (jsonRteChild.type) { - if (jsonRteChild.attrs.type === 'asset') { + if (jsonRteChild.attrs?.type === 'asset') { let assetUrl; if (mappedAssetUids[jsonRteChild.attrs['asset-uid']]) { jsonRteChild.attrs['asset-uid'] = mappedAssetUids[jsonRteChild.attrs['asset-uid']]; From 84d60afe8b84bda2dfe83c673cb4f1da11b0f088 Mon Sep 17 00:00:00 2001 From: Antony Date: Fri, 8 Dec 2023 18:20:40 +0530 Subject: [PATCH 10/11] Version bump --- package-lock.json | 16 ++++++++-------- packages/contentstack-clone/package.json | 2 +- packages/contentstack-import/package.json | 2 +- packages/contentstack-seed/package.json | 2 +- packages/contentstack/package.json | 4 ++-- pnpm-lock.yaml | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9db7a05ea8..e3adf3a518 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22764,7 +22764,7 @@ }, "packages/contentstack": { "name": "@contentstack/cli", - "version": "1.11.2", + "version": "1.11.3", "license": "MIT", "dependencies": { "@contentstack/cli-audit": "~1.3.0", @@ -22775,7 +22775,7 @@ "@contentstack/cli-cm-clone": "~1.8.0", "@contentstack/cli-cm-export": "~1.10.2", "@contentstack/cli-cm-export-to-csv": "~1.6.1", - "@contentstack/cli-cm-import": "~1.12.0", + "@contentstack/cli-cm-import": "~1.12.1", "@contentstack/cli-cm-migrate-rte": "~1.4.15", "@contentstack/cli-cm-seed": "~1.7.0", "@contentstack/cli-command": "~1.2.16", @@ -23767,7 +23767,7 @@ "dependencies": { "@colors/colors": "^1.5.0", "@contentstack/cli-cm-export": "~1.10.2", - "@contentstack/cli-cm-import": "~1.12.0", + "@contentstack/cli-cm-import": "~1.12.1", "@contentstack/cli-command": "~1.2.16", "@contentstack/cli-utilities": "~1.5.8", "async": "^3.2.4", @@ -24660,7 +24660,7 @@ }, "packages/contentstack-import": { "name": "@contentstack/cli-cm-import", - "version": "1.12.0", + "version": "1.12.1", "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.2.16", @@ -25361,7 +25361,7 @@ "version": "1.7.0", "license": "MIT", "dependencies": { - "@contentstack/cli-cm-import": "~1.12.0", + "@contentstack/cli-cm-import": "~1.12.1", "@contentstack/cli-command": "~1.2.16", "@contentstack/cli-utilities": "~1.5.8", "inquirer": "8.2.4", @@ -27205,7 +27205,7 @@ "@contentstack/cli-cm-clone": "~1.8.0", "@contentstack/cli-cm-export": "~1.10.2", "@contentstack/cli-cm-export-to-csv": "~1.6.1", - "@contentstack/cli-cm-import": "~1.12.0", + "@contentstack/cli-cm-import": "~1.12.1", "@contentstack/cli-cm-migrate-rte": "~1.4.15", "@contentstack/cli-cm-seed": "~1.7.0", "@contentstack/cli-command": "~1.2.16", @@ -27980,7 +27980,7 @@ "requires": { "@colors/colors": "^1.5.0", "@contentstack/cli-cm-export": "~1.10.2", - "@contentstack/cli-cm-import": "~1.12.0", + "@contentstack/cli-cm-import": "~1.12.1", "@contentstack/cli-command": "~1.2.16", "@contentstack/cli-utilities": "~1.5.8", "@oclif/test": "^1.2.7", @@ -28557,7 +28557,7 @@ "@contentstack/cli-cm-seed": { "version": "file:packages/contentstack-seed", "requires": { - "@contentstack/cli-cm-import": "~1.12.0", + "@contentstack/cli-cm-import": "~1.12.1", "@contentstack/cli-command": "~1.2.16", "@contentstack/cli-utilities": "~1.5.8", "@oclif/plugin-help": "^5.1.19", diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json index f671d49073..15993a6e83 100644 --- a/packages/contentstack-clone/package.json +++ b/packages/contentstack-clone/package.json @@ -6,7 +6,7 @@ "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues", "dependencies": { "@contentstack/cli-cm-export": "~1.10.2", - "@contentstack/cli-cm-import": "~1.12.0", + "@contentstack/cli-cm-import": "~1.12.1", "@contentstack/cli-command": "~1.2.16", "@contentstack/cli-utilities": "~1.5.8", "@colors/colors": "^1.5.0", diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json index 80c73ed836..c54918ce8d 100644 --- a/packages/contentstack-import/package.json +++ b/packages/contentstack-import/package.json @@ -1,7 +1,7 @@ { "name": "@contentstack/cli-cm-import", "description": "Contentstack CLI plugin to import content into stack", - "version": "1.12.0", + "version": "1.12.1", "author": "Contentstack", "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json index dc813d4146..9a0a73885d 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.12.0", + "@contentstack/cli-cm-import": "~1.12.1", "@contentstack/cli-command": "~1.2.16", "@contentstack/cli-utilities": "~1.5.8", "inquirer": "8.2.4", diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json index 848805a9e9..b30ba0c90e 100755 --- a/packages/contentstack/package.json +++ b/packages/contentstack/package.json @@ -1,7 +1,7 @@ { "name": "@contentstack/cli", "description": "Command-line tool (CLI) to interact with Contentstack", - "version": "1.11.2", + "version": "1.11.3", "author": "Contentstack", "bin": { "csdx": "./bin/run" @@ -30,7 +30,7 @@ "@contentstack/cli-cm-clone": "~1.8.0", "@contentstack/cli-cm-export": "~1.10.2", "@contentstack/cli-cm-export-to-csv": "~1.6.1", - "@contentstack/cli-cm-import": "~1.12.0", + "@contentstack/cli-cm-import": "~1.12.1", "@contentstack/cli-cm-migrate-rte": "~1.4.15", "@contentstack/cli-cm-seed": "~1.7.0", "@contentstack/cli-command": "~1.2.16", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c0d5503304..79d9944780 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,7 +18,7 @@ importers: '@contentstack/cli-cm-clone': ~1.8.0 '@contentstack/cli-cm-export': ~1.10.2 '@contentstack/cli-cm-export-to-csv': ~1.6.1 - '@contentstack/cli-cm-import': ~1.12.0 + '@contentstack/cli-cm-import': ~1.12.1 '@contentstack/cli-cm-migrate-rte': ~1.4.15 '@contentstack/cli-cm-seed': ~1.7.0 '@contentstack/cli-command': ~1.2.16 @@ -422,7 +422,7 @@ importers: specifiers: '@colors/colors': ^1.5.0 '@contentstack/cli-cm-export': ~1.10.2 - '@contentstack/cli-cm-import': ~1.12.0 + '@contentstack/cli-cm-import': ~1.12.1 '@contentstack/cli-command': ~1.2.16 '@contentstack/cli-utilities': ~1.5.8 '@oclif/test': ^1.2.7 @@ -984,7 +984,7 @@ importers: packages/contentstack-seed: specifiers: - '@contentstack/cli-cm-import': ~1.12.0 + '@contentstack/cli-cm-import': ~1.12.1 '@contentstack/cli-command': ~1.2.16 '@contentstack/cli-utilities': ~1.5.8 '@oclif/plugin-help': ^5.1.19 From b157410c08859cbf2a98b424d6714b7ee32e73ca Mon Sep 17 00:00:00 2001 From: Antony Date: Fri, 8 Dec 2023 18:32:16 +0530 Subject: [PATCH 11/11] Doc: Readme updated --- packages/contentstack-import/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/contentstack-import/README.md b/packages/contentstack-import/README.md index 663f9e16e5..9d0c0d912d 100644 --- a/packages/contentstack-import/README.md +++ b/packages/contentstack-import/README.md @@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-import/1.12.0 darwin-arm64 node-v20.8.0 +@contentstack/cli-cm-import/1.12.1 darwin-arm64 node-v21.2.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND