Skip to content

Commit b84d191

Browse files
Merge branch 'master' into rostislav/useSubscription-memory-or-control-leak-fix
2 parents 8f77135 + 31578ae commit b84d191

File tree

664 files changed

+20097
-5949
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

664 files changed

+20097
-5949
lines changed

.github/actions/build/action.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ inputs:
99
description: 'Node environment'
1010
required: false
1111
default: 'test'
12+
CROWDIN_WALLETS_API_KEY:
13+
description: 'Crowdin wallets api key'
14+
required: false
1215
DATADOG_CLIENT_TOKEN:
1316
description: 'Datadog client token'
1417
required: false
@@ -46,6 +49,7 @@ runs:
4649
- name: Build all packages
4750
env:
4851
NODE_ENV: ${{ inputs.NODE_ENV }}
52+
CROWDIN_WALLETS_API_KEY: ${{ inputs.CROWDIN_WALLETS_API_KEY }}
4953
DATADOG_APPLICATION_ID: ${{ inputs.DATADOG_APPLICATION_ID }}
5054
DATADOG_CLIENT_TOKEN: ${{ inputs.DATADOG_CLIENT_TOKEN }}
5155
DATADOG_CLIENT_TOKEN_LOGS: ${{ inputs.DATADOG_CLIENT_TOKEN_LOGS }}

.github/actions/versioning/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ runs:
1818
version="${{ inputs.RELEASE_TYPE }}-GH_Run#:${{ github.run_number }}-Date:$current_date"
1919
echo "Setting version to: $version"
2020
echo "version=$version" >> $GITHUB_ENV
21+
echo $version > packages/core/dist/version.txt
2122
shell: bash

.github/workflows/integration-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ jobs:
2525
run: npm run build:all
2626
- name: Install Playwright Browsers
2727
run: npx playwright install
28-
- name: Run integration tests
29-
run: npm run test:e2e
28+
- name: Run component tests
29+
run: npm run test:component

.github/workflows/release_staging.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
uses: "./.github/actions/build"
2121
with:
2222
NODE_ENV: staging
23+
CROWDIN_WALLETS_API_KEY: ${{ secrets.CROWDIN_WALLETS_API_KEY }}
2324
DATADOG_APPLICATION_ID: ${{ vars.DATADOG_APPLICATION_ID }}
2425
DATADOG_CLIENT_TOKEN: ${{ vars.DATADOG_CLIENT_TOKEN }}
2526
DATADOG_CLIENT_TOKEN_LOGS: ${{ vars.DATADOG_CLIENT_TOKEN_LOGS }}
@@ -33,6 +34,10 @@ jobs:
3334
REF_NAME: ${{ github.ref_name }}
3435
- name: Run tests
3536
run: npm test
37+
- name: Versioning
38+
uses: "./.github/actions/versioning"
39+
with:
40+
release_type: staging
3641
- name: Publish to Cloudflare Pages Staging
3742
uses: "./.github/actions/publish_to_pages_staging"
3843
with:

.github/workflows/release_test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
uses: "./.github/actions/build"
2121
with:
2222
NODE_ENV: staging
23+
CROWDIN_WALLETS_API_KEY: ${{ secrets.CROWDIN_WALLETS_API_KEY }}
2324
DATADOG_APPLICATION_ID: ${{ vars.DATADOG_APPLICATION_ID }}
2425
DATADOG_CLIENT_TOKEN: ${{ vars.DATADOG_CLIENT_TOKEN }}
2526
DATADOG_CLIENT_TOKEN_LOGS: ${{ vars.DATADOG_CLIENT_TOKEN_LOGS }}

.github/workflows/release_uat.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ jobs:
3131
GD_APP_ID: ${{ secrets.GD_APP_ID }}
3232
GD_CLIENT_ID: ${{ secrets.GD_CLIENT_ID }}
3333
RUDDERSTACK_KEY: ${{ vars.RUDDERSTACK_KEY }}
34+
- name: Versioning
35+
uses: "./.github/actions/versioning"
36+
with:
37+
release_type: uat
3438
- name: Run tests
3539
run: npm test
3640
- name: Publish to Cloudflare Pages UAT

jest.config.base.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,19 @@
44

55
module.exports = {
66
collectCoverage: false,
7-
collectCoverageFrom: ['**/*.{js,jsx,ts,tsx}', '!**/node_modules/**', '!**/dist/**', '!/integration-tests/'],
7+
collectCoverageFrom: [
8+
'**/*.{js,jsx,ts,tsx}',
9+
'!**/node_modules/**',
10+
'!**/dist/**',
11+
'!/integration-tests/',
12+
'!/component-tests/',
13+
],
814
coverageReporters: ['lcov'],
915
coverageDirectory: './coverage/',
1016
testRegex: '(/__tests__/.*|(\\.)(test|spec))\\.(js|jsx|tsx|ts)?$',
1117
// This is needed to transform es modules imported from node_modules of the target component.
1218
transformIgnorePatterns: ['/node_modules/(?!@enykeev/react-virtualized).+\\.js$'],
1319
setupFiles: ['<rootDir>/../../jest.setup.js'],
1420
setupFilesAfterEnv: ['<rootDir>/../../setupTests.js'],
15-
testPathIgnorePatterns: ['/integration-tests/'],
21+
testPathIgnorePatterns: ['/integration-tests/', '/component-tests/'],
1622
};

jest.config.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
module.exports = {
22
collectCoverage: false,
3-
collectCoverageFrom: ['**/*.{js,jsx,ts,tsx}', '!**/node_modules/**', '!**/dist/**', '!/integration-tests/'],
3+
collectCoverageFrom: [
4+
'**/*.{js,jsx,ts,tsx}',
5+
'!**/node_modules/**',
6+
'!**/dist/**',
7+
'!/integration-tests/',
8+
'!/component-tests/',
9+
],
410
coverageReporters: ['lcov'],
511
coverageDirectory: './coverage/',
612
clearMocks: true,

package-lock.json

Lines changed: 464 additions & 463 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,9 @@
8282
"test:stylelint": "stylelint \"./packages/*/src/**/*.s(a|c)ss\"",
8383
"test:ci": "f () { npm run test:stylelint && npm run test:eslint-all ;}; f",
8484
"test:jest": "jest --all --maxWorkers=${JEST_MAX_WORKERS:-'50%'}",
85-
"test:e2e": "npx playwright test",
86-
"test:e2e-dev": "npx playwright test --trace on && npx playwright show-report",
85+
"test:component": "npx playwright test",
86+
"test:component-debug": "npx playwright test --debug",
87+
"test:component-ui": "npx playwright test --ui",
8788
"test:performance": "cd e2e-tests && jest -c ./jest.config.js --detectOpenHandles performance",
8889
"stylelint:fix": "stylelint \"./packages/*/src/**/*.s(a|c)ss\" --fix",
8990
"translate": "f () { lerna exec --scope @deriv/translations -- npm run translate ;}; f",
@@ -92,7 +93,7 @@
9293
},
9394
"dependencies": {
9495
"@babel/preset-typescript": "^7.16.5",
95-
"@deriv/analytics": "^1.4.4",
96+
"@deriv/analytics": "^1.4.5",
9697
"@sendbird/chat": "^4.9.7",
9798
"@types/react-transition-group": "^4.4.4",
9899
"babel-jest": "^27.3.1",

0 commit comments

Comments
 (0)