Skip to content

Commit 62d13dd

Browse files
NethmiRodrigodenniskigen
NethmiRodrigo
and
denniskigen
authored
(chore): Bump dependencies (#99)
* (chore): Bump yarn * (chore): Update workflow * Add pull request template * bump turbo and playwright * Align Playwright versions for both test and docker envs * Invalidate cache when the playwright Dockerfile changes --------- Co-authored-by: Dennis Kigen <kigen.work@gmail.com>
1 parent 308a9f4 commit 62d13dd

File tree

7 files changed

+364
-345
lines changed

7 files changed

+364
-345
lines changed

‎.github/pull_request_template.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
## Requirements
2+
3+
- [ ] 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.
4+
- [ ] My work conforms to the [OpenMRS 3.0 Styleguide](https://om.rs/styleguide) and [design documentation](https://om.rs/o3ui).
5+
- [ ] My work includes tests or is validated by existing tests.
6+
7+
## Summary
8+
<!-- Please describe what problems your PR addresses. -->
9+
10+
## Screenshots
11+
<!-- Required if you are making UI changes. -->
12+
13+
## Related Issue
14+
<!-- Paste the link to the Jira ticket here if one exists. -->
15+
<!-- https://issues.openmrs.org/browse/O3- -->
16+
17+
## Other
18+
<!-- Anything not covered above -->

‎.github/workflows/e2e.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ jobs:
4040
uses: actions/cache@v4
4141
with:
4242
path: ~/.cache/ms-playwright
43-
key: ${{ runner.os }}-playwright-${{ hashFiles('**/package-lock.json') }}
44-
43+
key: ${{ runner.os }}-playwright-${{ hashFiles('**/package-lock.json', 'e2e/support/bamboo/playwright.Dockerfile') }}
44+
4545
- name: Install Playwright Browsers
4646
if: steps.cache-playwright.outputs.cache-hit != 'true'
4747
run: npx playwright install chromium --with-deps
@@ -62,10 +62,11 @@ jobs:
6262
if: "!cancelled()"
6363
run: docker stop $(docker ps -a -q)
6464

65-
- name: Upload Report
66-
uses: actions/upload-artifact@v3
67-
if: always()
65+
- name: 📤 Upload report
66+
uses: actions/upload-artifact@v4
67+
if: '!cancelled()'
6868
with:
6969
name: playwright-report
70-
path: test-results/
70+
path: playwright-report/
7171
retention-days: 30
72+
overwrite: true

.yarn/releases/yarn-4.5.3.cjs renamed to .yarn/releases/yarn-4.6.0.cjs

Lines changed: 287 additions & 287 deletions
Large diffs are not rendered by default.

‎.yarnrc.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ enableGlobalCache: false
44

55
nodeLinker: node-modules
66

7-
yarnPath: .yarn/releases/yarn-4.5.3.cjs
7+
yarnPath: .yarn/releases/yarn-4.6.0.cjs

‎e2e/support/bamboo/playwright.Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM mcr.microsoft.com/playwright:v1.44.0-jammy
1+
FROM mcr.microsoft.com/playwright:v1.50.1-jammy
22

33
ARG USER_ID
44
ARG GROUP_ID
55

66
RUN if ! getent group $GROUP_ID > /dev/null; then \
7-
groupadd -g $GROUP_ID myusergroup; \
8-
fi
7+
groupadd -g $GROUP_ID myusergroup; \
8+
fi
99

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

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"@openmrs/esm-framework": "next",
6464
"@openmrs/esm-patient-common-lib": "next",
6565
"@openmrs/esm-styleguide": "next",
66-
"@playwright/test": "1.49.0",
66+
"@playwright/test": "^1.50.1",
6767
"@swc/cli": "^0.1.61",
6868
"@swc/core": "^1.3.34",
6969
"@swc/jest": "^0.2.24",
@@ -95,7 +95,7 @@
9595
"react-dom": "^18.2.0",
9696
"react-i18next": "^12.1.5",
9797
"swc-loader": "^0.2.3",
98-
"turbo": "^2.3.3",
98+
"turbo": "^2.4.2",
9999
"typescript": "^4.9.5",
100100
"webpack": "^5.75.0",
101101
"webpack-cli": "^5.0.1"
@@ -104,5 +104,5 @@
104104
"*.{ts,tsx}": "eslint --cache --fix --max-warnings 0",
105105
"*.{css,scss,ts,tsx}": "prettier --write --list-different"
106106
},
107-
"packageManager": "yarn@4.5.3"
107+
"packageManager": "yarn@4.6.0"
108108
}

‎yarn.lock‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3471,7 +3471,7 @@ __metadata:
34713471
"@openmrs/esm-framework": "npm:next"
34723472
"@openmrs/esm-patient-common-lib": "npm:next"
34733473
"@openmrs/esm-styleguide": "npm:next"
3474-
"@playwright/test": "npm:1.49.0"
3474+
"@playwright/test": "npm:^1.50.1"
34753475
"@swc/cli": "npm:^0.1.61"
34763476
"@swc/core": "npm:^1.3.34"
34773477
"@swc/jest": "npm:^0.2.24"
@@ -3505,7 +3505,7 @@ __metadata:
35053505
react-dom: "npm:^18.2.0"
35063506
react-i18next: "npm:^12.1.5"
35073507
swc-loader: "npm:^0.2.3"
3508-
turbo: "npm:^2.3.3"
3508+
turbo: "npm:^2.4.2"
35093509
typescript: "npm:^4.9.5"
35103510
webpack: "npm:^5.75.0"
35113511
webpack-cli: "npm:^5.0.1"
@@ -3831,14 +3831,14 @@ __metadata:
38313831
languageName: node
38323832
linkType: hard
38333833

3834-
"@playwright/test@npm:1.49.0":
3835-
version: 1.49.0
3836-
resolution: "@playwright/test@npm:1.49.0"
3834+
"@playwright/test@npm:^1.50.1":
3835+
version: 1.50.1
3836+
resolution: "@playwright/test@npm:1.50.1"
38373837
dependencies:
3838-
playwright: "npm:1.49.0"
3838+
playwright: "npm:1.50.1"
38393839
bin:
38403840
playwright: cli.js
3841-
checksum: 10/e87485ab4c02b6dc0bc20a43ea3965c949c45caa4e7f5beea4a0abd29be0a318662931e887072db0d165f8dde93709b97ea1b2c6f4c833b403aa13427d76dd22
3841+
checksum: 10/0d8d2291d6554c492cb163b4d463e1e9cc6d3ae50680d790473f693f36a243c16c3620406849dd40115046c47a6ad5cc36a24511caec6d054dc1a1d9fffb4138
38423842
languageName: node
38433843
linkType: hard
38443844

@@ -15227,27 +15227,27 @@ __metadata:
1522715227
languageName: node
1522815228
linkType: hard
1522915229

15230-
"playwright-core@npm:1.49.0":
15231-
version: 1.49.0
15232-
resolution: "playwright-core@npm:1.49.0"
15230+
"playwright-core@npm:1.50.1":
15231+
version: 1.50.1
15232+
resolution: "playwright-core@npm:1.50.1"
1523315233
bin:
1523415234
playwright-core: cli.js
15235-
checksum: 10/ef9c708293adab100337ed7fd8e61660be381707fc2b84f07b5f40d1ead44feb6a8e52fef98075e594522229d15a9ad56dd1471689cfa59409bec6447c22944d
15235+
checksum: 10/9a310b8a66bf7fd926e620c1c8e27be29bdbdce91640e5f975b2fd4dc706d0307faec2bb0456cc8e7dedb1e71c0b5eb35c6a58acd5cedc7d8fd849a9067e637b
1523615236
languageName: node
1523715237
linkType: hard
1523815238

15239-
"playwright@npm:1.49.0":
15240-
version: 1.49.0
15241-
resolution: "playwright@npm:1.49.0"
15239+
"playwright@npm:1.50.1":
15240+
version: 1.50.1
15241+
resolution: "playwright@npm:1.50.1"
1524215242
dependencies:
1524315243
fsevents: "npm:2.3.2"
15244-
playwright-core: "npm:1.49.0"
15244+
playwright-core: "npm:1.50.1"
1524515245
dependenciesMeta:
1524615246
fsevents:
1524715247
optional: true
1524815248
bin:
1524915249
playwright: cli.js
15250-
checksum: 10/1fb198d09d388ec46cc2f0fc6b889a8bde8a75066ded82d35f08ba333091ebf3fc4ddf11263a86058a7078c7238ec4f23a86a9f1dc3ebd4f610c9eb07841fb32
15250+
checksum: 10/a3687614ac3238a81cbe3018e4f4a2ae92c71f3f65110cc6087068c020f6134f0628308da33177b9b08102644706e835d4053f6890beeb4a935f433bc4ac107a
1525115251
languageName: node
1525215252
linkType: hard
1525315253

@@ -18121,58 +18121,58 @@ __metadata:
1812118121
languageName: node
1812218122
linkType: hard
1812318123

18124-
"turbo-darwin-64@npm:2.3.3":
18125-
version: 2.3.3
18126-
resolution: "turbo-darwin-64@npm:2.3.3"
18124+
"turbo-darwin-64@npm:2.4.2":
18125+
version: 2.4.2
18126+
resolution: "turbo-darwin-64@npm:2.4.2"
1812718127
conditions: os=darwin & cpu=x64
1812818128
languageName: node
1812918129
linkType: hard
1813018130

18131-
"turbo-darwin-arm64@npm:2.3.3":
18132-
version: 2.3.3
18133-
resolution: "turbo-darwin-arm64@npm:2.3.3"
18131+
"turbo-darwin-arm64@npm:2.4.2":
18132+
version: 2.4.2
18133+
resolution: "turbo-darwin-arm64@npm:2.4.2"
1813418134
conditions: os=darwin & cpu=arm64
1813518135
languageName: node
1813618136
linkType: hard
1813718137

18138-
"turbo-linux-64@npm:2.3.3":
18139-
version: 2.3.3
18140-
resolution: "turbo-linux-64@npm:2.3.3"
18138+
"turbo-linux-64@npm:2.4.2":
18139+
version: 2.4.2
18140+
resolution: "turbo-linux-64@npm:2.4.2"
1814118141
conditions: os=linux & cpu=x64
1814218142
languageName: node
1814318143
linkType: hard
1814418144

18145-
"turbo-linux-arm64@npm:2.3.3":
18146-
version: 2.3.3
18147-
resolution: "turbo-linux-arm64@npm:2.3.3"
18145+
"turbo-linux-arm64@npm:2.4.2":
18146+
version: 2.4.2
18147+
resolution: "turbo-linux-arm64@npm:2.4.2"
1814818148
conditions: os=linux & cpu=arm64
1814918149
languageName: node
1815018150
linkType: hard
1815118151

18152-
"turbo-windows-64@npm:2.3.3":
18153-
version: 2.3.3
18154-
resolution: "turbo-windows-64@npm:2.3.3"
18152+
"turbo-windows-64@npm:2.4.2":
18153+
version: 2.4.2
18154+
resolution: "turbo-windows-64@npm:2.4.2"
1815518155
conditions: os=win32 & cpu=x64
1815618156
languageName: node
1815718157
linkType: hard
1815818158

18159-
"turbo-windows-arm64@npm:2.3.3":
18160-
version: 2.3.3
18161-
resolution: "turbo-windows-arm64@npm:2.3.3"
18159+
"turbo-windows-arm64@npm:2.4.2":
18160+
version: 2.4.2
18161+
resolution: "turbo-windows-arm64@npm:2.4.2"
1816218162
conditions: os=win32 & cpu=arm64
1816318163
languageName: node
1816418164
linkType: hard
1816518165

18166-
"turbo@npm:^2.3.3":
18167-
version: 2.3.3
18168-
resolution: "turbo@npm:2.3.3"
18169-
dependencies:
18170-
turbo-darwin-64: "npm:2.3.3"
18171-
turbo-darwin-arm64: "npm:2.3.3"
18172-
turbo-linux-64: "npm:2.3.3"
18173-
turbo-linux-arm64: "npm:2.3.3"
18174-
turbo-windows-64: "npm:2.3.3"
18175-
turbo-windows-arm64: "npm:2.3.3"
18166+
"turbo@npm:^2.4.2":
18167+
version: 2.4.2
18168+
resolution: "turbo@npm:2.4.2"
18169+
dependencies:
18170+
turbo-darwin-64: "npm:2.4.2"
18171+
turbo-darwin-arm64: "npm:2.4.2"
18172+
turbo-linux-64: "npm:2.4.2"
18173+
turbo-linux-arm64: "npm:2.4.2"
18174+
turbo-windows-64: "npm:2.4.2"
18175+
turbo-windows-arm64: "npm:2.4.2"
1817618176
dependenciesMeta:
1817718177
turbo-darwin-64:
1817818178
optional: true
@@ -18188,7 +18188,7 @@ __metadata:
1818818188
optional: true
1818918189
bin:
1819018190
turbo: bin/turbo
18191-
checksum: 10/580203a335321aa77bc04a1db46fe34504dce32c3b22f593044330403915b47f5b10d41158131007ed7a518ff5e8f739f6feb311fa139aa029cd904f398944d3
18191+
checksum: 10/31f0d3a6f1453afebbd1b38ac8080b9b846662452c8312ab98e382249b3e4b978535cba9437e3966802ce55992064f44d4632a62eb85ceec1fa46a1a2bf9d1e0
1819218192
languageName: node
1819318193
linkType: hard
1819418194

0 commit comments

Comments
 (0)