Skip to content

Commit

Permalink
Merge branch master into kate/dtra-269/ts_migration_trader_package_2
Browse files Browse the repository at this point in the history
  • Loading branch information
kate-deriv committed Sep 21, 2023
2 parents 4ea9d24 + 1646a2f commit ec5a35b
Show file tree
Hide file tree
Showing 1,088 changed files with 37,454 additions and 18,659 deletions.
15 changes: 9 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ commands:
- "packages/hooks/node_modules"
- "packages/cfd/node_modules"
- "packages/indicators/node_modules"
- "packages/integration/node_modules"
- "packages/p2p/node_modules"
- "packages/reports/node_modules"
- "packages/shared/node_modules"
Expand Down Expand Up @@ -222,15 +223,17 @@ jobs:
name: "Check TypeScript for @deriv/stores"
command: npx tsc --project packages/stores/tsconfig.json -noEmit
- run:
name: "Check TypeScript and linting for @deriv/wallets"
command: |
npx tsc --project packages/wallets/tsconfig.json -noEmit
npx eslint --fix --config packages/wallets/.eslintrc.js packages/wallets
npx stylelint packages/wallets/**/*.scss
name: "Check TypeScript for @deriv/wallets"
command: npx tsc --project packages/wallets/tsconfig.json -noEmit
# - run:
# name: "Check TypeScript for @deriv/cashier"
# command: npx tsc --project packages/cashier/tsconfig.json -noEmit
- run:
name: "Check ESLint for @deriv/wallets"
command: npx eslint --fix --config packages/wallets/.eslintrc.js packages/wallets
- run:
name: "Check Stylelint for @deriv/wallets"
command: npx stylelint packages/wallets/**/*.scss
- run:
name: "Check tests for @deriv/hooks"
command: bash ./scripts/check-tests.sh packages/hooks/src
Expand Down
12 changes: 12 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -155,3 +155,15 @@
/packages/trader/**/* @matin-deriv @maryia-deriv


# ==============================================================
# deriv-app/wallets
# ==============================================================

/packages/wallets/**/* @adrienne-deriv @thisyahlen-deriv @farhan-nurzi-deriv


# ==============================================================
# deriv-app/api
# ==============================================================

/packages/api/**/* @adrienne-deriv @thisyahlen-deriv @farhan-nurzi-deriv
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@ packages/appstore/lib/
packages/appstore/.out
.env
nx-cloud.env

test-results/
playwright-report/
playwright/.cache/
4 changes: 3 additions & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx lint-staged --allow-empty
npx lint-staged --allow-empty

bash ./.husky/secret-scanner.sh
29 changes: 29 additions & 0 deletions .husky/secret-scanner.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#!/bin/bash

#checking absolute paths
if command -v trufflehog &> /dev/null; then
trufflehog_path="trufflehog"
elif [[ -x /usr/local/bin/trufflehog ]]; then
trufflehog_path="/usr/local/bin/trufflehog"
elif [[ -x /opt/homebrew/bin/trufflehog ]]; then
trufflehog_path="/opt/homebrew/bin/trufflehog"
else
echo "Trufflehog is not setup. Please connect with Product Security Team"
exit 1
fi

# Use `filesysytem` if the git repo does not have any commits i.e its a new git repo.
if git log -1 > /dev/null 2>&1; then
$trufflehog_path git file://. --no-update --since-commit HEAD --fail > /tmp/trufflehog_output_$(whoami) 2>&1
trufflehog_exit_code=$?
else
$trufflehog_path filesystem . --no-update --fail > /tmp/trufflehog_output_$(whoami) 2>&1
trufflehog_exit_code=$?
fi

# Only display results to stdout if trufflehog found something.
if [ $trufflehog_exit_code -eq 183 ]; then
cat /tmp/trufflehog_output_$(whoami)
echo "TruffleHog found secrets. Aborting commit. use --no-verify to bypass it"
exit $trufflehog_exit_code
fi
16 changes: 0 additions & 16 deletions end-to-end-test/.env.example

This file was deleted.

27 changes: 0 additions & 27 deletions end-to-end-test/.github/workflows/playwright.yml

This file was deleted.

4 changes: 0 additions & 4 deletions end-to-end-test/.gitignore

This file was deleted.

63 changes: 0 additions & 63 deletions end-to-end-test/README.md

This file was deleted.

18 changes: 0 additions & 18 deletions end-to-end-test/global-setup.ts

This file was deleted.

21 changes: 0 additions & 21 deletions end-to-end-test/package.json

This file was deleted.

118 changes: 0 additions & 118 deletions end-to-end-test/playwright.config.ts

This file was deleted.

Loading

0 comments on commit ec5a35b

Please sign in to comment.