diff --git a/apps/meteor/app/slashcommands-inviteall/server/server.ts b/apps/meteor/app/slashcommands-inviteall/server/server.ts index cd5ed9dc4932..5e045d39038f 100644 --- a/apps/meteor/app/slashcommands-inviteall/server/server.ts +++ b/apps/meteor/app/slashcommands-inviteall/server/server.ts @@ -86,7 +86,6 @@ function inviteAll(type: T): SlashCommand['callback'] { void api.broadcast('notify.ephemeralMessage', userId, message.rid, { msg: i18n.t('Users_added', { lng }), }); - return; } catch (e: any) { const msg = e.error === 'cant-invite-for-direct-room' ? 'Cannot_invite_users_to_direct_rooms' : e.error; void api.broadcast('notify.ephemeralMessage', userId, message.rid, { diff --git a/apps/meteor/client/views/room/components/body/composer/messageBox/hooks/useMediaPermissions.ts b/apps/meteor/client/views/room/components/body/composer/messageBox/hooks/useMediaPermissions.ts index bdaf9a1c8732..2aa712d8a76a 100644 --- a/apps/meteor/client/views/room/components/body/composer/messageBox/hooks/useMediaPermissions.ts +++ b/apps/meteor/client/views/room/components/body/composer/messageBox/hooks/useMediaPermissions.ts @@ -37,7 +37,6 @@ export const useMediaPermissions = (name: MediaDevices): [isPermissionDenied: bo try { if (!(await navigator.mediaDevices.enumerateDevices()).some(({ kind }) => kind === getDeviceKind(name))) { setIsPermissionDenied(true); - return; } } catch (error) { console.warn(error); diff --git a/apps/meteor/package.json b/apps/meteor/package.json index ca58b4d37dba..b8d6391ad9e3 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -62,13 +62,13 @@ "email": "support@rocket.chat" }, "devDependencies": { - "@babel/core": "~7.22.5", - "@babel/eslint-parser": "~7.22.5", - "@babel/plugin-proposal-nullish-coalescing-operator": "~7.18.6", - "@babel/plugin-proposal-optional-chaining": "~7.21.0", - "@babel/preset-env": "~7.22.5", - "@babel/preset-react": "~7.22.5", - "@babel/register": "~7.22.5", + "@babel/core": "^7.20.5", + "@babel/eslint-parser": "^7.19.1", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6", + "@babel/plugin-proposal-optional-chaining": "^7.18.9", + "@babel/preset-env": "^7.20.2", + "@babel/preset-react": "^7.18.6", + "@babel/register": "^7.18.9", "@faker-js/faker": "~8.0.2", "@playwright/test": "^1.22.2", "@rocket.chat/eslint-config": "workspace:^", @@ -164,7 +164,7 @@ "chai-spies": "~1.0.0", "cross-env": "^7.0.3", "emojione-assets": "^4.5.0", - "eslint": "~8.38.0", + "eslint": "^8.29.0", "eslint-config-prettier": "~8.8.0", "eslint-plugin-import": "~2.26.0", "eslint-plugin-no-floating-promise": "~1.0.2", diff --git a/apps/meteor/server/startup/migrations/v273.ts b/apps/meteor/server/startup/migrations/v273.ts index f731f71cb7d7..083898c0316e 100644 --- a/apps/meteor/server/startup/migrations/v273.ts +++ b/apps/meteor/server/startup/migrations/v273.ts @@ -7,7 +7,6 @@ addMigration({ async up() { try { await AppsTokens.col.dropIndex('userId_1'); - return; } catch (error: unknown) { console.warn('Error dropping index for _raix_push_app_tokens, continuing...'); console.warn(error); diff --git a/yarn.lock b/yarn.lock index e288cd29b8f0..402cdc445bd8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1043,6 +1043,29 @@ __metadata: languageName: node linkType: hard +"@babel/core@npm:^7.20.5, @babel/core@npm:~7.22.5": + version: 7.22.5 + resolution: "@babel/core@npm:7.22.5" + dependencies: + "@ampproject/remapping": ^2.2.0 + "@babel/code-frame": ^7.22.5 + "@babel/generator": ^7.22.5 + "@babel/helper-compilation-targets": ^7.22.5 + "@babel/helper-module-transforms": ^7.22.5 + "@babel/helpers": ^7.22.5 + "@babel/parser": ^7.22.5 + "@babel/template": ^7.22.5 + "@babel/traverse": ^7.22.5 + "@babel/types": ^7.22.5 + convert-source-map: ^1.7.0 + debug: ^4.1.0 + gensync: ^1.0.0-beta.2 + json5: ^2.2.2 + semver: ^6.3.0 + checksum: 173ae426958c90c7bbd7de622c6f13fcab8aef0fac3f138e2d47bc466d1cd1f86f71ca82ae0acb9032fd8794abed8efb56fea55c031396337eaec0d673b69d56 + languageName: node + linkType: hard + "@babel/core@npm:^7.21.4": version: 7.21.8 resolution: "@babel/core@npm:7.21.8" @@ -1066,30 +1089,7 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:~7.22.5": - version: 7.22.5 - resolution: "@babel/core@npm:7.22.5" - dependencies: - "@ampproject/remapping": ^2.2.0 - "@babel/code-frame": ^7.22.5 - "@babel/generator": ^7.22.5 - "@babel/helper-compilation-targets": ^7.22.5 - "@babel/helper-module-transforms": ^7.22.5 - "@babel/helpers": ^7.22.5 - "@babel/parser": ^7.22.5 - "@babel/template": ^7.22.5 - "@babel/traverse": ^7.22.5 - "@babel/types": ^7.22.5 - convert-source-map: ^1.7.0 - debug: ^4.1.0 - gensync: ^1.0.0-beta.2 - json5: ^2.2.2 - semver: ^6.3.0 - checksum: 173ae426958c90c7bbd7de622c6f13fcab8aef0fac3f138e2d47bc466d1cd1f86f71ca82ae0acb9032fd8794abed8efb56fea55c031396337eaec0d673b69d56 - languageName: node - linkType: hard - -"@babel/eslint-parser@npm:~7.22.5": +"@babel/eslint-parser@npm:^7.19.1, @babel/eslint-parser@npm:~7.22.5": version: 7.22.5 resolution: "@babel/eslint-parser@npm:7.22.5" dependencies: @@ -1948,7 +1948,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.12.1, @babel/plugin-proposal-nullish-coalescing-operator@npm:^7.18.6, @babel/plugin-proposal-nullish-coalescing-operator@npm:~7.18.6": +"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.12.1, @babel/plugin-proposal-nullish-coalescing-operator@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.18.6" dependencies: @@ -2012,7 +2012,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-optional-chaining@npm:^7.12.7, @babel/plugin-proposal-optional-chaining@npm:^7.20.7, @babel/plugin-proposal-optional-chaining@npm:^7.21.0, @babel/plugin-proposal-optional-chaining@npm:~7.21.0": +"@babel/plugin-proposal-optional-chaining@npm:^7.12.7, @babel/plugin-proposal-optional-chaining@npm:^7.18.9, @babel/plugin-proposal-optional-chaining@npm:^7.20.7, @babel/plugin-proposal-optional-chaining@npm:^7.21.0": version: 7.21.0 resolution: "@babel/plugin-proposal-optional-chaining@npm:7.21.0" dependencies: @@ -3585,7 +3585,7 @@ __metadata: languageName: node linkType: hard -"@babel/preset-env@npm:~7.22.5": +"@babel/preset-env@npm:^7.20.2, @babel/preset-env@npm:~7.22.5": version: 7.22.5 resolution: "@babel/preset-env@npm:7.22.5" dependencies: @@ -3719,7 +3719,7 @@ __metadata: languageName: node linkType: hard -"@babel/preset-react@npm:~7.22.5": +"@babel/preset-react@npm:^7.18.6": version: 7.22.5 resolution: "@babel/preset-react@npm:7.22.5" dependencies: @@ -3780,7 +3780,7 @@ __metadata: languageName: node linkType: hard -"@babel/register@npm:~7.22.5": +"@babel/register@npm:^7.18.9": version: 7.22.5 resolution: "@babel/register@npm:7.22.5" dependencies: @@ -5109,6 +5109,13 @@ __metadata: languageName: node linkType: hard +"@eslint/js@npm:8.43.0": + version: 8.43.0 + resolution: "@eslint/js@npm:8.43.0" + checksum: 580487a09c82ac169744d36e4af77bc4f582c9a37749d1e9481eb93626c8f3991b2390c6e4e69e5642e3b6e870912b839229a0e23594fae348156ea5a8ed7e2e + languageName: node + linkType: hard + "@faker-js/faker@npm:~8.0.2": version: 8.0.2 resolution: "@faker-js/faker@npm:8.0.2" @@ -10062,13 +10069,13 @@ __metadata: version: 0.0.0-use.local resolution: "@rocket.chat/meteor@workspace:apps/meteor" dependencies: - "@babel/core": ~7.22.5 - "@babel/eslint-parser": ~7.22.5 - "@babel/plugin-proposal-nullish-coalescing-operator": ~7.18.6 - "@babel/plugin-proposal-optional-chaining": ~7.21.0 - "@babel/preset-env": ~7.22.5 - "@babel/preset-react": ~7.22.5 - "@babel/register": ~7.22.5 + "@babel/core": ^7.20.5 + "@babel/eslint-parser": ^7.19.1 + "@babel/plugin-proposal-nullish-coalescing-operator": ^7.18.6 + "@babel/plugin-proposal-optional-chaining": ^7.18.9 + "@babel/preset-env": ^7.20.2 + "@babel/preset-react": ^7.18.6 + "@babel/register": ^7.18.9 "@babel/runtime": ~7.22.5 "@bugsnag/js": ~7.20.2 "@bugsnag/plugin-react": ~7.19.0 @@ -10273,7 +10280,7 @@ __metadata: emoji-toolkit: ^7.0.1 emojione: ^4.5.0 emojione-assets: ^4.5.0 - eslint: ~8.38.0 + eslint: ^8.29.0 eslint-config-prettier: ~8.8.0 eslint-plugin-anti-trojan-source: ~1.1.1 eslint-plugin-import: ~2.26.0 @@ -22447,6 +22454,55 @@ __metadata: languageName: node linkType: hard +"eslint@npm:^8.29.0": + version: 8.43.0 + resolution: "eslint@npm:8.43.0" + dependencies: + "@eslint-community/eslint-utils": ^4.2.0 + "@eslint-community/regexpp": ^4.4.0 + "@eslint/eslintrc": ^2.0.3 + "@eslint/js": 8.43.0 + "@humanwhocodes/config-array": ^0.11.10 + "@humanwhocodes/module-importer": ^1.0.1 + "@nodelib/fs.walk": ^1.2.8 + ajv: ^6.10.0 + chalk: ^4.0.0 + cross-spawn: ^7.0.2 + debug: ^4.3.2 + doctrine: ^3.0.0 + escape-string-regexp: ^4.0.0 + eslint-scope: ^7.2.0 + eslint-visitor-keys: ^3.4.1 + espree: ^9.5.2 + esquery: ^1.4.2 + esutils: ^2.0.2 + fast-deep-equal: ^3.1.3 + file-entry-cache: ^6.0.1 + find-up: ^5.0.0 + glob-parent: ^6.0.2 + globals: ^13.19.0 + graphemer: ^1.4.0 + ignore: ^5.2.0 + import-fresh: ^3.0.0 + imurmurhash: ^0.1.4 + is-glob: ^4.0.0 + is-path-inside: ^3.0.3 + js-yaml: ^4.1.0 + json-stable-stringify-without-jsonify: ^1.0.1 + levn: ^0.4.1 + lodash.merge: ^4.6.2 + minimatch: ^3.1.2 + natural-compare: ^1.4.0 + optionator: ^0.9.1 + strip-ansi: ^6.0.1 + strip-json-comments: ^3.1.0 + text-table: ^0.2.0 + bin: + eslint: bin/eslint.js + checksum: 55654ce00b0d128822b57526e40473d0497c7c6be3886afdc0b41b6b0dfbd34d0eae8159911b18451b4db51a939a0e6d2e117e847ae419086884fc3d4fe23c7c + languageName: node + linkType: hard + "eslint@npm:^8.38.0": version: 8.41.0 resolution: "eslint@npm:8.41.0"