Skip to content
Open
18 changes: 18 additions & 0 deletions .rebase/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,24 @@

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


#### @sbouchet
https://github.com/che-incubator/che-code/pull/659

- code/package.json
- code/build/package.json
- code/build/npm/gyp/package.json
- code/extensions/css-language-features/package.json
- code/extensions/html-language-features/package.json
- code/extensions/json-language-features/package.json
- code/extensions/markdown-language-features/package.json
- code/extensions/npm/package.json
- code/test/mcp/package.json
- code/test/automation/package.json
- code/test/integration/browser/package.json
- code/test/smoke/package.json
---

#### @sbouchet
https://github.com/che-incubator/che-code/pull/668

Expand Down
3 changes: 2 additions & 1 deletion .rebase/add/code/build/npm/gyp/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"overrides": {
"glob": "10.5.0",
"tar": "^7.5.11"
"tar": "^7.5.11",
"minimatch": "^9.0.9"
}
}
6 changes: 6 additions & 0 deletions .rebase/add/code/build/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
},
"qs": "6.14.1",
"lodash": "^4.17.23",
"@vscode/vsce": {
"minimatch": "^3.1.5"
},
"vscode-universal-bundler": {
"minimatch": "^9.0.9"
},
"fast-xml-parser": "^4.5.4"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"overrides": {
"minimatch": "^10.2.4"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"overrides": {
"minimatch": "^10.2.4"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"overrides": {
"minimatch": "^10.2.4"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"overrides": {
"minimatch": "^3.1.5"
}
}
20 changes: 20 additions & 0 deletions .rebase/add/code/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,26 @@
"ajv": "^8.18.0"
},
"tar": "^7.5.11",
"@vscode/test-cli": {
"minimatch": "^9.0.9"
},
"@ts-morph/common": {
"minimatch": "^7.4.9"
},
"@vscode/l10n-dev": {
"minimatch": "^5.1.9"
},
"tsec": {
"minimatch": "^3.1.5"
},
"@typescript-eslint/typescript-estree": {
"minimatch": "^9.0.9"
},
"mocha": {
"glob": {
"minimatch": "^5.1.9"
}
},
"undici": "^7.24.0"
}
}
5 changes: 5 additions & 0 deletions .rebase/add/code/test/automation/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"overrides": {
"minimatch": "^3.1.5"
}
}
5 changes: 5 additions & 0 deletions .rebase/add/code/test/integration/browser/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"overrides": {
"minimatch": "^3.1.5"
}
}
3 changes: 2 additions & 1 deletion .rebase/add/code/test/mcp/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"overrides": {
"qs": "6.14.1",
"ajv": "6.14.0"
"ajv": "6.14.0",
"minimatch": "^3.1.5"
}
}
5 changes: 5 additions & 0 deletions .rebase/add/code/test/smoke/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"overrides": {
"minimatch": "^3.1.5"
}
}
5 changes: 5 additions & 0 deletions .rebase/override/code/extensions/npm/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"dependencies": {
"minimatch": "^5.1.9"
}
}
2 changes: 1 addition & 1 deletion .rebase/override/code/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"@vscode/l10n-dev": "0.0.18",
"@vscode/test-cli": "^0.0.12",
"@vscode/test-web": "^0.0.77",
"minimatch": "^3.0.5",
"minimatch": "^3.1.5",
"eslint": "^9.39.3"
}
}
14 changes: 7 additions & 7 deletions code/build/npm/gyp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion code/build/npm/gyp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
},
"overrides": {
"glob": "10.5.0",
"tar": "^7.5.11"
"tar": "^7.5.11",
"minimatch": "^9.0.9"
},
"scripts": {}
}
16 changes: 9 additions & 7 deletions code/build/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions code/build/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@
},
"qs": "6.14.1",
"lodash": "^4.17.23",
"@vscode/vsce": {
"minimatch": "^3.1.5"
},
"vscode-universal-bundler": {
"minimatch": "^9.0.9"
},
"fast-xml-parser": "^4.5.4"
}
}
6 changes: 3 additions & 3 deletions code/extensions/che-api/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions code/extensions/che-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@
"ts-jest": "29.4.5",
"webpack-node-externals": "^3.0.0"
},
"overrides": {
"minimatch": "^3.1.5"
},
"repository": {
"type": "git",
"url": "https://github.com/che-incubator/che-code.git"
Expand Down
6 changes: 3 additions & 3 deletions code/extensions/che-port/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion code/extensions/che-port/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@
},
"jsdom": {
"form-data": "3.0.4"
}
},
"minimatch": "^3.1.5"
},
"repository": {
"type": "git",
Expand Down
7 changes: 4 additions & 3 deletions code/extensions/che-remote/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion code/extensions/che-remote/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@
"form-data": "3.0.4"
},
"lodash": "^4.17.23",
"ajv": "6.14.0"
"ajv": "6.14.0",
"minimatch": "^3.1.5"
},
"repository": {
"type": "git",
Expand Down
6 changes: 3 additions & 3 deletions code/extensions/che-resource-monitor/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions code/extensions/che-resource-monitor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
"typescript": "^5.9.2",
"ts-jest": "29.4.5"
},
"overrides": {
"minimatch": "^3.1.5"
},
"repository": {
"type": "git",
"url": "https://github.com/che-incubator/che-code.git"
Expand Down
35 changes: 21 additions & 14 deletions code/extensions/css-language-features/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions code/extensions/css-language-features/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -1000,6 +1000,9 @@
"devDependencies": {
"@types/node": "22.x"
},
"overrides": {
"minimatch": "^10.2.4"
},
"repository": {
"type": "git",
"url": "https://github.com/microsoft/vscode.git"
Expand Down
Loading
Loading