diff --git a/package-lock.json b/package-lock.json index c82d17d74e1a..b750ddecb305 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "2023.1.0-dev", "license": "MIT", "dependencies": { - "@ltd/j-toml": "^1.37.0", + "@iarna/toml": "^2.2.5", "@vscode/extension-telemetry": "^0.7.4-preview", "@vscode/jupyter-lsp-middleware": "^0.2.50", "arch": "^2.1.0", @@ -490,6 +490,11 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, + "node_modules/@iarna/toml": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz", + "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==" + }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz", @@ -587,11 +592,6 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, - "node_modules/@ltd/j-toml": { - "version": "1.37.0", - "resolved": "https://registry.npmjs.org/@ltd/j-toml/-/j-toml-1.37.0.tgz", - "integrity": "sha512-VN6aOzc57LPBxnySMRX+7YHt7IsZsYiBzEoi2z2LdedztOHK/gqvM2i1OpJhrOXxPI8djCF09z1F8ZN6+EEY5Q==" - }, "node_modules/@microsoft/1ds-core-js": { "version": "3.2.8", "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-3.2.8.tgz", @@ -15753,6 +15753,11 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, + "@iarna/toml": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz", + "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==" + }, "@istanbuljs/load-nyc-config": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz", @@ -15829,11 +15834,6 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, - "@ltd/j-toml": { - "version": "1.37.0", - "resolved": "https://registry.npmjs.org/@ltd/j-toml/-/j-toml-1.37.0.tgz", - "integrity": "sha512-VN6aOzc57LPBxnySMRX+7YHt7IsZsYiBzEoi2z2LdedztOHK/gqvM2i1OpJhrOXxPI8djCF09z1F8ZN6+EEY5Q==" - }, "@microsoft/1ds-core-js": { "version": "3.2.8", "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-3.2.8.tgz", diff --git a/package.json b/package.json index b820542b7728..fe19d62deeef 100644 --- a/package.json +++ b/package.json @@ -1806,7 +1806,7 @@ "webpack": "webpack" }, "dependencies": { - "@ltd/j-toml": "^1.37.0", + "@iarna/toml": "^2.2.5", "@vscode/extension-telemetry": "^0.7.4-preview", "@vscode/jupyter-lsp-middleware": "^0.2.50", "arch": "^2.1.0", diff --git a/src/client/pythonEnvironments/creation/provider/venvUtils.ts b/src/client/pythonEnvironments/creation/provider/venvUtils.ts index e7d7124a20ca..d3f6441ffc15 100644 --- a/src/client/pythonEnvironments/creation/provider/venvUtils.ts +++ b/src/client/pythonEnvironments/creation/provider/venvUtils.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License -import * as tomljs from '@ltd/j-toml'; +import * as tomljs from '@iarna/toml'; import * as fs from 'fs-extra'; import { flatten, isArray } from 'lodash'; import * as path from 'path'; @@ -68,8 +68,8 @@ async function pickTomlExtras(extras: string[], token?: CancellationToken): Prom async function pickRequirementsFiles(files: string[], token?: CancellationToken): Promise { const items: QuickPickItem[] = files .sort((a, b) => { - const al = a.split(/[\\\/]/).length; - const bl = b.split(/[\\\/]/).length; + const al: number = a.split(/[\\\/]/).length; + const bl: number = b.split(/[\\\/]/).length; if (al === bl) { if (a.length === b.length) { return a.localeCompare(b);