Skip to content

Commit 51173e1

Browse files
authored
Use VSCode workspaces to better deal with multiple packages (#57)
1 parent 16df704 commit 51173e1

9 files changed

Lines changed: 117 additions & 41 deletions

File tree

databricks-vscode.code-workspace

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"folders": [
3+
{
4+
"path": ".",
5+
"name": "databricks-vscode.git"
6+
},
7+
{
8+
"path": "packages/databricks-sdk-js",
9+
"name": "SDK"
10+
},
11+
{
12+
"path": "packages/databricks-vscode",
13+
"name": "Extension"
14+
}
15+
],
16+
"settings": {
17+
"typescript.tsc.autoDetect": "off",
18+
"editor.formatOnSave": true,
19+
"editor.defaultFormatter": "esbenp.prettier-vscode",
20+
"[javascript]": {
21+
"editor.defaultFormatter": "esbenp.prettier-vscode"
22+
}
23+
}
24+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
// See http://go.microsoft.com/fwlink/?LinkId=827846
3+
// for the documentation about the extensions.json format
4+
"recommendations": [
5+
"dbaeumer.vscode-eslint",
6+
"amodio.tsl-problem-matcher",
7+
"esbenp.prettier-vscode",
8+
"Tobermory.es6-string-html"
9+
]
10+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// A launch configuration that compiles the extension and then opens it inside a new window
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
{
6+
"version": "0.2.0",
7+
"configurations": [
8+
{
9+
"name": "Unit tests",
10+
"request": "launch",
11+
"runtimeArgs": ["run", "test:unit"],
12+
"runtimeExecutable": "npm",
13+
"cwd": "${workspaceFolder}/packages/databricks-sdk-js",
14+
"outFiles": [
15+
"${workspaceFolder}/packages/databricks-sdk-js/**/*.js"
16+
],
17+
"type": "node"
18+
}
19+
]
20+
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"files.exclude": {
3+
"out": true // set this to true to hide the "out" folder with the compiled JS files
4+
},
5+
"search.exclude": {
6+
"out": true // set this to false to include "out" folder in search results
7+
},
8+
"typescript.tsc.autoDetect": "off",
9+
"editor.formatOnSave": true,
10+
"editor.defaultFormatter": "esbenp.prettier-vscode",
11+
"[javascript]": {
12+
"editor.defaultFormatter": "esbenp.prettier-vscode"
13+
}
14+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
// See http://go.microsoft.com/fwlink/?LinkId=827846
3+
// for the documentation about the extensions.json format
4+
"recommendations": [
5+
"dbaeumer.vscode-eslint",
6+
"amodio.tsl-problem-matcher",
7+
"esbenp.prettier-vscode",
8+
"Tobermory.es6-string-html"
9+
]
10+
}

.vscode/launch.json renamed to packages/databricks-vscode/.vscode/launch.json

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,20 @@
88
{
99
"name": "Run Extension",
1010
"type": "extensionHost",
11-
"cwd": "${workspaceFolder}/packages/databricks-vscode",
1211
"request": "launch",
13-
"args": [
14-
"--extensionDevelopmentPath=${workspaceFolder}/packages/databricks-vscode"
15-
],
16-
"outFiles": [
17-
"${workspaceFolder}/packages/databricks-vscode/out/**/*.js"
18-
],
12+
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
13+
"outFiles": ["${workspaceFolder}/out/**/*.js"],
1914
"preLaunchTask": "${defaultBuildTask}"
2015
},
2116
{
2217
"name": "Extension Tests",
2318
"type": "extensionHost",
24-
"cwd": "${workspaceFolder}/packages/databricks-vscode",
2519
"request": "launch",
2620
"args": [
27-
"--extensionDevelopmentPath=${workspaceFolder}/packages/databricks-vscode",
28-
"--extensionTestsPath=${workspaceFolder}/packages/databricks-vscode/out/test/suite"
29-
],
30-
"outFiles": [
31-
"${workspaceFolder}/packages/databricks-vscode/out/**/*.js"
21+
"--extensionDevelopmentPath=${workspaceFolder}",
22+
"--extensionTestsPath=${workspaceFolder}/out/test/suite"
3223
],
24+
"outFiles": ["${workspaceFolder}/out/**/*.js"],
3325
"preLaunchTask": "${defaultBuildTask}"
3426
}
3527
]
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"files.exclude": {
3+
"out": true, // set this to true to hide the "out" folder with the compiled JS files
4+
"dist": true // set this to true to hide the "dist" folder with the compiled JS files
5+
},
6+
"search.exclude": {
7+
"out": true, // set this to false to include "out" folder in search results
8+
"dist": true // set this to false to include "dist" folder in search results
9+
},
10+
"typescript.tsc.autoDetect": "off",
11+
"editor.formatOnSave": true,
12+
"editor.defaultFormatter": "esbenp.prettier-vscode",
13+
"[javascript]": {
14+
"editor.defaultFormatter": "esbenp.prettier-vscode"
15+
}
16+
}

.vscode/tasks.json renamed to packages/databricks-vscode/.vscode/tasks.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
"tasks": [
66
{
77
"type": "npm",
8-
"options": {
9-
"cwd": "${workspaceFolder}/packages/databricks-vscode"
10-
},
118
"script": "watch",
129
"problemMatcher": "$tsc-watch",
1310
"isBackground": true,

yarn.lock

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -191,12 +191,12 @@ __metadata:
191191
languageName: node
192192
linkType: hard
193193

194-
"@babel/parser@npm:^7.18.10":
195-
version: 7.18.10
196-
resolution: "@babel/parser@npm:7.18.10"
194+
"@babel/parser@npm:^7.18.10, @babel/parser@npm:^7.18.11":
195+
version: 7.18.11
196+
resolution: "@babel/parser@npm:7.18.11"
197197
bin:
198198
parser: ./bin/babel-parser.js
199-
checksum: adf417daccb5bc5edb53cc86b8e60abd911eaee8212703ea702ec17ff7967a9a17a84f6aa19b1cd0faec58e9beaa31a026c85238fd8ca08f2d66ba1db8180dc6
199+
checksum: 5ecc75b83e62ec53a947b1635a6ca75d6210d4a4f962f9f16f4239a6783f98e57f9662b598fa2fb1b8e12c0ad5c2bd86846ed0b97b85eb73dd7498b3a6d71a4b
200200
languageName: node
201201
linkType: hard
202202

@@ -212,20 +212,20 @@ __metadata:
212212
linkType: hard
213213

214214
"@babel/traverse@npm:^7.18.10, @babel/traverse@npm:^7.18.9":
215-
version: 7.18.10
216-
resolution: "@babel/traverse@npm:7.18.10"
215+
version: 7.18.11
216+
resolution: "@babel/traverse@npm:7.18.11"
217217
dependencies:
218218
"@babel/code-frame": ^7.18.6
219219
"@babel/generator": ^7.18.10
220220
"@babel/helper-environment-visitor": ^7.18.9
221221
"@babel/helper-function-name": ^7.18.9
222222
"@babel/helper-hoist-variables": ^7.18.6
223223
"@babel/helper-split-export-declaration": ^7.18.6
224-
"@babel/parser": ^7.18.10
224+
"@babel/parser": ^7.18.11
225225
"@babel/types": ^7.18.10
226226
debug: ^4.1.0
227227
globals: ^11.1.0
228-
checksum: c58b744b1c145649d3bf8167f7a3a6df032808f4582fb8f86b15fba0b7f237640f2289e67b854abfd7f1bda0abdbc0a71527fe78c6d470120ba0a96e64f8bf36
228+
checksum: 727409464d5cf27f33555010098ce9bb435f0648cc76e674f4fb7513522356655ba62be99c8df330982b391ccf5f0c0c23c7bd7453d4936d47e2181693fed14c
229229
languageName: node
230230
linkType: hard
231231

@@ -1356,9 +1356,9 @@ __metadata:
13561356
linkType: hard
13571357

13581358
"caniuse-lite@npm:^1.0.30001370":
1359-
version: 1.0.30001373
1360-
resolution: "caniuse-lite@npm:1.0.30001373"
1361-
checksum: cd2f027e2fcf66ed3b0e3eccec89df871f951f2e7600944fae2c3f6f1c37ac82392e573c279e15bf851b75f9696472e38d33fd52d964819ffb8af7af4078ceba
1359+
version: 1.0.30001374
1360+
resolution: "caniuse-lite@npm:1.0.30001374"
1361+
checksum: a75656e971d7ef2af4d2f3529a4620ae1a45d09460601fbc34b26f6867f31bbca006f71d8840291c471a2f01fc1994044f319a5660241ffaf35a2d84535af442
13621362
languageName: node
13631363
linkType: hard
13641364

@@ -1904,9 +1904,9 @@ __metadata:
19041904
linkType: hard
19051905

19061906
"electron-to-chromium@npm:^1.4.202":
1907-
version: 1.4.210
1908-
resolution: "electron-to-chromium@npm:1.4.210"
1909-
checksum: e9cb6cb7754b64f89bc1ae8a3b57b8b6ee7cf2317b4b104978ca4fde3d1d384a694919401d0583ec8f108790be1b576bc4663b1888e917bc577428d19d3dbafd
1907+
version: 1.4.211
1908+
resolution: "electron-to-chromium@npm:1.4.211"
1909+
checksum: 43d983b94f5aa542926c4063bae597591458b59e96ec0ab85a62cc296b9760c447d7d0af369d3c40b44b75cfc9d3a66277495736517c370cf03e181cf3ed39f1
19101910
languageName: node
19111911
linkType: hard
19121912

@@ -3899,11 +3899,11 @@ __metadata:
38993899
linkType: hard
39003900

39013901
"node-abi@npm:^3.3.0":
3902-
version: 3.23.0
3903-
resolution: "node-abi@npm:3.23.0"
3902+
version: 3.24.0
3903+
resolution: "node-abi@npm:3.24.0"
39043904
dependencies:
39053905
semver: ^7.3.5
3906-
checksum: 3691ff1120ce3ed3dd2ab97916a5ded9a5858706b3a8cca7f44978f2435368b76ecbb31bf87fdac0058099e1ae91fa6d4f7e39083091754bfd71885970bd7458
3906+
checksum: d90ab48802497b2203800cac71018668e99c246435395ca4f67afcabf689e7e81568ed36e8036bae79a052b63ea5707375bece6ca0a1d2e2b99bfafde7a5c9b2
39073907
languageName: node
39083908
linkType: hard
39093909

@@ -5693,7 +5693,7 @@ __metadata:
56935693
languageName: node
56945694
linkType: hard
56955695

5696-
"yargs-parser@npm:20.2.4":
5696+
"yargs-parser@npm:20.2.4, yargs-parser@npm:^20.2.2":
56975697
version: 20.2.4
56985698
resolution: "yargs-parser@npm:20.2.4"
56995699
checksum: d251998a374b2743a20271c2fd752b9fbef24eb881d53a3b99a7caa5e8227fcafd9abf1f345ac5de46435821be25ec12189a11030c12ee6481fef6863ed8b924
@@ -5710,13 +5710,6 @@ __metadata:
57105710
languageName: node
57115711
linkType: hard
57125712

5713-
"yargs-parser@npm:^20.2.2":
5714-
version: 20.2.9
5715-
resolution: "yargs-parser@npm:20.2.9"
5716-
checksum: 8bb69015f2b0ff9e17b2c8e6bfe224ab463dd00ca211eece72a4cd8a906224d2703fb8a326d36fdd0e68701e201b2a60ed7cf81ce0fd9b3799f9fe7745977ae3
5717-
languageName: node
5718-
linkType: hard
5719-
57205713
"yargs-unparser@npm:2.0.0":
57215714
version: 2.0.0
57225715
resolution: "yargs-unparser@npm:2.0.0"

0 commit comments

Comments
 (0)