Skip to content

Commit

Permalink
Merge branch 'master' into nada/P2PS-491/chatbox-message
Browse files Browse the repository at this point in the history
  • Loading branch information
nada-deriv committed Jul 3, 2023
2 parents e2d2b25 + 5dff230 commit 2f2c7ac
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 3 deletions.
6 changes: 6 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,12 @@ module.exports = {
},
},
overrides: [
{
files: ['*.ts', '*.tsx'],
rules: {
'react/prop-types': 'off',
},
},
{
files: ['**/__tests__/**/*.[jt]s?(x)', '**/?(*.)+(spec|test).[jt]s?(x)'],
extends: ['plugin:testing-library/react'],
Expand Down
2 changes: 1 addition & 1 deletion .lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"*.{js,jsx,ts,tsx,md,html,css,scss}": "prettier --write",
"*.{js,jsx,ts,tsx}": "npx eslint --fix",
"*.{js,jsx,ts,tsx}": "eslint --fix --config .eslintrc.js",
"*.{css,scss}": "npx stylelint --fix"
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"ts-jest": "^26.4.2"
},
"scripts": {
"build:all": "nx build @deriv/components --skip-nx-cache && nx run-many --target=build",
"build:all": "nx build @deriv/components --skip-nx-cache && nx build @deriv/account --skip-nx-cache && nx run-many --target=build",
"build:one": "f () { nx build @deriv/$1 $2 ;}; f",
"build:since": "nx affected --target=build",
"test:eslint-all": "nx run-many --target=test:eslint",
Expand All @@ -91,7 +91,7 @@
"publish_package": "f () { lerna exec --scope=@deriv/${1:-'*'} -- npm run publish_package $2 ;}; f",
"serve": "f () { lerna exec --scope=@deriv/${1:-'*'} -- npm run serve $npm_config_open;}; f",
"start": "f () { lerna exec --scope=@deriv/${1:-'*'} -- npm run start ;}; f",
"test": "f () { bash ./scripts/circleci-config.test.sh && npm run test:stylelint && npm run test:eslint-all && npm run test:jest ;}; f",
"test": "f () { bash ./scripts/circleci-config.test.sh && npm run test:stylelint && npm run test:eslint-all && JEST_MAX_WORKERS=6 npm run test:jest ;}; f",
"test:stylelint": "stylelint \"./packages/*/src/**/*.s(a|c)ss\"",
"test:jest": "jest --all --maxWorkers=${JEST_MAX_WORKERS:-'45%'}",
"test:e2e": "cd end-to-end-test && npx playwright test",
Expand Down
8 changes: 8 additions & 0 deletions packages/components/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@ const webpackConfig = require('./webpack.config');

module.exports = {
extends: '../../.eslintrc.js',
overrides: [
{
files: ['*.ts', '*.tsx'],
rules: {
'react/prop-types': 'off',
},
},
],
settings: {
react: {
version: '16',
Expand Down

0 comments on commit 2f2c7ac

Please sign in to comment.