Skip to content

Commit e8f0208

Browse files
Artmannclaude
andcommitted
Merge main into artmann/grn-5047-sql-lsp
Merges the following changes from main: - ESM migration & Vega libraries update - Python environment deletion feature - Python LSP base implementation - Various dependency bumps Conflict resolution: - Kept SQL LSP branch versions for deepnoteLspClientManager files (extends Python LSP with SQL LSP support) - Regenerated package-lock.json with lockfileVersion 2 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
2 parents d1990af + 7b7576e commit e8f0208

File tree

199 files changed

+6041
-14805
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+6041
-14805
lines changed

.eslintrc.js renamed to .eslintrc.cjs

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ module.exports = {
4747
'@typescript-eslint/no-explicit-any': 'error',
4848
'@typescript-eslint/no-non-null-assertion': 'off',
4949
'no-unused-vars': 'off',
50-
'@typescript-eslint/no-unused-vars': ['warn', { argsIgnorePattern: '_\\w*' }],
50+
'@typescript-eslint/no-unused-vars': ['warn', { argsIgnorePattern: '_\\w*', varsIgnorePattern: '_\\w*' }],
5151
'no-use-before-define': 'off',
5252
'@typescript-eslint/no-use-before-define': [
5353
'error',
@@ -74,7 +74,14 @@ module.exports = {
7474
'import/no-unresolved': [
7575
'error',
7676
{
77-
ignore: ['monaco-editor', 'vscode', 'react-error-boundary']
77+
ignore: [
78+
'monaco-editor',
79+
'vscode',
80+
'react-error-boundary',
81+
'vega-lite',
82+
'vega-embed',
83+
'why-is-node-running'
84+
]
7885
}
7986
],
8087
'import/prefer-default-export': 'off',
@@ -225,18 +232,32 @@ module.exports = {
225232
'import/no-restricted-paths': ['off']
226233
}
227234
},
235+
{
236+
files: ['src/kernels/**/*.ts'],
237+
rules: {
238+
'@typescript-eslint/no-restricted-imports': 'off'
239+
}
240+
},
241+
{
242+
files: ['src/notebooks/**/*.ts', 'src/webviews/**/*.ts'],
243+
rules: {
244+
'@typescript-eslint/no-restricted-imports': 'off'
245+
}
246+
},
228247
{
229248
files: ['**/*.test.ts'],
230249
rules: {
231250
'@typescript-eslint/no-explicit-any': 'off',
232-
'@typescript-eslint/no-restricted-imports': 'off'
251+
'@typescript-eslint/no-restricted-imports': 'off',
252+
'@typescript-eslint/no-empty-function': 'off'
233253
}
234254
},
235255
{
236256
files: ['src/test/**/*.ts'],
237257
rules: {
238258
'@typescript-eslint/no-explicit-any': 'off',
239-
'@typescript-eslint/no-restricted-imports': 'off'
259+
'@typescript-eslint/no-restricted-imports': 'off',
260+
'@typescript-eslint/no-empty-function': 'off'
240261
}
241262
},
242263
{

.github/workflows/ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
timeout-minutes: 15
2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
25+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
2626

2727
- name: Setup Node.js
2828
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
@@ -45,7 +45,7 @@ jobs:
4545
timeout-minutes: 15
4646
steps:
4747
- name: Checkout
48-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
48+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
4949

5050
- name: Setup Node.js
5151
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
@@ -66,7 +66,7 @@ jobs:
6666

6767
steps:
6868
- name: Checkout code
69-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
69+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
7070
with:
7171
fetch-depth: 0
7272

@@ -88,7 +88,7 @@ jobs:
8888
contents: read
8989
steps:
9090
- name: Checkout
91-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
91+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
9292

9393
- name: Setup Node.js
9494
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
@@ -134,7 +134,7 @@ jobs:
134134
runs-on: ubuntu-latest
135135
steps:
136136
- name: Checkout
137-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
137+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
138138

139139
- name: Setup Node.js
140140
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
@@ -154,7 +154,7 @@ jobs:
154154
timeout-minutes: 15
155155
steps:
156156
- name: Checkout
157-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
157+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
158158

159159
- name: Setup Node.js
160160
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
@@ -174,7 +174,7 @@ jobs:
174174
timeout-minutes: 5
175175
steps:
176176
- name: Checkout
177-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
177+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
178178

179179
- name: Setup Node.js
180180
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
@@ -195,7 +195,7 @@ jobs:
195195
timeout-minutes: 15
196196
steps:
197197
- name: Checkout
198-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
198+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
199199

200200
- name: Setup Node.js
201201
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
@@ -215,7 +215,7 @@ jobs:
215215
timeout-minutes: 15
216216
steps:
217217
- name: Checkout
218-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
218+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
219219

220220
- name: Setup Node.js
221221
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6

.github/workflows/copilot-setup-steps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
# If you do not check out your code, Copilot will do this for you.
3636
steps:
3737
- name: Checkout code
38-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
38+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
3939

4040
- name: Use Node ${{env.NODE_VERSION}}
4141
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
@@ -73,7 +73,7 @@ jobs:
7373
continue-on-error: true
7474

7575
- name: Install uv
76-
uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7
76+
uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7
7777

7878
- name: Setup Venv
7979
run: |

.github/workflows/deps.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
23+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
2424

2525
- name: Setup Node.js
2626
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
@@ -36,7 +36,7 @@ jobs:
3636

3737
- name: Upload audit report
3838
if: always()
39-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
39+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
4040
with:
4141
name: npm-audit-report
4242
path: audit-report.json
@@ -49,7 +49,7 @@ jobs:
4949
runs-on: ubuntu-latest
5050
steps:
5151
- name: Checkout
52-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
52+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
5353

5454
- name: Setup Node.js
5555
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6

.github/workflows/package.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
timeout-minutes: 20
2222
steps:
2323
- name: Checkout
24-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
24+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
2525

2626
- name: Setup Node.js
2727
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
@@ -70,7 +70,7 @@ jobs:
7070
ls -lh *.vsix
7171
7272
- name: Upload VSIX artifact
73-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
73+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
7474
with:
7575
name: vscode-deepnote-${{ steps.package-version.outputs.version }}-${{ steps.branch-name.outputs.branch }}
7676
path: vscode-deepnote-*.vsix

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,4 @@ tmp
7373
vscode.d.ts
7474
vscode.proposed.*.d.ts
7575
xunit-test-results.xml
76+
tsconfig.tsbuildinfo
File renamed without changes.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
</div>
1212

13-
# Deepnote in VS Code, Cursor and Windsurf
13+
# Deepnote in VS Code, Cursor, Windsurf, and Antigravity
1414

15-
A powerful [Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=Deepnote.vscode-deepnote), [Cursor](https://open-vsx.org/extension/Deepnote/vscode-deepnote) and [Windsurf](https://open-vsx.org/extension/Deepnote/vscode-deepnote) extension that brings [Deepnote](https://deepnote.com/) notebook capabilities directly into your favorite editor. Work with sleek AI notebooks featuring SQL blocks, database integrations, and reactive blocks - all within VS Code.
15+
A powerful [Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=Deepnote.vscode-deepnote), [Cursor](https://open-vsx.org/extension/Deepnote/vscode-deepnote), [Windsurf](https://open-vsx.org/extension/Deepnote/vscode-deepnote), and [Antigravity](https://open-vsx.org/extension/Deepnote/vscode-deepnote) extension that brings [Deepnote](https://deepnote.com/) notebook capabilities directly into your favorite editor. Work with sleek AI notebooks featuring SQL blocks, database integrations, and reactive blocks - all within your IDE.
1616

1717
![Deepnote Projects](./assets/deepnote-projects.png)
1818

build/.mocha-multi-reporters.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"reporterEnabled": "./build/ci/scripts/spec_with_pid,mocha-junit-reporter",
2+
"reporterEnabled": "./build/ci/scripts/spec_with_pid.js,mocha-junit-reporter",
33
"mochaJunitReporterReporterOptions": {
44
"includePending": true
55
}

build/.mocha.unittests.js.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
22
"spec": "./out/**/*.unit.test.js",
3-
"require": ["source-map-support/register", "out/test/unittests.js"],
4-
"reporter": "mocha-multi-reporters",
5-
"reporter-option": "configFile=build/.mocha-multi-reporters.config",
3+
"loader": ["./build/mocha-esm-loader.js"],
4+
"require": ["./out/test/unittests.js"],
5+
"reporter": "spec",
66
"ui": "tdd",
77
"recursive": true,
8-
"colors": true
8+
"colors": true,
9+
"node-option": ["no-warnings=ExperimentalWarning", "loader=./build/mocha-esm-loader.js"]
910
}

0 commit comments

Comments
 (0)