Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 58daa02

Browse files
RomanNikitenkoRomanNikitenko
authored
Merge pull request #547 from RomanNikitenko/alignment-with-upstream-1-100
Alignment with 1.100.3 version of VS Code
2 parents 5d1c2f6 + 06f87b2 commit 58daa02

1,174 files changed

Lines changed: 55989 additions & 22268 deletions

File tree

Some content is hidden

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

‎.rebase/CHANGELOG.md‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@ https://github.com/che-incubator/che-code/pull/549
88
- code/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
99
---
1010

11-
#### @RomanNikitenko
12-
https://github.com/che-incubator/che-code/pull/546
13-
14-
- code/package.json
15-
- code/build/package.json
16-
- code/remote/package.json
17-
---
18-
1911
#### @RomanNikitenko
2012
https://github.com/che-incubator/che-code/pull/545
2113

@@ -25,13 +17,11 @@ https://github.com/che-incubator/che-code/pull/545
2517
#### @RomanNikitenko
2618
https://github.com/che-incubator/che-code/pull/540 \
2719
https://github.com/RomanNikitenko/che-code/commit/724c0a97f73e070f80818091a8d19b7ed186b394 \
28-
https://github.com/RomanNikitenko/che-code/commit/1e51134551f4c876c4d6de388dcab90180d4607d \
29-
https://github.com/RomanNikitenko/che-code/commit/7ea82ac755a21d2cb021736a07d8216fe294beff
20+
https://github.com/RomanNikitenko/che-code/commit/1e51134551f4c876c4d6de388dcab90180d4607d
3021

3122
- code/package.json
3223
- code/remote/package.json
3324
- code/src/vs/platform/extensionManagement/node/extensionManagementService.ts
34-
- code/src/vs/platform/webContentExtractor/node/sharedWebContentExtractorService.ts
3525
---
3626

3727
#### @RomanNikitenko

‎.rebase/add/code/build/package.json‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎.rebase/add/code/package.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616
},
1717
"postcss": {
1818
"nanoid": "3.3.8"
19-
},
20-
"@vscode/test-web": {
21-
"tar-fs": "3.0.8"
22-
},
23-
"prebuild-install": {
24-
"tar-fs": "2.1.2"
2519
}
2620
}
2721
}

‎.rebase/add/code/remote/package.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,5 @@
33
"ws": "8.2.3",
44
"js-yaml": "^4.1.0",
55
"@kubernetes/client-node": "^0.22.0"
6-
},
7-
"overrides": {
8-
"prebuild-install": {
9-
"tar-fs": "2.1.2"
10-
}
116
}
127
}

‎.rebase/override/code/package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
},
77
"devDependencies": {
88
"@vscode/l10n-dev": "0.0.18",
9-
"electron": "30.5.1",
10-
"typescript": "5.6.0-dev.20240715"
9+
"electron": "30.5.1"
1110
}
1211
}

‎.rebase/replace/code/src/vs/platform/webContentExtractor/node/sharedWebContentExtractorService.ts.json‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.rebase/replace/code/test/automation/src/playwrightBrowser.ts.json‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.rebase/replace/code/test/integration/browser/src/index.ts.json‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎build/artifacts/artifacts.lock.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ artifacts:
77
filename: ms-vscode.js-debug-companion.1.1.3.vsix
88
checksum: sha256:7380a890787452f14b2db7835dfa94de538caf358ebc263f9d46dd68ac52de93
99
# ms-vscode.js-debug
10-
- download_url: https://open-vsx.org/api/ms-vscode/js-debug/1.97.1/file/ms-vscode.js-debug-1.97.1.vsix
11-
filename: ms-vscode.js-debug.1.97.1.vsix
12-
checksum: sha256:977dd854805547702e312e176f68a1b142fa123f228258f47f0964560ad32496
10+
- download_url: https://open-vsx.org/api/ms-vscode/js-debug/1.100.1/file/ms-vscode.js-debug-1.100.1.vsix
11+
filename: ms-vscode.js-debug.1.100.1.vsix
12+
checksum: sha256:8c2218df3422d45b95e96d9d28cdc4aa4426a2799aaaedd862d3f60ecab03844
1313
# ms-vscode.vscode-js-profile-table
1414
- download_url: https://open-vsx.org/api/ms-vscode/vscode-js-profile-table/1.0.10/file/ms-vscode.vscode-js-profile-table-1.0.10.vsix
1515
filename: ms-vscode.vscode-js-profile-table.1.0.10.vsix

‎build/dockerfiles/assembly.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ FROM linux-musl as linux-musl-content
1515
FROM quay.io/eclipse/che-machine-exec:7.56.0 as machine-exec
1616

1717
# https://registry.access.redhat.com/ubi8/ubi
18-
FROM registry.access.redhat.com/ubi8/ubi:8.9 AS ubi-builder
18+
FROM registry.access.redhat.com/ubi8/ubi:8.10 AS ubi-builder
1919
RUN mkdir -p /mnt/rootfs
2020
RUN yum install --installroot /mnt/rootfs brotli libstdc++ coreutils glibc-minimal-langpack --releasever 8 --setopt install_weak_deps=false --nodocs -y && yum --installroot /mnt/rootfs clean all
2121
RUN rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.*

0 commit comments

Comments
 (0)