Skip to content

Commit dff2732

Browse files
Merge pull request #358 from multiversx/development
Development
2 parents a5e3659 + 7359864 commit dff2732

File tree

9 files changed

+45
-46
lines changed

9 files changed

+45
-46
lines changed

.github/workflows/deploy-devnet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup yarn
2323
run: npm install -g yarn
2424
- run: yarn install
25-
- run: yarn build:devnet
25+
- run: yarn build-devnet
2626
env:
2727
CI: false
2828
- name: Configure AWS Credentials

.github/workflows/deploy-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup yarn
2323
run: npm install -g yarn
2424
- run: yarn install
25-
- run: yarn build:devnet
25+
- run: yarn build-devnet
2626
env:
2727
CI: false
2828
- name: Configure AWS Credentials

.github/workflows/deploy-mainnet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup yarn
2323
run: npm install -g yarn
2424
- run: yarn install
25-
- run: yarn build:mainnet
25+
- run: yarn build-mainnet
2626
env:
2727
CI: false
2828
- name: Configure AWS Credentials

.github/workflows/deploy-next.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Setup yarn
2020
run: npm install -g yarn
2121
- run: yarn install
22-
- run: yarn build:devnet
22+
- run: yarn build-devnet
2323
env:
2424
CI: false
2525
- name: Configure AWS Credentials

.github/workflows/deploy-testnet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup yarn
2323
run: npm install -g yarn
2424
- run: yarn install
25-
- run: yarn build:testnet
25+
- run: yarn build-testnet
2626
env:
2727
CI: false
2828
- name: Configure AWS Credentials

.github/workflows/playwright.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
name: Playwright Tests
22
on:
33
pull_request:
4-
branches: [ development,main]
4+
branches: [development, main]
55
jobs:
66
test:
77
timeout-minutes: 60
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v4
11-
- uses: actions/setup-node@v4
12-
with:
13-
node-version: lts/*
14-
- name: Install dependencies
15-
run: npm install -g yarn && yarn
16-
- name: Build
17-
run: yarn build:devnet
18-
- name: Install Playwright Browsers
19-
run: yarn playwright install --with-deps
20-
- name: Run Playwright tests
21-
run: yarn playwright test --workers=20
22-
- uses: actions/upload-artifact@v4
23-
if: ${{ !cancelled() }}
24-
with:
25-
name: playwright-report
26-
path: playwright-report/
27-
retention-days: 30
10+
- uses: actions/checkout@v4
11+
- uses: actions/setup-node@v4
12+
with:
13+
node-version: lts/*
14+
- name: Install dependencies
15+
run: npm install -g yarn && yarn
16+
- name: Build
17+
run: yarn build-devnet
18+
- name: Install Playwright Browsers
19+
run: yarn playwright install --with-deps
20+
- name: Run Playwright tests
21+
run: yarn playwright test --workers=20
22+
- uses: actions/upload-artifact@v4
23+
if: ${{ !cancelled() }}
24+
with:
25+
name: playwright-report
26+
path: playwright-report/
27+
retention-days: 30

README.md

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ It's a basic implementation of [@multiversx/sdk-dapp](https://www.npmjs.com/pack
66
See [Dapp template](https://template-dapp.multiversx.com/) for live demo.
77

88
### Tests
9-
[![E2E tests](https://github.com/multiversx/mx-template-dapp/actions/workflows/playwright.yml/badge.svg)](https://github.com/multiversx/mx-template-dapp/actions/workflows/playwright.yml)
109

10+
[![E2E tests](https://github.com/multiversx/mx-template-dapp/actions/workflows/playwright.yml/badge.svg)](https://github.com/multiversx/mx-template-dapp/actions/workflows/playwright.yml)
1111

1212
## Requirements
1313

@@ -33,9 +33,9 @@ yarn install
3333
In the project folder run:
3434

3535
```bash
36-
yarn start:devnet
37-
yarn start:testnet
38-
yarn start:mainnet
36+
yarn start-devnet
37+
yarn start-testnet
38+
yarn start-mainnet
3939
```
4040

4141
This will start the React app in development mode, using the configs found in the `vite.config.ts` file.
@@ -44,20 +44,20 @@ Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
4444
The page will reload if you make edits.\
4545
You will also see any lint errors in the console.
4646

47-
> **Note:**
48-
While in development, to test the passkeys provider use the following command:
49-
`open -a Google\ Chrome --args --ignore-certificate-errors --ignore-urlfetcher-cert-requests`
50-
Make sure to close all instances of Chrome after the development session.
47+
> **Note:**
48+
> While in development, to test the passkeys provider use the following command:
49+
> `open -a Google\ Chrome --args --ignore-certificate-errors --ignore-urlfetcher-cert-requests`
50+
> Make sure to close all instances of Chrome after the development session.
5151
5252
### Step 3. Build for testing and production use
5353

5454
A build of the app is necessary to deploy for testing purposes or for production use.
5555
To build the project run:
5656

5757
```bash
58-
yarn build:devnet
59-
yarn build:testnet
60-
yarn build:mainnet
58+
yarn build-devnet
59+
yarn build-testnet
60+
yarn build-mainnet
6161
```
6262

6363
## Roadmap
@@ -75,4 +75,3 @@ One can contribute by creating _pull requests_, or by opening _issues_ for disco
7575
3. Commit your Changes (`git commit -m 'Add some AmazingFeature'`)
7676
4. Push to the Branch (`git push origin feature/AmazingFeature`)
7777
5. Open a Pull Request
78-

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
"scripts": {
2424
"lint": "eslint --ext js,ts,tsx src --fix",
2525
"run-cypress": "npx cypress run",
26-
"start:devnet": "yarn run copy:devnet-config && vite dev",
27-
"start:testnet": "yarn run copy:testnet-config && vite dev",
28-
"start:mainnet": "yarn run copy:mainnet-config && vite dev",
29-
"build:devnet": "tsc & yarn run copy:devnet-config && vite build",
30-
"build:testnet": "tsc & yarn run copy:testnet-config && vite build",
31-
"build:mainnet": "tsc & yarn run copy:mainnet-config && vite build",
32-
"copy:devnet-config": "cp ./src/config/config.devnet.ts ./src/config/index.ts",
33-
"copy:testnet-config": "cp ./src/config/config.testnet.ts ./src/config/index.ts",
34-
"copy:mainnet-config": "cp ./src/config/config.mainnet.ts ./src/config/index.ts",
26+
"start-devnet": "yarn run copy-devnet-config & vite dev",
27+
"start-testnet": "yarn run copy-testnet-config & vite dev",
28+
"start-mainnet": "yarn run copy-mainnet-config & vite dev",
29+
"build-devnet": "tsc & yarn run copy-devnet-config & vite build",
30+
"build-testnet": "tsc & yarn run copy-testnet-config & vite build",
31+
"build-mainnet": "tsc & yarn run copy-mainnet-config & vite build",
32+
"copy-devnet-config": "cp ./src/config/config.devnet.ts ./src/config/index.ts",
33+
"copy-testnet-config": "cp ./src/config/config.testnet.ts ./src/config/index.ts",
34+
"copy-mainnet-config": "cp ./src/config/config.mainnet.ts ./src/config/index.ts",
3535
"test": "jest",
3636
"wdio-smoke": "wdio run wdio/wdio.conf.ts",
3737
"smoke": "wdio run wdio/wdio.conf.ts --suite smoke"

playwright.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export default defineConfig({
2121
}
2222
],
2323
webServer: {
24-
command: 'npm run start:devnet',
24+
command: 'npm run start-devnet',
2525
timeout: 120 * 1000,
2626
reuseExistingServer: true
2727
}

0 commit comments

Comments
 (0)