Skip to content

Commit ca5afa4

Browse files
DonJayamanneDonJayamanne
authored
Merge branch 'main' into don/joyous-thrush
2 parents a4cc68b + 583c114 commit ca5afa4

28 files changed

+160
-138
lines changed

‎.github/actions/npm-ci/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: 'npm install (with GITHUB_TOKEN to run postinstall step)'
44
runs:
55
using: 'composite'
66
steps:
7-
- run: npm ci --foreground-scripts --prefer-offline
7+
- run: npm ci --foreground-scripts --prefer-offline --ignore-scripts
88
env:
99
npm_config_build_from_source: true
1010
shell: bash

‎.github/endgame_plan.md‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,19 @@
2323
- [ ] Sanity test release candidate VSIX against VS Code RC
2424
Tip: You can use the dev containers in the this repo for testing against linux (just open the repo and use thd command `Dev Containers: Reopen in Container`)
2525
- [ ] Windows
26-
- [ ] win32-x64
26+
- [ ] win32-x64 (tip: use https://devbox.microsoft.com/)
2727
- [ ] win32-arm64
2828
- [ ] macOS
29-
- [ ] darwin-x64
3029
- [ ] darwin-arm64
31-
- [ ] Linux
30+
- [ ] darwin-x64 (tip: use rosetta mode, see below)
31+
> [!TIP]
32+
> Testing Mac x64 on Apple Silicon as follows
33+
> Install Mac Universal version of Code
34+
> Right click on the app in `finder` and select `Get Info`
35+
> Select the option `Open using Rosetta`
36+
> Open VS Code
37+
> Its very very slow, (some times just hangs forever, might crash/restart, after all its an emulation).
38+
- [ ] Linux (tip: use VS Code sanity testing https://github.com/microsoft/vscode/wiki/Sanity-Check#linux-using-the-clitunnels)
3239
- [ ] linux-arm64
3340
- [ ] linux-armhf
3441
- [ ] linux-x64

‎.github/workflows/aggregate-test-results.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
persist-credentials: false
2626

2727
- name: setup python
28-
uses: actions/setup-python@v5
28+
uses: actions/setup-python@v6
2929

3030
- name: Install Python libs
3131
run: python -m pip install requests

‎.github/workflows/build-test.yml‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ jobs:
6969
persist-credentials: false
7070

7171
- name: Use Node ${{env.NODE_VERSION}}
72-
uses: actions/setup-node@v4
72+
uses: actions/setup-node@v5
7373
with:
7474
node-version: ${{env.NODE_VERSION}}
7575

7676
- name: Use Npm ${{env.NPM_VERSION}}
7777
run: npm i -g npm@${{env.NPM_VERSION}}
7878

7979
- name: Use Python ${{env.PYTHON_VERSION}}
80-
uses: actions/setup-python@v5
80+
uses: actions/setup-python@v6
8181
with:
8282
python-version: ${{env.PYTHON_VERSION}}
8383

@@ -112,7 +112,7 @@ jobs:
112112
persist-credentials: false
113113

114114
- name: Use Node ${{env.NODE_VERSION}}
115-
uses: actions/setup-node@v4
115+
uses: actions/setup-node@v5
116116
with:
117117
node-version: ${{env.NODE_VERSION}}
118118

@@ -155,7 +155,7 @@ jobs:
155155
run: npm run format
156156

157157
- name: Use Python ${{env.PYTHON_VERSION}}
158-
uses: actions/setup-python@v5
158+
uses: actions/setup-python@v6
159159
with:
160160
python-version: ${{env.PYTHON_VERSION}}
161161

@@ -201,7 +201,7 @@ jobs:
201201
persist-credentials: false
202202

203203
- name: Use Node ${{env.NODE_VERSION}}
204-
uses: actions/setup-node@v4
204+
uses: actions/setup-node@v5
205205
with:
206206
node-version: ${{env.NODE_VERSION}}
207207

@@ -392,14 +392,14 @@ jobs:
392392
echo "TAGS_NAME=${TAGSVAR//[^a-zA-Z]/_}" >> $GITHUB_ENV
393393

394394
- name: Use Python ${{matrix.pythonVersion}}
395-
uses: actions/setup-python@v5
395+
uses: actions/setup-python@v6
396396
id: setupPythonVersion
397397
if: matrix.python != 'conda' && matrix.python != 'noPython'
398398
with:
399399
python-version: ${{matrix.pythonVersion}}
400400

401401
- name: Install Conda environment from environment.yml
402-
uses: mamba-org/setup-micromamba@b09ef9b599704322748535812ca03efb2625677b # v2.0.5
402+
uses: mamba-org/setup-micromamba@add3a49764cedee8ee24e82dfde87f5bc2914462 # v2.0.7
403403
if: matrix.python == 'conda'
404404
with:
405405
cache-downloads: true
@@ -421,7 +421,7 @@ jobs:
421421
PYTHON_VERSION: ${{matrix.pythonVersion}}
422422

423423
- name: Use Node ${{env.NODE_VERSION}}
424-
uses: actions/setup-node@v4
424+
uses: actions/setup-node@v5
425425
with:
426426
node-version: ${{env.NODE_VERSION}}
427427

@@ -717,6 +717,10 @@ jobs:
717717
env:
718718
VSC_JUPYTER_CI_TEST_GREP: ${{ matrix.tags }}
719719

720+
- name: Install playwright
721+
run: npx playwright install
722+
if: matrix.python != 'noPython' && matrix.os == 'ubuntu-latest' && matrix.jupyterConnection == 'web'
723+
720724
- name: Run Native Notebook with VSCode & Jupyter (web)
721725
uses: GabrielBB/xvfb-action@b706e4e27b14669b486812790492dc50ca16b465 # v1.7
722726
with:
@@ -808,7 +812,7 @@ jobs:
808812
persist-credentials: false
809813

810814
- name: Use Python ${{matrix.python}}
811-
uses: actions/setup-python@v5
815+
uses: actions/setup-python@v6
812816
id: setupPythonVersion
813817
with:
814818
python-version: ${{matrix.python}}
@@ -818,7 +822,7 @@ jobs:
818822
run: echo "CI_PYTHON_PATH=${{ steps.setupPythonVersion.outputs.python-path }}" >> $GITHUB_ENV
819823

820824
- name: Use Node ${{env.NODE_VERSION}}
821-
uses: actions/setup-node@v4
825+
uses: actions/setup-node@v5
822826
with:
823827
node-version: ${{env.NODE_VERSION}}
824828

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
uses: actions/checkout@v5
4040

4141
- name: Use Node ${{env.NODE_VERSION}}
42-
uses: actions/setup-node@v4
42+
uses: actions/setup-node@v5
4343
with:
4444
node-version: ${{env.NODE_VERSION}}
4545

@@ -74,7 +74,7 @@ jobs:
7474
continue-on-error: true
7575

7676
- name: Install uv
77-
uses: astral-sh/setup-uv@v6
77+
uses: astral-sh/setup-uv@v7
7878

7979
- name: Setup Venv
8080
run: |

‎build/azure-pipeline.pre-release.yml‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,28 +35,53 @@ extends:
3535
- name: Linux
3636
packageArch: arm64
3737
vsceTarget: linux-arm64
38+
codesignPaths:
39+
[
40+
'./dist/node_modules/zeromq/prebuilds/linux-arm64/node.napi.glibc.node',
41+
'./dist/node_modules/zeromq/prebuilds/linux-arm64/node.napi.musl.node'
42+
]
3843
- name: Linux
3944
packageArch: arm
4045
vsceTarget: linux-armhf
46+
codesignPaths: ['./dist/node_modules/zeromq/prebuilds/linux-arm/node.napi.glibc.node']
4147
- name: Linux
4248
vsceTarget: alpine-x64
49+
codesignPaths:
50+
[
51+
'./dist/node_modules/zeromq/prebuilds/linux-x64/node.napi.glibc.node',
52+
'./dist/node_modules/zeromq/prebuilds/linux-x64/node.napi.musl.node'
53+
]
4354
- name: Linux
4455
vsceTarget: alpine-arm64
56+
codesignPaths:
57+
[
58+
'./dist/node_modules/zeromq/prebuilds/linux-arm64/node.napi.glibc.node',
59+
'./dist/node_modules/zeromq/prebuilds/linux-arm64/node.napi.musl.node'
60+
]
4561
- name: Linux
4662
packageArch: x64
4763
vsceTarget: linux-x64
64+
codesignPaths:
65+
[
66+
'./dist/node_modules/zeromq/prebuilds/linux-x64/node.napi.glibc.node',
67+
'./dist/node_modules/zeromq/prebuilds/linux-x64/node.napi.musl.node'
68+
]
4869
- name: MacOS
4970
packageArch: arm64
5071
vsceTarget: darwin-arm64
72+
codesignPaths: ['./dist/node_modules/zeromq/prebuilds/darwin-arm64/node.napi.glibc.node']
5173
- name: MacOS
5274
packageArch: x64
5375
vsceTarget: darwin-x64
76+
codesignPaths: ['./dist/node_modules/zeromq/prebuilds/darwin-x64/node.napi.glibc.node']
5477
- name: Windows
5578
packageArch: x64
5679
vsceTarget: win32-x64
80+
codesignPaths: ['./dist/node_modules/zeromq/prebuilds/win32-x64/node.napi.glibc.node']
5781
- name: Windows
5882
packageArch: arm64
5983
vsceTarget: win32-arm64
84+
codesignPaths: ['./dist/node_modules/zeromq/prebuilds/win32-arm64/node.napi.glibc.node']
6085
buildSteps:
6186
- script: |
6287
sudo apt-get update
@@ -73,12 +98,18 @@ extends:
7398
addToPath: true
7499
architecture: 'x64'
75100

76-
- script: npm ci --foreground-scripts
101+
- script: npm ci --foreground-scripts --ignore-scripts
77102
displayName: npm ci
78103
env:
79104
npm_config_build_from_source: true
80105
VSC_VSCE_TARGET: $(vsceTarget)
81106

107+
- script: npm run postinstall
108+
displayName: npm postinstall
109+
env:
110+
npm_config_build_from_source: true
111+
VSC_VSCE_TARGET: $(vsceTarget)
112+
82113
- script: npm run clean
83114
displayName: Clean
84115

‎build/azure-pipeline.stable.yml‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,28 +29,53 @@ extends:
2929
- name: Linux
3030
packageArch: arm64
3131
vsceTarget: linux-arm64
32+
codesignPaths:
33+
[
34+
'./dist/node_modules/zeromq/prebuilds/linux-arm64/node.napi.glibc.node',
35+
'./dist/node_modules/zeromq/prebuilds/linux-arm64/node.napi.musl.node'
36+
]
3237
- name: Linux
3338
packageArch: arm
3439
vsceTarget: linux-armhf
40+
codesignPaths: ['./dist/node_modules/zeromq/prebuilds/linux-arm/node.napi.glibc.node']
3541
- name: Linux
3642
vsceTarget: alpine-x64
43+
codesignPaths:
44+
[
45+
'./dist/node_modules/zeromq/prebuilds/linux-x64/node.napi.glibc.node',
46+
'./dist/node_modules/zeromq/prebuilds/linux-x64/node.napi.musl.node'
47+
]
3748
- name: Linux
3849
vsceTarget: alpine-arm64
50+
codesignPaths:
51+
[
52+
'./dist/node_modules/zeromq/prebuilds/linux-arm64/node.napi.glibc.node',
53+
'./dist/node_modules/zeromq/prebuilds/linux-arm64/node.napi.musl.node'
54+
]
3955
- name: Linux
4056
packageArch: x64
4157
vsceTarget: linux-x64
58+
codesignPaths:
59+
[
60+
'./dist/node_modules/zeromq/prebuilds/linux-x64/node.napi.glibc.node',
61+
'./dist/node_modules/zeromq/prebuilds/linux-x64/node.napi.musl.node'
62+
]
4263
- name: MacOS
4364
packageArch: arm64
4465
vsceTarget: darwin-arm64
66+
codesignPaths: ['./dist/node_modules/zeromq/prebuilds/darwin-arm64/node.napi.glibc.node']
4567
- name: MacOS
4668
packageArch: x64
4769
vsceTarget: darwin-x64
70+
codesignPaths: ['./dist/node_modules/zeromq/prebuilds/darwin-x64/node.napi.glibc.node']
4871
- name: Windows
4972
packageArch: x64
5073
vsceTarget: win32-x64
74+
codesignPaths: ['./dist/node_modules/zeromq/prebuilds/win32-x64/node.napi.glibc.node']
5175
- name: Windows
5276
packageArch: arm64
5377
vsceTarget: win32-arm64
78+
codesignPaths: ['./dist/node_modules/zeromq/prebuilds/win32-arm64/node.napi.glibc.node']
5479
buildSteps:
5580
- script: |
5681
sudo apt-get update
@@ -67,12 +92,18 @@ extends:
6792
addToPath: true
6893
architecture: 'x64'
6994

70-
- script: npm ci --foreground-scripts
95+
- script: npm ci --foreground-scripts --ignore-scripts
7196
displayName: npm ci
7297
env:
7398
npm_config_build_from_source: true
7499
VSC_VSCE_TARGET: $(vsceTarget)
75100

101+
- script: npm run postinstall
102+
displayName: npm postinstall
103+
env:
104+
npm_config_build_from_source: true
105+
VSC_VSCE_TARGET: $(vsceTarget)
106+
76107
- script: npm run clean
77108
displayName: Clean
78109

‎package-lock.json‎

Lines changed: 9 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "jupyter",
33
"displayName": "Jupyter",
4-
"version": "2025.8.0",
4+
"version": "2025.10.0",
55
"description": "Jupyter notebook support, interactive programming and computing that supports Intellisense, debugging and more.",
66
"publisher": "ms-toolsai",
77
"author": {
@@ -29,7 +29,7 @@
2929
"theme": "light"
3030
},
3131
"engines": {
32-
"vscode": "^1.104.0"
32+
"vscode": "^1.105.0"
3333
},
3434
"l10n": "./l10n",
3535
"extensionKind": [

‎src/extension.node.ts‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -200,16 +200,6 @@ function tryGetHomePath() {
200200
}
201201
}
202202

203-
/////////////////////////////
204-
// old activation code
205-
206-
// eslint-disable-next-line
207-
// TODO: Gradually move simple initialization
208-
// and DI registration currently in this function over
209-
// to initializeComponents(). Likewise with complex
210-
// init and activation: move them to activateComponents().
211-
// See https://github.com/microsoft/vscode-python/issues/10454.
212-
213203
async function activateLegacy(
214204
context: IExtensionContext,
215205
serviceManager: IServiceManager,

0 commit comments

Comments
 (0)