Merge branch 'main' into versions/5.0.0

This commit is contained in:
Joachim Van Herwegen 2022-04-21 14:58:44 +02:00
commit 0423ccaaed
8 changed files with 14 additions and 14 deletions

View File

@ -30,13 +30,12 @@ jobs:
- ubuntu-latest - ubuntu-latest
- windows-latest - windows-latest
node-version: node-version:
- '12.17'
- '12.x'
- '14.2' - '14.2'
- '14.x' - '14.x'
- '16.0' - '16.0'
- '16.x' - '16.x'
- '17.x' - '18.0'
- '18.x'
timeout-minutes: 15 timeout-minutes: 15
steps: steps:
- name: Use Node.js ${{ matrix.node-version }} - name: Use Node.js ${{ matrix.node-version }}
@ -67,9 +66,9 @@ jobs:
strategy: strategy:
matrix: matrix:
node-version: node-version:
- '12.x'
- '14.x' - '14.x'
- '16.x' - '16.x'
- '18.x'
env: env:
TEST_DOCKER: true TEST_DOCKER: true
services: services:
@ -101,9 +100,9 @@ jobs:
strategy: strategy:
matrix: matrix:
node-version: node-version:
- '12.x'
- '14.x' - '14.x'
- '16.x' - '16.x'
- '18.x'
timeout-minutes: 15 timeout-minutes: 15
steps: steps:
- name: Use Node.js ${{ matrix.node-version }} - name: Use Node.js ${{ matrix.node-version }}

View File

@ -14,7 +14,7 @@ jobs:
matrix: matrix:
branch: branch:
- 'main' - 'main'
- 'versions/4.0.0' - 'versions/5.0.0'
timeout-minutes: 10 timeout-minutes: 10
steps: steps:
- name: Use Node.js 16.x - name: Use Node.js 16.x

View File

@ -33,7 +33,7 @@ and get started with Solid immediately.
## ⚡ Running the server ## ⚡ Running the server
To run the server, you will need [Node.js](https://nodejs.org/en/). 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.
<br> <br>
If you do not use Node.js, If you do not use Node.js,
you can run a [Docker](https://www.docker.com/) version instead. you can run a [Docker](https://www.docker.com/) version instead.

View File

@ -9,6 +9,7 @@ Steps to follow:
* Does authentication still work? * Does authentication still work?
* Is there an issue upgrading the recipes at https://github.com/CommunitySolidServer/recipes * 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. * 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. * Update all Components.js references to the new version.
* All contexts in all configs to * All contexts in all configs to
`https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^x.0.0/components/context.jsonld`. `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. * Most `chore` and `docs` entries can probably be removed.
* Make sure there are 2 newlines between this and the previous section. * Make sure there are 2 newlines between this and the previous section.
* `git push --follow-tags` * `git push --follow-tags`
* Merge `versions/x.0.0` into `main`. * Merge `versions/x.0.0` into `main` and push.
* Do a GitHub release. * Do a GitHub release.
* `npm publish` * `npm publish`
* Rename the `versions/x.0.0` branch to the next version. * Rename the `versions/x.0.0` branch to the next version.

2
package-lock.json generated
View File

@ -104,7 +104,7 @@
"typescript": "^4.5.5" "typescript": "^4.5.5"
}, },
"engines": { "engines": {
"node": ">=12.17" "node": ">=14.2"
} }
}, },
"node_modules/@babel/code-frame": { "node_modules/@babel/code-frame": {

View File

@ -15,7 +15,7 @@
], ],
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">=12.17" "node": ">=14.2"
}, },
"lsd:module": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server", "lsd:module": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server",
"lsd:components": "dist/components/components.jsonld", "lsd:components": "dist/components/components.jsonld",

View File

@ -52,7 +52,7 @@ async function clearInitialFiles(rootFilePath: string, pods: string[]): Promise<
if (file !== '.meta') { if (file !== '.meta') {
const path = joinFilePath(rootFilePath, pod, file); const path = joinFilePath(rootFilePath, pod, file);
if ((await fsPromises.stat(path)).isDirectory()) { if ((await fsPromises.stat(path)).isDirectory()) {
await fsPromises.rmdir(path, { recursive: true }); await fsPromises.rm(path, { recursive: true });
} else { } else {
await fsPromises.unlink(path); await fsPromises.unlink(path);
} }

View File

@ -164,7 +164,7 @@ export function mockFileSystem(rootFilepath?: string, time?: Date): { data: any
const entry = folder[name]; const entry = folder[name];
return typeof entry === 'symbol' ? entry.description ?? 'invalid' : path; return typeof entry === 'symbol' ? entry.description ?? 'invalid' : path;
}, },
async rmdir(path: string): Promise<void> { async rm(path: string): Promise<void> {
const { folder, name } = getFolder(path); const { folder, name } = getFolder(path);
if (!folder[name]) { if (!folder[name]) {
throwSystemError('ENOENT'); throwSystemError('ENOENT');
@ -278,8 +278,8 @@ export function mockFileSystem(rootFilepath?: string, time?: Date): { data: any
async symlink(target: string, path: string): Promise<void> { async symlink(target: string, path: string): Promise<void> {
await mockFs.promises.symlink(target, path); await mockFs.promises.symlink(target, path);
}, },
async rmdir(path: string): Promise<void> { async rm(path: string): Promise<void> {
await mockFs.promises.rmdir(path); await mockFs.promises.rm(path);
}, },
async readdir(path: string): Promise<string[]> { async readdir(path: string): Promise<string[]> {
return await mockFs.promises.readdir(path); return await mockFs.promises.readdir(path);