Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

upgrade to ts 5.5.4 #23884

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

upgrade to ts 5.5.4 #23884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f621edc
upgrade to ts 5.5.4
eleanorjboyd Jul 29, 2024
e964dd4
updating ts version 5.5.4
eleanorjboyd Jul 30, 2024
3c7a17c
reduce del pkg version
eleanorjboyd Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24,292 changes: 7,187 additions & 17,105 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

158 changes: 79 additions & 79 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"description": "%walkthrough.pythonWelcome.description%",
"when": "workspacePlatform != webworker",
"steps": [
{
{
"id": "python.createPythonFolder",
"title": "%walkthrough.step.python.createPythonFolder.title%",
"description": "%walkthrough.step.python.createPythonFolder.description%",
Expand Down Expand Up @@ -1513,109 +1513,109 @@
},
"dependencies": {
"@iarna/toml": "^2.2.5",
"@vscode/extension-telemetry": "^0.8.4",
"arch": "^2.1.0",
"fs-extra": "^10.0.1",
"glob": "^7.2.0",
"@vscode/extension-telemetry": "^0.9.6",
"arch": "^3.0.0",
"fs-extra": "^11.2.0",
"glob": "^11.0.0",
"hash.js": "^1.1.7",
"iconv-lite": "^0.6.3",
"inversify": "^5.0.4",
"jsonc-parser": "^3.0.0",
"inversify": "^6.0.2",
"jsonc-parser": "^3.3.1",
"lodash": "^4.17.21",
"minimatch": "^5.0.1",
"named-js-regexp": "^1.3.3",
"node-stream-zip": "^1.6.0",
"reflect-metadata": "^0.1.12",
"rxjs": "^6.5.4",
"rxjs-compat": "^6.5.4",
"semver": "^7.5.2",
"minimatch": "^10.0.1",
"named-js-regexp": "^1.3.5",
"node-stream-zip": "^1.15.0",
"reflect-metadata": "^0.2.2",
"rxjs": "^7.8.1",
"rxjs-compat": "^6.6.7",
"semver": "^7.6.3",
"stack-trace": "0.0.10",
"sudo-prompt": "^9.2.1",
"tmp": "^0.0.33",
"tmp": "^0.2.3",
"uint64be": "^3.0.0",
"unicode": "^14.0.0",
"untildify": "^4.0.0",
"untildify": "^5.0.0",
"vscode-debugprotocol": "^1.28.0",
"vscode-jsonrpc": "^9.0.0-next.4",
"vscode-languageclient": "^10.0.0-next.8",
"vscode-languageserver-protocol": "^3.17.6-next.6",
"vscode-tas-client": "^0.1.84",
"which": "^2.0.2",
"winreg": "^1.2.4",
"xml2js": "^0.5.0"
"which": "^4.0.0",
"winreg": "^1.2.5",
"xml2js": "^0.6.2"
},
"devDependencies": {
"@istanbuljs/nyc-config-typescript": "^1.0.2",
"@types/bent": "^7.3.0",
"@types/chai": "^4.1.2",
"@types/chai-arrays": "^2.0.0",
"@types/chai-as-promised": "^7.1.0",
"@types/download": "^8.0.1",
"@types/fs-extra": "^9.0.13",
"@types/glob": "^7.2.0",
"@types/lodash": "^4.14.104",
"@types/mocha": "^9.1.0",
"@types/node": "^18.17.1",
"@types/semver": "^5.5.0",
"@types/shortid": "^0.0.29",
"@types/sinon": "^10.0.11",
"@types/stack-trace": "0.0.29",
"@types/tmp": "^0.0.33",
"@types/vscode": "^1.81.0",
"@types/which": "^2.0.1",
"@types/winreg": "^1.2.30",
"@types/xml2js": "^0.4.2",
"@typescript-eslint/eslint-plugin": "^3.7.0",
"@typescript-eslint/parser": "^3.7.0",
"@vscode/test-electron": "^2.3.8",
"@vscode/vsce": "^2.27.0",
"@types/bent": "^7.3.8",
"@types/chai": "^4.3.16",
"@types/chai-arrays": "^2.0.3",
"@types/chai-as-promised": "^7.1.8",
"@types/download": "^8.0.5",
"@types/fs-extra": "^11.0.4",
"@types/glob": "^8.1.0",
"@types/lodash": "^4.17.7",
"@types/mocha": "^10.0.7",
"@types/node": "^22.0.0",
"@types/semver": "^7.5.8",
"@types/shortid": "^0.0.32",
"@types/sinon": "^17.0.3",
"@types/stack-trace": "0.0.33",
"@types/tmp": "^0.2.6",
"@types/vscode": "^1.91.0",
"@types/which": "^3.0.4",
"@types/winreg": "^1.2.36",
"@types/xml2js": "^0.4.14",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@vscode/test-electron": "^2.4.1",
"@vscode/vsce": "^2.31.1",
"bent": "^7.3.12",
"chai": "^4.1.2",
"chai-arrays": "^2.0.0",
"chai-as-promised": "^7.1.1",
"copy-webpack-plugin": "^9.1.0",
"cross-spawn": "^6.0.5",
"chai": "^5.1.1",
"chai-arrays": "^2.2.0",
"chai-as-promised": "^8.0.0",
"copy-webpack-plugin": "^12.0.2",
"cross-spawn": "^7.0.3",
"del": "^6.0.0",
"download": "^8.0.0",
"eslint": "^7.2.0",
"eslint-config-airbnb": "^18.2.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jsx-a11y": "^6.3.1",
"eslint-plugin-react": "^7.20.3",
"eslint-plugin-react-hooks": "^4.0.0",
"expose-loader": "^3.1.0",
"flat": "^5.0.2",
"get-port": "^5.1.1",
"eslint": "8.36.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.9.0",
"eslint-plugin-react": "^7.35.0",
"eslint-plugin-react-hooks": "^4.6.2",
"expose-loader": "^5.0.0",
"flat": "^6.0.1",
"get-port": "^7.1.0",
"gulp": "^5.0.0",
"gulp-typescript": "^5.0.0",
"mocha": "^9.2.2",
"mocha-junit-reporter": "^2.0.2",
"mocha-multi-reporters": "^1.1.7",
"gulp-typescript": "^5.0.1",
"mocha": "^10.7.0",
"mocha-junit-reporter": "^2.2.1",
"mocha-multi-reporters": "^1.5.1",
"node-has-native-dependencies": "^1.0.2",
"node-loader": "^1.0.2",
"node-polyfill-webpack-plugin": "^1.1.4",
"nyc": "^15.0.0",
"prettier": "^2.0.2",
"rewiremock": "^3.13.0",
"node-loader": "^2.0.0",
"node-polyfill-webpack-plugin": "^4.0.0",
"nyc": "^17.0.0",
"prettier": "^3.3.3",
"rewiremock": "^3.14.5",
"shortid": "^2.2.8",
"sinon": "^13.0.1",
"source-map-support": "^0.5.12",
"ts-loader": "^9.2.8",
"ts-mockito": "^2.5.0",
"ts-node": "^10.7.0",
"tsconfig-paths-webpack-plugin": "^3.2.0",
"sinon": "^18.0.0",
"source-map-support": "^0.5.21",
"ts-loader": "^9.5.1",
"ts-mockito": "^2.6.1",
"ts-node": "^10.9.2",
"tsconfig-paths-webpack-plugin": "^4.1.0",
"typemoq": "^2.1.0",
"typescript": "4.5.5",
"uuid": "^8.3.2",
"webpack": "^5.76.0",
"webpack-bundle-analyzer": "^4.5.0",
"webpack-cli": "^4.9.2",
"typescript": "5.5.4",
"uuid": "^10.0.0",
"webpack": "^5.93.0",
"webpack-bundle-analyzer": "^4.10.2",
"webpack-cli": "^5.1.4",
"webpack-fix-default-import-plugin": "^1.0.3",
"webpack-merge": "^5.8.0",
"webpack-merge": "^6.0.1",
"webpack-node-externals": "^3.0.0",
"webpack-require-from": "^1.8.6",
"worker-loader": "^3.0.8",
"yargs": "^15.3.1"
"yargs": "^17.7.2"
}
}
1 change: 1 addition & 0 deletions src/client/common/experiments/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ export class ExperimentService implements IExperimentService {
this.experimentationService = getExperimentationService(
PVSC_EXTENSION_ID,
this.appEnvironment.packageJson.version!,
// @ts-ignore - we're using a custom TargetPopulation enum
targetPopulation,
telemetryReporter,
this.experiments.storage,
Expand Down
1 change: 1 addition & 0 deletions src/client/common/installer/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ export enum ModuleInstallFlags {
updateDependencies = 2,
reInstall = 4,
installPipIfRequired = 8,
default = 0,
}

export type InstallOptions = {
Expand Down
2 changes: 1 addition & 1 deletion src/test/common/serviceRegistry.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ suite('Common - Service Registry', () => {
.setup((s) =>
s.addSingleton(
typemoq.It.isValue(mapping[0] as any),
typemoq.It.is((value) => mapping[1] === value),
typemoq.It.is((value: any) => mapping[1] === value),
),
)
.verifiable(typemoq.Times.atLeastOnce());
Expand Down
6 changes: 3 additions & 3 deletions src/test/pythonEnvironments/common/environmentManagers/conda.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ suite('Conda and its environments are located correctly', () => {

sinon
.stub(fs.promises, 'readdir' as any) // eslint-disable-line @typescript-eslint/no-explicit-any
.callsFake(async (filePath: fs.PathLike, options?: { withFileTypes?: boolean }) => {
.callsFake(async (filePath: unknown, options?: { withFileTypes?: boolean } | unknown) => {
if (typeof filePath !== 'string') {
throw new Error(`expected path to be string, got ${typeof path}`);
}
Expand All @@ -147,7 +147,7 @@ suite('Conda and its environments are located correctly', () => {
}

const names = Object.keys(dir);
if (!options?.withFileTypes) {
if (!(options as { withFileTypes?: boolean })?.withFileTypes) {
return names;
}

Expand All @@ -171,7 +171,7 @@ suite('Conda and its environments are located correctly', () => {

sinon
.stub(fsapi, 'readFile' as any) // eslint-disable-line @typescript-eslint/no-explicit-any
.callsFake(async (filePath: string | Buffer | number, encoding: string) => {
.callsFake(async (filePath: unknown, encoding: unknown) => {
if (typeof filePath !== 'string') {
throw new Error(`expected filePath to be string, got ${typeof filePath}`);
} else if (encoding !== 'utf8') {
Expand Down
12 changes: 8 additions & 4 deletions src/test/terminals/serviceRegistry.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Licensed under the MIT License.

import * as typemoq from 'typemoq';
import { interfaces } from 'inversify';
import { IExtensionActivationService, IExtensionSingleActivationService } from '../../client/activation/types';
import { IServiceManager } from '../../client/ioc/types';
import { TerminalAutoActivation } from '../../client/terminals/activation';
Expand Down Expand Up @@ -44,7 +45,7 @@ suite('Terminal - Service Registry', () => {
services
.setup((s) =>
s.addSingleton(
typemoq.It.is((v) => args[0] === v),
typemoq.It.is((v: interfaces.ServiceIdentifier<unknown>) => args[0] === v),
typemoq.It.is((value) => args[1] === value),
),
)
Expand All @@ -53,7 +54,7 @@ suite('Terminal - Service Registry', () => {
services
.setup((s) =>
s.addSingleton(
typemoq.It.is((v) => args[0] === v),
typemoq.It.is((v: interfaces.ServiceIdentifier<unknown>) => args[0] === v),
typemoq.It.is((value) => args[1] === value),

typemoq.It.isValue((args[2] as unknown) as string),
Expand All @@ -65,8 +66,11 @@ suite('Terminal - Service Registry', () => {
services
.setup((s) =>
s.addBinding(
typemoq.It.is((v) => ITerminalEnvVarCollectionService === v),
typemoq.It.is((value) => IExtensionActivationService === value),
typemoq.It.is((v: interfaces.ServiceIdentifier<unknown>) => v === IExtensionActivationService),
typemoq.It.is(
(value: interfaces.ServiceIdentifier<unknown>) =>
value === (IExtensionActivationService as unknown),
),
),
)
.verifiable(typemoq.Times.once());
Expand Down
Loading