Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
## Requirements

- [ ] This PR has a title that briefly describes the work done including the ticket number. If there is a ticket, make sure your PR title includes a [conventional commit](https://o3-docs.openmrs.org/docs/frontend-modules/contributing.en-US#contributing-guidelines) label. See existing PR titles for inspiration.
- [ ] My work conforms to the [OpenMRS 3.0 Styleguide](https://om.rs/styleguide) and [design documentation](https://om.rs/o3ui).
- [ ] My work includes tests or is validated by existing tests.

## Summary
<!-- Please describe what problems your PR addresses. -->

## Screenshots
<!-- Required if you are making UI changes. -->

## Related Issue
<!-- Paste the link to the Jira ticket here if one exists. -->
<!-- https://issues.openmrs.org/browse/O3- -->

## Other
<!-- Anything not covered above -->
13 changes: 7 additions & 6 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ jobs:
uses: actions/cache@v4
with:
path: ~/.cache/ms-playwright
key: ${{ runner.os }}-playwright-${{ hashFiles('**/package-lock.json') }}
key: ${{ runner.os }}-playwright-${{ hashFiles('**/package-lock.json', 'e2e/support/bamboo/playwright.Dockerfile') }}

- name: Install Playwright Browsers
if: steps.cache-playwright.outputs.cache-hit != 'true'
run: npx playwright install chromium --with-deps
Expand All @@ -62,10 +62,11 @@ jobs:
if: "!cancelled()"
run: docker stop $(docker ps -a -q)

- name: Upload Report
uses: actions/upload-artifact@v3
if: always()
- name: 📤 Upload report
uses: actions/upload-artifact@v4
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@samuelmale done here

if: '!cancelled()'
with:
name: playwright-report
path: test-results/
path: playwright-report/
retention-days: 30
overwrite: true
574 changes: 287 additions & 287 deletions .yarn/releases/yarn-4.5.3.cjs → .yarn/releases/yarn-4.6.0.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ enableGlobalCache: false

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.5.3.cjs
yarnPath: .yarn/releases/yarn-4.6.0.cjs
6 changes: 3 additions & 3 deletions e2e/support/bamboo/playwright.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM mcr.microsoft.com/playwright:v1.44.0-jammy
FROM mcr.microsoft.com/playwright:v1.50.1-jammy

ARG USER_ID
ARG GROUP_ID

RUN if ! getent group $GROUP_ID > /dev/null; then \
groupadd -g $GROUP_ID myusergroup; \
fi
groupadd -g $GROUP_ID myusergroup; \
fi

RUN useradd -u $USER_ID -g $GROUP_ID -m playwrightuser

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"@openmrs/esm-framework": "next",
"@openmrs/esm-patient-common-lib": "next",
"@openmrs/esm-styleguide": "next",
"@playwright/test": "1.49.0",
"@playwright/test": "^1.50.1",
"@swc/cli": "^0.1.61",
"@swc/core": "^1.3.34",
"@swc/jest": "^0.2.24",
Expand Down Expand Up @@ -95,7 +95,7 @@
"react-dom": "^18.2.0",
"react-i18next": "^12.1.5",
"swc-loader": "^0.2.3",
"turbo": "^2.3.3",
"turbo": "^2.4.2",
"typescript": "^4.9.5",
"webpack": "^5.75.0",
"webpack-cli": "^5.0.1"
Expand All @@ -104,5 +104,5 @@
"*.{ts,tsx}": "eslint --cache --fix --max-warnings 0",
"*.{css,scss,ts,tsx}": "prettier --write --list-different"
},
"packageManager": "yarn@4.5.3"
"packageManager": "yarn@4.6.0"
}
90 changes: 45 additions & 45 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3471,7 +3471,7 @@ __metadata:
"@openmrs/esm-framework": "npm:next"
"@openmrs/esm-patient-common-lib": "npm:next"
"@openmrs/esm-styleguide": "npm:next"
"@playwright/test": "npm:1.49.0"
"@playwright/test": "npm:^1.50.1"
"@swc/cli": "npm:^0.1.61"
"@swc/core": "npm:^1.3.34"
"@swc/jest": "npm:^0.2.24"
Expand Down Expand Up @@ -3505,7 +3505,7 @@ __metadata:
react-dom: "npm:^18.2.0"
react-i18next: "npm:^12.1.5"
swc-loader: "npm:^0.2.3"
turbo: "npm:^2.3.3"
turbo: "npm:^2.4.2"
typescript: "npm:^4.9.5"
webpack: "npm:^5.75.0"
webpack-cli: "npm:^5.0.1"
Expand Down Expand Up @@ -3831,14 +3831,14 @@ __metadata:
languageName: node
linkType: hard

"@playwright/test@npm:1.49.0":
version: 1.49.0
resolution: "@playwright/test@npm:1.49.0"
"@playwright/test@npm:^1.50.1":
version: 1.50.1
resolution: "@playwright/test@npm:1.50.1"
dependencies:
playwright: "npm:1.49.0"
playwright: "npm:1.50.1"
bin:
playwright: cli.js
checksum: 10/e87485ab4c02b6dc0bc20a43ea3965c949c45caa4e7f5beea4a0abd29be0a318662931e887072db0d165f8dde93709b97ea1b2c6f4c833b403aa13427d76dd22
checksum: 10/0d8d2291d6554c492cb163b4d463e1e9cc6d3ae50680d790473f693f36a243c16c3620406849dd40115046c47a6ad5cc36a24511caec6d054dc1a1d9fffb4138
languageName: node
linkType: hard

Expand Down Expand Up @@ -15227,27 +15227,27 @@ __metadata:
languageName: node
linkType: hard

"playwright-core@npm:1.49.0":
version: 1.49.0
resolution: "playwright-core@npm:1.49.0"
"playwright-core@npm:1.50.1":
version: 1.50.1
resolution: "playwright-core@npm:1.50.1"
bin:
playwright-core: cli.js
checksum: 10/ef9c708293adab100337ed7fd8e61660be381707fc2b84f07b5f40d1ead44feb6a8e52fef98075e594522229d15a9ad56dd1471689cfa59409bec6447c22944d
checksum: 10/9a310b8a66bf7fd926e620c1c8e27be29bdbdce91640e5f975b2fd4dc706d0307faec2bb0456cc8e7dedb1e71c0b5eb35c6a58acd5cedc7d8fd849a9067e637b
languageName: node
linkType: hard

"playwright@npm:1.49.0":
version: 1.49.0
resolution: "playwright@npm:1.49.0"
"playwright@npm:1.50.1":
version: 1.50.1
resolution: "playwright@npm:1.50.1"
dependencies:
fsevents: "npm:2.3.2"
playwright-core: "npm:1.49.0"
playwright-core: "npm:1.50.1"
dependenciesMeta:
fsevents:
optional: true
bin:
playwright: cli.js
checksum: 10/1fb198d09d388ec46cc2f0fc6b889a8bde8a75066ded82d35f08ba333091ebf3fc4ddf11263a86058a7078c7238ec4f23a86a9f1dc3ebd4f610c9eb07841fb32
checksum: 10/a3687614ac3238a81cbe3018e4f4a2ae92c71f3f65110cc6087068c020f6134f0628308da33177b9b08102644706e835d4053f6890beeb4a935f433bc4ac107a
languageName: node
linkType: hard

Expand Down Expand Up @@ -18121,58 +18121,58 @@ __metadata:
languageName: node
linkType: hard

"turbo-darwin-64@npm:2.3.3":
version: 2.3.3
resolution: "turbo-darwin-64@npm:2.3.3"
"turbo-darwin-64@npm:2.4.2":
version: 2.4.2
resolution: "turbo-darwin-64@npm:2.4.2"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard

"turbo-darwin-arm64@npm:2.3.3":
version: 2.3.3
resolution: "turbo-darwin-arm64@npm:2.3.3"
"turbo-darwin-arm64@npm:2.4.2":
version: 2.4.2
resolution: "turbo-darwin-arm64@npm:2.4.2"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard

"turbo-linux-64@npm:2.3.3":
version: 2.3.3
resolution: "turbo-linux-64@npm:2.3.3"
"turbo-linux-64@npm:2.4.2":
version: 2.4.2
resolution: "turbo-linux-64@npm:2.4.2"
conditions: os=linux & cpu=x64
languageName: node
linkType: hard

"turbo-linux-arm64@npm:2.3.3":
version: 2.3.3
resolution: "turbo-linux-arm64@npm:2.3.3"
"turbo-linux-arm64@npm:2.4.2":
version: 2.4.2
resolution: "turbo-linux-arm64@npm:2.4.2"
conditions: os=linux & cpu=arm64
languageName: node
linkType: hard

"turbo-windows-64@npm:2.3.3":
version: 2.3.3
resolution: "turbo-windows-64@npm:2.3.3"
"turbo-windows-64@npm:2.4.2":
version: 2.4.2
resolution: "turbo-windows-64@npm:2.4.2"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard

"turbo-windows-arm64@npm:2.3.3":
version: 2.3.3
resolution: "turbo-windows-arm64@npm:2.3.3"
"turbo-windows-arm64@npm:2.4.2":
version: 2.4.2
resolution: "turbo-windows-arm64@npm:2.4.2"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard

"turbo@npm:^2.3.3":
version: 2.3.3
resolution: "turbo@npm:2.3.3"
dependencies:
turbo-darwin-64: "npm:2.3.3"
turbo-darwin-arm64: "npm:2.3.3"
turbo-linux-64: "npm:2.3.3"
turbo-linux-arm64: "npm:2.3.3"
turbo-windows-64: "npm:2.3.3"
turbo-windows-arm64: "npm:2.3.3"
"turbo@npm:^2.4.2":
version: 2.4.2
resolution: "turbo@npm:2.4.2"
dependencies:
turbo-darwin-64: "npm:2.4.2"
turbo-darwin-arm64: "npm:2.4.2"
turbo-linux-64: "npm:2.4.2"
turbo-linux-arm64: "npm:2.4.2"
turbo-windows-64: "npm:2.4.2"
turbo-windows-arm64: "npm:2.4.2"
dependenciesMeta:
turbo-darwin-64:
optional: true
Expand All @@ -18188,7 +18188,7 @@ __metadata:
optional: true
bin:
turbo: bin/turbo
checksum: 10/580203a335321aa77bc04a1db46fe34504dce32c3b22f593044330403915b47f5b10d41158131007ed7a518ff5e8f739f6feb311fa139aa029cd904f398944d3
checksum: 10/31f0d3a6f1453afebbd1b38ac8080b9b846662452c8312ab98e382249b3e4b978535cba9437e3966802ce55992064f44d4632a62eb85ceec1fa46a1a2bf9d1e0
languageName: node
linkType: hard

Expand Down
Loading