Skip to content

Commit 1835fc2

Browse files
kartikgupta-dbkartikgupta-db
authored
Update dependencies (#974)
## Changes <!-- Summary of your changes that are easy to understand --> ## Tests <!-- How is this tested? -->
1 parent b5a80a7 commit 1835fc2

File tree

15 files changed

+1881
-2538
lines changed

15 files changed

+1881
-2538
lines changed

‎package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@
3434
"homepage": "https://github.com/databricks/databricks-vscode#readme",
3535
"packageManager": "yarn@3.2.1",
3636
"devDependencies": {
37-
"@types/node": "^20.5.0",
38-
"@typescript-eslint/eslint-plugin": "^6.0.0",
39-
"@typescript-eslint/parser": "^6.0.0",
40-
"conventional-changelog-cli": "^3.0.0",
41-
"eslint": "^8.51.0",
42-
"eslint-config-prettier": "^8.8.0",
37+
"@types/node": "^20.10.4",
38+
"@typescript-eslint/eslint-plugin": "^6.14.0",
39+
"@typescript-eslint/parser": "^6.14.0",
40+
"conventional-changelog-cli": "^4.1.0",
41+
"eslint": "^8.55.0",
42+
"eslint-config-prettier": "^9.1.0",
4343
"eslint-plugin-no-only-tests": "^3.1.0",
4444
"ts-mockito": "^2.6.1",
45-
"typescript": "5.1.6"
45+
"typescript": "^5.3.3"
4646
},
4747
"resolutions": {
4848
"json5": "2.2.2"

‎packages/databricks-vscode-types/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
"test": "yarn run test:lint && yarn run test:unit"
2424
},
2525
"devDependencies": {
26-
"@types/vscode": "^1.69.1",
27-
"eslint": "^8.51.0",
28-
"prettier": "^3.0.0",
29-
"typescript": "5.1.6"
26+
"@types/vscode": "^1.85.0",
27+
"eslint": "^8.55.0",
28+
"prettier": "^3.1.1",
29+
"typescript": "^5.3.3"
3030
},
3131
"dependencies": {
3232
"@databricks/databricks-sdk": "file:../../vendor/databricks-sdk.tgz",
33-
"databricks": "*"
33+
"databricks": "workspace:^"
3434
}
3535
}

‎packages/databricks-vscode/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ bin/**
33
.wdio-vscode-service
44
src/test/e2e/workspace/
55
extension/
6+
.pytest_cache/
67

78
# Telemetry file, automatically generated by packages/databricks-vscode/scripts/generateTelemetry.ts
89
telemetry.json

‎packages/databricks-vscode/.prettierignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ package-lock.json
66
.wdio-vscode-service/
77
src/test/e2e/workspace/.databricks/
88
extension/
9-
resources/python/generated/
9+
resources/python/generated/
10+
.venv
11+
*.vsix

‎packages/databricks-vscode/package.json‎

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -724,62 +724,61 @@
724724
"dependencies": {
725725
"@databricks/databricks-sdk": "file:../../vendor/databricks-sdk.tgz",
726726
"@databricks/databricks-vscode-types": "workspace:^",
727-
"@types/lodash": "^4.14.199",
728-
"@vscode/debugadapter": "^1.61.0",
729-
"@vscode/extension-telemetry": "^0.8.1",
730-
"@vscode/webview-ui-toolkit": "^1.2.2",
727+
"@types/lodash": "^4.14.202",
728+
"@vscode/debugadapter": "^1.64.0",
729+
"@vscode/extension-telemetry": "^0.9.1",
730+
"@vscode/webview-ui-toolkit": "^1.4.0",
731731
"add": "^2.0.6",
732732
"ansi-to-html": "^0.7.2",
733733
"bcryptjs": "^2.4.3",
734734
"lodash": "^4.17.21",
735735
"triple-beam": "^1.4.1",
736-
"winston": "^3.10.0",
737-
"yaml": "^2.3.2"
736+
"winston": "^3.11.0",
737+
"yaml": "^2.3.4"
738738
},
739739
"devDependencies": {
740740
"@istanbuljs/nyc-config-typescript": "^1.0.2",
741-
"@sinonjs/fake-timers": "^10.3.0",
742-
"@types/bcryptjs": "^2.4.2",
743-
"@types/chai": "^4.3.5",
744-
"@types/eslint": "^8.44.6",
745-
"@types/fs-extra": "^11.0.1",
746-
"@types/mocha": "^10.0.2",
747-
"@types/mock-require": "^2.0.1",
748-
"@types/node": "^20.4.2",
749-
"@types/sinonjs__fake-timers": "^8.1.2",
750-
"@types/tmp": "^0.2.3",
751-
"@types/triple-beam": "^1.3.2",
752-
"@types/vscode": "^1.69.1",
753-
"@types/yargs": "^17.0.24",
754-
"@typescript-eslint/eslint-plugin": "^6.0.0",
755-
"@typescript-eslint/parser": "^6.0.0",
756-
"@typescript-eslint/utils": "^6.9.0",
757-
"@vscode/test-electron": "^2.3.3",
758-
"@wdio/cli": "^8.12.2",
759-
"@wdio/local-runner": "^8.12.1",
760-
"@wdio/mocha-framework": "^8.12.1",
761-
"@wdio/spec-reporter": "^8.12.2",
762-
"@wdio/types": "^8.10.4",
763-
"chai": "^4.3.7",
764-
"esbuild": "^0.19.4",
765-
"eslint": "^8.51.0",
766-
"eslint-plugin-local-rules": "^2.0.0",
767-
"fs-extra": "^11.1.1",
741+
"@sinonjs/fake-timers": "^11.2.2",
742+
"@types/bcryptjs": "^2.4.6",
743+
"@types/chai": "^4.3.11",
744+
"@types/eslint": "^8.44.9",
745+
"@types/fs-extra": "^11.0.4",
746+
"@types/mocha": "^10.0.6",
747+
"@types/mock-require": "^2.0.3",
748+
"@types/node": "^20.10.4",
749+
"@types/sinonjs__fake-timers": "^8.1.5",
750+
"@types/tmp": "^0.2.6",
751+
"@types/triple-beam": "^1.3.5",
752+
"@types/vscode": "^1.83.0",
753+
"@types/yargs": "^17.0.32",
754+
"@typescript-eslint/eslint-plugin": "^6.14.0",
755+
"@typescript-eslint/parser": "^6.14.0",
756+
"@typescript-eslint/utils": "^6.14.0",
757+
"@vscode/test-electron": "^2.3.8",
758+
"@wdio/cli": "^8.26.1",
759+
"@wdio/local-runner": "^8.26.1",
760+
"@wdio/mocha-framework": "^8.24.12",
761+
"@wdio/spec-reporter": "^8.24.12",
762+
"@wdio/types": "^8.24.12",
763+
"chai": "^4.3.10",
764+
"esbuild": "^0.19.9",
765+
"eslint": "^8.55.0",
766+
"eslint-plugin-local-rules": "^2.0.1",
767+
"fs-extra": "^11.2.0",
768768
"glob": "^10.3.10",
769769
"json-schema-to-typescript": "^13.1.1",
770770
"mocha": "^10.2.0",
771771
"mock-require": "^3.0.3",
772772
"nyc": "^15.1.0",
773-
"prettier": "^3.0.0",
773+
"prettier": "^3.1.1",
774774
"tmp-promise": "^3.0.3",
775775
"ts-mocha": "^10.0.0",
776776
"ts-mockito": "^2.6.1",
777-
"ts-node": "^10.9.1",
778-
"typescript": "5.1.6",
777+
"ts-node": "^10.9.2",
778+
"typescript": "^5.3.3",
779779
"vsce": "^2.15.0",
780-
"wdio-video-reporter": "^4.0.3",
781-
"wdio-vscode-service": "^5.2.0",
782-
"winston": "^3.10.0",
780+
"wdio-video-reporter": "^4.0.5",
781+
"wdio-vscode-service": "^5.2.2",
783782
"yargs": "^17.7.2"
784783
},
785784
"nyc": {

‎packages/databricks-vscode/src/cluster/ClusterListDataProvider.test.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,8 @@ describe(__filename, () => {
114114
mockListClustersResponse.clusters![0]
115115
);
116116

117-
const items = await ClusterListDataProvider.clusterNodeToTreeItems(
118-
cluster
119-
);
117+
const items =
118+
await ClusterListDataProvider.clusterNodeToTreeItems(cluster);
120119
assert.deepEqual(items, [
121120
{
122121
description: "cluster-id-2",

‎packages/databricks-vscode/src/cluster/ClusterManager.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import {compute, Time, TimeUnits} from "@databricks/databricks-sdk";
22
import {Cluster} from "../sdk-extensions";
33
import {CancellationTokenSource, Disposable} from "vscode";
4-
import _ from "lodash";
4+
import * as lodash from "lodash";
55
export class ClusterManager implements Disposable {
66
private cancellationTokenSource?: CancellationTokenSource;
7-
private refreshTimer?: NodeJS.Timer;
7+
private refreshTimer?: NodeJS.Timeout;
88

99
constructor(
1010
readonly cluster: Cluster,
@@ -18,7 +18,7 @@ export class ClusterManager implements Disposable {
1818
this.refreshTimer = setInterval(async () => {
1919
const oldState = this.cluster.state;
2020
await this.cluster.refresh();
21-
if (!_.isEqual(oldState, this.cluster.state)) {
21+
if (!lodash.isEqual(oldState, this.cluster.state)) {
2222
this.onChange(this.cluster.state);
2323
}
2424
}, this.refreshTimeout.toMillSeconds().value);

‎packages/databricks-vscode/src/configuration/BundleConfigReaderWriter.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {BundleFileSet, parseBundleYaml, writeBundleYaml} from "../bundle";
33
import {BundleTarget} from "../bundle/types";
44
import {Mutex} from "../locking";
55
import {BundleConfig, ConfigReaderWriter, isBundleConfigKey} from "./types";
6-
import _ from "lodash";
6+
import * as lodash from "lodash";
77
/**
88
* Reads and writes bundle configs. This class does not notify when the configs change.
99
* We use the BundleWatcher to notify when the configs change.
@@ -179,7 +179,7 @@ export class BundleConfigReaderWriter
179179

180180
const newTargetData = this.writerMapping[key](targetData, value);
181181

182-
if (_.isEqual(newTargetData, targetData)) {
182+
if (lodash.isEqual(newTargetData, targetData)) {
183183
return;
184184
}
185185
data.targets = {...data.targets, [target]: newTargetData};

‎packages/databricks-vscode/src/configuration/ConfigModel.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {Mutex} from "../locking";
1313
import {BundleWatcher} from "../bundle";
1414
import {CachedValue} from "../locking/CachedValue";
1515
import {StateStorage} from "../vscode-objs/StateStorage";
16-
import _ from "lodash";
16+
import * as lodash from "lodash";
1717
import {onError} from "../utils/onErrorDecorator";
1818

1919
function isDirectToBundleConfig(
@@ -74,7 +74,7 @@ export class ConfigModel implements Disposable {
7474
(oldValue === null && newValue[key] !== undefined) ||
7575
// Old value is not null, and old and new values for the key are different
7676
(oldValue !== null &&
77-
!_.isEqual(oldValue.config[key], newValue[key]))
77+
!lodash.isEqual(oldValue.config[key], newValue[key]))
7878
) {
7979
this.changeEmitters.get(key)?.emitter.fire();
8080
didAnyConfigChange = true;
@@ -209,8 +209,8 @@ export class ConfigModel implements Disposable {
209209
}
210210
| undefined
211211
> {
212-
const {config: fullConfig, source: fullSource} = await this.configCache
213-
.value;
212+
const {config: fullConfig, source: fullSource} =
213+
await this.configCache.value;
214214
const config = fullConfig[key] ?? defaults[key];
215215
const source =
216216
fullConfig[key] !== undefined ? fullSource[key] : "default";

‎packages/databricks-vscode/src/configuration/ConnectionCommands.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,8 @@ export class ConnectionCommands implements Disposable {
289289
);
290290
return;
291291
}
292-
const created = await this.wsfsCommands.createFolder(
293-
rootDir
294-
);
292+
const created =
293+
await this.wsfsCommands.createFolder(rootDir);
295294
if (created === undefined) {
296295
return;
297296
}

0 commit comments

Comments
 (0)