Merge branch 'main' into versions/5.0.0

.github/dependabot.yml

@@ -4,14 +4,30 @@ updates:
     directory: /
     schedule:
       interval: "daily"
-    open-pull-requests-limit: 0
+      time: "02:13"
+      timezone: "Europe/Brussels"
+    labels:
+      - "⚙️ dependencies"
   - package-ecosystem: "npm"
     directory: /
     schedule:
       interval: "daily"
-    open-pull-requests-limit: 0
+      time: "03:35"
+      timezone: "Europe/Brussels"
+    target-branch: "versions/5.0.0"
+    ignore:
+      # Ignore minor and patch version updates
+      - dependency-name: "*"
+        update-types: ["version-update:semver-minor", "version-update:semver-patch"]
+      # Sticking with Husky 4.x
+      - dependency-name: "husky"
+    labels:
+      - "⚙️ dependencies"
   - package-ecosystem: "docker"
     directory: /
     schedule:
       interval: "daily"
-    open-pull-requests-limit: 0
+      time: "04:22"
+      timezone: "Europe/Brussels"
+    labels:
+      - "⚙️ dependencies"

.github/workflows/ci.yml

@@ -162,7 +162,7 @@ jobs:
         uses: actions/checkout@v3
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           images: |
             solidproject/community-server
@@ -174,15 +174,15 @@ jobs:
             type=semver,pattern={{major}}
           github-token: ${{ secrets.github_token }}
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           push: true
@@ -206,7 +206,7 @@ jobs:
           ref: ${{ github.ref }}
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           images: |
             solidproject/community-server
@@ -215,15 +215,15 @@ jobs:
             type=raw,value=next
           github-token: ${{ secrets.github_token }}
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           push: true

CHANGELOG.md

@@ -13,14 +13,23 @@ All notable changes to this project will be documented in this file.
 * [fix(deps): Update to Comunica v2](https://github.com/CommunitySolidServer/CommunitySolidServer/commit/1de1f7c12a8ae3f89fd91e9cb33af0405af7d995)
 * [refactor: Replace RedirectAllHttpHandler usage with RedirectingHttpHandler](https://github.com/CommunitySolidServer/CommunitySolidServer/commit/d2bc995272ed596b2bd6acd0d4cab50fcb7859f0)
 
+### Fixed
+* [fix: Update prefixes in all configs](https://github.com/CommunitySolidServer/CommunitySolidServer/commit/ce27bec207652f0bd37beb23301f864464751438)
+* [fix: Always define @type in configs](https://github.com/CommunitySolidServer/CommunitySolidServer/commit/cfdd1221f05f2b51abc770e64407bb8392224383)
+* [fix: Change YargsCliExtractor structure to avoid Components.js issues](https://github.com/CommunitySolidServer/CommunitySolidServer/commit/6f4e70dbb928a9cb64e83a71954ea607a0bdb1a0)
+
+
+<a name="v4.0.1"></a>
+## [v4.0.1](https://github.com/CommunitySolidServer/CommunitySolidServer/compare/v4.0.0...v4.0.1) - 2022-05-10
+
+### Changed
+* [chore: Fix oidc-provider library to v7.10.6](https://github.com/CommunitySolidServer/CommunitySolidServer/commit/ef9dd433464799f54eade34fe11de04c5ab3a70e)
+
 ### Deprecated
 * [chore: Drop support for Node 12](https://github.com/CommunitySolidServer/CommunitySolidServer/commit/3d6e3d2e39ffd54ffed6fc0d24de97d50d45c96d)
 
 ### Fixed
 * [fix: %2F not handled correctly in file backend #1184](https://github.com/CommunitySolidServer/CommunitySolidServer/commit/dbdb9b424e4c4f68c19c66396064486bff93a7e4)
-* [fix: Update prefixes in all configs](https://github.com/CommunitySolidServer/CommunitySolidServer/commit/ce27bec207652f0bd37beb23301f864464751438)
-* [fix: Always define @type in configs](https://github.com/CommunitySolidServer/CommunitySolidServer/commit/cfdd1221f05f2b51abc770e64407bb8392224383)
-* [fix: Change YargsCliExtractor structure to avoid Components.js issues](https://github.com/CommunitySolidServer/CommunitySolidServer/commit/6f4e70dbb928a9cb64e83a71954ea607a0bdb1a0)
 * [fix: Make delimiter encoding case-insensitive.](https://github.com/CommunitySolidServer/CommunitySolidServer/commit/50469e2c1f3d9c808062fde96d2ce62d5e85475e)
 
 

RELEASE_NOTES.md

@@ -37,6 +37,10 @@ These changes are relevant if you wrote custom modules for the server that depen
 - `RedirectAllHttpHandler` was removed and fully replaced by `RedirectingHttpHandler`.
 - `SingleThreadedResourceLocker` has been renamed to `MemoryResourceLocker`.
 
+## V4.0.1
+Freezes the `oidc-provider` dependency to prevent a potential issue with the solid authn client
+as described in https://github.com/inrupt/solid-client-authn-js/issues/2103.
+
 ## v4.0.0
 ### New features
 - The server can be started with a new parameter to automatically generate accounts and pods, 

commitlint.config.js

@@ -1 +1,10 @@
-module.exports = { extends: ['@commitlint/config-conventional'] };
+module.exports = {
+  extends: ['@commitlint/config-conventional'],
+  rules: {
+    'subject-case': [
+      2,
+      'never',
+      ['start-case', 'kebab-case', 'snake-case'],
+    ],
+  }
+};

documentation/release.md

@@ -15,7 +15,7 @@ Steps to follow:
      `https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^x.0.0/components/context.jsonld`.
    * Update all `lsd` entries in `package.json` to the new version.
    * Commit this with `chore: Update configs to vx.0.0`.
- * `npm version major -m "Release version %s of the npm package."`
+ * `npm version major -m "chore: Release version %s of the npm package"`
    * This will update the `package.json`, generate a tag, and generate the new entries in `CHANGELOG.md`.
  * Manually edit the `CHANGELOG.md`.
    * First reverse the list of new entries so they go from old to new.
@@ -27,5 +27,11 @@ Steps to follow:
  * Do a GitHub release.
  * `npm publish`
  * Rename the `versions/x.0.0` branch to the next version.
- * Update `.github/workflows/schedule.yml` to point at the new branch.
+ * Update `.github/workflows/schedule.yml` and `.github/dependabot.yml` to point at the new branch.
  * Potentially upgrade the recipes at https://github.com/CommunitySolidServer/recipes
+ 
+Changes when doing a pre-release of a major version:
+ * Version with `npm version premajor --preid alpha -m "chore: Release version %s of the npm package"`.
+ * Do not merge `versions/x.0.0` into `main`.
+ * Publish with `npm publish --tag next`.
+ * Do not update the branch or anything related.

package-lock.json

@@ -51,7 +51,7 @@
         "mime-types": "^2.1.34",
         "n3": "^1.16.0",
         "nodemailer": "^6.7.2",
-        "oidc-provider": "^7.10.6",
+        "oidc-provider": "7.10.6",
         "proper-lockfile": "^4.1.2",
         "pump": "^3.0.0",
         "punycode": "^2.1.1",

package.json

@@ -118,7 +118,7 @@
     "mime-types": "^2.1.34",
     "n3": "^1.16.0",
     "nodemailer": "^6.7.2",
-    "oidc-provider": "^7.10.6",
+    "oidc-provider": "7.10.6",
     "proper-lockfile": "^4.1.2",
     "pump": "^3.0.0",
     "punycode": "^2.1.1",

renovate.json

@@ -1,5 +0,0 @@
-{
-  "extends": [
-    "github>rubensworks/renovate-presets:js"
-  ]
-}