Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-deploy-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup NodeJS
uses: ./.github/actions/setup-node
with:
node-version: 22.14.0
node-version: 22.16.0
deno-version: 1.43.5
cache-modules: true
install: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ jobs:
uses: ./.github/actions/setup-node
if: github.event.action != 'closed'
with:
node-version: 22.14.0
node-version: 22.16.0
deno-version: 1.43.5
cache-modules: true
install: true
Expand Down Expand Up @@ -306,7 +306,7 @@ jobs:
- if: steps.matrix-rust-sdk-crypto-nodejs.outputs.cache-hit != 'true'
uses: actions/setup-node@v4.4.0
with:
node-version: '22.14.0'
node-version: 22.16.0

- if: steps.matrix-rust-sdk-crypto-nodejs.outputs.cache-hit != 'true'
uses: actions-rust-lang/setup-rust-toolchain@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Setup NodeJS
uses: ./.github/actions/setup-node
with:
node-version: 22.14.0
node-version: 22.16.0
deno-version: 1.43.5
cache-modules: true
install: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-update-description.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup NodeJS
uses: ./.github/actions/setup-node
with:
node-version: 22.14.0
node-version: 22.16.0
deno-version: 1.43.5
cache-modules: true
install: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Setup NodeJS
uses: ./.github/actions/setup-node
with:
node-version: 22.14.0
node-version: 22.16.0
deno-version: 1.43.5
cache-modules: true
install: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-candidate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Setup NodeJS
uses: ./.github/actions/setup-node
with:
node-version: 22.14.0
node-version: 22.16.0
deno-version: 1.43.5
cache-modules: true
install: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-version-durability.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4.4.0
with:
node-version: '22.14.0'
node-version: 22.16.0

- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/.docker/Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.14.0-alpine3.20
FROM node:22.16.0-alpine3.20

LABEL maintainer="buildmaster@rocket.chat"

Expand Down
16 changes: 8 additions & 8 deletions apps/meteor/.meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ rocketchat:streamer
rocketchat:version
rocketchat:user-presence

accounts-base@3.1.0
accounts-base@3.1.1
accounts-facebook@1.3.4
accounts-github@1.5.1
accounts-google@1.4.1
accounts-meteor-developer@1.5.1
accounts-oauth@1.4.6
accounts-password@3.1.0
accounts-password@3.2.0
accounts-twitter@1.5.2

google-oauth@1.4.5
Expand All @@ -33,9 +33,9 @@ email@3.1.2

meteor-base@1.5.2
ddp-common@1.4.4
webapp@2.0.6
webapp@2.0.7

mongo@2.1.1
mongo@2.1.2

reload@1.3.2
service-configuration@1.3.5
Expand All @@ -57,13 +57,13 @@ tracker@1.3.4
reactive-dict@1.3.2
reactive-var@1.0.13

babel-compiler@7.11.3
babel-compiler@7.12.0
standard-minifier-css@1.9.3
dynamic-import@0.7.4
ecmascript@0.16.10
typescript@5.6.3
ecmascript@0.16.11
typescript@5.6.4

autoupdate@2.0.0
autoupdate@2.0.1

# photoswipe

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/.meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@3.2.2
METEOR@3.3
28 changes: 14 additions & 14 deletions apps/meteor/.meteor/versions
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
accounts-base@3.1.0
accounts-base@3.1.1
accounts-facebook@1.3.4
accounts-github@1.5.1
accounts-google@1.4.1
accounts-meteor-developer@1.5.1
accounts-oauth@1.4.6
accounts-password@3.1.0
accounts-password@3.2.0
accounts-twitter@1.5.2
allow-deny@2.1.0
autoupdate@2.0.0
babel-compiler@7.11.3
autoupdate@2.0.1
babel-compiler@7.12.0
babel-runtime@1.5.2
base64@1.0.13
binary-heap@1.0.12
boilerplate-generator@2.0.0
boilerplate-generator@2.0.1
callback-hook@1.6.0
check@1.4.4
core-runtime@1.0.0
ddp@1.4.2
ddp-client@3.1.0
ddp-client@3.1.1
ddp-common@1.4.4
ddp-rate-limiter@1.2.2
ddp-server@3.1.2
diff-sequence@1.1.3
dispatch:run-as-user@1.1.1
dynamic-import@0.7.4
ecmascript@0.16.10
ecmascript@0.16.11
ecmascript-runtime@0.8.3
ecmascript-runtime-client@0.12.3
ecmascript-runtime-server@0.11.1
ejson@1.1.4
ejson@1.1.5
email@3.1.2
es5-shim@4.8.1
facebook-oauth@1.11.6
Expand All @@ -43,16 +43,16 @@ id-map@1.2.0
inter-process-messaging@0.1.2
localstorage@1.2.1
logging@1.3.6
meteor@2.1.0
meteor@2.1.1
meteor-base@1.5.2
meteor-developer-oauth@1.3.3
meteorhacks:inject-initial@1.0.5
minifier-css@2.0.1
minimongo@2.0.2
modern-browsers@0.2.1
modern-browsers@0.2.2
modules@0.20.3
modules-runtime@0.13.2
mongo@2.1.1
mongo@2.1.2
mongo-decimal@0.2.0
mongo-dev-server@1.1.1
mongo-id@1.0.9
Expand Down Expand Up @@ -82,14 +82,14 @@ service-configuration@1.3.5
session@1.2.2
sha@1.0.10
shell-server@0.6.1
socket-stream-client@0.6.0
socket-stream-client@0.6.1
standard-minifier-css@1.9.3
tracker@1.3.4
twitter-oauth@1.3.4
typescript@5.6.3
typescript@5.6.4
underscore@1.6.4
url@1.3.5
webapp@2.0.6
webapp@2.0.7
webapp-hashing@1.1.2
zodern:caching-minifier@0.5.0
zodern:standard-minifier-js@5.3.1
Expand Down
6 changes: 3 additions & 3 deletions apps/meteor/client/lib/2fa/process2faReturn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@ export async function process2faReturn({
}
}

export async function process2faAsyncReturn({
export async function process2faAsyncReturn<TResult>({
error,
onCode,
emailOrUsername,
}: {
error: unknown;
onCode: (code: string, method: string) => unknown | Promise<unknown>;
onCode: (code: string, method: string) => TResult | Promise<TResult>;
emailOrUsername: string | null | undefined;
}): Promise<unknown> {
}): Promise<TResult> {
// if the promise is rejected, we need to check if it's a 2fa error
// if it's not a 2fa error, we reject the promise
if (!(isTotpRequiredError(error) || isTotpInvalidError(error)) || !hasRequiredTwoFactorMethod(error)) {
Expand Down
6 changes: 3 additions & 3 deletions apps/meteor/client/meteorOverrides/totpOnCall.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ const withSyncTOTP = (call: (name: string, ...args: any[]) => any) => {
};
};

const withAsyncTOTP = (callAsync: (name: string, ...args: any[]) => Promise<any>) => {
return async function callAsyncWithTOTP(methodName: string, ...args: unknown[]): Promise<unknown> {
const withAsyncTOTP = <T extends (name: string, ...args: any[]) => Promise<any>>(callAsync: T): T => {
return async function callAsyncWithTOTP(methodName: string, ...args: unknown[]): Promise<ReturnType<T>> {
try {
return await callAsync(methodName, ...args);
} catch (error: unknown) {
Expand All @@ -56,7 +56,7 @@ const withAsyncTOTP = (callAsync: (name: string, ...args: any[]) => Promise<any>
emailOrUsername: undefined,
});
}
};
} as T;
};

Meteor.call = withSyncTOTP(Meteor.call);
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/ee/server/services/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN yarn install
RUN yarn workspace @rocket.chat/core-typings run build \
&& yarn workspace @rocket.chat/rest-typings run build

FROM node:22.14.0-alpine3.20
FROM node:22.16.0-alpine3.20

ARG SERVICE

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/ee/server/services/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@types/ejson": "^2.2.2",
"@types/express": "^4.17.23",
"@types/fibers": "^3.1.4",
"@types/node": "~22.14.1",
"@types/node": "~22.16.1",
"@types/ws": "^8.5.13",
"npm-run-all": "^4.1.5",
"pino-pretty": "^7.6.1",
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
"@types/mkdirp": "^1.0.2",
"@types/mocha": "github:whitecolor/mocha-types",
"@types/nedb": "^1",
"@types/node": "~22.14.1",
"@types/node": "~22.16.1",
"@types/node-rsa": "^1.1.4",
"@types/nodemailer": "^6.4.17",
"@types/oauth2-server": "^3.0.18",
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/packages/autoupdate/package.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package.describe({
name: 'autoupdate',
summary: 'Update the client when new client code is available',
version: '2.0.0',
version: '2.0.1',
});

Package.onUse(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/account-service/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.14.0-alpine3.20
FROM node:22.16.0-alpine3.21

ARG SERVICE

Expand Down
2 changes: 1 addition & 1 deletion ee/apps/account-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@rocket.chat/string-helpers": "~0.31.25",
"@rocket.chat/tools": "workspace:^",
"@rocket.chat/tracing": "workspace:^",
"@types/node": "~22.14.1",
"@types/node": "~22.16.1",
"bcrypt": "^5.1.1",
"ejson": "^2.2.3",
"event-loop-stats": "^1.4.1",
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/authorization-service/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.14.0-alpine3.20
FROM node:22.16.0-alpine3.21

ARG SERVICE

Expand Down
2 changes: 1 addition & 1 deletion ee/apps/authorization-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@rocket.chat/rest-typings": "workspace:^",
"@rocket.chat/string-helpers": "~0.31.25",
"@rocket.chat/tracing": "workspace:^",
"@types/node": "~22.14.1",
"@types/node": "~22.16.1",
"ejson": "^2.2.3",
"event-loop-stats": "^1.4.1",
"eventemitter3": "^5.0.1",
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/ddp-streamer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.14.0-alpine3.20
FROM node:22.16.0-alpine3.21

ARG SERVICE

Expand Down
2 changes: 1 addition & 1 deletion ee/apps/ddp-streamer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"@rocket.chat/eslint-config": "workspace:^",
"@types/ejson": "^2.2.2",
"@types/gc-stats": "^1.4.3",
"@types/node": "~22.14.1",
"@types/node": "~22.16.1",
"@types/polka": "^0.5.7",
"@types/underscore": "^1.13.0",
"@types/uuid": "^10.0.0",
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/omnichannel-transcript/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.14.0-alpine3.20
FROM node:22.16.0-alpine3.21

ARG SERVICE

Expand Down
2 changes: 1 addition & 1 deletion ee/apps/omnichannel-transcript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@rocket.chat/pdf-worker": "workspace:^",
"@rocket.chat/tools": "workspace:^",
"@rocket.chat/tracing": "workspace:^",
"@types/node": "~22.14.1",
"@types/node": "~22.16.1",
"ejson": "^2.2.3",
"emoji-toolkit": "^7.0.1",
"event-loop-stats": "^1.4.1",
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/presence-service/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.14.0-alpine3.20
FROM node:22.16.0-alpine3.21

ARG SERVICE

Expand Down
2 changes: 1 addition & 1 deletion ee/apps/presence-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@rocket.chat/presence": "workspace:^",
"@rocket.chat/string-helpers": "~0.31.25",
"@rocket.chat/tracing": "workspace:^",
"@types/node": "~22.14.1",
"@types/node": "~22.16.1",
"ejson": "^2.2.3",
"event-loop-stats": "^1.4.1",
"eventemitter3": "^5.0.1",
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/queue-worker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.14.0-alpine3.20
FROM node:22.16.0-alpine3.21

ARG SERVICE

Expand Down
2 changes: 1 addition & 1 deletion ee/apps/queue-worker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@rocket.chat/network-broker": "workspace:^",
"@rocket.chat/omnichannel-services": "workspace:^",
"@rocket.chat/tracing": "workspace:^",
"@types/node": "~22.14.1",
"@types/node": "~22.16.1",
"ejson": "^2.2.3",
"emoji-toolkit": "^7.0.1",
"event-loop-stats": "^1.4.1",
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/stream-hub-service/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.14.0-alpine3.20
FROM node:22.16.0-alpine3.21

ARG SERVICE

Expand Down
2 changes: 1 addition & 1 deletion ee/apps/stream-hub-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@rocket.chat/network-broker": "workspace:^",
"@rocket.chat/string-helpers": "~0.31.25",
"@rocket.chat/tracing": "workspace:^",
"@types/node": "~22.14.1",
"@types/node": "~22.16.1",
"ejson": "^2.2.3",
"event-loop-stats": "^1.4.1",
"eventemitter3": "^5.0.1",
Expand Down
2 changes: 1 addition & 1 deletion ee/packages/network-broker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"@rocket.chat/tsconfig": "workspace:*",
"@types/chai": "~4.3.20",
"@types/ejson": "^2.2.2",
"@types/node": "~22.14.1",
"@types/node": "~22.16.1",
"@types/sinon": "^10.0.20",
"chai": "^4.5.0",
"eslint": "~8.45.0",
Expand Down
Loading
Loading