Merge branch 'release/4.2.0' into develop

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## v4.2.0-rc.1
+## v4.2.0
 
 ### IMPORTANT NOTES
 

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "peertube-client",
-  "version": "4.2.0-rc.1",
+  "version": "4.2.0",
   "private": true,
   "license": "AGPL-3.0",
   "author": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "peertube",
   "description": "PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.",
-  "version": "4.2.0-rc.1",
+  "version": "4.2.0",
   "private": true,
   "licence": "AGPL-3.0",
   "engines": {

scripts/release.sh

@@ -122,7 +122,7 @@ rm -f "./client/dist/embed-stats.json"
 
       # Release types package
       npm run generate-types-package "$version"
-      cd types/dist
+      cd packages/types/dist
       npm publish --access public
   fi
 )

server/lib/activitypub/context.ts

@@ -179,7 +179,7 @@ function buildContext (contextValue?: ContextValue) {
 
     {
       pt: 'https://joinpeertube.org/ns#',
-      sc: 'http://schema.org#',
+      sc: 'http://schema.org/',
 
       ...contextValue
     }

server/tests/api/activitypub/helpers.ts

@@ -9,6 +9,7 @@ import { buildAbsoluteFixturePath } from '@shared/core-utils'
 import { isHTTPSignatureVerified, isJsonLDSignatureVerified, parseHTTPSignature } from '../../../helpers/peertube-crypto'
 
 describe('Test activity pub helpers', function () {
+
   describe('When checking the Linked Signature', function () {
 
     it('Should fail with an invalid Mastodon signature', async function () {