From 2149780a817844ebfbc66af7d90c09fa30cb85e1 Mon Sep 17 00:00:00 2001 From: Roman Nikitenko Date: Mon, 23 Jun 2025 13:55:55 +0300 Subject: [PATCH 1/3] [fork] Simplify Testing --- .../workflows/pull-request-check-publish.yml | 24 ++------- .github/workflows/pull-request-check.yml | 37 +------------ build/dockerfiles/linux-libc-ubi8.Dockerfile | 52 ------------------- build/dockerfiles/linux-libc-ubi9.Dockerfile | 51 ------------------ build/dockerfiles/linux-musl.Dockerfile | 49 ----------------- code/build/gulpfile.compile.js | 2 +- launcher/package.json | 2 +- 7 files changed, 8 insertions(+), 209 deletions(-) diff --git a/.github/workflows/pull-request-check-publish.yml b/.github/workflows/pull-request-check-publish.yml index 90a998a3380..d35c0d4956d 100644 --- a/.github/workflows/pull-request-check-publish.yml +++ b/.github/workflows/pull-request-check-publish.yml @@ -59,37 +59,21 @@ jobs: - name: Load Docker images run: | docker load -i che-code-amd64.tgz - docker load -i che-code-arm64.tgz - docker load -i che-dev.tgz - name: Login to Quay.io uses: docker/login-action@v3 with: registry: quay.io - username: ${{ secrets.QUAY_PULL_REQUESTS_USERNAME }} - password: ${{ secrets.QUAY_PULL_REQUESTS_PASSWORD }} + username: ${{ secrets.QUAY_USERNAME }} + password: ${{ secrets.QUAY_PASSWORD }} - name: Push che-code-amd64 docker image run: | - export IMAGE=quay.io/che-incubator-pull-requests/che-code:pr-${{env._PR_NUMBER}}-amd64 + export IMAGE=quay.io/${{ secrets.QUAY_USERNAME }}/che-code:pr-${{env._PR_NUMBER}}-amd64 docker tag che-code-amd64 ${IMAGE} docker push ${IMAGE} echo "_CHE_CODE_AMD64_IMAGE=${IMAGE}" >> $GITHUB_ENV - - name: Push che-code-arm64 docker image - run: | - export IMAGE=quay.io/che-incubator-pull-requests/che-code:pr-${{env._PR_NUMBER}}-arm64 - docker tag che-code-arm64 ${IMAGE} - docker push ${IMAGE} - echo "_CHE_CODE_ARM64_IMAGE=${IMAGE}" >> $GITHUB_ENV - - - name: Push che-dev docker image - run: | - export IMAGE=quay.io/che-incubator-pull-requests/che-code-dev:pr-${{env._PR_NUMBER}}-dev-amd64 - docker tag che-dev ${IMAGE} - docker push ${IMAGE} - echo "_CHE_DEV_IMAGE=${IMAGE}" >> $GITHUB_ENV - - name: 'Comment PR' uses: actions/github-script@v7 with: @@ -99,5 +83,5 @@ jobs: issue_number: process.env._PR_NUMBER, owner: context.repo.owner, repo: context.repo.repo, - body: `Pull Request images published ✨\n\nEditor amd64: [${process.env._CHE_CODE_AMD64_IMAGE}](https://${process.env._CHE_CODE_AMD64_IMAGE})\nEditor arm64: [${process.env._CHE_CODE_ARM64_IMAGE}](https://${process.env._CHE_CODE_ARM64_IMAGE})\nDev image: [${process.env._CHE_DEV_IMAGE}](https://${process.env._CHE_DEV_IMAGE})` + body: `Pull Request images published ✨\n\nEditor amd64: [${process.env._CHE_CODE_AMD64_IMAGE}](https://${process.env._CHE_CODE_AMD64_IMAGE})` }) diff --git a/.github/workflows/pull-request-check.yml b/.github/workflows/pull-request-check.yml index 12b6e3b4acd..76ca89da051 100644 --- a/.github/workflows/pull-request-check.yml +++ b/.github/workflows/pull-request-check.yml @@ -42,7 +42,7 @@ jobs: fail-fast: false matrix: dist: ['libc-ubi8', 'libc-ubi9', 'musl'] - runners: ['ubuntu-22.04', 'ubuntu-22.04-arm'] + runners: ['ubuntu-22.04'] runs-on: ${{matrix.runners}} steps: - name: Set arch environment variable @@ -79,7 +79,7 @@ jobs: strategy: fail-fast: false matrix: - runners: ['ubuntu-22.04', 'ubuntu-22.04-arm'] + runners: ['ubuntu-22.04'] runs-on: ${{matrix.runners}} steps: - name: Set arch environment variable @@ -138,36 +138,3 @@ jobs: with: name: pull-request-number path: PR_NUMBER - - dev: - name: build-che-dev-image - runs-on: ubuntu-22.04 - steps: - - name: Checkout che-code source code - uses: actions/checkout@v4 - - - name: Cleanup docker images - run: | - docker system prune -af - - - name: Build Che-Code Docker image - run: | - docker buildx build \ - --platform linux/amd64 \ - --progress=plain \ - -f build/dockerfiles/dev.Dockerfile \ - -t che-dev . - - - name: Display docker images - run: | - docker images - - - name: Compress che-dev image to a file - run: | - docker save che-dev | gzip > che-dev.tgz - - - name: Upload che-dev docker image artifact - uses: actions/upload-artifact@v4 - with: - name: che-dev - path: che-dev.tgz diff --git a/build/dockerfiles/linux-libc-ubi8.Dockerfile b/build/dockerfiles/linux-libc-ubi8.Dockerfile index e8e001950bc..ed59821172a 100644 --- a/build/dockerfiles/linux-libc-ubi8.Dockerfile +++ b/build/dockerfiles/linux-libc-ubi8.Dockerfile @@ -86,58 +86,6 @@ RUN chmod a+x /checode/out/server-main.js \ ### Beginning of tests # Do not change line above! It is used to cut this section to skip tests -# Compile tests -RUN ./node_modules/.bin/gulp compile-extension:vscode-api-tests \ - compile-extension:markdown-language-features \ - compile-extension:typescript-language-features \ - compile-extension:emmet \ - compile-extension:git \ - compile-extension:ipynb \ - compile-extension-media \ - compile-extension:configuration-editing - -# Compile test suites -# https://github.com/microsoft/vscode/blob/cdde5bedbf3ed88f93b5090bb3ed9ef2deb7a1b4/test/integration/browser/README.md#compile -RUN if [ "$(uname -m)" = "x86_64" ]; then npm --prefix test/smoke run compile && npm --prefix test/integration/browser run compile; fi - -# install test dependencies -ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=0 -RUN if [ "$(uname -m)" = "x86_64" ]; then npm run playwright-install; fi -# Install procps to manage to kill processes and centos stream repository -RUN if [ "$(uname -m)" = "x86_64" ]; then \ - ARCH=$(uname -m) && \ - yum install --nobest -y procps \ - https://vault.centos.org/centos/8/extras/${ARCH}/os/Packages/epel-release-8-11.el8.noarch.rpm \ - https://vault.centos.org/8-stream/BaseOS/${ARCH}/os/Packages/centos-gpg-keys-8-3.el8.noarch.rpm \ - https://vault.centos.org/8-stream/BaseOS/${ARCH}/os/Packages/centos-stream-repos-8-3.el8.noarch.rpm; \ - fi - -RUN if [ "$(uname -m)" = "x86_64" ]; then \ - sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* \ - && yum install -y chromium \ - && PLAYWRIGHT_CHROMIUM_PATH=$(echo /opt/app-root/src/.cache/ms-playwright/chromium-*/) \ - && rm "${PLAYWRIGHT_CHROMIUM_PATH}/chrome-linux/chrome" \ - && ln -s /usr/bin/chromium-browser "${PLAYWRIGHT_CHROMIUM_PATH}/chrome-linux/chrome"; \ - fi - -# use of retry and timeout -COPY /build/scripts/helper/retry.sh /opt/app-root/src/retry.sh -RUN chmod u+x /opt/app-root/src/retry.sh - -# Run integration tests (Browser) -RUN if [ "$(uname -m)" = "x86_64" ]; then \ - NODE_ARCH=$(echo "console.log(process.arch)" | node) \ - VSCODE_REMOTE_SERVER_PATH="$(pwd)/../vscode-reh-web-linux-${NODE_ARCH}" \ - /opt/app-root/src/retry.sh -v -t 3 -s 2 -- timeout -v 5m ./scripts/test-web-integration.sh --browser chromium; \ - fi - -# Run smoke tests (Browser) -RUN if [ "$(uname -m)" = "x86_64" ]; then \ - NODE_ARCH=$(echo "console.log(process.arch)" | node) \ - VSCODE_REMOTE_SERVER_PATH="$(pwd)/../vscode-reh-web-linux-${NODE_ARCH}" \ - /opt/app-root/src/retry.sh -v -t 3 -s 2 -- timeout -v 5m npm run smoketest-no-compile -- --web --headless --electronArgs="--disable-dev-shm-usage --use-gl=swiftshader"; \ - fi - # Do not change line below! It is used to cut this section to skip tests ### Ending of tests diff --git a/build/dockerfiles/linux-libc-ubi9.Dockerfile b/build/dockerfiles/linux-libc-ubi9.Dockerfile index dfe4e44a58e..1c2ec3003de 100644 --- a/build/dockerfiles/linux-libc-ubi9.Dockerfile +++ b/build/dockerfiles/linux-libc-ubi9.Dockerfile @@ -88,57 +88,6 @@ RUN chmod a+x /checode/out/server-main.js \ ### Beginning of tests # Do not change line above! It is used to cut this section to skip tests -# Compile tests -RUN ./node_modules/.bin/gulp compile-extension:vscode-api-tests \ - compile-extension:markdown-language-features \ - compile-extension:typescript-language-features \ - compile-extension:emmet \ - compile-extension:git \ - compile-extension:ipynb \ - compile-extension-media \ - compile-extension:configuration-editing - -# # Compile test suites -# https://github.com/microsoft/vscode/blob/cdde5bedbf3ed88f93b5090bb3ed9ef2deb7a1b4/test/integration/browser/README.md#compile -RUN if [ "$(uname -m)" = "x86_64" ]; then npm --prefix test/smoke run compile && npm --prefix test/integration/browser run compile; fi - -# install test dependencies -ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=0 -RUN if [ "$(uname -m)" = "x86_64" ]; then npm run playwright-install; fi -# Install procps to manage to kill processes and centos stream repository -RUN if [ "$(uname -m)" = "x86_64" ]; then \ - ARCH=$(uname -m) && \ - yum install --nobest -y procps \ - https://rpmfind.net/linux/epel/9/Everything/x86_64/Packages/e/epel-release-9-10.el9.noarch.rpm \ - https://rpmfind.net/linux/centos-stream/9-stream/BaseOS/x86_64/os/Packages/centos-gpg-keys-9.0-23.el9.noarch.rpm \ - https://rpmfind.net/linux/centos-stream/9-stream/BaseOS/x86_64/os/Packages/centos-stream-repos-9.0-23.el9.noarch.rpm; \ - fi - -RUN if [ "$(uname -m)" = "x86_64" ]; then \ - yum install -y chromium && \ - PLAYWRIGHT_CHROMIUM_PATH=$(echo /opt/app-root/src/.cache/ms-playwright/chromium-*/) && \ - rm "${PLAYWRIGHT_CHROMIUM_PATH}/chrome-linux/chrome" && \ - ln -s /usr/bin/chromium-browser "${PLAYWRIGHT_CHROMIUM_PATH}/chrome-linux/chrome"; \ - fi - -# use of retry and timeout -COPY /build/scripts/helper/retry.sh /opt/app-root/src/retry.sh -RUN chmod u+x /opt/app-root/src/retry.sh - -# Run integration tests (Browser) -RUN if [ "$(uname -m)" = "x86_64" ]; then \ - NODE_ARCH=$(echo "console.log(process.arch)" | node) \ - VSCODE_REMOTE_SERVER_PATH="$(pwd)/../vscode-reh-web-linux-${NODE_ARCH}" \ - /opt/app-root/src/retry.sh -v -t 3 -s 2 -- timeout -v 5m ./scripts/test-web-integration.sh --browser chromium; \ - fi - -# Run smoke tests (Browser) -RUN if [ "$(uname -m)" = "x86_64" ]; then \ - NODE_ARCH=$(echo "console.log(process.arch)" | node) \ - VSCODE_REMOTE_SERVER_PATH="$(pwd)/../vscode-reh-web-linux-${NODE_ARCH}" \ - /opt/app-root/src/retry.sh -v -t 3 -s 2 -- timeout -v 5m npm run smoketest-no-compile -- --web --headless --electronArgs="--disable-dev-shm-usage --use-gl=swiftshader"; \ - fi - # Do not change line below! It is used to cut this section to skip tests ### Ending of tests diff --git a/build/dockerfiles/linux-musl.Dockerfile b/build/dockerfiles/linux-musl.Dockerfile index c245f1c583e..7423c3f747d 100644 --- a/build/dockerfiles/linux-musl.Dockerfile +++ b/build/dockerfiles/linux-musl.Dockerfile @@ -64,55 +64,6 @@ RUN cp -r ../vscode-reh-web-linux-alpine /checode RUN chmod a+x /checode/out/server-main.js \ && chgrp -R 0 /checode && chmod -R g+rwX /checode -# Compile tests -RUN ./node_modules/.bin/gulp compile-extension:vscode-api-tests \ - compile-extension:markdown-language-features \ - compile-extension:typescript-language-features \ - compile-extension:emmet \ - compile-extension:git \ - compile-extension:ipynb \ - compile-extension-media \ - compile-extension:configuration-editing - -# Compile test suites -# https://github.com/microsoft/vscode/blob/cdde5bedbf3ed88f93b5090bb3ed9ef2deb7a1b4/test/integration/browser/README.md#compile -RUN if [ "$(uname -m)" = "x86_64" ]; then \ - npm --prefix test/smoke run compile && npm --prefix test/integration/browser run compile; \ - fi -# use of retry and timeout -COPY /build/scripts/helper/retry.sh /usr/bin/retry -RUN chmod u+x /usr/bin/retry - -# install test dependencies -# chromium for tests and procps as tests are using kill commands and it does not work with busybox implementation -RUN if [ "$(uname -m)" = "x86_64" ]; then \ - apk add --update --no-cache chromium procps; \ - fi -ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=0 -RUN if [ "$(uname -m)" = "x86_64" ]; then \ - npm run playwright-install; \ - fi -RUN if [ "$(uname -m)" = "x86_64" ]; then \ - PLAYWRIGHT_HEADLESS_PATH=$(echo /root/.cache/ms-playwright/chromium_headless_shell-*/chrome-linux) && \ - echo "Found headless_shell path: $PLAYWRIGHT_HEADLESS_PATH" && \ - rm -f "$PLAYWRIGHT_HEADLESS_PATH/headless_shell" && \ - ln -sf /usr/bin/chromium-browser "$PLAYWRIGHT_HEADLESS_PATH/headless_shell" && \ - ln -sf /usr/bin/chromium-browser "$PLAYWRIGHT_HEADLESS_PATH/chrome" && \ - ls -la "$PLAYWRIGHT_HEADLESS_PATH"; \ - fi - -# Run integration tests (Browser) -RUN if [ "$(uname -m)" = "x86_64" ]; then \ - VSCODE_REMOTE_SERVER_PATH="/vscode-reh-web-linux-alpine" \ - retry -v -t 3 -s 2 -- timeout 5m ./scripts/test-web-integration.sh --browser chromium; \ - fi - -# Run smoke tests (Browser) -RUN if [ "$(uname -m)" = "x86_64" ]; then \ - VSCODE_REMOTE_SERVER_PATH="/vscode-reh-web-linux-alpine" \ - retry -v -t 3 -s 2 -- timeout 5m npm run smoketest-no-compile -- --web --headless --electronArgs="--disable-dev-shm-usage --use-gl=swiftshader"; \ - fi - ######################################################### # # Copy VS Code launcher to the container diff --git a/code/build/gulpfile.compile.js b/code/build/gulpfile.compile.js index 0c0a024c8fc..fef1cd73d82 100644 --- a/code/build/gulpfile.compile.js +++ b/code/build/gulpfile.compile.js @@ -30,6 +30,6 @@ gulp.task(compileBuildWithoutManglingTask); exports.compileBuildWithoutManglingTask = compileBuildWithoutManglingTask; // CI compile, including nls and inline sources in sourcemaps, mangling, minification, for build -const compileBuildWithManglingTask = task.define('compile-build-with-mangling', makeCompileBuildTask(false)); +const compileBuildWithManglingTask = task.define('compile-build-with-mangling', makeCompileBuildTask(true)); gulp.task(compileBuildWithManglingTask); exports.compileBuildWithManglingTask = compileBuildWithManglingTask; diff --git a/launcher/package.json b/launcher/package.json index be6145baa78..c51884a3a01 100644 --- a/launcher/package.json +++ b/launcher/package.json @@ -23,7 +23,7 @@ "format:fix": "prettier --write '{src,tests}/**/*.ts' package.json", "lint": "eslint --cache=true --no-error-on-unmatched-pattern=true '{src,tests}/(!model|**)/*.ts'", "lint:fix": "eslint --fix --cache=true --no-error-on-unmatched-pattern=true \"{src,tests}/(!model|**)/*.{ts,tsx}\"", - "test": "jest --forceExit", + "test": "echo 'tests were skipped'", "watch": "tsc -w" }, "repository": { From b76e3bd23fb7963b5faca8e12124e94a28ea739a Mon Sep 17 00:00:00 2001 From: Roman Nikitenko Date: Thu, 13 Nov 2025 12:42:24 +0200 Subject: [PATCH 2/3] chore: Add dependabot Signed-off-by: Roman Nikitenko --- .github/dependabot.yml | 131 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000000..2332ef9e4d5 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,131 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + open-pull-requests-limit: 5 + commit-message: + prefix: "deps(actions)" + + - package-ecosystem: "docker" + directory: "/build/dockerfiles" + schedule: + interval: "weekly" + open-pull-requests-limit: 3 + commit-message: + prefix: "deps(docker)" + + - package-ecosystem: "npm" + directory: "/code" + schedule: + interval: "weekly" + open-pull-requests-limit: 5 + commit-message: + prefix: "deps(npm)" + + - package-ecosystem: "npm" + directory: "/code/remote" + schedule: + interval: "weekly" + open-pull-requests-limit: 5 + commit-message: + prefix: "deps(npm)" + + - package-ecosystem: "npm" + directory: "/code/build" + schedule: + interval: "weekly" + open-pull-requests-limit: 5 + commit-message: + prefix: "deps(npm)" + + - package-ecosystem: "npm" + directory: "/code/extensions" + schedule: + interval: "weekly" + open-pull-requests-limit: 5 + commit-message: + prefix: "deps(npm)" + + - package-ecosystem: "npm" + directory: "/code/extensions/che-api" + schedule: + interval: "weekly" + open-pull-requests-limit: 5 + commit-message: + prefix: "deps(npm)" + + - package-ecosystem: "npm" + directory: "/code/extensions/che-activity-tracker" + schedule: + interval: "weekly" + open-pull-requests-limit: 5 + commit-message: + prefix: "deps(npm)" + + - package-ecosystem: "npm" + directory: "/code/extensions/che-commands" + schedule: + interval: "weekly" + open-pull-requests-limit: 5 + commit-message: + prefix: "deps(npm)" + + - package-ecosystem: "npm" + directory: "/code/extensions/che-github-authentication" + schedule: + interval: "weekly" + open-pull-requests-limit: 5 + commit-message: + prefix: "deps(npm)" + + - package-ecosystem: "npm" + directory: "/code/extensions/che-port" + schedule: + interval: "weekly" + open-pull-requests-limit: 5 + commit-message: + prefix: "deps(npm)" + + - package-ecosystem: "npm" + directory: "/code/extensions/che-remote" + schedule: + interval: "weekly" + open-pull-requests-limit: 5 + commit-message: + prefix: "deps(npm)" + + - package-ecosystem: "npm" + directory: "/code/extensions/che-resource-monitor" + schedule: + interval: "weekly" + open-pull-requests-limit: 5 + commit-message: + prefix: "deps(npm)" + + - package-ecosystem: "npm" + directory: "/code/extensions/che-telemetry" + schedule: + interval: "weekly" + open-pull-requests-limit: 5 + commit-message: + prefix: "deps(npm)" + + - package-ecosystem: "npm" + directory: "/code/extensions/che-terminal" + schedule: + interval: "weekly" + open-pull-requests-limit: 5 + commit-message: + prefix: "deps(npm)" + + - package-ecosystem: "npm" + directory: "/launcher" + schedule: + interval: "weekly" + open-pull-requests-limit: 5 + commit-message: + prefix: "deps(npm)" + + \ No newline at end of file From a57c613a08e71d5a9b3a5f652772f6c5384434ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Nov 2025 10:44:10 +0000 Subject: [PATCH 3/3] deps(npm): bump ts-jest in /code/extensions/che-api Bumps [ts-jest](https://github.com/kulshekhar/ts-jest) from 27.1.5 to 29.4.5. - [Release notes](https://github.com/kulshekhar/ts-jest/releases) - [Changelog](https://github.com/kulshekhar/ts-jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/kulshekhar/ts-jest/compare/v27.1.5...v29.4.5) --- updated-dependencies: - dependency-name: ts-jest dependency-version: 29.4.5 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- code/extensions/che-api/package-lock.json | 139 +++++++++++++++++----- code/extensions/che-api/package.json | 2 +- 2 files changed, 110 insertions(+), 31 deletions(-) diff --git a/code/extensions/che-api/package-lock.json b/code/extensions/che-api/package-lock.json index 9d09df71f8c..c33be69c8d0 100644 --- a/code/extensions/che-api/package-lock.json +++ b/code/extensions/che-api/package-lock.json @@ -25,7 +25,7 @@ "@types/js-yaml": "^4.0.5", "@types/node": "22.x", "jest": "^27.4.7", - "ts-jest": "^27.1.2", + "ts-jest": "^29.4.5", "webpack-node-externals": "^3.0.0" }, "engines": { @@ -2577,6 +2577,28 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" }, + "node_modules/handlebars": { + "version": "4.7.8", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", + "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "minimist": "^1.2.5", + "neo-async": "^2.6.2", + "source-map": "^0.6.1", + "wordwrap": "^1.0.0" + }, + "bin": { + "handlebars": "bin/handlebars" + }, + "engines": { + "node": ">=0.4.7" + }, + "optionalDependencies": { + "uglify-js": "^3.1.4" + } + }, "node_modules/har-schema": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", @@ -3945,6 +3967,16 @@ "node": "*" } }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/minipass": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", @@ -4046,6 +4078,13 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, + "node_modules/neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true, + "license": "MIT" + }, "node_modules/node-fetch": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", @@ -4978,38 +5017,45 @@ } }, "node_modules/ts-jest": { - "version": "27.1.5", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-27.1.5.tgz", - "integrity": "sha512-Xv6jBQPoBEvBq/5i2TeSG9tt/nqkbpcurrEG1b+2yfBrcJelOZF9Ml6dmyMh7bcW9JyFbRYpR5rxROSlBLTZHA==", + "version": "29.4.5", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.5.tgz", + "integrity": "sha512-HO3GyiWn2qvTQA4kTgjDcXiMwYQt68a1Y8+JuLRVpdIzm+UOLSHgl/XqR4c6nzJkq5rOkjc02O2I7P7l/Yof0Q==", "dev": true, + "license": "MIT", "dependencies": { - "bs-logger": "0.x", - "fast-json-stable-stringify": "2.x", - "jest-util": "^27.0.0", - "json5": "2.x", - "lodash.memoize": "4.x", - "make-error": "1.x", - "semver": "7.x", - "yargs-parser": "20.x" + "bs-logger": "^0.2.6", + "fast-json-stable-stringify": "^2.1.0", + "handlebars": "^4.7.8", + "json5": "^2.2.3", + "lodash.memoize": "^4.1.2", + "make-error": "^1.3.6", + "semver": "^7.7.3", + "type-fest": "^4.41.0", + "yargs-parser": "^21.1.1" }, "bin": { "ts-jest": "cli.js" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0" }, "peerDependencies": { "@babel/core": ">=7.0.0-beta.0 <8", - "@types/jest": "^27.0.0", - "babel-jest": ">=27.0.0 <28", - "jest": "^27.0.0", - "typescript": ">=3.8 <5.0" + "@jest/transform": "^29.0.0 || ^30.0.0", + "@jest/types": "^29.0.0 || ^30.0.0", + "babel-jest": "^29.0.0 || ^30.0.0", + "jest": "^29.0.0 || ^30.0.0", + "jest-util": "^29.0.0 || ^30.0.0", + "typescript": ">=4.3 <6" }, "peerDependenciesMeta": { "@babel/core": { "optional": true }, - "@types/jest": { + "@jest/transform": { + "optional": true + }, + "@jest/types": { "optional": true }, "babel-jest": { @@ -5017,14 +5063,18 @@ }, "esbuild": { "optional": true + }, + "jest-util": { + "optional": true } } }, "node_modules/ts-jest/node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "version": "7.7.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", + "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -5032,6 +5082,29 @@ "node": ">=10" } }, + "node_modules/ts-jest/node_modules/type-fest": { + "version": "4.41.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz", + "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ts-jest/node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, "node_modules/tslib": { "version": "2.8.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz", @@ -5083,19 +5156,18 @@ "is-typedarray": "^1.0.0" } }, - "node_modules/typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "node_modules/uglify-js": { + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz", + "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==", "dev": true, - "license": "Apache-2.0", - "peer": true, + "license": "BSD-2-Clause", + "optional": true, "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" + "uglifyjs": "bin/uglifyjs" }, "engines": { - "node": ">=4.2.0" + "node": ">=0.8.0" } }, "node_modules/undici-types": { @@ -5301,6 +5373,13 @@ "node": ">= 8" } }, + "node_modules/wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", + "dev": true, + "license": "MIT" + }, "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", diff --git a/code/extensions/che-api/package.json b/code/extensions/che-api/package.json index c1c7cfd2aa1..8507f9bdd3c 100644 --- a/code/extensions/che-api/package.json +++ b/code/extensions/che-api/package.json @@ -46,7 +46,7 @@ "@types/js-yaml": "^4.0.5", "@types/node": "22.x", "jest": "^27.4.7", - "ts-jest": "^27.1.2", + "ts-jest": "^29.4.5", "webpack-node-externals": "^3.0.0" }, "overrides": {