Reapply "Update to Electron v30"" (#25982)
* Revert "Revert "Update to Electron v30 (#25948)" (#25955)"
This reverts commit 8a7208671a.
* Bump node-sass resolution
* Update yarn.lock
* Update yarn..lock for remote
This commit is contained in:
Karl Burtram
GitHub
Родитель
ea2b00d574
Коммит
30db6f6d0e
|
|
@ -20,7 +20,7 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18.15
|
||||
node-version: 20.17
|
||||
- uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: "3.11.x"
|
||||
|
|
@ -86,7 +86,7 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18.15
|
||||
node-version: 20.17
|
||||
- uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: "3.11.x"
|
||||
|
|
@ -126,12 +126,6 @@ jobs:
|
|||
- name: Run Hygiene Checks
|
||||
run: yarn gulp hygiene
|
||||
|
||||
- name: Run Valid Layers Checks
|
||||
run: yarn valid-layers-check
|
||||
|
||||
- name: Compile /build/
|
||||
run: yarn --cwd build compile
|
||||
|
||||
- name: Check clean git state
|
||||
run: ./.github/workflows/check-clean-git-state.sh
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18.15
|
||||
node-version: 20.17
|
||||
- uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: "3.11.x"
|
||||
|
|
@ -88,7 +88,7 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18.15
|
||||
node-version: 20.17
|
||||
- uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: "3.11.x"
|
||||
|
|
@ -177,7 +177,7 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18.15
|
||||
node-version: 20.17
|
||||
- uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: "3.11.x"
|
||||
|
|
@ -241,7 +241,7 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18.15
|
||||
node-version: 20.17
|
||||
|
||||
- name: Compute node modules cache key
|
||||
id: nodeModulesCacheKey
|
||||
|
|
@ -283,12 +283,6 @@ jobs:
|
|||
- name: Run Hygiene Checks
|
||||
run: yarn gulp hygiene
|
||||
|
||||
- name: Run Valid Layers Checks
|
||||
run: yarn valid-layers-check
|
||||
|
||||
- name: Compile /build/
|
||||
run: yarn --cwd build compile
|
||||
|
||||
- name: Check clean git state
|
||||
run: ./.github/workflows/check-clean-git-state.sh
|
||||
|
||||
|
|
|
|||
2
.nvmrc
2
.nvmrc
|
|
@ -1 +1 @@
|
|||
18.15
|
||||
20.16.0
|
||||
4
.yarnrc
4
.yarnrc
|
|
@ -1,5 +1,5 @@
|
|||
disturl "https://electronjs.org/headers"
|
||||
target "25.9.8"
|
||||
ms_build_id "25675648"
|
||||
target "30.5.1"
|
||||
ms_build_id "10230572"
|
||||
runtime "electron"
|
||||
build_from_source "true"
|
||||
|
|
|
|||
|
|
@ -35,10 +35,6 @@ steps:
|
|||
# yarn monaco-compile-check
|
||||
# displayName: Run Monaco Editor Checks
|
||||
|
||||
- script: |
|
||||
yarn valid-layers-check
|
||||
displayName: Run Valid Layers Checks
|
||||
|
||||
- script: |
|
||||
yarn compile
|
||||
displayName: Compile Sources
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ steps:
|
|||
|
||||
- task: NodeTool@0
|
||||
inputs:
|
||||
versionSpec: "18.15.0"
|
||||
versionSpec: "20.17.0"
|
||||
|
||||
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
|
||||
inputs:
|
||||
|
|
|
|||
|
|
@ -53,10 +53,6 @@ steps:
|
|||
# yarn monaco-compile-check
|
||||
# displayName: Run Monaco Editor Checks
|
||||
|
||||
- script: |
|
||||
yarn valid-layers-check
|
||||
displayName: Run Valid Layers Checks
|
||||
|
||||
- script: |
|
||||
yarn compile
|
||||
displayName: Compile Sources
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ yarn config set registry "$NPM_REGISTRY"
|
|||
|
||||
if [ -z "$CC" ] || [ -z "$CXX" ]; then
|
||||
# Download clang based on chromium revision used by vscode
|
||||
curl -s https://raw.githubusercontent.com/chromium/chromium/114.0.5735.199/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
|
||||
curl -s https://raw.githubusercontent.com/chromium/chromium/118.0.5993.159/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
|
||||
|
||||
# Download libcxx headers and objects from upstream electron releases
|
||||
DEBUG=libcxx-fetcher \
|
||||
|
|
@ -19,9 +19,9 @@ if [ -z "$CC" ] || [ -z "$CXX" ]; then
|
|||
|
||||
# Set compiler toolchain
|
||||
# Flags for the client build are based on
|
||||
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/114.0.5735.199:build/config/arm.gni
|
||||
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/114.0.5735.199:build/config/compiler/BUILD.gn
|
||||
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/114.0.5735.199:build/config/c++/BUILD.gn
|
||||
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/118.0.5993.159:build/config/arm.gni
|
||||
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/118.0.5993.159:build/config/compiler/BUILD.gn
|
||||
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/118.0.5993.159:build/config/c++/BUILD.gn
|
||||
export CC=$PWD/.build/CR_Clang/bin/clang
|
||||
export CXX=$PWD/.build/CR_Clang/bin/clang++
|
||||
export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -I$PWD/.build/libcxx_headers -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit -D_LIBCPP_ABI_NAMESPACE=Cr"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ parameters:
|
|||
steps:
|
||||
- task: NodeTool@0
|
||||
inputs:
|
||||
versionSpec: "18.15.0"
|
||||
versionSpec: "20.17.0"
|
||||
|
||||
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
|
||||
inputs:
|
||||
|
|
|
|||
|
|
@ -97,12 +97,12 @@ steps:
|
|||
- template: common/install-builtin-extensions.yml
|
||||
|
||||
- ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
|
||||
- script: yarn npm-run-all -lp core-ci-pr extensions-ci-pr hygiene eslint valid-layers-check vscode-dts-compile-check tsec-compile-check
|
||||
- script: yarn npm-run-all -lp core-ci-pr extensions-ci-pr hygiene eslint vscode-dts-compile-check tsec-compile-check
|
||||
env:
|
||||
GITHUB_TOKEN: "$(github-distro-mixin-password)"
|
||||
displayName: Compile & Hygiene
|
||||
- ${{ else }}:
|
||||
- script: yarn npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check vscode-dts-compile-check tsec-compile-check
|
||||
- script: yarn npm-run-all -lp core-ci extensions-ci hygiene eslint vscode-dts-compile-check tsec-compile-check
|
||||
env:
|
||||
GITHUB_TOKEN: "$(github-distro-mixin-password)"
|
||||
displayName: Compile & Hygiene
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
steps:
|
||||
- task: NodeTool@0
|
||||
inputs:
|
||||
versionSpec: "18.15.0"
|
||||
versionSpec: "20.17.0"
|
||||
|
||||
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
|
||||
inputs:
|
||||
|
|
@ -84,7 +84,7 @@ steps:
|
|||
set -e
|
||||
yarn npm-run-all -lp core-ci
|
||||
yarn npm-run-all -lp extensions-ci
|
||||
yarn npm-run-all -lp hygiene eslint valid-layers-check
|
||||
yarn npm-run-all -lp hygiene eslint
|
||||
displayName: Compile & Hygiene
|
||||
|
||||
- script: |
|
||||
|
|
|
|||
|
|
@ -42,10 +42,6 @@ steps:
|
|||
# yarn monaco-compile-check
|
||||
# displayName: Run Monaco Editor Checks
|
||||
|
||||
- script: |
|
||||
yarn valid-layers-check
|
||||
displayName: Run Valid Layers Checks
|
||||
|
||||
- powershell: |
|
||||
yarn compile
|
||||
displayName: Compile Sources
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
steps:
|
||||
- task: NodeTool@0
|
||||
inputs:
|
||||
versionSpec: "18.15.0"
|
||||
versionSpec: "20.17.0"
|
||||
|
||||
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
|
||||
inputs:
|
||||
|
|
|
|||
|
|
@ -1,75 +1,75 @@
|
|||
af1d0a60fc87ada42198654c557212cbdcd6d0e0aeb4d8830a8f648cf50bf0ce *chromedriver-v25.9.8-darwin-arm64.zip
|
||||
26884d8bb8a491393891522b71aeb38fec868969744f4d7d38db94e0b74200b3 *chromedriver-v25.9.8-darwin-x64.zip
|
||||
d60463f02ee09e3b620ee1c1a4441a05992a1937f98e47ed8b249d392fc9d212 *chromedriver-v25.9.8-linux-arm64.zip
|
||||
4d5a84bd413a40475c6b545cb63c34ec17323fa753887012283d02c32a851f3b *chromedriver-v25.9.8-linux-armv7l.zip
|
||||
ceceb5c2ea8569b837952005d71f61036c1827128f387fd467c95a175771f3b7 *chromedriver-v25.9.8-linux-x64.zip
|
||||
5bf09c74032dd46f39022c3230b347c4d94a73558608b99d5ec56d031f63b83f *chromedriver-v25.9.8-mas-arm64.zip
|
||||
169abf7fcf62d8f41e27df739f3c75a4f0d25d0893593409db14b3650b42b45c *chromedriver-v25.9.8-mas-x64.zip
|
||||
25827c368f85b2ef5d64bb12bd54db8ea6c57266154376258165856f58383ddc *chromedriver-v25.9.8-win32-arm64.zip
|
||||
6da40b9557317c0cffd57456faf9489bbd761f321fb2bfffac90dcf16380f260 *chromedriver-v25.9.8-win32-ia32.zip
|
||||
082a535301e450f516259f3ecdaa64bba96df1cd06416d7b8a6f886bf7a11484 *chromedriver-v25.9.8-win32-x64.zip
|
||||
6e84820903a43cf19d645a5bf5678e692719169ddc4abab06cfca974decc22ad *electron-api.json
|
||||
c7cd3b0a217c140f5721734b1173e351d43a5aadebc170c4264ed25c34975bc9 *electron-v25.9.8-darwin-arm64-dsym-snapshot.zip
|
||||
d1c8121b505193662f3783c9681a3e258f47193c228c0c98bc6ed09fd311056b *electron-v25.9.8-darwin-arm64-dsym.zip
|
||||
e6d98eb4fd63208b42b5b11c52f4e2bc6d23457ae894f2e031c5024aa15a063b *electron-v25.9.8-darwin-arm64-symbols.zip
|
||||
c3660ba4dd6341422ff83acd4b674a74424145ffb6519ab16e1967a61598870f *electron-v25.9.8-darwin-arm64.zip
|
||||
fc57c56064773cc06efd34f7eea8a11aca6362dc0713ea04631f2e3b88edb1bc *electron-v25.9.8-darwin-x64-dsym-snapshot.zip
|
||||
48bb3f121eaedba9fbe061572e6be9dba8a0951c6754d5f813bbdef07e61dd01 *electron-v25.9.8-darwin-x64-dsym.zip
|
||||
0c522086740d2da5bf92ac48ff10eb493dce57577a95c2f69b085f2010801109 *electron-v25.9.8-darwin-x64-symbols.zip
|
||||
fae00b55b4d4fcf11976fd8f92dd0d4a7d10881f8d641d872dd6fba543dc71a4 *electron-v25.9.8-darwin-x64.zip
|
||||
8280da89a8297c6a46752925e05b8d1970c288134ab438493619e2435da4a80a *electron-v25.9.8-linux-arm64-debug.zip
|
||||
b0336e9110f4613907f1be51b8b5efe80b3af3e1d7c890fe03ca5f0f2cec225c *electron-v25.9.8-linux-arm64-symbols.zip
|
||||
e1a0e898410569fbc9b1611b55f99d7ca0d50d1e8dad0450e6a0959ad9b3ed93 *electron-v25.9.8-linux-arm64.zip
|
||||
8280da89a8297c6a46752925e05b8d1970c288134ab438493619e2435da4a80a *electron-v25.9.8-linux-armv7l-debug.zip
|
||||
624ebb21635f134c3b30d1e1a8e9255dd44167fa73ec3e35a85853fe2772ba06 *electron-v25.9.8-linux-armv7l-symbols.zip
|
||||
0a8bff6d84f934c3387d24c467aa3a0bec817d735b7b16677043c47692ef3524 *electron-v25.9.8-linux-armv7l.zip
|
||||
ae51ddaa1f429f97cf84f92a7e93a63627f3a88a8139115f639c9eee560757ac *electron-v25.9.8-linux-x64-debug.zip
|
||||
661b2fef1b3a8e8e2d1eaccc378c309e98bec39a1a64e64cf432693543247c7d *electron-v25.9.8-linux-x64-symbols.zip
|
||||
c77fec4d32d473f75611c76ef46d947da253821a64e48edf70dafb120b434752 *electron-v25.9.8-linux-x64.zip
|
||||
c7cd3b0a217c140f5721734b1173e351d43a5aadebc170c4264ed25c34975bc9 *electron-v25.9.8-mas-arm64-dsym-snapshot.zip
|
||||
88d3bba228b523957b4cf02d1de4d76aec585116afc60f6e46c1221a25f95c0d *electron-v25.9.8-mas-arm64-dsym.zip
|
||||
10d7db2eed2d345460fd7bf591d59478960f00dfc506a67be702ac7bf78c8206 *electron-v25.9.8-mas-arm64-symbols.zip
|
||||
525e798877f75d52c33820b51ce800ed0a1b5aec53e4af46426700c351d49e02 *electron-v25.9.8-mas-arm64.zip
|
||||
a0921765db6a9481dd0b14552edcef1f48fa5b1f3afb85fd962b9556be908755 *electron-v25.9.8-mas-x64-dsym-snapshot.zip
|
||||
30d2948de05d48d9d7487c07dde889296e62cc61b11ae3f1c152839bb655068f *electron-v25.9.8-mas-x64-dsym.zip
|
||||
53d5b6dd284f70abba9fa03e226801d959bfdede0c26b3d93730a8141ae612b5 *electron-v25.9.8-mas-x64-symbols.zip
|
||||
aca091a644078f265309244fb482d4a44f699fc10f6207b9ebbf3421fbecdfa8 *electron-v25.9.8-mas-x64.zip
|
||||
44d50d43fdeadb2ed882f42f6e25bb8acff362804393803dcd22355a5aed430b *electron-v25.9.8-win32-arm64-pdb.zip
|
||||
c23d57e23168cd62181bced40fb141346b308bbdfa45a12cf528c13a5aefd445 *electron-v25.9.8-win32-arm64-symbols.zip
|
||||
e7b968fc53cc7a10a4ccb5133af045968479685ebb9617f06817f03667fdd425 *electron-v25.9.8-win32-arm64-toolchain-profile.zip
|
||||
bd566d146cbaef6ab9729caa900f0a9cd0cea12713c4c500f4d82dfe27cc86b0 *electron-v25.9.8-win32-arm64.zip
|
||||
de4d9d66a1d55e5bc9876c0e8b6677f2c3a1bb466f962db2c87dd4fde99ab32d *electron-v25.9.8-win32-ia32-pdb.zip
|
||||
cd6e62b1494022c07ea820fbbef6f224901fe663f9bd21edbea4bfb04d766e2e *electron-v25.9.8-win32-ia32-symbols.zip
|
||||
e7b968fc53cc7a10a4ccb5133af045968479685ebb9617f06817f03667fdd425 *electron-v25.9.8-win32-ia32-toolchain-profile.zip
|
||||
5b93d155449f2015191dc53c3508c21ac989bd8707fee2548bc3b1a55506e689 *electron-v25.9.8-win32-ia32.zip
|
||||
b635e93ef5a5eae32c4c349d901e15b9c9715ccb1ed3c57d038351db4c6bafe6 *electron-v25.9.8-win32-x64-pdb.zip
|
||||
2bc21640c94d1983507880afece4f594ef8e87fd9df29ef676c8b7d73a2c7d98 *electron-v25.9.8-win32-x64-symbols.zip
|
||||
e7b968fc53cc7a10a4ccb5133af045968479685ebb9617f06817f03667fdd425 *electron-v25.9.8-win32-x64-toolchain-profile.zip
|
||||
c8d9a7fa63216527e81e38dbe29e628a4c63dfbd6ad8faef5cdcbbe755cba1e0 *electron-v25.9.8-win32-x64.zip
|
||||
70f12dada24b40589e2439ee3baf48bd1d800fad52217ca2acfa1d94cff0dd88 *electron.d.ts
|
||||
f4078ddb80d3349b246bd42d2c3134cf57a6a908ac3dbf58bc98a888b1097c6d *ffmpeg-v25.9.8-darwin-arm64.zip
|
||||
e4325ce77b427348c2b199d09c0383c668e07d54ea0b9f6668fc08f1c102e457 *ffmpeg-v25.9.8-darwin-x64.zip
|
||||
bd52d57ff97fb56ac01a3482af905d04f0d4e9c13c53858c6d9f99957eca82da *ffmpeg-v25.9.8-linux-arm64.zip
|
||||
9b3d09177fa1e63e2a6beecfa70aeec30aeb5c1873ff21128a68051c4e23f95d *ffmpeg-v25.9.8-linux-armv7l.zip
|
||||
edc7b1c9f1a0733f109a2c0375a4e40c5bfe0bf28b7f06dcc76e1ada0aa2f125 *ffmpeg-v25.9.8-linux-x64.zip
|
||||
d4cb7dba09bbb145691bf4e98fad7cb6c92506e32c87ade24fe7c3b62b687aa0 *ffmpeg-v25.9.8-mas-arm64.zip
|
||||
c0b856ce2bbaf37940c9a006f87cc0c5d8d2c23a2a909693b536beb40fe027cf *ffmpeg-v25.9.8-mas-x64.zip
|
||||
ebe648794492f9241df6c946bc659bfe7686ac09bd039ee305487a79995908cd *ffmpeg-v25.9.8-win32-arm64.zip
|
||||
18aa4201f02eaf6830af4d88356516728ea0d249d1d488bd4aa04f4f3fb59c35 *ffmpeg-v25.9.8-win32-ia32.zip
|
||||
4d7ba4ce56442426a4c3a57c4b6d113b76cc13268a6631c9e652c8312ba60507 *ffmpeg-v25.9.8-win32-x64.zip
|
||||
47d9364189c214a3200a80ae6298e451326091078a315e61a68a39257d07d0d0 *hunspell_dictionaries.zip
|
||||
00d7cf46a1c13ede99662e32991ad32d38f232016eedd348c0e6b1bd20d64766 *libcxx-objects-v25.9.8-linux-arm64.zip
|
||||
112885212f8c6af21fddfc48763921611b0ddbe7cc56157141f04f1e7e56b967 *libcxx-objects-v25.9.8-linux-armv7l.zip
|
||||
ebef4944e2d2cd783731311ae1bc591815d687424217d723ccc2445098917e42 *libcxx-objects-v25.9.8-linux-x64.zip
|
||||
e0856686317b8edaec586e8f6264ae87711e4a04c47ee0bb84b22207c4e38e4c *libcxx_headers.zip
|
||||
202da6696c538562aa7d325c9828baa7990dbaafc64874968aeb7f8348e427a4 *libcxxabi_headers.zip
|
||||
360c43637e0b478aaea555620a64cba709b412f1b5602ac84a1fa7d22e208444 *mksnapshot-v25.9.8-darwin-arm64.zip
|
||||
d3d5dd3fed313fdce519ab8fc8c9cf831cca03a40357d5ec169e95c0f0753a93 *mksnapshot-v25.9.8-darwin-x64.zip
|
||||
3c88fe6d7a804e0d2eda1c6ea8e63e707779e2078454e468e505fc0db2e39790 *mksnapshot-v25.9.8-linux-arm64-x64.zip
|
||||
6d3ba6501d972667cc4455b22b2fdec922492dfdb9713d6e2f820c0d9ed0dbc8 *mksnapshot-v25.9.8-linux-armv7l-x64.zip
|
||||
97c92e2386b429eb80cac0a9785df248a7a0aa3a209c7e7212003736a34639d7 *mksnapshot-v25.9.8-linux-x64.zip
|
||||
25f3dbcbf5ab78f4a6667b88f37d8944ade0065e5d6a156d345e44fc55d4b8c9 *mksnapshot-v25.9.8-mas-arm64.zip
|
||||
e5bf2e39980ff1e9787a7c3e58953b191bcc8a7f74e68d2793ef6c686145845e *mksnapshot-v25.9.8-mas-x64.zip
|
||||
bfcfd7d8bf640a32759d658755efc5e0df4817fe61f95f586022fe4a14713d90 *mksnapshot-v25.9.8-win32-arm64-x64.zip
|
||||
5bdbd50faf800cf98515b4639f1b0d6d8dc9c61ea734326c94c256f5cc3a1595 *mksnapshot-v25.9.8-win32-ia32.zip
|
||||
cc9b5797c8fa1950fdaf121a44a81ad140ec677847399d2b0f1f4297b9847901 *mksnapshot-v25.9.8-win32-x64.zip
|
||||
3de7da4462c7690f75680aecac8fddedc4b998d0da769136d8eff2932b36004e *chromedriver-v30.5.1-darwin-arm64.zip
|
||||
d89b89f7c2ba45cb10df7fc23722bacf6f77e13002c42648762cd18ae3fa9182 *chromedriver-v30.5.1-darwin-x64.zip
|
||||
3722d46929fd2c7b33c17d37464a08150e60d9269053eb67195795254fb5e947 *chromedriver-v30.5.1-linux-arm64.zip
|
||||
a786d51f834c24b768bd415bf9a2fc5c1d9abdf9dc0b1a091bf9a8ff101becfe *chromedriver-v30.5.1-linux-armv7l.zip
|
||||
688e4da8dbcb7dbfacab6f29341d96736e6d06e4c8029835b83ef30b69885b01 *chromedriver-v30.5.1-linux-x64.zip
|
||||
786a7c2659ad97d5a09866b9aafd55edc015cb17a87bd8d72aa5925f2bfcf55a *chromedriver-v30.5.1-mas-arm64.zip
|
||||
398759d1dc02fc4928d48ff0f8fbade8811347e1a51d1cedcb2ba9350fbed04d *chromedriver-v30.5.1-mas-x64.zip
|
||||
65766f1270d1876e2a81acfb4b1130dc4a41eb7165842afa8f41ea438bf2fecb *chromedriver-v30.5.1-win32-arm64.zip
|
||||
ca9fe0abd1032ebd51497049cb1bb2ae1dd9592697b278f6b1ee2a1a25148891 *chromedriver-v30.5.1-win32-ia32.zip
|
||||
b6b6ea2202e0139ea436288add736d19078bfb190fc0b22937283927f3024bb9 *chromedriver-v30.5.1-win32-x64.zip
|
||||
50e8b2d59916bc180873324fdbeb8227dbb8b2375cc936e58b7c9885fb23376d *electron-api.json
|
||||
595db4fa3f755432bf59cbbaf591ee44b576e15952d014d83d3748646b2e338c *electron-v30.5.1-darwin-arm64-dsym-snapshot.zip
|
||||
c1beb80553f3c9575e638625ce0ffbfdb87b6f8b23799eb132954b2bb74a9a2f *electron-v30.5.1-darwin-arm64-dsym.zip
|
||||
cba315d6d6f607a2ee6cfc437b46f92da88daded86f0130d85129adb4742bc48 *electron-v30.5.1-darwin-arm64-symbols.zip
|
||||
d312544ea29844cf328b44b9dbde12f4fdced90cb442dfca6df36c098dbb6e7a *electron-v30.5.1-darwin-arm64.zip
|
||||
fd24d585d28909c082d703db3fcc5ffa0b55e1077ff320e25ed510f36e6a3761 *electron-v30.5.1-darwin-x64-dsym-snapshot.zip
|
||||
4d1a2adea4b98c4d0b03c6561fca146aab102d636d359e48ce418c465df891ae *electron-v30.5.1-darwin-x64-dsym.zip
|
||||
d9065eaf659f4c3e8a75f5453ceb65269763b2e57110bdcc01904b9a1e33a62c *electron-v30.5.1-darwin-x64-symbols.zip
|
||||
faf9dcc20d525607ea205f2f6a1dfe3270f6268aa439bb0ba5646c7e4fbbd842 *electron-v30.5.1-darwin-x64.zip
|
||||
b85dba1cdb49591542dcecff3e710f29b81285569c8c5db8c1181c3ed818ba44 *electron-v30.5.1-linux-arm64-debug.zip
|
||||
5e97cc105282783d1c20d8e8dd4ca1134342839235288840cb50f314ca7a6ede *electron-v30.5.1-linux-arm64-symbols.zip
|
||||
eb31470c0d7cd6e23e7ce0d89cc93a2356c9dac8bcc997e335353b8aa995afa0 *electron-v30.5.1-linux-arm64.zip
|
||||
b85dba1cdb49591542dcecff3e710f29b81285569c8c5db8c1181c3ed818ba44 *electron-v30.5.1-linux-armv7l-debug.zip
|
||||
137548cd73cd648107f6e01c777e411838173309848a492b42825857cec7d110 *electron-v30.5.1-linux-armv7l-symbols.zip
|
||||
224bd46983e503101c756c72d10b195f14712a7a56438718acb126017dd04edf *electron-v30.5.1-linux-armv7l.zip
|
||||
1f87fadebc444c9c0de43f52972a3f61af83ca0594c3de368f7579ce613fcb60 *electron-v30.5.1-linux-x64-debug.zip
|
||||
aae78654f599a68310bdbdc0e3de8db644320ef44e58a5c6e5c693dff5cd1970 *electron-v30.5.1-linux-x64-symbols.zip
|
||||
ec4707783d39e86005f42899e30ae59e50dd5d9c7f28531ed494eb43f2361403 *electron-v30.5.1-linux-x64.zip
|
||||
c61f3121e52fd29987814b7805b597ef3fc78b2ce891eba5e3fc6bbe14128f23 *electron-v30.5.1-mas-arm64-dsym-snapshot.zip
|
||||
f934e55ef6c986d3ec56626b2605fed16030efc45efcd8b05afa9322d625ec56 *electron-v30.5.1-mas-arm64-dsym.zip
|
||||
3cc36e99f2cd59d7cb2f47b52d19609c2a2358f6ddde35fd832872abe241cc8d *electron-v30.5.1-mas-arm64-symbols.zip
|
||||
c5085ab1fb74dfa4a4e463dcb688989bc63baf44007419fd96db4e7c974fb6db *electron-v30.5.1-mas-arm64.zip
|
||||
47102b6dcd5892de734be2b48e40bbbdbc5e0a228bf5fec33071661d2724d946 *electron-v30.5.1-mas-x64-dsym-snapshot.zip
|
||||
607091ddfd313ed27bb5a0acb6fa58b0d65cb87e6c6ce9b373949b4b152476d8 *electron-v30.5.1-mas-x64-dsym.zip
|
||||
ac49568635d41e1075bca39c97aca1f2fcede702f721ddce5d80f18cc2dd1067 *electron-v30.5.1-mas-x64-symbols.zip
|
||||
3746bc4ba32ab9c11398a393d54ba81733088729ae7cef4e5dccf1e64dc82b0a *electron-v30.5.1-mas-x64.zip
|
||||
930ad941c8bc0aa5e4e3457b235f104846939974d71bde5b42a8980de2d4a35d *electron-v30.5.1-win32-arm64-pdb.zip
|
||||
11c1252547b381ab6e40cc032ee60c5209dee9ea1102d1b47ad3fcd4da03049f *electron-v30.5.1-win32-arm64-symbols.zip
|
||||
7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v30.5.1-win32-arm64-toolchain-profile.zip
|
||||
f18baa98ba9c04b346fda9f40fc3150a57b539d0cd510971a073983f78e0a20c *electron-v30.5.1-win32-arm64.zip
|
||||
b03c7297dc61aa234ab2273c419d9ae064e52c2c0c3dd56f09135f81964630b5 *electron-v30.5.1-win32-ia32-pdb.zip
|
||||
8fc570c7f4d97eb6b745fb4af5932311d1da57058da8f39a3d97d6e099cd6982 *electron-v30.5.1-win32-ia32-symbols.zip
|
||||
7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v30.5.1-win32-ia32-toolchain-profile.zip
|
||||
20845163bf9d5a4ead03c5f0280c9bae71f0ab1fc03362f3406ed12620e4d9cd *electron-v30.5.1-win32-ia32.zip
|
||||
019f3ae97a69dc837d89c44d25e0e5dadc88564b74202c5a3524fc6ab59490bc *electron-v30.5.1-win32-x64-pdb.zip
|
||||
2eb4889fe275e5ea42cf6f51821bcceb833d5714aa1b45ad7915495afb447e94 *electron-v30.5.1-win32-x64-symbols.zip
|
||||
7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v30.5.1-win32-x64-toolchain-profile.zip
|
||||
443119bb559fc2ca297a57cf79f2bce532e853ada070c1e71460c9657c13b4b3 *electron-v30.5.1-win32-x64.zip
|
||||
deecdc1f3f5ea9548ef73774f412c7af489afeb7dca1c394b5add10e929aff42 *electron.d.ts
|
||||
14319b51118a5c94e108731f6b5c4e701c700212e790198ba22242eb9674a334 *ffmpeg-v30.5.1-darwin-arm64.zip
|
||||
bfd5110457438fa8b113a8806db45f30b8975304d95e5efb1b71b0f5e46757fe *ffmpeg-v30.5.1-darwin-x64.zip
|
||||
44ebf3185fc24404647da0c1f9e496effefd32ff3dbc2499c022164b919d06ed *ffmpeg-v30.5.1-linux-arm64.zip
|
||||
4f7583513d48b48c44a2cbc4430cbc9a33d8f9728622166db688e3de61190821 *ffmpeg-v30.5.1-linux-armv7l.zip
|
||||
154900e5db5810f63e38fd4551cfff3d88d6eac39226e06e12e1e43558d360a4 *ffmpeg-v30.5.1-linux-x64.zip
|
||||
14319b51118a5c94e108731f6b5c4e701c700212e790198ba22242eb9674a334 *ffmpeg-v30.5.1-mas-arm64.zip
|
||||
bfd5110457438fa8b113a8806db45f30b8975304d95e5efb1b71b0f5e46757fe *ffmpeg-v30.5.1-mas-x64.zip
|
||||
f2169c4b6b9f073c20652953599f2453947936e851ff25c9f2719e7d889faea3 *ffmpeg-v30.5.1-win32-arm64.zip
|
||||
90745f1422ae0431b295cb5d27ff03e69c890f3572ef6c4655774b892419e94f *ffmpeg-v30.5.1-win32-ia32.zip
|
||||
567fe8952f17b224d4492980af741b470e86b31d58e7c6a9262258eeae490122 *ffmpeg-v30.5.1-win32-x64.zip
|
||||
8bbbadb52a19f074d9f8bd533891e2bacbe4813101ae6c344cfc88e28b1429a3 *hunspell_dictionaries.zip
|
||||
61137508aee6837c70a2ead2e31dd106d753ec5fac01b49e7e8701be0e09e7aa *libcxx-objects-v30.5.1-linux-arm64.zip
|
||||
3c285f012f256f767e777550a1f18054cfcffc4e13ad6fa4e4e90dd58ec22069 *libcxx-objects-v30.5.1-linux-armv7l.zip
|
||||
9b96b53c8dfbc70a0f617f78dde89a1e8510ae2261bcddfbf7c12c61eb5a3d73 *libcxx-objects-v30.5.1-linux-x64.zip
|
||||
1b5cbe24d6356a388e166bff60d7452583019ea7dec85f593c552eb287346f43 *libcxx_headers.zip
|
||||
eae200a0d1fd0d4b881358bdef600111891c75ecc4db679b680b0cbaf87ecfc3 *libcxxabi_headers.zip
|
||||
ed1f7463b5869acf57dd388208918652182b049b2846f572d52ed47e7c091d54 *mksnapshot-v30.5.1-darwin-arm64.zip
|
||||
bc80de1f29b869cdb2676d2dc08cbb4bd6228a6825b1b0bfc13acee0b070ac3e *mksnapshot-v30.5.1-darwin-x64.zip
|
||||
5e526ca4f4250a9b9b040d6eb60f1d2b8db974ab68c27e46198f4bf8dc1ef347 *mksnapshot-v30.5.1-linux-arm64-x64.zip
|
||||
c40ca2a45cc9ab4e1668f063860ba243baef8c192a253638e4c93aaccb0ef8da *mksnapshot-v30.5.1-linux-armv7l-x64.zip
|
||||
a3134e0b0980547167dd3ca2f17dd2f40a7db697ab563ba6257534f9ad0d256d *mksnapshot-v30.5.1-linux-x64.zip
|
||||
82776eafcb3e4d053e275ad50d84151f41a651986baacda20c6ed722854cb8fb *mksnapshot-v30.5.1-mas-arm64.zip
|
||||
9d6d95d4cb121a29fd68d64557edd8c9859345ac37d0645de8aff518391755ed *mksnapshot-v30.5.1-mas-x64.zip
|
||||
94b9ce6cb40ae001962b77525d12483c3458776066a69a4e714b327bab1decfc *mksnapshot-v30.5.1-win32-arm64-x64.zip
|
||||
4d89d06c2e85b25d52bb64f48258ad5d05b98ac21697ae9c49ccd19bad9d7d94 *mksnapshot-v30.5.1-win32-ia32.zip
|
||||
ccfd322bafde0485a0ac6b0acc3669c7b08f30003a1c2e044eebc1bf02289de3 *mksnapshot-v30.5.1-win32-x64.zip
|
||||
|
|
@ -440,7 +440,7 @@ function patchWin32DependenciesTask(destinationFolderName) {
|
|||
const cwd = path.join(path.dirname(root), destinationFolderName);
|
||||
|
||||
return async () => {
|
||||
const deps = await glob('**/*.node', { cwd });
|
||||
const deps = await glob('**/*.node', { cwd, ignore: 'extensions/node_modules/@parcel/watcher/**' });
|
||||
const packageJson = JSON.parse(await fs.promises.readFile(path.join(cwd, 'resources', 'app', 'package.json'), 'utf8'));
|
||||
const product = JSON.parse(await fs.promises.readFile(path.join(cwd, 'resources', 'app', 'product.json'), 'utf8'));
|
||||
const baseVersion = packageJson.version.replace(/-.*$/, '');
|
||||
|
|
|
|||
|
|
@ -234,7 +234,7 @@ class MonacoGenerator {
|
|||
}
|
||||
}
|
||||
|
||||
private _executeSoonTimer: NodeJS.Timer | null = null;
|
||||
private _executeSoonTimer: NodeJS.Timeout | null = null;
|
||||
private _executeSoon(): void {
|
||||
if (this._executeSoonTimer !== null) {
|
||||
clearTimeout(this._executeSoonTimer);
|
||||
|
|
|
|||
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
|
@ -118,8 +118,7 @@ export const config = {
|
|||
winIcon: 'resources/win32/code.ico',
|
||||
token: process.env['GITHUB_TOKEN'],
|
||||
repo: product.electronRepository || undefined,
|
||||
validateChecksum: true,
|
||||
checksumFile: path.join(root, 'build', 'checksums', 'electron.txt'),
|
||||
validateChecksum: false
|
||||
};
|
||||
|
||||
function getElectron(arch: string): () => NodeJS.ReadWriteStream {
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ function yarnInstall(dir, opts) {
|
|||
...(opts ?? {}),
|
||||
cwd: dir,
|
||||
stdio: 'inherit',
|
||||
shell: true
|
||||
};
|
||||
|
||||
const raw = process.env['npm_config_argv'] || '{}';
|
||||
|
|
|
|||
|
|
@ -10,12 +10,9 @@ const minorNodeVersion = parseInt(nodeVersion[2]);
|
|||
const patchNodeVersion = parseInt(nodeVersion[3]);
|
||||
|
||||
if (!process.env['VSCODE_SKIP_NODE_VERSION_CHECK']) {
|
||||
if (majorNodeVersion < 18 || (majorNodeVersion === 18 && minorNodeVersion < 15)) {
|
||||
console.error('\033[1;31m*** Please use node.js versions >=18.15.x and <19.\033[0;0m');
|
||||
err = true;
|
||||
}
|
||||
if (majorNodeVersion >= 19) {
|
||||
console.warn('\033[1;31m*** Warning: Versions of node.js >= 19 have not been tested.\033[0;0m')
|
||||
if (majorNodeVersion < 20) {
|
||||
console.error('\x1b[1;31m*** Please use latest Node.js v20 LTS for development.\x1b[0;0m');
|
||||
throw new Error();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -102,10 +99,11 @@ function installHeaders() {
|
|||
const yarnResult = cp.spawnSync(yarn, ['install'], {
|
||||
env: process.env,
|
||||
cwd: path.join(__dirname, 'gyp'),
|
||||
stdio: 'inherit'
|
||||
stdio: 'inherit',
|
||||
shell: true
|
||||
});
|
||||
if (yarnResult.error || yarnResult.status !== 0) {
|
||||
console.error(`Installing node-gyp failed`);
|
||||
console.error(`Installing node-gyp failed: ` + yarnResult.error + " --- " + yarnResult.status);
|
||||
err = true;
|
||||
return;
|
||||
}
|
||||
|
|
@ -114,7 +112,7 @@ function installHeaders() {
|
|||
// file checked into our repository. So from that point it is save to construct the path
|
||||
// to that executable
|
||||
const node_gyp = path.join(__dirname, 'gyp', 'node_modules', '.bin', 'node-gyp.cmd');
|
||||
const result = cp.execFileSync(node_gyp, ['list'], { encoding: 'utf8' });
|
||||
const result = cp.execFileSync(node_gyp, ['list'], { encoding: 'utf8', shell: true });
|
||||
const versions = new Set(result.split(/\n/g).filter(line => !line.startsWith('gyp info')).map(value => value));
|
||||
|
||||
const local = getHeaderInfo(path.join(__dirname, '..', '..', '.yarnrc'));
|
||||
|
|
@ -122,7 +120,7 @@ function installHeaders() {
|
|||
|
||||
if (local !== undefined && !versions.has(local.target)) {
|
||||
// Both disturl and target come from a file checked into our repository
|
||||
cp.execFileSync(node_gyp, ['install', '--dist-url', local.disturl, local.target]);
|
||||
cp.execFileSync(node_gyp, ['install', '--dist-url', local.disturl, local.target], { shell: true });
|
||||
}
|
||||
|
||||
// Avoid downloading headers for Windows arm64 till we move to Nodejs v19 in remote
|
||||
|
|
@ -139,7 +137,7 @@ function installHeaders() {
|
|||
process.env['npm_config_arch'] !== "arm64" &&
|
||||
process.arch !== "arm64") {
|
||||
// Both disturl and target come from a file checked into our repository
|
||||
cp.execFileSync(node_gyp, ['install', '--dist-url', remote.disturl, remote.target]);
|
||||
cp.execFileSync(node_gyp, ['install', '--dist-url', remote.disturl, remote.target], { shell: true });
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
"@actions/core": "1.9.1",
|
||||
"@actions/github": "^5.0.3",
|
||||
"@azure/cosmos": "^3.17.3",
|
||||
"@azure/identity": "^3.3.0",
|
||||
"@azure/identity": "^4.2.1",
|
||||
"@azure/storage-blob": "^12.16.0",
|
||||
"@electron/get": "^3.0.0",
|
||||
"@types/ansi-colors": "^3.2.0",
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
"@types/minimist": "^1.2.1",
|
||||
"@types/mkdirp": "^1.0.1",
|
||||
"@types/mocha": "^9.1.1",
|
||||
"@types/node": "18.x",
|
||||
"@types/node": "20.x",
|
||||
"@types/p-limit": "^2.2.0",
|
||||
"@types/plist": "^3.0.2",
|
||||
"@types/pump": "^1.0.1",
|
||||
|
|
|
|||
|
|
@ -34,6 +34,13 @@
|
|||
dependencies:
|
||||
tslib "^2.0.0"
|
||||
|
||||
"@azure/abort-controller@^2.0.0":
|
||||
version "2.1.2"
|
||||
resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-2.1.2.tgz#42fe0ccab23841d9905812c58f1082d27784566d"
|
||||
integrity sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==
|
||||
dependencies:
|
||||
tslib "^2.6.2"
|
||||
|
||||
"@azure/core-asynciterator-polyfill@^1.0.0":
|
||||
version "1.0.0"
|
||||
resolved "https://registry.npmjs.org/@azure/core-asynciterator-polyfill/-/core-asynciterator-polyfill-1.0.0.tgz"
|
||||
|
|
@ -56,18 +63,18 @@
|
|||
"@azure/core-util" "^1.1.0"
|
||||
tslib "^2.2.0"
|
||||
|
||||
"@azure/core-client@^1.4.0":
|
||||
version "1.6.1"
|
||||
resolved "https://registry.npmjs.org/@azure/core-client/-/core-client-1.6.1.tgz"
|
||||
integrity sha512-mZ1MSKhZBYoV8GAWceA+PEJFWV2VpdNSpxxcj1wjIAOi00ykRuIQChT99xlQGZWLY3/NApWhSImlFwsmCEs4vA==
|
||||
"@azure/core-client@^1.9.2":
|
||||
version "1.9.2"
|
||||
resolved "https://registry.yarnpkg.com/@azure/core-client/-/core-client-1.9.2.tgz#6fc69cee2816883ab6c5cdd653ee4f2ff9774f74"
|
||||
integrity sha512-kRdry/rav3fUKHl/aDLd/pDLcB+4pOFwPPTVEExuMyaI5r+JBbMWqRbCY1pn5BniDaU3lRxO9eaQ1AmSMehl/w==
|
||||
dependencies:
|
||||
"@azure/abort-controller" "^1.0.0"
|
||||
"@azure/abort-controller" "^2.0.0"
|
||||
"@azure/core-auth" "^1.4.0"
|
||||
"@azure/core-rest-pipeline" "^1.9.1"
|
||||
"@azure/core-tracing" "^1.0.0"
|
||||
"@azure/core-util" "^1.0.0"
|
||||
"@azure/core-util" "^1.6.1"
|
||||
"@azure/logger" "^1.0.0"
|
||||
tslib "^2.2.0"
|
||||
tslib "^2.6.2"
|
||||
|
||||
"@azure/core-http@^3.0.0":
|
||||
version "3.0.1"
|
||||
|
|
@ -159,6 +166,14 @@
|
|||
"@azure/abort-controller" "^1.0.0"
|
||||
tslib "^2.2.0"
|
||||
|
||||
"@azure/core-util@^1.3.0", "@azure/core-util@^1.6.1":
|
||||
version "1.10.0"
|
||||
resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.10.0.tgz#cf3163382d40343972848c914869864df5d44bdb"
|
||||
integrity sha512-dqLWQsh9Nro1YQU+405POVtXnwrIVqPyfUzc4zXCbThTg7+vNNaiMkwbX9AMXKyoFYFClxmB3s25ZFr3+jZkww==
|
||||
dependencies:
|
||||
"@azure/abort-controller" "^2.0.0"
|
||||
tslib "^2.6.2"
|
||||
|
||||
"@azure/cosmos@^3.17.3":
|
||||
version "3.17.3"
|
||||
resolved "https://registry.yarnpkg.com/@azure/cosmos/-/cosmos-3.17.3.tgz#380398496af8ef3473ae0a9ad8cdbab32d91eb08"
|
||||
|
|
@ -178,27 +193,25 @@
|
|||
universal-user-agent "^6.0.0"
|
||||
uuid "^8.3.0"
|
||||
|
||||
"@azure/identity@^3.3.0":
|
||||
version "3.3.0"
|
||||
resolved "https://registry.yarnpkg.com/@azure/identity/-/identity-3.3.0.tgz#0166cfdfa892d73eeb69c390dac91796c6f85f79"
|
||||
integrity sha512-gISa/dAAxrWt6F2WiDXZY0y2xY4MLlN2wkNW4cPuq5OgPQKLSkxLc4I2WR04puTfZyQZnpXbAapAMEj1b96fgg==
|
||||
"@azure/identity@^4.2.1":
|
||||
version "4.4.1"
|
||||
resolved "https://registry.yarnpkg.com/@azure/identity/-/identity-4.4.1.tgz#490fa2ad26786229afa36411892bb53dfa3478d3"
|
||||
integrity sha512-DwnG4cKFEM7S3T+9u05NstXU/HN0dk45kPOinUyNKsn5VWwpXd9sbPKEg6kgJzGbm1lMuhx9o31PVbCtM5sfBA==
|
||||
dependencies:
|
||||
"@azure/abort-controller" "^1.0.0"
|
||||
"@azure/core-auth" "^1.5.0"
|
||||
"@azure/core-client" "^1.4.0"
|
||||
"@azure/core-client" "^1.9.2"
|
||||
"@azure/core-rest-pipeline" "^1.1.0"
|
||||
"@azure/core-tracing" "^1.0.0"
|
||||
"@azure/core-util" "^1.0.0"
|
||||
"@azure/core-util" "^1.3.0"
|
||||
"@azure/logger" "^1.0.0"
|
||||
"@azure/msal-browser" "^2.37.1"
|
||||
"@azure/msal-common" "^13.1.0"
|
||||
"@azure/msal-node" "^1.17.3"
|
||||
"@azure/msal-browser" "^3.14.0"
|
||||
"@azure/msal-node" "^2.9.2"
|
||||
events "^3.0.0"
|
||||
jws "^4.0.0"
|
||||
open "^8.0.0"
|
||||
stoppable "^1.1.0"
|
||||
tslib "^2.2.0"
|
||||
uuid "^8.3.0"
|
||||
|
||||
"@azure/logger@^1.0.0":
|
||||
version "1.0.1"
|
||||
|
|
@ -207,24 +220,24 @@
|
|||
dependencies:
|
||||
tslib "^2.0.0"
|
||||
|
||||
"@azure/msal-browser@^2.37.1":
|
||||
version "2.38.2"
|
||||
resolved "https://registry.yarnpkg.com/@azure/msal-browser/-/msal-browser-2.38.2.tgz#707725c892258fe6b3af4dd410e1daff608521b5"
|
||||
integrity sha512-71BeIn2we6LIgMplwCSaMq5zAwmalyJR3jFcVOZxNVfQ1saBRwOD+P77nLs5vrRCedVKTq8RMFhIOdpMLNno0A==
|
||||
"@azure/msal-browser@^3.14.0":
|
||||
version "3.24.0"
|
||||
resolved "https://registry.yarnpkg.com/@azure/msal-browser/-/msal-browser-3.24.0.tgz#3208047672d0b0c943b0bef5f995d510d6582ae4"
|
||||
integrity sha512-JGNV9hTYAa7lsum9IMIibn2kKczAojNihGo1hi7pG0kNrcKej530Fl6jxwM05A44/6I079CSn6WxYxbVhKUmWg==
|
||||
dependencies:
|
||||
"@azure/msal-common" "13.3.0"
|
||||
"@azure/msal-common" "14.15.0"
|
||||
|
||||
"@azure/msal-common@13.3.0", "@azure/msal-common@^13.1.0":
|
||||
version "13.3.0"
|
||||
resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-13.3.0.tgz#dfa39810e0fbce6e07ca85a2cf305da58d30b7c9"
|
||||
integrity sha512-/VFWTicjcJbrGp3yQP7A24xU95NiDMe23vxIU1U6qdRPFsprMDNUohMudclnd+WSHE4/McqkZs/nUU3sAKkVjg==
|
||||
"@azure/msal-common@14.15.0":
|
||||
version "14.15.0"
|
||||
resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-14.15.0.tgz#0e27ac0bb88fe100f4f8d1605b64d5c268636a55"
|
||||
integrity sha512-ImAQHxmpMneJ/4S8BRFhjt1MZ3bppmpRPYYNyzeQPeFN288YKbb8TmmISQEbtfkQ1BPASvYZU5doIZOPBAqENQ==
|
||||
|
||||
"@azure/msal-node@^1.17.3":
|
||||
version "1.18.3"
|
||||
resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-1.18.3.tgz#e265556d4db0340590eeab5341469fb6740251d0"
|
||||
integrity sha512-lI1OsxNbS/gxRD4548Wyj22Dk8kS7eGMwD9GlBZvQmFV8FJUXoXySL1BiNzDsHUE96/DS/DHmA+F73p1Dkcktg==
|
||||
"@azure/msal-node@^2.9.2":
|
||||
version "2.14.0"
|
||||
resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-2.14.0.tgz#7881895d41b03d8b9b38a29550ba3bbb15f73b3c"
|
||||
integrity sha512-rrfzIpG3Q1rHjVYZmHAEDidWAZZ2cgkxlIcMQ8dHebRISaZ2KCV33Q8Vs+uaV6lxweROabNxKFlR2lIKagZqYg==
|
||||
dependencies:
|
||||
"@azure/msal-common" "13.3.0"
|
||||
"@azure/msal-common" "14.15.0"
|
||||
jsonwebtoken "^9.0.0"
|
||||
uuid "^8.3.0"
|
||||
|
||||
|
|
@ -731,10 +744,12 @@
|
|||
resolved "https://registry.npmjs.org/@types/node/-/node-16.11.62.tgz"
|
||||
integrity sha512-K/ggecSdwAAy2NUW4WKmF4Rc03GKbsfP+k326UWgckoS+Rzd2PaWbjk76dSmqdLQvLTJAO9axiTUJ6488mFsYQ==
|
||||
|
||||
"@types/node@18.x":
|
||||
version "18.15.13"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469"
|
||||
integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==
|
||||
"@types/node@20.x":
|
||||
version "20.16.10"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.10.tgz#0cc3fdd3daf114a4776f54ba19726a01c907ef71"
|
||||
integrity sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==
|
||||
dependencies:
|
||||
undici-types "~6.19.2"
|
||||
|
||||
"@types/p-limit@^2.2.0":
|
||||
version "2.2.0"
|
||||
|
|
@ -3397,6 +3412,11 @@ tslib@^2.2.0:
|
|||
resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz"
|
||||
integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
|
||||
|
||||
tslib@^2.6.2:
|
||||
version "2.7.0"
|
||||
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01"
|
||||
integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==
|
||||
|
||||
tsutils@^3.21.0:
|
||||
version "3.21.0"
|
||||
resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz"
|
||||
|
|
@ -3445,6 +3465,11 @@ underscore@^1.12.1:
|
|||
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
|
||||
integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
|
||||
|
||||
undici-types@~6.19.2:
|
||||
version "6.19.8"
|
||||
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
|
||||
integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
|
||||
|
||||
universal-user-agent@^6.0.0:
|
||||
version "6.0.0"
|
||||
resolved "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz"
|
||||
|
|
|
|||
|
|
@ -528,12 +528,12 @@
|
|||
"git": {
|
||||
"name": "electron",
|
||||
"repositoryUrl": "https://github.com/electron/electron",
|
||||
"commitHash": "69fe268d4d3ccc23eece0f5ca4bfbd44d85786b1"
|
||||
"commitHash": "a07a70e8db21718dd76644d99892d3e15e0ed440"
|
||||
}
|
||||
},
|
||||
"isOnlyProductionDependency": true,
|
||||
"license": "MIT",
|
||||
"version": "25.9.8"
|
||||
"version": "30.5.1"
|
||||
},
|
||||
{
|
||||
"component": {
|
||||
|
|
|
|||
|
|
@ -507,7 +507,7 @@
|
|||
"@azure/arm-resourcegraph": "^4.2.1",
|
||||
"@azure/arm-subscriptions": "^3.0.0",
|
||||
"@azure/msal-common": "11.0.0",
|
||||
"@azure/msal-node": "2.9.2",
|
||||
"@azure/msal-node": "^2.13.1",
|
||||
"@azure/ms-rest-js": "^2.2.0",
|
||||
"@azure/storage-blob": "^12.13.0",
|
||||
"axios": "^1.6.0",
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ export class SimpleWebServer {
|
|||
private readonly pathMappings = new Map<string, WebHandler>();
|
||||
private readonly server: http.Server;
|
||||
private lastUsed: number = new Date().getTime();
|
||||
private shutoffInterval: NodeJS.Timer;
|
||||
private shutoffInterval: NodeJS.Timeout;
|
||||
|
||||
constructor(private readonly autoShutoffTimer = 5 * 60 * 1000) { // Default to five minutes.
|
||||
this.bumpLastUsed();
|
||||
|
|
@ -64,7 +64,7 @@ export class SimpleWebServer {
|
|||
throw new AlreadyRunningError();
|
||||
}
|
||||
this.hasStarted = true;
|
||||
let portTimeout: NodeJS.Timer;
|
||||
let portTimeout: NodeJS.Timeout;
|
||||
const portPromise = new Promise<string>((resolve, reject) => {
|
||||
portTimeout = setTimeout(() => {
|
||||
reject(new Error('Timed out waiting for the server to start'));
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ class AzureTerminal implements vscode.Pseudoterminal {
|
|||
public readonly onDidWrite: vscode.Event<string>;
|
||||
|
||||
private socket: WS | undefined = undefined;
|
||||
private intervalTimer: NodeJS.Timer | undefined = undefined;
|
||||
private intervalTimer: NodeJS.Timeout | undefined = undefined;
|
||||
private terminalDimensions: vscode.TerminalDimensions | undefined;
|
||||
|
||||
constructor(private readonly consoleUri: string, private readonly token: string, private shell: string) {
|
||||
|
|
|
|||
|
|
@ -134,17 +134,17 @@
|
|||
resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-11.0.0.tgz#d35bfa6cdd2a5b8c036ce427aa3fd36f8f985239"
|
||||
integrity sha512-SZH8ObQ3Hq5v3ogVGBYJp1nNW7p+MtM4PH4wfNadBP9wf7K0beQHF9iOtRcjPOkwZf+ZD49oXqw91LndIkdk8g==
|
||||
|
||||
"@azure/msal-common@14.12.0":
|
||||
version "14.12.0"
|
||||
resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-14.12.0.tgz#844abe269b071f8fa8949dadc2a7b65bbb147588"
|
||||
integrity sha512-IDDXmzfdwmDkv4SSmMEyAniJf6fDu3FJ7ncOjlxkDuT85uSnLEhZi3fGZpoR7T4XZpOMx9teM9GXBgrfJgyeBw==
|
||||
"@azure/msal-common@14.15.0":
|
||||
version "14.15.0"
|
||||
resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-14.15.0.tgz#0e27ac0bb88fe100f4f8d1605b64d5c268636a55"
|
||||
integrity sha512-ImAQHxmpMneJ/4S8BRFhjt1MZ3bppmpRPYYNyzeQPeFN288YKbb8TmmISQEbtfkQ1BPASvYZU5doIZOPBAqENQ==
|
||||
|
||||
"@azure/msal-node@2.9.2":
|
||||
version "2.9.2"
|
||||
resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-2.9.2.tgz#e6d3c1661012c1bd0ef68e328f73a2fdede52931"
|
||||
integrity sha512-8tvi6Cos3m+0KmRbPjgkySXi+UQU/QiuVRFnrxIwt5xZlEEFa69O04RTaNESGgImyBBlYbo2mfE8/U8Bbdk1WQ==
|
||||
"@azure/msal-node@^2.13.1":
|
||||
version "2.14.0"
|
||||
resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-2.14.0.tgz#7881895d41b03d8b9b38a29550ba3bbb15f73b3c"
|
||||
integrity sha512-rrfzIpG3Q1rHjVYZmHAEDidWAZZ2cgkxlIcMQ8dHebRISaZ2KCV33Q8Vs+uaV6lxweROabNxKFlR2lIKagZqYg==
|
||||
dependencies:
|
||||
"@azure/msal-common" "14.12.0"
|
||||
"@azure/msal-common" "14.15.0"
|
||||
jsonwebtoken "^9.0.0"
|
||||
uuid "^8.3.0"
|
||||
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@
|
|||
]
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "18.x"
|
||||
"@types/node": "20.x"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
|
|
|||
|
|
@ -115,10 +115,12 @@
|
|||
dependencies:
|
||||
"@octokit/openapi-types" "^14.0.0"
|
||||
|
||||
"@types/node@18.x":
|
||||
version "18.15.13"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469"
|
||||
integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==
|
||||
"@types/node@20.x":
|
||||
version "20.16.10"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.10.tgz#0cc3fdd3daf114a4776f54ba19726a01c907ef71"
|
||||
integrity sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==
|
||||
dependencies:
|
||||
undici-types "~6.19.2"
|
||||
|
||||
before-after-hook@^2.2.0:
|
||||
version "2.2.3"
|
||||
|
|
@ -164,6 +166,11 @@ tunnel@^0.0.6:
|
|||
resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
|
||||
integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
|
||||
|
||||
undici-types@~6.19.2:
|
||||
version "6.19.8"
|
||||
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
|
||||
integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
|
||||
|
||||
universal-user-agent@^6.0.0:
|
||||
version "6.0.0"
|
||||
resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee"
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@
|
|||
]
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "18.x"
|
||||
"@types/node": "20.x"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
|
|
|||
|
|
@ -2,7 +2,14 @@
|
|||
# yarn lockfile v1
|
||||
|
||||
|
||||
"@types/node@18.x":
|
||||
version "18.15.13"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469"
|
||||
integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==
|
||||
"@types/node@20.x":
|
||||
version "20.16.10"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.10.tgz#0cc3fdd3daf114a4776f54ba19726a01c907ef71"
|
||||
integrity sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==
|
||||
dependencies:
|
||||
undici-types "~6.19.2"
|
||||
|
||||
undici-types@~6.19.2:
|
||||
version "6.19.8"
|
||||
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
|
||||
integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
|
||||
|
|
|
|||
|
|
@ -3017,7 +3017,7 @@
|
|||
"devDependencies": {
|
||||
"@types/byline": "4.2.31",
|
||||
"@types/mocha": "^9.1.1",
|
||||
"@types/node": "18.x",
|
||||
"@types/node": "20.x",
|
||||
"@types/picomatch": "2.3.0",
|
||||
"@types/which": "3.0.0"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ export class Askpass implements IIPCHandler, ITerminalEnvironmentProvider {
|
|||
GIT_ASKPASS: path.join(__dirname, this.ipc ? 'askpass.sh' : 'askpass-empty.sh'),
|
||||
// VSCODE_GIT_ASKPASS
|
||||
VSCODE_GIT_ASKPASS_NODE: process.execPath,
|
||||
VSCODE_GIT_ASKPASS_EXTRA_ARGS: (process.versions['electron'] && process.versions['microsoft-build']) ? '--ms-enable-electron-run-as-node' : '',
|
||||
VSCODE_GIT_ASKPASS_EXTRA_ARGS: '',
|
||||
VSCODE_GIT_ASKPASS_MAIN: path.join(__dirname, 'askpass-main.js'),
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ export class GitEditor implements IIPCHandler, ITerminalEnvironmentProvider {
|
|||
this.env = {
|
||||
GIT_EDITOR: `"${path.join(__dirname, ipc ? 'git-editor.sh' : 'git-editor-empty.sh')}"`,
|
||||
VSCODE_GIT_EDITOR_NODE: process.execPath,
|
||||
VSCODE_GIT_EDITOR_EXTRA_ARGS: (process.versions['electron'] && process.versions['microsoft-build']) ? '--ms-enable-electron-run-as-node' : '',
|
||||
VSCODE_GIT_EDITOR_EXTRA_ARGS: '',
|
||||
VSCODE_GIT_EDITOR_MAIN: path.join(__dirname, 'git-editor-main.js')
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ export function onceEvent<T>(event: Event<T>): Event<T> {
|
|||
|
||||
export function debounceEvent<T>(event: Event<T>, delay: number): Event<T> {
|
||||
return (listener: (e: T) => any, thisArgs?: any, disposables?: Disposable[]) => {
|
||||
let timer: NodeJS.Timer;
|
||||
let timer: NodeJS.Timeout;
|
||||
return event(e => {
|
||||
clearTimeout(timer);
|
||||
timer = setTimeout(() => listener.call(thisArgs, e), delay);
|
||||
|
|
|
|||
|
|
@ -273,10 +273,12 @@
|
|||
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.51.tgz#b31d716fb8d58eeb95c068a039b9b6292817d5fb"
|
||||
integrity sha512-El3+WJk2D/ppWNd2X05aiP5l2k4EwF7KwheknQZls+I26eSICoWRhRIJ56jGgw2dqNGQ5LtNajmBU2ajS28EvQ==
|
||||
|
||||
"@types/node@18.x":
|
||||
version "18.15.13"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469"
|
||||
integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==
|
||||
"@types/node@20.x":
|
||||
version "20.16.10"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.10.tgz#0cc3fdd3daf114a4776f54ba19726a01c907ef71"
|
||||
integrity sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==
|
||||
dependencies:
|
||||
undici-types "~6.19.2"
|
||||
|
||||
"@types/picomatch@2.3.0":
|
||||
version "2.3.0"
|
||||
|
|
@ -651,6 +653,11 @@ tslib@^2.2.0:
|
|||
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
|
||||
integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
|
||||
|
||||
undici-types@~6.19.2:
|
||||
version "6.19.8"
|
||||
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
|
||||
integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
|
||||
|
||||
util-deprecate@^1.0.1:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
"vscode-tas-client": "^0.1.47"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "18.x",
|
||||
"@types/node": "20.x",
|
||||
"@types/node-fetch": "^2.5.7"
|
||||
},
|
||||
"repository": {
|
||||
|
|
|
|||
|
|
@ -253,12 +253,12 @@
|
|||
dependencies:
|
||||
undici-types "~5.26.4"
|
||||
|
||||
"@types/node@18.x":
|
||||
version "18.18.9"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.18.9.tgz#5527ea1832db3bba8eb8023ce8497b7d3f299592"
|
||||
integrity sha512-0f5klcuImLnG4Qreu9hPj/rEfFq6YRc5n2mAjSsH+ec/mJL+3voBH0+8T7o8RpFjH7ovc+TRsL/c7OYIQsPTfQ==
|
||||
"@types/node@20.x":
|
||||
version "20.16.10"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.10.tgz#0cc3fdd3daf114a4776f54ba19726a01c907ef71"
|
||||
integrity sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==
|
||||
dependencies:
|
||||
undici-types "~5.26.4"
|
||||
undici-types "~6.19.2"
|
||||
|
||||
"@types/shimmer@^1.0.2":
|
||||
version "1.0.5"
|
||||
|
|
@ -573,6 +573,11 @@ undici-types@~5.26.4:
|
|||
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
|
||||
integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
|
||||
|
||||
undici-types@~6.19.2:
|
||||
version "6.19.8"
|
||||
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
|
||||
integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
|
||||
|
||||
uuid@^8.3.0:
|
||||
version "8.3.2"
|
||||
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@
|
|||
"@vscode/extension-telemetry": "^0.8.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "18.x"
|
||||
"@types/node": "20.x"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
|
|
|||
|
|
@ -376,10 +376,12 @@
|
|||
resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
|
||||
integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
|
||||
|
||||
"@types/node@18.x":
|
||||
version "18.15.13"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469"
|
||||
integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==
|
||||
"@types/node@20.x":
|
||||
version "20.16.10"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.10.tgz#0cc3fdd3daf114a4776f54ba19726a01c907ef71"
|
||||
integrity sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==
|
||||
dependencies:
|
||||
undici-types "~6.19.2"
|
||||
|
||||
"@types/shimmer@^1.0.2":
|
||||
version "1.0.2"
|
||||
|
|
@ -707,6 +709,11 @@ tunnel@^0.0.6:
|
|||
resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
|
||||
integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
|
||||
|
||||
undici-types@~6.19.2:
|
||||
version "6.19.8"
|
||||
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
|
||||
integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
|
||||
|
||||
universal-user-agent@^6.0.0:
|
||||
version "6.0.0"
|
||||
resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee"
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ export async function asyncTimeout<T>(p: Thenable<T>, timeout: number): Promise<
|
|||
}
|
||||
|
||||
export async function pollTimeout(predicate: () => Thenable<boolean>, intervalDelay: number, timeoutTime: number): Promise<boolean> {
|
||||
let interval: NodeJS.Timer;
|
||||
let interval: NodeJS.Timeout;
|
||||
return new Promise(pollOver => {
|
||||
const complete = (success = false) => {
|
||||
clearInterval(interval);
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@
|
|||
"vscode-languageclient": "^8.2.0-next.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "18.x"
|
||||
"@types/node": "20.x"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
},
|
||||
"devDependencies": {
|
||||
"@types/mocha": "^9.1.1",
|
||||
"@types/node": "18.x"
|
||||
"@types/node": "20.x"
|
||||
},
|
||||
"scripts": {
|
||||
"prepublishOnly": "npm run clean && npm run compile",
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ export function getLanguageModelCache<T>(maxEntries: number, cleanupIntervalTime
|
|||
let languageModels: { [uri: string]: { version: number; languageId: string; cTime: number; languageModel: T } } = {};
|
||||
let nModels = 0;
|
||||
|
||||
let cleanupInterval: NodeJS.Timer | undefined = undefined;
|
||||
let cleanupInterval: NodeJS.Timeout | undefined = undefined;
|
||||
if (cleanupIntervalTimeInSec > 0) {
|
||||
cleanupInterval = setInterval(() => {
|
||||
const cutoffTime = Date.now() - cleanupIntervalTimeInSec * 1000;
|
||||
|
|
|
|||
|
|
@ -7,10 +7,12 @@
|
|||
resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.1.1.tgz#e7c4f1001eefa4b8afbd1eee27a237fee3bf29c4"
|
||||
integrity sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==
|
||||
|
||||
"@types/node@18.x":
|
||||
version "18.15.13"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469"
|
||||
integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==
|
||||
"@types/node@20.x":
|
||||
version "20.16.10"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.10.tgz#0cc3fdd3daf114a4776f54ba19726a01c907ef71"
|
||||
integrity sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==
|
||||
dependencies:
|
||||
undici-types "~6.19.2"
|
||||
|
||||
"@vscode/l10n@^0.0.16":
|
||||
version "0.0.16"
|
||||
|
|
@ -27,6 +29,11 @@ request-light@^0.7.0:
|
|||
resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.7.0.tgz#885628bb2f8040c26401ebf258ec51c4ae98ac2a"
|
||||
integrity sha512-lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q==
|
||||
|
||||
undici-types@~6.19.2:
|
||||
version "6.19.8"
|
||||
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
|
||||
integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
|
||||
|
||||
vscode-json-languageservice@^5.3.6:
|
||||
version "5.3.6"
|
||||
resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-5.3.6.tgz#8cbe39dfdf29e7f7e97c9b6966b76031991290f6"
|
||||
|
|
|
|||
|
|
@ -259,10 +259,12 @@
|
|||
resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
|
||||
integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
|
||||
|
||||
"@types/node@18.x":
|
||||
version "18.15.13"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469"
|
||||
integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==
|
||||
"@types/node@20.x":
|
||||
version "20.16.10"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.10.tgz#0cc3fdd3daf114a4776f54ba19726a01c907ef71"
|
||||
integrity sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==
|
||||
dependencies:
|
||||
undici-types "~6.19.2"
|
||||
|
||||
"@types/shimmer@^1.0.2":
|
||||
version "1.0.2"
|
||||
|
|
@ -558,6 +560,11 @@ tslib@^2.2.0:
|
|||
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
|
||||
integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
|
||||
|
||||
undici-types@~6.19.2:
|
||||
version "6.19.8"
|
||||
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
|
||||
integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
|
||||
|
||||
uuid@^8.3.0:
|
||||
version "8.3.2"
|
||||
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
"vscode-uri": "^3.0.7"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "18.x"
|
||||
"@types/node": "20.x"
|
||||
},
|
||||
"scripts": {
|
||||
"compile": "gulp compile-extension:markdown-language-features-server",
|
||||
|
|
|
|||
|
|
@ -2,10 +2,12 @@
|
|||
# yarn lockfile v1
|
||||
|
||||
|
||||
"@types/node@18.x":
|
||||
version "18.15.13"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469"
|
||||
integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==
|
||||
"@types/node@20.x":
|
||||
version "20.16.10"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.10.tgz#0cc3fdd3daf114a4776f54ba19726a01c907ef71"
|
||||
integrity sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==
|
||||
dependencies:
|
||||
undici-types "~6.19.2"
|
||||
|
||||
"@vscode/l10n@^0.0.10":
|
||||
version "0.0.10"
|
||||
|
|
@ -98,6 +100,11 @@ picomatch@^2.3.1:
|
|||
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
|
||||
integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
|
||||
|
||||
undici-types@~6.19.2:
|
||||
version "6.19.8"
|
||||
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
|
||||
integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
|
||||
|
||||
vscode-jsonrpc@8.1.0:
|
||||
version "8.1.0"
|
||||
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz#cb9989c65e219e18533cc38e767611272d274c94"
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@
|
|||
"@vscode/extension-telemetry": "^0.8.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "18.x"
|
||||
"@types/node": "20.x"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
|
|
|||
|
|
@ -259,10 +259,12 @@
|
|||
resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
|
||||
integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
|
||||
|
||||
"@types/node@18.x":
|
||||
version "18.15.13"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469"
|
||||
integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==
|
||||
"@types/node@20.x":
|
||||
version "20.16.10"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.10.tgz#0cc3fdd3daf114a4776f54ba19726a01c907ef71"
|
||||
integrity sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==
|
||||
dependencies:
|
||||
undici-types "~6.19.2"
|
||||
|
||||
"@types/shimmer@^1.0.2":
|
||||
version "1.0.2"
|
||||
|
|
@ -534,6 +536,11 @@ tslib@^2.2.0:
|
|||
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
|
||||
integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
|
||||
|
||||
undici-types@~6.19.2:
|
||||
version "6.19.8"
|
||||
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
|
||||
integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
|
||||
|
||||
uuid@^8.3.0:
|
||||
version "8.3.2"
|
||||
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@
|
|||
"watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "18.x",
|
||||
"@types/node": "20.x",
|
||||
"@types/node-fetch": "^2.5.7",
|
||||
"@types/randombytes": "^2.0.0",
|
||||
"@types/sha.js": "^2.4.0",
|
||||
|
|
|
|||
|
|
@ -277,10 +277,12 @@
|
|||
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.23.tgz#676fa0883450ed9da0bb24156213636290892806"
|
||||
integrity sha512-Z4U8yDAl5TFkmYsZdFPdjeMa57NOvnaf1tljHzhouaPEp7LCj2JKkejpI1ODviIAQuW4CcQmxkQ77rnLsOOoKw==
|
||||
|
||||
"@types/node@18.x":
|
||||
version "18.15.13"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469"
|
||||
integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==
|
||||
"@types/node@20.x":
|
||||
version "20.16.10"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.10.tgz#0cc3fdd3daf114a4776f54ba19726a01c907ef71"
|
||||
integrity sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==
|
||||
dependencies:
|
||||
undici-types "~6.19.2"
|
||||
|
||||
"@types/randombytes@^2.0.0":
|
||||
version "2.0.0"
|
||||
|
|
@ -592,6 +594,11 @@ tslib@^2.2.0:
|
|||
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
|
||||
integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
|
||||
|
||||
undici-types@~6.19.2:
|
||||
version "6.19.8"
|
||||
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
|
||||
integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
|
||||
|
||||
uuid@^8.3.0:
|
||||
version "8.3.2"
|
||||
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
|
||||
|
|
|
|||
|
|
@ -13,5 +13,8 @@
|
|||
"@parcel/watcher": "2.1.0",
|
||||
"esbuild": "0.17.14",
|
||||
"vscode-grammar-updater": "^1.1.0"
|
||||
},
|
||||
"resolutions": {
|
||||
"node-gyp-build": "4.8.1"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -109,4 +109,6 @@ export class TestChildProcessPromise<T> implements cp.ChildProcessPromise {
|
|||
listenerCount(type: string | symbol): number {
|
||||
throw new Error('Method not implemented.');
|
||||
}
|
||||
[Symbol.dispose](): void {
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
"watch": "gulp watch-extension:tunnel-forwarding"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "18.x"
|
||||
"@types/node": "20.x"
|
||||
},
|
||||
"prettier": {
|
||||
"printWidth": 100,
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
"main": "./out/extension",
|
||||
"browser": "./dist/browser/testResolverMain",
|
||||
"devDependencies": {
|
||||
"@types/node": "18.x"
|
||||
"@types/node": "20.x"
|
||||
},
|
||||
"capabilities": {
|
||||
"untrustedWorkspaces": {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,14 @@
|
|||
# yarn lockfile v1
|
||||
|
||||
|
||||
"@types/node@18.x":
|
||||
version "18.15.13"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469"
|
||||
integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==
|
||||
"@types/node@20.x":
|
||||
version "20.16.10"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.10.tgz#0cc3fdd3daf114a4776f54ba19726a01c907ef71"
|
||||
integrity sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==
|
||||
dependencies:
|
||||
undici-types "~6.19.2"
|
||||
|
||||
undici-types@~6.19.2:
|
||||
version "6.19.8"
|
||||
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
|
||||
integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
|
||||
|
|
|
|||
|
|
@ -211,10 +211,10 @@ node-addon-api@^3.2.1:
|
|||
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
|
||||
integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
|
||||
|
||||
node-gyp-build@^4.3.0:
|
||||
version "4.3.0"
|
||||
resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3"
|
||||
integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==
|
||||
node-gyp-build@4.8.1, node-gyp-build@^4.3.0:
|
||||
version "4.8.1"
|
||||
resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.1.tgz#976d3ad905e71b76086f4f0b0d3637fe79b6cda5"
|
||||
integrity sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==
|
||||
|
||||
picomatch@^2.3.1:
|
||||
version "2.3.1"
|
||||
|
|
|
|||
27
package.json
27
package.json
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "azuredatastudio",
|
||||
"version": "1.50.0",
|
||||
"distro": "dfa69056c7889033a844ae14b2968ee195bf2286",
|
||||
"distro": "e5dd154bea415a56b55d661b443b5d0cb013f2fe",
|
||||
"author": {
|
||||
"name": "Microsoft Corporation"
|
||||
},
|
||||
|
|
@ -80,13 +80,13 @@
|
|||
"@vscode/iconv-lite-umd": "0.7.0",
|
||||
"@vscode/policy-watcher": "^1.1.4",
|
||||
"@vscode/proxy-agent": "^0.17.2",
|
||||
"@vscode/ripgrep": "^1.15.5",
|
||||
"@vscode/spdlog": "^0.13.11",
|
||||
"@vscode/ripgrep": "^1.15.9",
|
||||
"@vscode/spdlog": "^0.15.0",
|
||||
"@vscode/sqlite3": "5.1.6-vscode",
|
||||
"@vscode/sudo-prompt": "9.3.1",
|
||||
"@vscode/vscode-languagedetection": "1.0.21",
|
||||
"@vscode/windows-mutex": "^0.4.4",
|
||||
"@vscode/windows-process-tree": "^0.5.0",
|
||||
"@vscode/windows-mutex": "^0.5.0",
|
||||
"@vscode/windows-process-tree": "^0.6.0",
|
||||
"@vscode/windows-registry": "^1.1.0",
|
||||
"angular2-grid": "2.0.6",
|
||||
"ansi_up": "^5.1.0",
|
||||
|
|
@ -102,7 +102,7 @@
|
|||
"https-proxy-agent": "^5.0.0",
|
||||
"jquery": "3.5.0",
|
||||
"jschardet": "3.0.0",
|
||||
"kerberos": "^2.0.1",
|
||||
"kerberos": "2.1.1",
|
||||
"keytar": "7.9.0",
|
||||
"mark.js": "^8.11.1",
|
||||
"minimist": "^1.2.6",
|
||||
|
|
@ -110,7 +110,7 @@
|
|||
"native-is-elevated": "0.7.0",
|
||||
"native-keymap": "^3.3.4",
|
||||
"native-watchdog": "^1.4.1",
|
||||
"node-pty": "1.1.0-beta1",
|
||||
"node-pty": "^1.1.0-beta22",
|
||||
"plotly.js-dist-min": "^1.53.0",
|
||||
"reflect-metadata": "^0.1.8",
|
||||
"rxjs": "5.4.0",
|
||||
|
|
@ -155,7 +155,7 @@
|
|||
"@types/mark.js": "^8.11.8",
|
||||
"@types/minimist": "^1.2.1",
|
||||
"@types/mocha": "^9.1.1",
|
||||
"@types/node": "18.x",
|
||||
"@types/node": "20.x",
|
||||
"@types/plotly.js": "^1.44.9",
|
||||
"@types/sanitize-html": "^1.18.2",
|
||||
"@types/sinon": "10.0.2",
|
||||
|
|
@ -173,7 +173,7 @@
|
|||
"@typescript-eslint/experimental-utils": "^5.57.0",
|
||||
"@typescript-eslint/parser": "^5.57.0",
|
||||
"@vscode/gulp-electron": "^1.36.0",
|
||||
"@vscode/l10n-dev": "0.0.21",
|
||||
"@vscode/l10n-dev": "0.0.35",
|
||||
"@vscode/telemetry-extractor": "^1.9.9",
|
||||
"@vscode/test-web": "^0.0.42",
|
||||
"@vscode/vscode-perf": "^0.0.14",
|
||||
|
|
@ -191,7 +191,7 @@
|
|||
"electron": "25.9.8",
|
||||
"eslint": "8.36.0",
|
||||
"eslint-plugin-header": "3.1.1",
|
||||
"eslint-plugin-jsdoc": "^39.3.2",
|
||||
"eslint-plugin-jsdoc": "^46.5.0",
|
||||
"eslint-plugin-local": "^1.0.0",
|
||||
"event-stream": "3.3.4",
|
||||
"fancy-log": "^1.3.3",
|
||||
|
|
@ -262,6 +262,9 @@
|
|||
"webpack-stream": "^7.0.0",
|
||||
"yaserver": "^0.2.0"
|
||||
},
|
||||
"overrides": {
|
||||
"node-gyp-build": "4.8.1"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Microsoft/azuredatastudio.git"
|
||||
|
|
@ -274,6 +277,8 @@
|
|||
},
|
||||
"resolutions": {
|
||||
"elliptic": "^6.5.3",
|
||||
"nwmatcher": "^1.4.4"
|
||||
"nwmatcher": "^1.4.4",
|
||||
"gridstack/node-sass": "^7.0.0",
|
||||
"node-sass": "^7.0.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@
|
|||
"@parcel/watcher": "2.1.0",
|
||||
"@vscode/iconv-lite-umd": "0.7.0",
|
||||
"@vscode/proxy-agent": "^0.17.2",
|
||||
"@vscode/ripgrep": "^1.15.5",
|
||||
"@vscode/spdlog": "^0.13.11",
|
||||
"@vscode/ripgrep": "^1.15.9",
|
||||
"@vscode/spdlog": "^0.15.0",
|
||||
"@vscode/vscode-languagedetection": "1.0.21",
|
||||
"applicationinsights": "1.4.2",
|
||||
"angular2-grid": "2.0.6",
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
"azdataGraph": "github:Microsoft/azdataGraph#0.0.62",
|
||||
"chart.js": "^4.3.0",
|
||||
"chartjs-adapter-moment": "^1.0.1",
|
||||
"@vscode/windows-process-tree": "^0.5.0",
|
||||
"@vscode/windows-process-tree": "^0.6.0",
|
||||
"@vscode/windows-registry": "^1.1.0",
|
||||
"cookie": "^0.7.0",
|
||||
"graceful-fs": "4.2.11",
|
||||
|
|
@ -35,13 +35,13 @@
|
|||
"https-proxy-agent": "^5.0.0",
|
||||
"jquery": "3.5.0",
|
||||
"jschardet": "3.0.0",
|
||||
"kerberos": "^2.0.1",
|
||||
"kerberos": "2.1.1",
|
||||
"keytar": "7.9.0",
|
||||
"mark.js": "^8.11.1",
|
||||
"minimist": "^1.2.6",
|
||||
"moment": "^2.29.4",
|
||||
"native-watchdog": "^1.4.1",
|
||||
"node-pty": "1.1.0-beta1",
|
||||
"node-pty": "^1.1.0-beta22",
|
||||
"plotly.js-dist-min": "^1.53.0",
|
||||
"reflect-metadata": "^0.1.8",
|
||||
"rxjs": "5.4.0",
|
||||
|
|
|
|||
1627
remote/web/yarn.lock
1627
remote/web/yarn.lock
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
1670
remote/yarn.lock
1670
remote/yarn.lock
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -31,5 +31,5 @@ fi
|
|||
CONTENTS="$APP_PATH/Contents"
|
||||
ELECTRON="$CONTENTS/MacOS/Electron"
|
||||
CLI="$CONTENTS/Resources/app/out/cli.js"
|
||||
ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" --ms-enable-electron-run-as-node "$@"
|
||||
ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
|
||||
exit $?
|
||||
|
|
|
|||
|
|
@ -59,5 +59,5 @@ fi
|
|||
|
||||
ELECTRON="$VSCODE_PATH/@@APPNAME@@"
|
||||
CLI="$VSCODE_PATH/resources/app/out/cli.js"
|
||||
ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" --ms-enable-electron-run-as-node "$@"
|
||||
ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
|
||||
exit $?
|
||||
|
|
|
|||
|
|
@ -2,5 +2,5 @@
|
|||
setlocal
|
||||
set VSCODE_DEV=
|
||||
set ELECTRON_RUN_AS_NODE=1
|
||||
"%~dp0..\@@NAME@@.exe" "%~dp0..\resources\app\out\cli.js" --ms-enable-electron-run-as-node %*
|
||||
"%~dp0..\@@NAME@@.exe" "%~dp0..\resources\app\out\cli.js" %*
|
||||
endlocal
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ if [ $IN_WSL = true ]; then
|
|||
# use the Remote WSL extension if installed
|
||||
WSL_EXT_ID="ms-vscode-remote.remote-wsl"
|
||||
|
||||
ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" --ms-enable-electron-run-as-node --locate-extension $WSL_EXT_ID >/tmp/remote-wsl-loc.txt 2>/dev/null </dev/null
|
||||
ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" --locate-extension $WSL_EXT_ID >/tmp/remote-wsl-loc.txt 2>/dev/null </dev/null
|
||||
WSL_EXT_WLOC=$(cat /tmp/remote-wsl-loc.txt)
|
||||
|
||||
if [ -n "$WSL_EXT_WLOC" ]; then
|
||||
|
|
@ -58,5 +58,5 @@ elif [ -x "$(command -v cygpath)" ]; then
|
|||
else
|
||||
CLI="$VSCODE_PATH/resources/app/out/cli.js"
|
||||
fi
|
||||
ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" --ms-enable-electron-run-as-node "$@"
|
||||
ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
|
||||
exit $?
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ set ELECTRON_ENABLE_LOGGING=1
|
|||
set ELECTRON_ENABLE_STACK_DUMPING=1
|
||||
|
||||
:: Launch Code
|
||||
%CODE% --inspect=5874 out\cli.js --ms-enable-electron-run-as-node %~dp0.. %*
|
||||
%CODE% --inspect=5874 out\cli.js %~dp0.. %*
|
||||
goto end
|
||||
|
||||
:builtin
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ function code() {
|
|||
VSCODE_DEV=1 \
|
||||
ELECTRON_ENABLE_LOGGING=1 \
|
||||
ELECTRON_ENABLE_STACK_DUMPING=1 \
|
||||
"$CODE" --inspect=5874 "$ROOT/out/cli.js" --ms-enable-electron-run-as-node . "$@"
|
||||
"$CODE" --inspect=5874 "$ROOT/out/cli.js" . "$@"
|
||||
}
|
||||
|
||||
code "$@"
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ function code-wsl()
|
|||
cd $ROOT
|
||||
export WSLENV=ELECTRON_RUN_AS_NODE/w:VSCODE_DEV/w:$WSLENV
|
||||
local WSL_EXT_ID="ms-vscode-remote.remote-wsl"
|
||||
local WSL_EXT_WLOC=$(echo "" | VSCODE_DEV=1 ELECTRON_RUN_AS_NODE=1 "$ROOT/.build/electron/Code - OSS.exe" "out/cli.js" --ms-enable-electron-run-as-node --locate-extension $WSL_EXT_ID)
|
||||
local WSL_EXT_WLOC=$(echo "" | VSCODE_DEV=1 ELECTRON_RUN_AS_NODE=1 "$ROOT/.build/electron/Code - OSS.exe" "out/cli.js" --locate-extension $WSL_EXT_ID)
|
||||
cd $CWD
|
||||
if [ -n "$WSL_EXT_WLOC" ]; then
|
||||
# replace \r\n with \n in WSL_EXT_WLOC
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ set NAMESHORT=%NAMESHORT: "=%
|
|||
set NAMESHORT=%NAMESHORT:"=%.exe
|
||||
set CODE=".build\electron\%NAMESHORT%"
|
||||
|
||||
%CODE% %* --ms-enable-electron-run-as-node
|
||||
%CODE% %*
|
||||
|
||||
popd
|
||||
|
||||
|
|
|
|||
|
|
@ -26,11 +26,9 @@ export VSCODE_DEV=1
|
|||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
ulimit -n 4096 ; ELECTRON_RUN_AS_NODE=1 \
|
||||
"$CODE" \
|
||||
"$@" \
|
||||
--ms-enable-electron-run-as-node
|
||||
"$@"
|
||||
else
|
||||
ELECTRON_RUN_AS_NODE=1 \
|
||||
"$CODE" \
|
||||
"$@" \
|
||||
--ms-enable-electron-run-as-node
|
||||
"$@"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -92,11 +92,11 @@ if (portable && portable.isPortable) {
|
|||
protocol.registerSchemesAsPrivileged([
|
||||
{
|
||||
scheme: 'vscode-webview',
|
||||
privileges: { standard: true, secure: true, supportFetchAPI: true, corsEnabled: true, allowServiceWorkers: true, }
|
||||
privileges: { standard: true, secure: true, supportFetchAPI: true, corsEnabled: true, allowServiceWorkers: true, codeCache: true }
|
||||
},
|
||||
{
|
||||
scheme: 'vscode-file',
|
||||
privileges: { secure: true, standard: true, supportFetchAPI: true, corsEnabled: true }
|
||||
privileges: { secure: true, standard: true, supportFetchAPI: true, corsEnabled: true, codeCache: true }
|
||||
}
|
||||
]);
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,6 @@ export function listProcesses(rootPid: number): Promise<ProcessItem> {
|
|||
function findName(cmd: string): string {
|
||||
|
||||
const UTILITY_NETWORK_HINT = /--utility-sub-type=network/i;
|
||||
const NODEJS_PROCESS_HINT = /--ms-enable-electron-run-as-node/i;
|
||||
const WINDOWS_CRASH_REPORTER = /--crashes-directory/i;
|
||||
const WINPTY = /\\pipe\\winpty-control/i;
|
||||
const CONPTY = /conhost\.exe.+--headless/i;
|
||||
|
|
@ -103,11 +102,6 @@ export function listProcesses(rootPid: number): Promise<ProcessItem> {
|
|||
}
|
||||
}
|
||||
|
||||
// find Electron node.js processes
|
||||
if (NODEJS_PROCESS_HINT.exec(cmd)) {
|
||||
return `electron-nodejs (${cmd})`;
|
||||
}
|
||||
|
||||
return cmd;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ export class DialogMainService implements IDialogMainService {
|
|||
if (!fileDialogLock) {
|
||||
this.logService.error('[DialogMainService]: file save dialog is already or will be showing for the window with the same configuration');
|
||||
|
||||
return { canceled: true };
|
||||
return { canceled: true, filePath: '' };
|
||||
}
|
||||
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -197,7 +197,4 @@ export interface NativeParsedArgs {
|
|||
'log-net-log'?: string;
|
||||
'vmodule'?: string;
|
||||
'disable-dev-shm-usage'?: boolean;
|
||||
|
||||
// MS Build command line arg
|
||||
'ms-enable-electron-run-as-node'?: boolean;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -121,7 +121,6 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
|
|||
'inspect-brk-extensions': { type: 'string', allowEmptyValue: true, deprecates: ['debugBrkPluginHost'], args: 'port', cat: 't', description: localize('inspect-brk-extensions', "Allow debugging and profiling of extensions with the extension host being paused after start. Check the developer tools for the connection URI.") },
|
||||
'disable-gpu': { type: 'boolean', cat: 't', description: localize('disableGPU', "Disable GPU hardware acceleration.") },
|
||||
'disable-chromium-sandbox': { type: 'boolean', cat: 't', description: localize('disableChromiumSandbox', "Use this option only when there is requirement to launch the application as sudo user on Linux or when running as an elevated user in an applocker environment on Windows.") },
|
||||
'ms-enable-electron-run-as-node': { type: 'boolean', global: true },
|
||||
'telemetry': { type: 'boolean', cat: 't', description: localize('telemetry', "Shows all telemetry events which VS code collects.") },
|
||||
|
||||
'remote': { type: 'string', allowEmptyValue: true },
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ async function doResolveUnixShellEnv(logService: ILogService, token: Cancellatio
|
|||
// handle popular non-POSIX shells
|
||||
const name = basename(systemShellUnix);
|
||||
let command: string, shellArgs: Array<string>;
|
||||
const extraArgs = (process.versions['electron'] && process.versions['microsoft-build']) ? '--ms-enable-electron-run-as-node' : '';
|
||||
const extraArgs = '';
|
||||
if (/^pwsh(-preview)?$/.test(name)) {
|
||||
// Older versions of PowerShell removes double quotes sometimes so we use "double single quotes" which is how
|
||||
// you escape single quotes inside of a single quoted string.
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
|
|||
private _isDisposed: boolean = false;
|
||||
private _windowsShellHelper: WindowsShellHelper | undefined;
|
||||
private _childProcessMonitor: ChildProcessMonitor | undefined;
|
||||
private _titleInterval: NodeJS.Timer | null = null;
|
||||
private _titleInterval: NodeJS.Timeout | null = null;
|
||||
private _writeQueue: IWriteObject[] = [];
|
||||
private _writeTimeout: NodeJS.Timeout | undefined;
|
||||
private _delayedResizer: DelayedResizer | undefined;
|
||||
|
|
|
|||
|
|
@ -316,6 +316,44 @@ export class UtilityProcess extends Disposable {
|
|||
this.onDidExitOrCrashOrKill();
|
||||
}));
|
||||
|
||||
// V8 Error
|
||||
this._register(Event.fromNodeEventEmitter(process, 'error', (type, location, report) => ({ type, location, report }))(({ type, location, report }) => {
|
||||
this.log(`crashed due to ${type} from V8 at ${location}`, Severity.Info);
|
||||
let addons: string[] = [];
|
||||
try {
|
||||
const reportJSON = JSON.parse(report);
|
||||
addons = reportJSON.sharedObjects
|
||||
.filter((sharedObject: string) => sharedObject.endsWith('.node'))
|
||||
.map((addon: string) => {
|
||||
const index = addon.indexOf('extensions') === -1 ? addon.indexOf('node_modules') : addon.indexOf('extensions');
|
||||
return addon.substring(index);
|
||||
});
|
||||
} catch (e) {
|
||||
// ignore
|
||||
}
|
||||
// Telemetry
|
||||
type UtilityProcessV8ErrorClassification = {
|
||||
processtype: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'The type of utility process to understand the origin of the crash better.' };
|
||||
error: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'The type of error from the utility process to understand the nature of the crash better.' };
|
||||
location: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'The source location that triggered the crash to understand the nature of the crash better.' };
|
||||
addons: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'The list of addons loaded in the utility process to understand the nature of the crash better' };
|
||||
owner: 'deepak1556';
|
||||
comment: 'Provides insight into V8 sandbox FATAL error caused by native addons.';
|
||||
};
|
||||
type UtilityProcessV8ErrorEvent = {
|
||||
processtype: string;
|
||||
error: string;
|
||||
location: string;
|
||||
addons: string[];
|
||||
};
|
||||
this.telemetryService.publicLog2<UtilityProcessV8ErrorEvent, UtilityProcessV8ErrorClassification>('utilityprocessv8error', {
|
||||
processtype: configuration.type,
|
||||
error: type,
|
||||
location,
|
||||
addons
|
||||
});
|
||||
}));
|
||||
|
||||
// Child process gone
|
||||
this._register(Event.fromNodeEventEmitter<{ details: Details }>(app, 'child-process-gone', (event, details) => ({ event, details }))(({ details }) => {
|
||||
if (details.type === 'Utility' && details.name === serviceName) {
|
||||
|
|
|
|||
|
|
@ -826,6 +826,13 @@ export class CodeWindow extends Disposable implements ICodeWindow {
|
|||
const proxyBypassRules = newNoProxy ? `${newNoProxy},<local>` : '<local>';
|
||||
this.logService.trace(`Setting proxy to '${proxyRules}', bypassing '${proxyBypassRules}'`);
|
||||
this._win.webContents.session.setProxy({ proxyRules, proxyBypassRules, pacScript: '' });
|
||||
type appWithProxySupport = Electron.App & {
|
||||
setProxy(config: Electron.Config): Promise<void>;
|
||||
resolveProxy(url: string): Promise<string>;
|
||||
};
|
||||
if (typeof (app as appWithProxySupport).setProxy === 'function') {
|
||||
(app as appWithProxySupport).setProxy({ proxyRules, proxyBypassRules, pacScript: '' });
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ class RemoteExtensionHostAgentServer extends Disposable implements IServerAPI {
|
|||
|
||||
private readonly _serverRootPath: string;
|
||||
|
||||
private shutdownTimer: NodeJS.Timer | undefined;
|
||||
private shutdownTimer: NodeJS.Timeout | undefined;
|
||||
|
||||
constructor(
|
||||
private readonly _socketServer: SocketServer<RemoteAgentConnectionContext>,
|
||||
|
|
|
|||
|
|
@ -266,7 +266,6 @@ export async function main(desc: ProductDescription, args: string[]): Promise<vo
|
|||
} else {
|
||||
const cliCwd = dirname(cliCommand);
|
||||
const env = { ...process.env, ELECTRON_RUN_AS_NODE: '1' };
|
||||
newCommandline.unshift('--ms-enable-electron-run-as-node');
|
||||
newCommandline.unshift('resources/app/out/cli.js');
|
||||
if (verbose) {
|
||||
console.log(`Invoking: cd "${cliCwd}" && ELECTRON_RUN_AS_NODE=1 "${cliCommand}" "${newCommandline.join('" "')}"`);
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
"devDependencies": {
|
||||
"@types/mkdirp": "^1.0.1",
|
||||
"@types/ncp": "2.0.1",
|
||||
"@types/node": "18.x",
|
||||
"@types/node": "20.x",
|
||||
"@types/tmp": "0.2.2",
|
||||
"cpx2": "3.0.0",
|
||||
"npm-run-all": "^4.1.5",
|
||||
|
|
|
|||
|
|
@ -21,10 +21,12 @@
|
|||
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.1.tgz#3b5c3a26393c19b400844ac422bd0f631a94d69d"
|
||||
integrity sha512-aK9jxMypeSrhiYofWWBf/T7O+KwaiAHzM4sveCdWPn71lzUSMimRnKzhXDKfKwV1kWoBo2P1aGgaIYGLf9/ljw==
|
||||
|
||||
"@types/node@18.x":
|
||||
version "18.15.13"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469"
|
||||
integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==
|
||||
"@types/node@20.x":
|
||||
version "20.16.10"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.10.tgz#0cc3fdd3daf114a4776f54ba19726a01c907ef71"
|
||||
integrity sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==
|
||||
dependencies:
|
||||
undici-types "~6.19.2"
|
||||
|
||||
"@types/tmp@0.2.2":
|
||||
version "0.2.2"
|
||||
|
|
@ -654,6 +656,11 @@ tree-kill@1.2.2:
|
|||
resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
|
||||
integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
|
||||
|
||||
undici-types@~6.19.2:
|
||||
version "6.19.8"
|
||||
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
|
||||
integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
|
||||
|
||||
universalify@^2.0.0:
|
||||
version "2.0.0"
|
||||
resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
},
|
||||
"devDependencies": {
|
||||
"@types/mkdirp": "^1.0.1",
|
||||
"@types/node": "18.x",
|
||||
"@types/node": "20.x",
|
||||
"@types/optimist": "0.0.29",
|
||||
"@types/rimraf": "^2.0.4",
|
||||
"@types/tmp": "0.1.0",
|
||||
|
|
|
|||
|
|
@ -33,10 +33,12 @@
|
|||
resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.0.tgz#b417deda18cf8400f278733499ad5547ed1abec4"
|
||||
integrity sha512-GnZbirvmqZUzMgkFn70c74OQpTTUcCzlhQliTzYjQMqg+hVKcDnxdL19Ne3UdYzdMA/+W3eb646FWn/ZaT1NfQ==
|
||||
|
||||
"@types/node@18.x":
|
||||
version "18.15.13"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469"
|
||||
integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==
|
||||
"@types/node@20.x":
|
||||
version "20.16.10"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.10.tgz#0cc3fdd3daf114a4776f54ba19726a01c907ef71"
|
||||
integrity sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==
|
||||
dependencies:
|
||||
undici-types "~6.19.2"
|
||||
|
||||
"@types/optimist@0.0.29":
|
||||
version "0.0.29"
|
||||
|
|
@ -147,6 +149,11 @@ tree-kill@1.2.2:
|
|||
resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
|
||||
integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
|
||||
|
||||
undici-types@~6.19.2:
|
||||
version "6.19.8"
|
||||
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
|
||||
integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
|
||||
|
||||
vscode-uri@^3.0.2:
|
||||
version "3.0.3"
|
||||
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.3.tgz#a95c1ce2e6f41b7549f86279d19f47951e4f4d84"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
"@types/mkdirp": "^1.0.1",
|
||||
"@types/mocha": "^9.1.1",
|
||||
"@types/ncp": "2.0.1",
|
||||
"@types/node": "18.x",
|
||||
"@types/node": "20.x",
|
||||
"@types/node-fetch": "^2.5.10",
|
||||
"@types/rimraf": "3.0.2",
|
||||
"npm-run-all": "^4.1.5",
|
||||
|
|
|
|||
|
|
@ -58,10 +58,12 @@
|
|||
resolved "https://registry.yarnpkg.com/@types/node/-/node-13.11.0.tgz#390ea202539c61c8fa6ba4428b57e05bc36dc47b"
|
||||
integrity sha512-uM4mnmsIIPK/yeO+42F2RQhGUIs39K2RFmugcJANppXe6J1nvH87PvzPZYpza7Xhhs8Yn9yIAVdLZ84z61+0xQ==
|
||||
|
||||
"@types/node@18.x":
|
||||
version "18.15.13"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469"
|
||||
integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==
|
||||
"@types/node@20.x":
|
||||
version "20.16.10"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.10.tgz#0cc3fdd3daf114a4776f54ba19726a01c907ef71"
|
||||
integrity sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==
|
||||
dependencies:
|
||||
undici-types "~6.19.2"
|
||||
|
||||
"@types/rimraf@3.0.2":
|
||||
version "3.0.2"
|
||||
|
|
@ -746,6 +748,11 @@ tr46@~0.0.3:
|
|||
resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
|
||||
integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
|
||||
|
||||
undici-types@~6.19.2:
|
||||
version "6.19.8"
|
||||
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
|
||||
integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
|
||||
|
||||
util-deprecate@~1.0.1:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
|
||||
|
|
|
|||
1555
yarn.lock
1555
yarn.lock
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
Загрузка…
Ссылка в новой задаче