From cb847e581a83b76c5f1cfc1e9fbc0607233fcc37 Mon Sep 17 00:00:00 2001 From: dklimpel <5740567+dklimpel@users.noreply.github.com> Date: Mon, 2 Jun 2025 23:20:07 +0200 Subject: [PATCH 1/5] ci: bump NodeJs to v22 (LTS) --- .github/workflows/build-test.yml | 2 +- .github/workflows/node.js.yml | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/node.js.yml diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index f8645ec5..6ceca690 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -17,7 +17,7 @@ jobs: - name: Setup node uses: actions/setup-node@v4 with: - node-version: "18" + node-version: "22" - name: Install dependencies run: yarn --immutable - name: Run checks diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml new file mode 100644 index 00000000..6f21d058 --- /dev/null +++ b/.github/workflows/node.js.yml @@ -0,0 +1,28 @@ +name: Create release tarball and attach to tag + +on: + push: + tags: + - "*" + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v2 + with: + node-version: "22" + - run: yarn install + - run: yarn build + - run: | + version=`git describe --dirty --tags || echo unknown` + mkdir -p dist + cp -r build synapse-admin-$version + tar chvzf dist/synapse-admin-$version.tar.gz synapse-admin-$version + - uses: softprops/action-gh-release@b7e450da2a4b4cb4bfbae528f788167786cfcedf + with: + files: dist/*.tar.gz + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 9b06d131b831b0e2a094edd0211469a95e5a77c2 Mon Sep 17 00:00:00 2001 From: dklimpel <5740567+dklimpel@users.noreply.github.com> Date: Mon, 2 Jun 2025 23:33:55 +0200 Subject: [PATCH 2/5] fix files --- .github/workflows/github-release.yml | 2 +- .github/workflows/node.js.yml | 28 ---------------------------- 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 .github/workflows/node.js.yml diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index 16cea5fa..18c96d37 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: "20" + node-version: "22" - run: yarn install --immutable - run: yarn build - run: | diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml deleted file mode 100644 index 6f21d058..00000000 --- a/.github/workflows/node.js.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Create release tarball and attach to tag - -on: - push: - tags: - - "*" - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - with: - node-version: "22" - - run: yarn install - - run: yarn build - - run: | - version=`git describe --dirty --tags || echo unknown` - mkdir -p dist - cp -r build synapse-admin-$version - tar chvzf dist/synapse-admin-$version.tar.gz synapse-admin-$version - - uses: softprops/action-gh-release@b7e450da2a4b4cb4bfbae528f788167786cfcedf - with: - files: dist/*.tar.gz - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 00312600eaef9bd2ced60fcbdb4b8bcdde8114f6 Mon Sep 17 00:00:00 2001 From: dklimpel <5740567+dklimpel@users.noreply.github.com> Date: Mon, 2 Jun 2025 23:38:31 +0200 Subject: [PATCH 3/5] bump edge_ghpage.yaml --- .github/workflows/edge_ghpage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/edge_ghpage.yml b/.github/workflows/edge_ghpage.yml index e7f79283..fbab4047 100644 --- a/.github/workflows/edge_ghpage.yml +++ b/.github/workflows/edge_ghpage.yml @@ -18,7 +18,7 @@ jobs: fetch-tags: true - uses: actions/setup-node@v4 with: - node-version: "20" + node-version: "22" - name: Install and Build 🔧 run: | yarn install --immutable From 047c0d2aa681563fb91bc91c18eb94a22d5cb483 Mon Sep 17 00:00:00 2001 From: dklimpel <5740567+dklimpel@users.noreply.github.com> Date: Tue, 3 Jun 2025 19:01:32 +0200 Subject: [PATCH 4/5] bump `@types/node` --- package.json | 2 +- yarn.lock | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 4285cdc7..1bbc2c69 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@testing-library/user-event": "^14.5.2", "@types/jest": "^29.5.12", "@types/lodash": "^4.17.7", - "@types/node": "^20.14.12", + "@types/node": "^22.15.29", "@types/papaparse": "^5.3.14", "@types/react": "^18.3.3", "@typescript-eslint/eslint-plugin": "^7.16.1", diff --git a/yarn.lock b/yarn.lock index 58a093bf..e84c7358 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1860,7 +1860,7 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:^20.14.12": +"@types/node@npm:*": version: 20.16.11 resolution: "@types/node@npm:20.16.11" dependencies: @@ -1869,6 +1869,15 @@ __metadata: languageName: node linkType: hard +"@types/node@npm:^22.15.29": + version: 22.15.29 + resolution: "@types/node@npm:22.15.29" + dependencies: + undici-types: "npm:~6.21.0" + checksum: 10c0/602cc88c6150780cd9b5b44604754e0ce13983ae876a538861d6ecfb1511dff289e5576fffd26c841cde2142418d4bb76e2a72a382b81c04557ccb17cff29e1d + languageName: node + linkType: hard + "@types/papaparse@npm:^5.3.14": version: 5.3.14 resolution: "@types/papaparse@npm:5.3.14" @@ -8091,7 +8100,7 @@ __metadata: "@testing-library/user-event": "npm:^14.5.2" "@types/jest": "npm:^29.5.12" "@types/lodash": "npm:^4.17.7" - "@types/node": "npm:^20.14.12" + "@types/node": "npm:^22.15.29" "@types/papaparse": "npm:^5.3.14" "@types/react": "npm:^18.3.3" "@typescript-eslint/eslint-plugin": "npm:^7.16.1" @@ -8502,6 +8511,13 @@ __metadata: languageName: node linkType: hard +"undici-types@npm:~6.21.0": + version: 6.21.0 + resolution: "undici-types@npm:6.21.0" + checksum: 10c0/c01ed51829b10aa72fc3ce64b747f8e74ae9b60eafa19a7b46ef624403508a54c526ffab06a14a26b3120d055e1104d7abe7c9017e83ced038ea5cf52f8d5e04 + languageName: node + linkType: hard + "unique-filename@npm:^3.0.0": version: 3.0.0 resolution: "unique-filename@npm:3.0.0" From 4347df59e7600900bdb914fcd8a88ef2ed2c4bf9 Mon Sep 17 00:00:00 2001 From: dklimpel <5740567+dklimpel@users.noreply.github.com> Date: Tue, 3 Jun 2025 19:00:32 +0200 Subject: [PATCH 5/5] fix test --- src/App.test.tsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/App.test.tsx b/src/App.test.tsx index 6e347805..f755af37 100644 --- a/src/App.test.tsx +++ b/src/App.test.tsx @@ -4,6 +4,13 @@ fetchMock.enableMocks(); import App from "./App"; +jest.mock("./synapse/authProvider", () => ({ + __esModule: true, + default: { + logout: jest.fn().mockResolvedValue(undefined), + }, +})); + describe("App", () => { it("renders", async () => { render();