From 3bea48ef2022153c5f1ac9c00f17df5246d1b6c7 Mon Sep 17 00:00:00 2001 From: Joachim Van Herwegen Date: Wed, 20 Apr 2022 09:26:42 +0200 Subject: [PATCH 1/3] chore: Update schedule.yml to use v5.0.0 branch --- .github/workflows/schedule.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/schedule.yml b/.github/workflows/schedule.yml index ca9345864..06e818c78 100644 --- a/.github/workflows/schedule.yml +++ b/.github/workflows/schedule.yml @@ -14,7 +14,7 @@ jobs: matrix: branch: - 'main' - - 'versions/4.0.0' + - 'versions/5.0.0' timeout-minutes: 10 steps: - name: Use Node.js 16.x From 828f5ca45758ff55429e142e3ab74fe747b4d560 Mon Sep 17 00:00:00 2001 From: Joachim Van Herwegen Date: Wed, 20 Apr 2022 09:49:57 +0200 Subject: [PATCH 2/3] docs: Update release documentation --- documentation/release.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/documentation/release.md b/documentation/release.md index dcae4a0bc..0f39ead1b 100644 --- a/documentation/release.md +++ b/documentation/release.md @@ -9,6 +9,7 @@ Steps to follow: * Does authentication still work? * Is there an issue upgrading the recipes at https://github.com/CommunitySolidServer/recipes * None of the above has to be blocking per se, but should be noted in the release notes if relevant. + * Verify that the RELEASE_NOTES.md are correct. * Update all Components.js references to the new version. * All contexts in all configs to `https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^x.0.0/components/context.jsonld`. @@ -22,7 +23,7 @@ Steps to follow: * Most `chore` and `docs` entries can probably be removed. * Make sure there are 2 newlines between this and the previous section. * `git push --follow-tags` - * Merge `versions/x.0.0` into `main`. + * Merge `versions/x.0.0` into `main` and push. * Do a GitHub release. * `npm publish` * Rename the `versions/x.0.0` branch to the next version. From 3d6e3d2e39ffd54ffed6fc0d24de97d50d45c96d Mon Sep 17 00:00:00 2001 From: Joachim Van Herwegen Date: Thu, 21 Apr 2022 14:31:41 +0200 Subject: [PATCH 3/3] chore: Drop support for Node 12 --- .github/workflows/ci.yml | 9 ++++----- README.md | 2 +- package-lock.json | 2 +- package.json | 2 +- test/integration/Quota.test.ts | 2 +- test/util/Util.ts | 6 +++--- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e05b19a5f..74d81fb80 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,13 +30,12 @@ jobs: - ubuntu-latest - windows-latest node-version: - - '12.17' - - '12.x' - '14.2' - '14.x' - '16.0' - '16.x' - - '17.x' + - '18.0' + - '18.x' timeout-minutes: 15 steps: - name: Use Node.js ${{ matrix.node-version }} @@ -67,9 +66,9 @@ jobs: strategy: matrix: node-version: - - '12.x' - '14.x' - '16.x' + - '18.x' env: TEST_DOCKER: true services: @@ -101,9 +100,9 @@ jobs: strategy: matrix: node-version: - - '12.x' - '14.x' - '16.x' + - '18.x' timeout-minutes: 15 steps: - name: Use Node.js ${{ matrix.node-version }} diff --git a/README.md b/README.md index 2dbecf6f8..84ef5761f 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ and get started with Solid immediately. ## ⚡ Running the server To run the server, you will need [Node.js](https://nodejs.org/en/). -We support versions 12.7 and up. +We support versions 14.2 and up.
If you do not use Node.js, you can run a [Docker](https://www.docker.com/) version instead. diff --git a/package-lock.json b/package-lock.json index a5fed8fdd..276d6822f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -104,7 +104,7 @@ "typescript": "^4.5.5" }, "engines": { - "node": ">=12.17" + "node": ">=14.2" } }, "node_modules/@babel/code-frame": { diff --git a/package.json b/package.json index de90d17dd..6ac4c416b 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ ], "license": "MIT", "engines": { - "node": ">=12.17" + "node": ">=14.2" }, "lsd:module": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server", "lsd:components": "dist/components/components.jsonld", diff --git a/test/integration/Quota.test.ts b/test/integration/Quota.test.ts index 58cc3825f..99f6642b1 100644 --- a/test/integration/Quota.test.ts +++ b/test/integration/Quota.test.ts @@ -52,7 +52,7 @@ async function clearInitialFiles(rootFilePath: string, pods: string[]): Promise< if (file !== '.meta') { const path = joinFilePath(rootFilePath, pod, file); if ((await fsPromises.stat(path)).isDirectory()) { - await fsPromises.rmdir(path, { recursive: true }); + await fsPromises.rm(path, { recursive: true }); } else { await fsPromises.unlink(path); } diff --git a/test/util/Util.ts b/test/util/Util.ts index 1410d38cb..e96f2c1af 100644 --- a/test/util/Util.ts +++ b/test/util/Util.ts @@ -164,7 +164,7 @@ export function mockFileSystem(rootFilepath?: string, time?: Date): { data: any const entry = folder[name]; return typeof entry === 'symbol' ? entry.description ?? 'invalid' : path; }, - async rmdir(path: string): Promise { + async rm(path: string): Promise { const { folder, name } = getFolder(path); if (!folder[name]) { throwSystemError('ENOENT'); @@ -278,8 +278,8 @@ export function mockFileSystem(rootFilepath?: string, time?: Date): { data: any async symlink(target: string, path: string): Promise { await mockFs.promises.symlink(target, path); }, - async rmdir(path: string): Promise { - await mockFs.promises.rmdir(path); + async rm(path: string): Promise { + await mockFs.promises.rm(path); }, async readdir(path: string): Promise { return await mockFs.promises.readdir(path);