diff --git a/pkgs/by-name/ma/matrix-hookshot/package.json b/pkgs/by-name/ma/matrix-hookshot/package.json index 80739890d253..c45b6a97ad66 100644 --- a/pkgs/by-name/ma/matrix-hookshot/package.json +++ b/pkgs/by-name/ma/matrix-hookshot/package.json @@ -1,6 +1,6 @@ { "name": "matrix-hookshot", - "version": "5.4.1", + "version": "6.0.1", "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.", "main": "lib/app.js", "repository": "https://github.com/matrix-org/matrix-hookshot", @@ -10,7 +10,7 @@ "name": "matrix-hookshot-rs" }, "engines": { - "node": ">=20" + "node": ">=22" }, "scripts": { "build:web": "vite build", @@ -31,11 +31,11 @@ "start:webhooks": "node --require source-map-support/register lib/App/GithubWebhookApp.js", "start:matrixsender": "node --require source-map-support/register lib/App/MatrixSenderApp.js", "start:resetcrypto": "node --require source-map-support/register lib/App/ResetCryptoStore.js", - "test": "mocha -r ts-node/register tests/init.ts tests/*.ts tests/**/*.ts", - "test:e2e": "yarn node --experimental-vm-modules $(yarn bin jest)", + "test": "mocha -r ts-node/register tests/init.ts 'tests/*.ts' 'tests/**/*.ts'", + "test:e2e": "tsc --p tsconfig.spec.json && cp ./lib/libRs.js ./lib/matrix-hookshot-rs.node ./spec-lib/src && yarn node --experimental-vm-modules $(yarn bin jest)", "test:cover": "nyc --reporter=lcov --reporter=text yarn test", "lint": "yarn run lint:js && yarn run lint:rs", - "lint:js": "eslint -c .eslintrc.js 'src/**/*.ts' 'tests/**/*.ts' 'web/**/*.ts' 'web/**/*.tsx'", + "lint:js": "eslint", "lint:rs": "cargo fmt --all -- --check && cargo clippy -- -Dwarnings", "lint:rs:apply": "cargo clippy --fix && cargo fmt --all", "generate-default-config": "ts-node src/config/Defaults.ts --config > config.sample.yml", @@ -48,12 +48,14 @@ "@octokit/rest": "^20.0.2", "@octokit/webhooks": "^12.0.10", "@sentry/node": "^7.52.1", - "@vector-im/compound-design-tokens": "^1.3.0", - "@vector-im/compound-web": "^4.8.0", + "@vector-im/compound-design-tokens": "^2.0.1", + "@vector-im/compound-web": "^7.3.0", "ajv": "^8.11.0", - "axios": "^1.6.3", + "axios": "^1.7.5", + "clsx": "^2.1.1", "cors": "^2.8.5", - "express": "^4.18.2", + "date-fns": "^4.1.0", + "express": "^4.20.0", "figma-js": "^1.14.0", "helmet": "^7.1.0", "http-status-codes": "^2.2.0", @@ -61,15 +63,15 @@ "jira-client": "^8.2.2", "markdown-it": "^14.0.0", "matrix-appservice-bridge": "^9.0.1", - "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.7.0-specific-device-2", - "matrix-widget-api": "^1.6.0", - "micromatch": "^4.0.5", - "mime": "^4.0.1", + "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@0.7.1-element.7", + "matrix-widget-api": "^1.10.0", + "micromatch": "^4.0.8", + "mime": "^4.0.4", "node-emoji": "^2.1.3", - "p-queue": "^6.6.2", + "parse-duration": "^1.1.0", "preact-render-to-string": "^6.3.1", "prom-client": "^15.1.0", - "quickjs-emscripten": "^0.26.0", + "quickjs-emscripten": "^0.31.0", "reflect-metadata": "^0.2.1", "source-map-support": "^0.5.21", "string-argv": "^0.3.1", @@ -81,10 +83,14 @@ }, "devDependencies": { "@codemirror/lang-javascript": "^6.0.2", + "@eslint/eslintrc": "^3.2.0", + "@eslint/js": "^9.15.0", + "@fontsource/inter": "^5.1.0", "@napi-rs/cli": "^2.13.2", - "@preact/preset-vite": "^2.2.0", + "@octokit/webhooks-types": "^7.6.1", + "@preact/preset-vite": "^2.9.1", "@rollup/plugin-alias": "^5.1.0", - "@tsconfig/node18": "^18.2.2", + "@tsconfig/node22": "^22", "@types/ajv": "^1.0.0", "@types/busboy": "^1.5.4", "@types/chai": "^4.2.22", @@ -96,28 +102,28 @@ "@types/micromatch": "^4.0.1", "@types/mime": "^3.0.4", "@types/mocha": "^10.0.6", - "@types/node": "20.10.6", + "@types/node": "^22", "@types/xml2js": "^0.4.11", - "@typescript-eslint/eslint-plugin": "^6.17.0", - "@typescript-eslint/parser": "^6.17.0", "@uiw/react-codemirror": "^4.12.3", + "babel-cli": "^6.26.0", + "babel-jest": "^29.7.0", "busboy": "^1.6.0", - "chai": "^4.3.4", - "eslint": "^8.49.0", - "eslint-config-preact": "^1.3.0", - "eslint-plugin-mocha": "^10.1.0", - "homerunner-client": "^1.0.0", + "chai": "^4", + "eslint": "^9.15.0", + "eslint-plugin-chai-expect": "^3.1.0", + "eslint-plugin-mocha": "^10.5.0", + "eslint-plugin-react": "^7.37.2", + "homerunner-client": "^1.1.0", "jest": "^29.7.0", - "mini.css": "^3.0.1", - "mocha": "^10.2.0", - "nyc": "^15.1.0", - "preact": "^10.5.15", - "rimraf": "^5.0.5", - "sass": "^1.69.6", - "ts-jest": "^29.1.1", - "ts-node": "^10.9.1", - "typescript": "^5.3.3", - "vite": "^5.0.13" + "mocha": "^10.8.2", + "nyc": "^17.1.0", + "preact": "^10.24.3", + "rimraf": "6.0.1", + "sass": "^1.81.0", + "ts-node": "10.9.2", + "typescript": "^5.7.2", + "typescript-eslint": "^8.16.0", + "vite": "^5.4.11" }, "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" } diff --git a/pkgs/by-name/ma/matrix-hookshot/package.nix b/pkgs/by-name/ma/matrix-hookshot/package.nix index 0d5e0a9b0a74..2c6dc3de7736 100644 --- a/pkgs/by-name/ma/matrix-hookshot/package.nix +++ b/pkgs/by-name/ma/matrix-hookshot/package.nix @@ -11,7 +11,7 @@ rustc, napi-rs-cli, pkg-config, - nodejs, + nodejs_22, openssl, }: @@ -30,6 +30,7 @@ mkYarnPackage rec { }; packageJSON = ./package.json; + nodejs = nodejs_22; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; @@ -70,7 +71,7 @@ mkYarnPackage rec { ''; postInstall = '' - makeWrapper '${nodejs}/bin/node' "$out/bin/matrix-hookshot" --add-flags \ + makeWrapper '${nodejs_22}/bin/node' "$out/bin/matrix-hookshot" --add-flags \ "$out/libexec/matrix-hookshot/deps/matrix-hookshot/lib/App/BridgeApp.js" ''; diff --git a/pkgs/by-name/ma/matrix-hookshot/pin.json b/pkgs/by-name/ma/matrix-hookshot/pin.json index d6480bcc7a49..cc81e0b96a2a 100644 --- a/pkgs/by-name/ma/matrix-hookshot/pin.json +++ b/pkgs/by-name/ma/matrix-hookshot/pin.json @@ -1,6 +1,6 @@ { - "version": "5.4.1", - "srcHash": "sha256-SZRMPnX4B7CHIp3aH3hh4NFgkOitpDB2w4jZLtLf4nY=", - "yarnHash": "1rscx9w63hpypwyj5ccnb49iwn581971ajzhfsyz1kmaf87f7hm9", - "cargoHash": "sha256-slH/EcFvJ3gcCsRX3rkelQDlt0elpbXOT/0/oiXN6qg=" + "version": "6.0.1", + "srcHash": "sha256-rs4jIRdGriZ2L02gSTqIYuwLE4Xu3avS5+nyHuSyJ/c=", + "yarnHash": "0sjc333cl115pm3w69aknf20n85r8nisrdjx1231101zrz01nhhh", + "cargoHash": "sha256-lcY0Eq64oPH0CtL4WhVx6L/Ix/m8mHqum/oLQhu6cNc=" }