From 844ff5fb3c7d8c9ee9ff0577ffc1d13272b1d5be Mon Sep 17 00:00:00 2001 From: Roman Nikitenko Date: Wed, 30 Oct 2024 14:38:42 +0200 Subject: [PATCH 1/4] chore: Upgrade typescript and devworkspace-generator versions Signed-off-by: Roman Nikitenko rh-pre-commit.version: 2.2.0 rh-pre-commit.check-secrets: ENABLED --- .rebase/CHANGELOG.md | 5 ----- .rebase/override/code/package.json | 3 +-- code/extensions/che-remote/package-lock.json | 16 ++++++++-------- code/extensions/che-remote/package.json | 2 +- code/package-lock.json | 8 ++++---- code/package.json | 2 +- launcher/package-lock.json | 8 ++++---- launcher/package.json | 2 +- 8 files changed, 20 insertions(+), 26 deletions(-) diff --git a/.rebase/CHANGELOG.md b/.rebase/CHANGELOG.md index 8963aaecc60..546e3d5f52a 100644 --- a/.rebase/CHANGELOG.md +++ b/.rebase/CHANGELOG.md @@ -9,11 +9,6 @@ https://github.com/che-incubator/che-code/commit/d3cf7dc86d284bc4cdff7cc163c5642 - code/src/vs/code/browser/workbench/workbench.html --- -#### @RomanNikitenko -https://github.com/che-incubator/che-code/pull/397 - -- code/package.json ---- #### @RomanNikitenko @azatsarynnyy https://github.com/che-incubator/che-code/pull/210 \ https://github.com/che-incubator/che-code/pull/379/commits/926b6fe20ccff7cc7e91aa8d83b3fa56f9fe7632 \ diff --git a/.rebase/override/code/package.json b/.rebase/override/code/package.json index 4bf05e8447e..d5ace388a6e 100644 --- a/.rebase/override/code/package.json +++ b/.rebase/override/code/package.json @@ -2,7 +2,6 @@ "name": "che-code", "bin": "out/vs/server/main.js", "devDependencies": { - "@vscode/l10n-dev": "0.0.18", - "typescript": "5.6.0-dev.20240715" + "@vscode/l10n-dev": "0.0.18" } } \ No newline at end of file diff --git a/code/extensions/che-remote/package-lock.json b/code/extensions/che-remote/package-lock.json index 53ec5528b6e..1b47a1f2a58 100644 --- a/code/extensions/che-remote/package-lock.json +++ b/code/extensions/che-remote/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.1", "license": "EPL-2.0", "dependencies": { - "@eclipse-che/che-devworkspace-generator": "7.90.0-1a2253f", + "@eclipse-che/che-devworkspace-generator": "^7.93.0", "axios": "^1.7.4", "https": "^1.0.0", "js-yaml": "^4.0.0", @@ -592,9 +592,9 @@ "dev": true }, "node_modules/@devfile/api": { - "version": "2.3.0-1721400636", - "resolved": "https://registry.npmjs.org/@devfile/api/-/api-2.3.0-1721400636.tgz", - "integrity": "sha512-W6g9uYSo22VcAeLj49YyVzOWTWZh5sRWP8fzgRcao6DRLd7FwkG3w4ZWCMTY5tMgyfcpaNBBoV1mqlRJuCvhTA==", + "version": "2.3.0-1725380172", + "resolved": "https://registry.npmjs.org/@devfile/api/-/api-2.3.0-1725380172.tgz", + "integrity": "sha512-J0O2h81M3kcbkwLnod64aHH9PAUzHRJyOvfDyOE8LSv62Yj+3tf0MYHPXOFWMwQWFUFTymMK2fHPnINWaV6MxQ==", "dependencies": { "@types/node": "*", "@types/node-fetch": "^2.5.7", @@ -605,11 +605,11 @@ } }, "node_modules/@eclipse-che/che-devworkspace-generator": { - "version": "7.90.0-1a2253f", - "resolved": "https://registry.npmjs.org/@eclipse-che/che-devworkspace-generator/-/che-devworkspace-generator-7.90.0-1a2253f.tgz", - "integrity": "sha512-jp3NVkF2JH0hjwfPMiLF7S9Rd2LW4WYzuz7Gr5N9/FPSUqhjksd9ihDpAIvxw5FiheSR8ptbsP6T31/qmhGhdg==", + "version": "7.93.0", + "resolved": "https://registry.npmjs.org/@eclipse-che/che-devworkspace-generator/-/che-devworkspace-generator-7.93.0.tgz", + "integrity": "sha512-4jXIcglvmxi8wPHruLnFt4uVv4sogChfi7SAqrUohz0tQyv3kK5hoYDLUG0ELTquqoE663vKF7h7w36Mt/wLBQ==", "dependencies": { - "@devfile/api": "2.3.0-1721400636", + "@devfile/api": "2.3.0-1725380172", "axios": "^1.7.4", "fs-extra": "^11.2.0", "inversify": "^6.0.2", diff --git a/code/extensions/che-remote/package.json b/code/extensions/che-remote/package.json index 0eefad6bb5f..10db8d1e0e9 100644 --- a/code/extensions/che-remote/package.json +++ b/code/extensions/che-remote/package.json @@ -32,7 +32,7 @@ "dependencies": { "vscode-nls": "^5.0.0", "axios": "^1.7.4", - "@eclipse-che/che-devworkspace-generator": "7.90.0-1a2253f", + "@eclipse-che/che-devworkspace-generator": "^7.93.0", "https": "^1.0.0", "js-yaml": "^4.0.0" }, diff --git a/code/package-lock.json b/code/package-lock.json index 4e28c14deae..08999dad44a 100644 --- a/code/package-lock.json +++ b/code/package-lock.json @@ -161,7 +161,7 @@ "ts-node": "^10.9.1", "tsec": "0.2.7", "tslib": "^2.6.3", - "typescript": "5.6.0-dev.20240715", + "typescript": "^5.7.0-dev.20240927", "util": "^0.12.4", "webpack": "^5.94.0", "webpack-cli": "^5.1.4", @@ -17542,9 +17542,9 @@ "dev": true }, "node_modules/typescript": { - "version": "5.6.0-dev.20240715", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.0-dev.20240715.tgz", - "integrity": "sha512-CLF8WFoqLgHgxQqjklkEOw3gT99Y2YNU4+TfkJurX5bfejAUYpb2jBjiYOn5Rq9HCew6ceZlRaG7Q++6/fBvVA==", + "version": "5.7.0-dev.20241030", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.0-dev.20241030.tgz", + "integrity": "sha512-GTDPhqdtcO+8WOPjYAp33e8dtlZN6pY9Z89aVLH1PsaiA1yaWNPVNCQ1KRCc1BK/jQGJVVBhu0fxWGSLjAE1Dw==", "dev": true, "bin": { "tsc": "bin/tsc", diff --git a/code/package.json b/code/package.json index 59f7050ed91..0ba63c36cb4 100644 --- a/code/package.json +++ b/code/package.json @@ -213,7 +213,7 @@ "ts-node": "^10.9.1", "tsec": "0.2.7", "tslib": "^2.6.3", - "typescript": "5.6.0-dev.20240715", + "typescript": "^5.7.0-dev.20240927", "util": "^0.12.4", "webpack": "^5.94.0", "webpack-cli": "^5.1.4", diff --git a/launcher/package-lock.json b/launcher/package-lock.json index 342ecfbd1e9..0bb94893ce0 100644 --- a/launcher/package-lock.json +++ b/launcher/package-lock.json @@ -24,7 +24,7 @@ "prettier": "^2.2.0", "ts-jest": "29.2.5", "ts-node": "^10.9.1", - "typescript": "^5.6.2" + "typescript": "^5.6.3" } }, "node_modules/@ampproject/remapping": { @@ -4921,9 +4921,9 @@ } }, "node_modules/typescript": { - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", - "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", + "version": "5.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", + "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", "dev": true, "bin": { "tsc": "bin/tsc", diff --git a/launcher/package.json b/launcher/package.json index 0000c060ca2..c90745cb860 100644 --- a/launcher/package.json +++ b/launcher/package.json @@ -44,7 +44,7 @@ "prettier": "^2.2.0", "ts-jest": "29.2.5", "ts-node": "^10.9.1", - "typescript": "^5.6.2" + "typescript": "^5.6.3" }, "jest": { "collectCoverage": true, From 54852c7fc9d9abab865e89e42413ee10864e61c2 Mon Sep 17 00:00:00 2001 From: Roman Nikitenko Date: Wed, 11 Dec 2024 11:43:33 +0200 Subject: [PATCH 2/4] fix: Use axios version with bug fixes Signed-off-by: Roman Nikitenko rh-pre-commit.version: 2.2.0 rh-pre-commit.check-secrets: ENABLED --- code/extensions/che-api/package-lock.json | 9 +++++---- code/extensions/che-api/package.json | 2 +- code/extensions/che-remote/package-lock.json | 18 ++++++++++-------- code/extensions/che-remote/package.json | 4 ++-- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/code/extensions/che-api/package-lock.json b/code/extensions/che-api/package-lock.json index 3d7b7aae93f..26665b60ebd 100644 --- a/code/extensions/che-api/package-lock.json +++ b/code/extensions/che-api/package-lock.json @@ -12,7 +12,7 @@ "@devfile/api": "^2.3.0-1723034342", "@eclipse-che/workspace-telemetry-client": "^0.0.1-1685523760", "@kubernetes/client-node": "^0.22.0", - "axios": "^1.7.4", + "axios": "^1.7.9", "fs-extra": "^11.2.0", "inversify": "^6.0.2", "js-yaml": "^4.1.0", @@ -1497,9 +1497,10 @@ "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==" }, "node_modules/axios": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", - "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", + "version": "1.7.9", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz", + "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==", + "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", diff --git a/code/extensions/che-api/package.json b/code/extensions/che-api/package.json index a4c4b2dcae0..80fc04dc42c 100644 --- a/code/extensions/che-api/package.json +++ b/code/extensions/che-api/package.json @@ -30,7 +30,7 @@ }, "dependencies": { "@devfile/api": "^2.3.0-1723034342", - "axios": "^1.7.4", + "axios": "^1.7.9", "@kubernetes/client-node": "^0.22.0", "fs-extra": "^11.2.0", "inversify": "^6.0.2", diff --git a/code/extensions/che-remote/package-lock.json b/code/extensions/che-remote/package-lock.json index 1b47a1f2a58..7f9aba73c9b 100644 --- a/code/extensions/che-remote/package-lock.json +++ b/code/extensions/che-remote/package-lock.json @@ -9,8 +9,8 @@ "version": "0.0.1", "license": "EPL-2.0", "dependencies": { - "@eclipse-che/che-devworkspace-generator": "^7.93.0", - "axios": "^1.7.4", + "@eclipse-che/che-devworkspace-generator": "^7.95.0", + "axios": "^1.7.9", "https": "^1.0.0", "js-yaml": "^4.0.0", "vscode-nls": "^5.0.0" @@ -605,9 +605,10 @@ } }, "node_modules/@eclipse-che/che-devworkspace-generator": { - "version": "7.93.0", - "resolved": "https://registry.npmjs.org/@eclipse-che/che-devworkspace-generator/-/che-devworkspace-generator-7.93.0.tgz", - "integrity": "sha512-4jXIcglvmxi8wPHruLnFt4uVv4sogChfi7SAqrUohz0tQyv3kK5hoYDLUG0ELTquqoE663vKF7h7w36Mt/wLBQ==", + "version": "7.95.0", + "resolved": "https://registry.npmjs.org/@eclipse-che/che-devworkspace-generator/-/che-devworkspace-generator-7.95.0.tgz", + "integrity": "sha512-uvvDG4i08/AysxAdWK8vRQBa6/2bud7od7hb11D4P1Iaa69lOtwlbCqRV36q0VGyGtEspvLbPuUVouGtrx89hg==", + "license": "EPL-2.0", "dependencies": { "@devfile/api": "2.3.0-1725380172", "axios": "^1.7.4", @@ -1495,9 +1496,10 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/axios": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", - "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", + "version": "1.7.9", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz", + "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==", + "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", diff --git a/code/extensions/che-remote/package.json b/code/extensions/che-remote/package.json index 10db8d1e0e9..82baf4cfce5 100644 --- a/code/extensions/che-remote/package.json +++ b/code/extensions/che-remote/package.json @@ -31,8 +31,8 @@ }, "dependencies": { "vscode-nls": "^5.0.0", - "axios": "^1.7.4", - "@eclipse-che/che-devworkspace-generator": "^7.93.0", + "axios": "^1.7.9", + "@eclipse-che/che-devworkspace-generator": "^7.95.0", "https": "^1.0.0", "js-yaml": "^4.0.0" }, From 04e0d686b313698e26be4cfe0f430806cbaa9ab7 Mon Sep 17 00:00:00 2001 From: Roman Nikitenko Date: Wed, 11 Dec 2024 13:48:05 +0200 Subject: [PATCH 3/4] Downgrade devworkspace-generator version Signed-off-by: Roman Nikitenko rh-pre-commit.version: 2.2.0 rh-pre-commit.check-secrets: ENABLED --- code/extensions/che-remote/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/extensions/che-remote/package.json b/code/extensions/che-remote/package.json index 82baf4cfce5..49f1f5edb79 100644 --- a/code/extensions/che-remote/package.json +++ b/code/extensions/che-remote/package.json @@ -32,7 +32,7 @@ "dependencies": { "vscode-nls": "^5.0.0", "axios": "^1.7.9", - "@eclipse-che/che-devworkspace-generator": "^7.95.0", + "@eclipse-che/che-devworkspace-generator": "^7.93.0", "https": "^1.0.0", "js-yaml": "^4.0.0" }, From e42ed458a0fd6c4d3f2b96f37709f594e063d448 Mon Sep 17 00:00:00 2001 From: Roman Nikitenko Date: Wed, 11 Dec 2024 15:02:02 +0200 Subject: [PATCH 4/4] Downgrade devworkspace-generator version Signed-off-by: Roman Nikitenko rh-pre-commit.version: 2.2.0 rh-pre-commit.check-secrets: ENABLED --- code/build/gulpfile.compile.js | 2 +- code/extensions/che-remote/package-lock.json | 8 +- code/extensions/che-remote/package.json | 2 +- code/remote/package-lock.json | 78 ++++++++++---------- 4 files changed, 45 insertions(+), 45 deletions(-) diff --git a/code/build/gulpfile.compile.js b/code/build/gulpfile.compile.js index e40b05f8d39..3db43369f00 100644 --- a/code/build/gulpfile.compile.js +++ b/code/build/gulpfile.compile.js @@ -25,7 +25,7 @@ function makeCompileBuildTask(disableMangle) { } // Full compile, including nls and inline sources in sourcemaps, mangling, minification, for build -const compileBuildTask = task.define('compile-build', makeCompileBuildTask(false)); +const compileBuildTask = task.define('compile-build', makeCompileBuildTask(true)); gulp.task(compileBuildTask); exports.compileBuildTask = compileBuildTask; diff --git a/code/extensions/che-remote/package-lock.json b/code/extensions/che-remote/package-lock.json index fae32063799..9219c0dda58 100644 --- a/code/extensions/che-remote/package-lock.json +++ b/code/extensions/che-remote/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.1", "license": "EPL-2.0", "dependencies": { - "@eclipse-che/che-devworkspace-generator": "^7.95.0", + "@eclipse-che/che-devworkspace-generator": "7.93.0", "axios": "^1.7.9", "https": "^1.0.0", "js-yaml": "^4.0.0", @@ -605,9 +605,9 @@ } }, "node_modules/@eclipse-che/che-devworkspace-generator": { - "version": "7.95.0", - "resolved": "https://registry.npmjs.org/@eclipse-che/che-devworkspace-generator/-/che-devworkspace-generator-7.95.0.tgz", - "integrity": "sha512-uvvDG4i08/AysxAdWK8vRQBa6/2bud7od7hb11D4P1Iaa69lOtwlbCqRV36q0VGyGtEspvLbPuUVouGtrx89hg==", + "version": "7.93.0", + "resolved": "https://registry.npmjs.org/@eclipse-che/che-devworkspace-generator/-/che-devworkspace-generator-7.93.0.tgz", + "integrity": "sha512-4jXIcglvmxi8wPHruLnFt4uVv4sogChfi7SAqrUohz0tQyv3kK5hoYDLUG0ELTquqoE663vKF7h7w36Mt/wLBQ==", "license": "EPL-2.0", "dependencies": { "@devfile/api": "2.3.0-1725380172", diff --git a/code/extensions/che-remote/package.json b/code/extensions/che-remote/package.json index 49f1f5edb79..95e2b0008af 100644 --- a/code/extensions/che-remote/package.json +++ b/code/extensions/che-remote/package.json @@ -32,7 +32,7 @@ "dependencies": { "vscode-nls": "^5.0.0", "axios": "^1.7.9", - "@eclipse-che/che-devworkspace-generator": "^7.93.0", + "@eclipse-che/che-devworkspace-generator": "7.93.0", "https": "^1.0.0", "js-yaml": "^4.0.0" }, diff --git a/code/remote/package-lock.json b/code/remote/package-lock.json index 83114b31298..93f696fbaf7 100644 --- a/code/remote/package-lock.json +++ b/code/remote/package-lock.json @@ -863,6 +863,33 @@ "node": ">=8" } }, + "node_modules/font-finder": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/font-finder/-/font-finder-1.1.0.tgz", + "integrity": "sha512-wpCL2uIbi6GurJbU7ZlQ3nGd61Ho+dSU6U83/xJT5UPFfN35EeCW/rOtS+5k+IuEZu2SYmHzDIPL9eA5tSYRAw==", + "license": "MIT", + "dependencies": { + "get-system-fonts": "^2.0.0", + "promise-stream-reader": "^1.0.1" + }, + "engines": { + "node": ">8.0.0" + } + }, + "node_modules/font-ligatures": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/font-ligatures/-/font-ligatures-1.4.1.tgz", + "integrity": "sha512-7W6zlfyhvCqShZ5ReUWqmSd9vBaUudW0Hxis+tqUjtHhsPU+L3Grf8mcZAtCiXHTzorhwdRTId2WeH/88gdFkw==", + "license": "MIT", + "dependencies": { + "font-finder": "^1.0.3", + "lru-cache": "^6.0.0", + "opentype.js": "^0.8.0" + }, + "engines": { + "node": ">8.0.0" + } + }, "node_modules/foreground-child": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", @@ -902,33 +929,6 @@ "node": ">= 0.12" } }, - "node_modules/font-finder": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/font-finder/-/font-finder-1.1.0.tgz", - "integrity": "sha512-wpCL2uIbi6GurJbU7ZlQ3nGd61Ho+dSU6U83/xJT5UPFfN35EeCW/rOtS+5k+IuEZu2SYmHzDIPL9eA5tSYRAw==", - "license": "MIT", - "dependencies": { - "get-system-fonts": "^2.0.0", - "promise-stream-reader": "^1.0.1" - }, - "engines": { - "node": ">8.0.0" - } - }, - "node_modules/font-ligatures": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/font-ligatures/-/font-ligatures-1.4.1.tgz", - "integrity": "sha512-7W6zlfyhvCqShZ5ReUWqmSd9vBaUudW0Hxis+tqUjtHhsPU+L3Grf8mcZAtCiXHTzorhwdRTId2WeH/88gdFkw==", - "license": "MIT", - "dependencies": { - "font-finder": "^1.0.3", - "lru-cache": "^6.0.0", - "opentype.js": "^0.8.0" - }, - "engines": { - "node": ">8.0.0" - } - }, "node_modules/fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", @@ -1510,6 +1510,18 @@ "url": "https://github.com/sponsors/panva" } }, + "node_modules/opentype.js": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/opentype.js/-/opentype.js-0.8.0.tgz", + "integrity": "sha512-FQHR4oGP+a0m/f6yHoRpBOIbn/5ZWxKd4D/djHVJu8+KpBTYrJda0b7mLcgDEMWXE9xBCJm+qb0yv6FcvPjukg==", + "license": "MIT", + "dependencies": { + "tiny-inflate": "^1.0.2" + }, + "bin": { + "ot": "bin/ot" + } + }, "node_modules/package-json-from-dist": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", @@ -1547,18 +1559,6 @@ "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", "license": "ISC" }, - "node_modules/opentype.js": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/opentype.js/-/opentype.js-0.8.0.tgz", - "integrity": "sha512-FQHR4oGP+a0m/f6yHoRpBOIbn/5ZWxKd4D/djHVJu8+KpBTYrJda0b7mLcgDEMWXE9xBCJm+qb0yv6FcvPjukg==", - "license": "MIT", - "dependencies": { - "tiny-inflate": "^1.0.2" - }, - "bin": { - "ot": "bin/ot" - } - }, "node_modules/pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",