Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/nightly-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- run: yarn install
- run: yarn run build

- run: yarn run vscode:package
- run: yarn run package
working-directory: packages/databricks-vscode

- name: Update nightly release
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,6 @@ jobs:
- name: Building packages
run: yarn run build

- run: yarn run test:compile
working-directory: packages/databricks-vscode

- name: Unit Tests with Coverage (OSX)
uses: GabrielBB/xvfb-action@v1
if: matrix.os != 'windows-latest'
Expand Down Expand Up @@ -143,7 +140,7 @@ jobs:
- run: mkdir -p packages/databricks-vscode/artifacts

- name: Build VSIX
run: yarn workspace databricks vscode:package -o artifacts
run: yarn workspace databricks package -o artifacts

- name: Upload artifacts
uses: actions/upload-artifact@v3
Expand Down
5 changes: 2 additions & 3 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"--extensionDevelopmentPath=${workspaceFolder}/packages/databricks-vscode"
],
"outFiles": [
"${workspaceFolder}/packages/databricks-vscode/dist/**/*.js"
"${workspaceFolder}/packages/databricks-vscode/out/**/*.js"
],
"preLaunchTask": "${defaultBuildTask}"
},
Expand All @@ -28,8 +28,7 @@
"--extensionTestsPath=${workspaceFolder}/packages/databricks-vscode/out/test/suite"
],
"outFiles": [
"${workspaceFolder}/packages/databricks-vscode/out/**/*.js",
"${workspaceFolder}/packages/databricks-vscode/dist/**/*.js"
"${workspaceFolder}/packages/databricks-vscode/out/**/*.js"
],
"preLaunchTask": "${defaultBuildTask}"
}
Expand Down
21 changes: 1 addition & 20 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"cwd": "${workspaceFolder}/packages/databricks-vscode"
},
"script": "watch",
"problemMatcher": ["$ts-webpack-watch", "$tslint-webpack-watch"],
"problemMatcher": "$tsc-watch",
"isBackground": true,
"presentation": {
"reveal": "never",
Expand All @@ -19,25 +19,6 @@
"kind": "build",
"isDefault": true
}
},
{
"type": "npm",
"options": {
"cwd": "${workspaceFolder}/packages/databricks-vscode"
},
"script": "watch-tests",
"problemMatcher": "$tsc-watch",
"isBackground": true,
"presentation": {
"reveal": "never",
"group": "watchers"
},
"group": "build"
},
{
"label": "tasks: watch-tests",
"dependsOn": ["npm: watch", "npm: watch-tests"],
"problemMatcher": []
}
]
}
4 changes: 1 addition & 3 deletions packages/databricks-vscode/.vscodeignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
.vscode/**
.vscode-test/**
out/**
dist/**
node_modules/**
src/**
.gitignore
.yarnrc
webpack.config.js
vsc-extension-quickstart.md
**/tsconfig.json
**/.eslintrc.json
**/*.map
Expand Down
36 changes: 16 additions & 20 deletions packages/databricks-vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"onView:clusterManager",
"onView:clusterList"
],
"main": "./dist/extension.js",
"main": "out/extension.js",
"contributes": {
"commands": [
{
Expand Down Expand Up @@ -206,23 +206,22 @@
"useYarn": false
},
"scripts": {
"vscode:prepublish": "yarn run package",
"vscode:package": "vsce package",
"compile": "webpack",
"watch": "webpack --watch",
"package": "webpack --mode production --devtool hidden-source-map",
"vscode:prepublish": "rm -rf out && yarn run package:compile && yarn run package:copy-webview-toolkit",
"package": "vsce package",
"package:compile": "yarn run esbuild:base --minify",
"package:copy-webview-toolkit": "cp ./node_modules/@vscode/webview-ui-toolkit/dist/toolkit.js ./out/toolkit.js",
"esbuild:base": "esbuild ./src/extension.ts --bundle --outfile=out/extension.js --external:vscode --format=cjs --platform=node",
"compile": "tsc",
"watch": "yarn run package:copy-webview-toolkit && tsc -w",
"fix": "prettier . --write",
"test:lint": "eslint src --ext ts && prettier . -c",
"test:compile": "tsc -p . --outDir out",
"test:watch": "tsc -p . -w --outDir out",
"test:unit": "yarn run test:compile && node ./out/test/runTest.js",
"test:integ:prepare": "yarn run vscode:package && extest get-vscode --type ${VSCODE_TEST_VERSION:-stable} --storage /tmp/vscode-test-databricks && extest get-chromedriver --storage /tmp/vscode-test-databricks && extest install-vsix -f databricks-0.0.1.vsix --storage /tmp/vscode-test-databricks",
"test:integ:run": "yarn run test:compile && ts-node src/test/e2e/scripts/e2e.ts --storage /tmp/vscode-test-databricks --code_settings src/test/e2e/settings.json 'out/**/*.e2e.js'",
"test:unit": "yarn run compile && node ./out/test/runTest.js",
"test:integ:prepare": "yarn run package && extest get-vscode --type ${VSCODE_TEST_VERSION:-stable} --storage /tmp/vscode-test-databricks && extest get-chromedriver --storage /tmp/vscode-test-databricks && extest install-vsix -f databricks-0.0.1.vsix --storage /tmp/vscode-test-databricks",
"test:integ:run": "yarn run compile && node out/test/e2e/scripts/e2e.js --storage /tmp/vscode-test-databricks --code_settings src/test/e2e/settings.json 'out/**/*.e2e.js'",
"test:integ": "yarn run test:integ:prepare && yarn run test:integ:run",
"test:cov": "nyc yarn run test:unit",
"test": "yarn run compile && yarn run test:lint && yarn run test:unit",
"build": "yarn run vscode:prepublish",
"clean": "rm -rf node_modules out dist .vscode-test"
"test": "yarn run test:lint && yarn run test:unit",
"clean": "rm -rf node_modules out .vscode-test"
},
"dependencies": {
"@databricks/databricks-sdk": "*",
Expand All @@ -237,20 +236,17 @@
"@types/vscode": "^1.69.0",
"@typescript-eslint/eslint-plugin": "^5.30.7",
"@vscode/test-electron": "^2.1.5",
"esbuild": "^0.14.51",
"eslint": "^8.20.0",
"glob": "^8.0.3",
"mocha": "^10.0.0",
"nyc": "^15.1.0",
"prettier": "^2.7.1",
"tmp-promise": "^3.0.3",
"ts-loader": "^9.3.1",
"ts-mockito": "^2.6.1",
"ts-node": "^10.9.1",
"typescript": "^4.7.4",
"vsce": "^2.10.0",
"vscode-extension-tester": "^4.3.0",
"webpack": "^5.73.0",
"webpack-cli": "^4.10.0"
"vscode-extension-tester": "^4.3.0"
},
"nyc": {
"extends": "@istanbuljs/nyc-config-typescript",
Expand All @@ -270,4 +266,4 @@
],
"report-dir": "coverage"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,7 @@ export class WorkflowOutputPanel {

private getWebviewContent(message: string): string {
const toolkitUri = this.getUri([
"node_modules",
"@vscode",
"webview-ui-toolkit",
"dist",
"out",
"toolkit.js", // A toolkit.min.js file is also available
]);

Expand Down
4 changes: 2 additions & 2 deletions packages/databricks-vscode/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"compilerOptions": {
"module": "CommonJS",
"target": "ES6",
"moduleResolution": "Node",
"target": "ES2020",
"outDir": "out",
"esModuleInterop": true,
"isolatedModules": true,
"lib": ["ES2020"],
Expand Down
45 changes: 0 additions & 45 deletions packages/databricks-vscode/vsc-extension-quickstart.md

This file was deleted.

48 changes: 0 additions & 48 deletions packages/databricks-vscode/webpack.config.js

This file was deleted.

Loading