Skip to content

Commit 04b70f9

Browse files
jamesbhobbsjamesbhobbs
authored
Merge branch 'main' into renovate/vscode-python-extension-1.x-lockfile
2 parents b8f0af4 + f90b894 commit 04b70f9

Some content is hidden

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

59 files changed

+10951
-1086
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
3030

3131
- name: Setup Node.js
32-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
32+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v5
3333
with:
3434
cache: 'npm'
3535
node-version: ${{ env.NODE_VERSION }}
@@ -56,7 +56,7 @@ jobs:
5656
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
5757

5858
- name: Setup Node.js
59-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
59+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v5
6060
with:
6161
cache: 'npm'
6262
node-version: ${{ env.NODE_VERSION }}
@@ -81,7 +81,7 @@ jobs:
8181
uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
8282

8383
- name: Install qlty
84-
uses: qltysh/qlty-action/install@a19242102d17e497f437d7466aa01b528537e899
84+
uses: qltysh/qlty-action/install@6bbb1add7432c45a3fd35a824ea69dc5bef27967
8585

8686
- name: Run qlty check
8787
run: qlty check
@@ -102,7 +102,7 @@ jobs:
102102
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
103103

104104
- name: Setup Node.js
105-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
105+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v5
106106
with:
107107
cache: 'npm'
108108
node-version: ${{ env.NODE_VERSION }}
@@ -152,7 +152,7 @@ jobs:
152152
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
153153

154154
- name: Setup Node.js
155-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
155+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v5
156156
with:
157157
cache: 'npm'
158158
node-version: ${{ env.NODE_VERSION }}
@@ -167,6 +167,30 @@ jobs:
167167
- name: Check Licenses
168168
run: npm run check-licenses
169169

170+
spell-check:
171+
name: Spell Check
172+
runs-on: ubuntu-latest
173+
timeout-minutes: 15
174+
steps:
175+
- name: Checkout
176+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
177+
178+
- name: Setup Node.js
179+
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
180+
with:
181+
cache: 'npm'
182+
node-version: ${{ env.NODE_VERSION }}
183+
registry-url: 'https://npm.pkg.github.com'
184+
scope: '@deepnote'
185+
186+
- name: Install dependencies
187+
run: npm ci --prefer-offline --no-audit
188+
env:
189+
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
190+
191+
- name: Run spell check
192+
run: npm run spell-check
193+
170194
audit-prod:
171195
name: Audit - Production
172196
runs-on: ubuntu-latest
@@ -176,7 +200,7 @@ jobs:
176200
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
177201

178202
- name: Setup Node.js
179-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
203+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v5
180204
with:
181205
cache: 'npm'
182206
node-version: ${{ env.NODE_VERSION }}
@@ -200,7 +224,7 @@ jobs:
200224
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
201225

202226
- name: Setup Node.js
203-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
227+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v5
204228
with:
205229
cache: 'npm'
206230
node-version: ${{ env.NODE_VERSION }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
4141

4242
- name: Use Node ${{env.NODE_VERSION}}
43-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
43+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v5
4444
with:
4545
node-version: ${{env.NODE_VERSION}}
4646
registry-url: 'https://npm.pkg.github.com'
@@ -79,7 +79,7 @@ jobs:
7979
continue-on-error: true
8080

8181
- name: Install uv
82-
uses: astral-sh/setup-uv@3259c6206f993105e3a61b142c2d97bf4b9ef83d # v7
82+
uses: astral-sh/setup-uv@2ddd2b9cb38ad8efd50337e8ab201519a34c9f24 # v7
8383

8484
- name: Setup Venv
8585
run: |

‎.github/workflows/deps.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
2828

2929
- name: Setup Node.js
30-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
30+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v5
3131
with:
3232
cache: 'npm'
3333
node-version: ${{ env.NODE_VERSION }}
@@ -60,7 +60,7 @@ jobs:
6060
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
6161

6262
- name: Setup Node.js
63-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
63+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v5
6464
with:
6565
node-version: ${{ env.NODE_VERSION }}
6666
cache: 'npm'

‎.gitignore‎

Lines changed: 56 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,75 @@
1+
__pycache__
2+
!build/
3+
!src/test/pythonEnvironments/**/*.*
4+
!yarn.lock
15
.DS_Store
6+
.eslintcache
7+
.github_token
28
.huskyrc.json
3-
dist
4-
out
9+
.nyc_output
10+
.pytest_cache
11+
.python-version
12+
.qlty/cache
13+
.qlty/logs
14+
.qlty/out
15+
.qlty/plugin_cachedir
16+
.qlty/results
17+
.vs/
18+
.vscode-test
19+
.vscode-test-web
520
*.exe
6-
log.log
7-
**/node_modules
21+
*.i18n.json
22+
*.nls.*.json
23+
*.noseids
824
*.pyc
925
*.vsix
26+
*.xlf
27+
**/.mypy_cache/**
28+
**/.venv*/
29+
**/.vscode test/**
30+
**/.vscode-smoke/**
31+
**/.vscode-test/**
1032
**/.vscode/.ropeproject/**
33+
**/*.esbuild.meta.json
34+
**/node_modules
1135
**/testFiles/**/.cache/**
12-
*.noseids
13-
.nyc_output
14-
.vscode-test
15-
__pycache__
16-
npm-debug.log
17-
**/.mypy_cache/**
18-
!yarn.lock
36+
# Compilation of less to css
37+
# Esbuild files
38+
# Qlty cache directories
39+
# translation files
40+
bin/**
1941
coverage/
2042
cucumber-report.json
21-
**/.vscode-test/**
22-
**/.vscode test/**
23-
**/.vscode-smoke/**
24-
**/.venv*/
25-
port.txt
26-
precommit.hook
27-
pythonFiles/lib/**
2843
debug_coverage*/**
29-
languageServer/**
44+
debug*.log
45+
debugpy*.log
46+
dist
47+
l10n/
3048
languageServer.*/**
31-
bin/**
49+
languageServer/**
50+
log.log
3251
logs/**
52+
nodeLanguageServer.*/**
53+
nodeLanguageServer/**
54+
npm-debug.log
3355
obj/**
34-
.pytest_cache
35-
temp
36-
tmp
37-
src/test/datascience/tmp/**
38-
src/test/datascience/temp/**
39-
.python-version
40-
.vs/
41-
test-results*.xml
42-
testresults.json
43-
telemetry.json
44-
xunit-test-results.xml
45-
!build/
46-
debug*.log
47-
debugpy*.log
56+
out
57+
port.txt
58+
precommit.hook
4859
pydevd*.log
49-
vscode.d.ts
50-
vscode.proposed.*.d.ts
51-
nodeLanguageServer/**
52-
nodeLanguageServer.*/**
60+
pythonFiles/lib/**
5361
src/test/datascience/.venv*
54-
!src/test/pythonEnvironments/**/*.*
55-
.vscode-test-web
56-
.github_token
57-
# translation files
58-
*.xlf
59-
*.nls.*.json
60-
*.i18n.json
61-
l10n/
62-
# Esbuild files
63-
**/*.esbuild.meta.json
64-
# Compilation of less to css
62+
src/test/datascience/temp/**
63+
src/test/datascience/tmp/**
6564
src/webviews/webview-side/interactive-common/variableExplorerGrid.css
6665
src/webviews/webview-side/interactive-common/variableExplorerGrid.css.map
6766
src/webviews/webview-side/react-common/seti/seti.css
6867
src/webviews/webview-side/react-common/seti/seti.css.map
69-
# Qlty cache directories
70-
.qlty/cache
71-
.qlty/logs
72-
.qlty/out
73-
.qlty/plugin_cachedir
74-
.qlty/results
68+
telemetry.json
69+
temp
70+
test-results*.xml
71+
testresults.json
72+
tmp
73+
vscode.d.ts
74+
vscode.proposed.*.d.ts
75+
xunit-test-results.xml

‎.husky/post-checkout‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
npm ci

‎.husky/pre-commit‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1 @@
1-
#!/bin/sh
2-
if npm list prettier | grep -q prettier@ ; then
3-
echo husky - prettier is installed
4-
else
5-
echo husky - prettier is not installed, skipping format check
6-
exit 0
7-
fi
8-
9-
# run prettier on all .ts files that are in the commit
10-
changed=$(git diff --diff-filter=ACM --cached --name-only | grep .ts$ | tr '\n' ' ')
11-
12-
if [ -z "$changed" ]; then
13-
echo husky - No modified files to check
14-
exit 0
15-
fi
16-
17-
npx prettier $changed --check
1+
npm exec lint-staged

‎.husky/pre-push‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
branch_name="$(git symbolic-ref --short HEAD)"
2+
if [ "$branch_name" = "main" ]; then
3+
echo "Pushing directly to main is not allowed."
4+
exit 1
5+
fi

‎build/esbuild/build.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ const commonExternals = [
4848
'vscode',
4949
'commonjs',
5050
'node:crypto',
51+
'node:fs/promises',
52+
'node:path',
5153
'vscode-jsonrpc', // Used by a few modules, might as well pull this out, instead of duplicating it in separate bundles.
5254
// Ignore telemetry specific packages that are not required.
5355
'applicationinsights-native-metrics',
@@ -329,6 +331,11 @@ async function buildAll() {
329331
path.join(extensionFolder, 'dist', 'webviews', 'webview-side', 'dataframeRenderer', 'dataframeRenderer.js'),
330332
{ target: 'web', watch: isWatchMode }
331333
),
334+
build(
335+
path.join(extensionFolder, 'src', 'webviews', 'webview-side', 'vega-renderer', 'index.ts'),
336+
path.join(extensionFolder, 'dist', 'webviews', 'webview-side', 'vegaRenderer', 'vegaRenderer.js'),
337+
{ target: 'web', watch: isWatchMode }
338+
),
332339
build(
333340
path.join(extensionFolder, 'src', 'webviews', 'webview-side', 'variable-view', 'index.tsx'),
334341
path.join(extensionFolder, 'dist', 'webviews', 'webview-side', 'viewers', 'variableView.js'),
@@ -343,6 +350,11 @@ async function buildAll() {
343350
path.join(extensionFolder, 'src', 'webviews', 'webview-side', 'data-explorer', 'index.tsx'),
344351
path.join(extensionFolder, 'dist', 'webviews', 'webview-side', 'viewers', 'dataExplorer.js'),
345352
{ target: 'web', watch: watchAll }
353+
),
354+
build(
355+
path.join(extensionFolder, 'src', 'webviews', 'webview-side', 'integrations', 'index.tsx'),
356+
path.join(extensionFolder, 'dist', 'webviews', 'webview-side', 'integrations', 'index.js'),
357+
{ target: 'web', watch: watchAll }
346358
)
347359
);
348360

‎cspell.json‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
{
2+
"version": "0.2",
3+
"files": [
4+
"src/notebooks/deepnote/**",
5+
"src/kernels/deepnote/**",
6+
"src/platform/errors/deepnoteServerNotFoundError.ts"
7+
],
8+
"ignorePaths": [
9+
"node_modules",
10+
"package-lock.json",
11+
"pnpm-lock.yaml",
12+
"dist",
13+
"out",
14+
"build",
15+
"coverage",
16+
".vscode",
17+
".git",
18+
"*.min.js",
19+
"*.min.css",
20+
"*.map"
21+
],
22+
"language": "en",
23+
"words": [
24+
"blockgroup",
25+
"channeldef",
26+
"dataframe",
27+
"deepnote",
28+
"deepnoteserver",
29+
"dntk",
30+
"dont",
31+
"DONT",
32+
"ename",
33+
"evalue",
34+
"findstr",
35+
"getsitepackages",
36+
"IMAGENAME",
37+
"ipykernel",
38+
"ipynb",
39+
"jupyter",
40+
"jupyterlab",
41+
"JVSC",
42+
"millis",
43+
"nbformat",
44+
"numpy",
45+
"pids",
46+
"Pids",
47+
"PYTHONHOME",
48+
"Reselecting",
49+
"taskkill",
50+
"unconfigured",
51+
"Unconfigured",
52+
"unittests",
53+
"vegalite",
54+
"venv",
55+
"venv's",
56+
"Venv",
57+
"venvs",
58+
"vscode"
59+
],
60+
"useGitignore": true
61+
}

0 commit comments

Comments
 (0)