Skip to content

Commit 102536e

Browse files
Merge remote-tracking branch 'eclipse/main'
2 parents 85da9dd + 47bf4cb commit 102536e

70 files changed

Lines changed: 2263 additions & 689 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: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,57 @@
22

33
The file to keep a list of changed files which will potentionaly help to resolve rebase conflicts.
44

5+
#### @sbouchet
6+
https://github.com/che-incubator/che-code/pull/659
7+
8+
- code/package.json
9+
- code/build/package.json
10+
- code/build/npm/gyp/package.json
11+
- code/extensions/css-language-features/package.json
12+
- code/extensions/html-language-features/package.json
13+
- code/extensions/json-language-features/package.json
14+
- code/extensions/markdown-language-features/package.json
15+
- code/extensions/npm/package.json
16+
- code/test/mcp/package.json
17+
- code/test/automation/package.json
18+
- code/test/integration/browser/package.json
19+
- code/test/smoke/package.json
20+
---
21+
22+
#### @sbouchet
23+
https://github.com/che-incubator/che-code/pull/669
24+
25+
- code/extensions/github-authentication/package.json
26+
- code/extensions/notebook-renderers/package.json
27+
- code/test/smoke/package.json
28+
---
29+
30+
#### @sbouchet
31+
https://github.com/che-incubator/che-code/pull/670
32+
33+
- code/package.json
34+
---
35+
36+
#### @sbouchet
37+
https://github.com/che-incubator/che-code/pull/668
38+
39+
- code/package.json
40+
- code/remote/package.json
41+
---
42+
43+
#### @sbouchet
44+
https://github.com/che-incubator/che-code/pull/662
45+
46+
- code/build/package.json
47+
---
48+
49+
#### @sbouchet
50+
https://github.com/che-incubator/che-code/pull/661
51+
52+
- code/package.json
53+
- code/build/npm/gyp/package.json
54+
---
55+
556
#### @RomanNikitenko
657
https://github.com/che-incubator/che-code/pull/655
758

@@ -10,6 +61,22 @@ https://github.com/che-incubator/che-code/pull/655
1061
- code/src/vs/server/node/extensionHostConnection.ts
1162
---
1263

64+
#### @sbouchet
65+
https://github.com/che-incubator/che-code/pull/654
66+
67+
- code/test/mcp/package.json
68+
- code/package.json
69+
---
70+
71+
#### @sbouchet
72+
https://github.com/che-incubator/che-code/pull/648
73+
74+
- code/package.json
75+
- code/build/npm/gyp/package.json
76+
- code/build/gulpfile.cli.js
77+
- code/build/gulpfile.reh.js
78+
---
79+
1380
#### @sbouchet
1481
https://github.com/che-incubator/che-code/pull/647
1582

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{
22
"overrides": {
3-
"glob": "10.5.0"
3+
"glob": "10.5.0",
4+
"tar": "^7.5.11",
5+
"minimatch": "^9.0.9"
46
}
57
}

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@
77
"jws": "^3.2.3"
88
},
99
"qs": "6.14.1",
10-
"lodash": "^4.17.23"
10+
"lodash": "^4.17.23",
11+
"@vscode/vsce": {
12+
"minimatch": "^3.1.5"
13+
},
14+
"vscode-universal-bundler": {
15+
"minimatch": "^9.0.9"
16+
},
17+
"fast-xml-parser": "^4.5.4"
1118
}
1219
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"overrides": {
3+
"minimatch": "^10.2.4"
4+
}
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"overrides": {
3+
"form-data": "^3.0.4"
4+
}
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"overrides": {
3+
"minimatch": "^10.2.4"
4+
}
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"overrides": {
3+
"minimatch": "^10.2.4"
4+
}
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"overrides": {
3+
"minimatch": "^3.1.5"
4+
}
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"overrides": {
3+
"form-data": "^4.0.5"
4+
}
5+
}

.rebase/add/code/package.json

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,36 @@
3232
"@azure/core-http": {
3333
"form-data": "4.0.4"
3434
},
35-
"lodash": "^4.17.23"
35+
"lodash": "^4.17.23",
36+
"ajv": "6.14.0",
37+
"ajv-formats": {
38+
"ajv": "^8.18.0"
39+
},
40+
"schema-utils": {
41+
"ajv": "^8.18.0"
42+
},
43+
"tar": "^7.5.11",
44+
"undici": "^7.24.0",
45+
"svgo": "^2.8.1",
46+
"@vscode/test-cli": {
47+
"minimatch": "^9.0.9"
48+
},
49+
"@ts-morph/common": {
50+
"minimatch": "^7.4.9"
51+
},
52+
"@vscode/l10n-dev": {
53+
"minimatch": "^5.1.9"
54+
},
55+
"tsec": {
56+
"minimatch": "^3.1.5"
57+
},
58+
"@typescript-eslint/typescript-estree": {
59+
"minimatch": "^9.0.9"
60+
},
61+
"mocha": {
62+
"glob": {
63+
"minimatch": "^5.1.9"
64+
}
65+
}
3666
}
3767
}

0 commit comments

Comments
 (0)