From 844950faa6bb7536206ec86509b50402c74328e0 Mon Sep 17 00:00:00 2001 From: Kai Vandivier Date: Wed, 11 Dec 2024 15:23:47 +0100 Subject: [PATCH 1/3] chore: upgrade react to 18 in example apps --- examples/pwa-app/package.json | 4 ++-- examples/simple-app/package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/pwa-app/package.json b/examples/pwa-app/package.json index 56730808..26a76440 100644 --- a/examples/pwa-app/package.json +++ b/examples/pwa-app/package.json @@ -15,7 +15,7 @@ "peerDependencies": { "@dhis2/app-runtime": "*", "@dhis2/d2-i18n": "*", - "react": "^16.8", - "react-dom": "^16.8" + "react": "^18", + "react-dom": "^18" } } diff --git a/examples/simple-app/package.json b/examples/simple-app/package.json index 3f1d222e..b45d52fb 100644 --- a/examples/simple-app/package.json +++ b/examples/simple-app/package.json @@ -15,7 +15,7 @@ "@dhis2/app-runtime": "*", "@dhis2/d2-i18n": "*", "moment": "*", - "react": "^16.8", - "react-dom": "^16.8" + "react": "^18", + "react-dom": "^18" } } From 3eb746d9aab44ed91576f8bc1d55f9a0c1729339 Mon Sep 17 00:00:00 2001 From: Kai Vandivier Date: Wed, 11 Dec 2024 15:47:04 +0100 Subject: [PATCH 2/3] ci: node 14 on publish --- .github/workflows/dhis2-verify-lib.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dhis2-verify-lib.yml b/.github/workflows/dhis2-verify-lib.yml index 2407f474..f6fb077e 100644 --- a/.github/workflows/dhis2-verify-lib.yml +++ b/.github/workflows/dhis2-verify-lib.yml @@ -81,7 +81,11 @@ jobs: token: ${{env.GH_TOKEN}} - uses: actions/setup-node@v1 with: - node-version: 18.x + # Higher Node versions introduce npm > 7, which ends up + # changing yarn.lock when the semantic release action runs + # (specifically the `npm version` script). + # Apps need Node 18 to run, but aren't being run in this step + node-version: 14.x - uses: actions/download-artifact@v4 with: From 48dfd8dd43fb27e4c97e5bc324854adb849fb0c1 Mon Sep 17 00:00:00 2001 From: Kai Vandivier Date: Wed, 11 Dec 2024 16:05:49 +0100 Subject: [PATCH 3/3] chore: revert "ci: node 14 on publish" This reverts commit 3eb746d9aab44ed91576f8bc1d55f9a0c1729339. --- .github/workflows/dhis2-verify-lib.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/dhis2-verify-lib.yml b/.github/workflows/dhis2-verify-lib.yml index f6fb077e..2407f474 100644 --- a/.github/workflows/dhis2-verify-lib.yml +++ b/.github/workflows/dhis2-verify-lib.yml @@ -81,11 +81,7 @@ jobs: token: ${{env.GH_TOKEN}} - uses: actions/setup-node@v1 with: - # Higher Node versions introduce npm > 7, which ends up - # changing yarn.lock when the semantic release action runs - # (specifically the `npm version` script). - # Apps need Node 18 to run, but aren't being run in this step - node-version: 14.x + node-version: 18.x - uses: actions/download-artifact@v4 with: