Skip to content

Commit

Permalink
Merge pull request #23825 from RocketChat/release-4.2.0
Browse files Browse the repository at this point in the history
Release 4.2.0
  • Loading branch information
sampaiodiego authored Nov 30, 2021
2 parents 2aba8d2 + 6be430d commit a4ad199
Show file tree
Hide file tree
Showing 928 changed files with 20,754 additions and 13,013 deletions.
3 changes: 2 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"presets": [
"@babel/preset-env"
"@babel/preset-env",
"@babel/preset-react"
]
}
2 changes: 1 addition & 1 deletion .docker/Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.access.redhat.com/ubi8/nodejs-12

ENV RC_VERSION 4.1.2
ENV RC_VERSION 4.2.0

MAINTAINER [email protected]

Expand Down
5 changes: 3 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@ public/packages/rocketchat_videobridge/client/public/external_api.js
packages/tap-i18n/lib/tap_i18next/tap_i18next-1.7.3.js
private/moment-locales/
public/livechat/
!.scripts
public/pdf.worker.min.js
public/workers/**/*
imports/client/**/*
!/.storybook/
ee/server/services/dist/**
!/.mocharc.js
!/.mocharc.*.js
!/.scripts/
!/.storybook/
!/client/.eslintrc.js
!/ee/client/.eslintrc.js
16 changes: 14 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@
},
"plugins": [
"react",
"@typescript-eslint"
"@typescript-eslint",
"anti-trojan-source"
],
"rules": {
"func-call-spacing": "off",
Expand Down Expand Up @@ -122,7 +123,8 @@
"@typescript-eslint/no-unused-vars": ["error", {
"argsIgnorePattern": "^_",
"ignoreRestSiblings": true
}]
}],
"anti-trojan-source/no-bidi": "error"
},
"env": {
"browser": true,
Expand All @@ -144,6 +146,16 @@
"version": "detect"
}
}
},
{
"files": [
"**/*.tests.js",
"**/*.tests.ts",
"**/*.spec.ts"
],
"env": {
"mocha": true
}
}
]
}
Loading

0 comments on commit a4ad199

Please sign in to comment.