Skip to content

Commit 06738ea

Browse files
committed
Merge branch 'main' into pr/abhayymishraa/1281-1
2 parents 89c6674 + 11608c1 commit 06738ea

File tree

10 files changed

+234
-218
lines changed

10 files changed

+234
-218
lines changed

.github/workflows/run-ci-cd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: Run CI/CD
22

33
on:
4-
merge_group:
54
pull_request:
65
branches:
76
- main
@@ -240,6 +239,7 @@ jobs:
240239

241240
- name: Prepare frontend environment
242241
run: |
242+
touch frontend/.env
243243
echo "VITE_API_URL=${{ secrets.VITE_API_URL }}" >> frontend/.env
244244
echo "VITE_ENVIRONMENT=${{ secrets.VITE_ENVIRONMENT }}" >> frontend/.env
245245
echo "VITE_GRAPHQL_URL=${{ secrets.VITE_GRAPHQL_URL }}" >> frontend/.env

backend/poetry.lock

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

cspell/package-lock.json

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

docs/poetry.lock

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

frontend/docker/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ COPY --chmod=444 package.json pnpm-lock.yaml ./
66
RUN npm install --ignore-scripts -g pnpm && \
77
pnpm install --ignore-scripts
88

9-
COPY . .
9+
COPY .env .env
10+
COPY components.json tailwind.config.js tsconfig.json vite.config.ts ./
11+
COPY index.html index.html
12+
COPY public public
13+
COPY src src
1014

1115
RUN pnpm run build
1216

frontend/docker/Dockerfile.e2e.test

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,9 @@ COPY --chmod=444 package.json pnpm-lock.yaml ./
88
RUN npm install --ignore-scripts -g pnpm && \
99
pnpm install --ignore-scripts
1010

11-
COPY . .
11+
COPY __tests__/e2e __tests__/e2e
12+
COPY __tests__/unit/data __tests__/unit/data
13+
COPY index.html index.html
14+
COPY playwright.config.ts playwright.config.ts
15+
COPY src src
16+
COPY tailwind.config.js tsconfig.json vite.config.ts ./

frontend/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"@playwright/test": "^1.51.1",
6060
"@swc/core": "^1.11.16",
6161
"@swc/jest": "^0.2.37",
62-
"@tailwindcss/postcss": "^4.1.1",
62+
"@tailwindcss/postcss": "^4.1.2",
6363
"@testing-library/jest-dom": "^6.6.3",
6464
"@testing-library/react": "^16.3.0",
6565
"@types/jest": "^29.5.14",
@@ -78,7 +78,7 @@
7878
"eslint-plugin-jest": "^28.11.0",
7979
"eslint-plugin-jsx-a11y": "^6.10.2",
8080
"eslint-plugin-prettier": "^5.2.6",
81-
"eslint-plugin-react": "^7.37.4",
81+
"eslint-plugin-react": "^7.37.5",
8282
"eslint-plugin-react-hooks": "^5.2.0",
8383
"globals": "^16.0.0",
8484
"identity-obj-proxy": "^3.0.0",

frontend/playwright.config.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { defineConfig } from '@playwright/test'
1+
import { defineConfig, devices } from '@playwright/test'
22

33
export default defineConfig({
44
fullyParallel: true,
@@ -7,8 +7,15 @@ export default defineConfig({
77
name: 'Chromium',
88
use: { browserName: 'chromium' },
99
},
10+
{
11+
name: 'Mobile Safari - iPhone 13',
12+
use: {
13+
...devices['iPhone 13'],
14+
},
15+
},
1016
],
1117
reporter: [['list', { printSteps: true }]],
18+
retries: 2,
1219
testDir: './__tests__/e2e',
1320
use: {
1421
baseURL: 'http://localhost:3000',

0 commit comments

Comments
 (0)