Merge pull request #863 from serlo/staging

Deployment

__tests__/__utils__/services/database.ts

@@ -39,7 +39,7 @@ interface Course extends AbstractUuid<'Course'> {
   pages?: { alias: string }[]
 }
 
-interface GenericUuid extends AbstractUuid<GenericTypenames> {}
+type GenericUuid = AbstractUuid<GenericTypenames>
 
 type GenericTypenames = 'Page' | 'Article' | 'TaxonomyTerm' | 'Comment'
 

package.json

@@ -30,38 +30,38 @@
     "test:staging": "cross-env TEST_ENVIRONMENT=staging yarn test --runInBand"
   },
   "dependencies": {
-    "fp-ts": "^2.16.7",
+    "fp-ts": "^2.16.9",
     "io-ts": "^2.2.21",
-    "jose": "^5.4.1",
-    "toucan-js": "^3.4.0"
+    "jose": "^5.8.0",
+    "toucan-js": "^4.0.0"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20240620.0",
+    "@cloudflare/workers-types": "^4.20240903.0",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^29.7.0",
-    "@sentry/types": "^8.13.0",
-    "@testing-library/jest-dom": "^6.4.6",
+    "@sentry/types": "^8.28.0",
+    "@testing-library/jest-dom": "^6.5.0",
     "@types/iarna__toml": "^2.0.5",
     "@types/jest": "^29.5.12",
-    "@typescript-eslint/eslint-plugin": "^7.13.1",
-    "@typescript-eslint/parser": "^7.15.0",
+    "@typescript-eslint/eslint-plugin": "^8.4.0",
+    "@typescript-eslint/parser": "^8.4.0",
     "cross-env": "^7.0.3",
     "depcheck": "^1.4.7",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-deprecation": "^3.0.0",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-react": "^7.34.3",
+    "eslint-plugin-import": "^2.30.0",
+    "eslint-plugin-react": "^7.35.2",
     "jest": "^29.7.0",
-    "msw": "^2.3.1",
+    "msw": "^2.4.3",
     "npm-run-all": "^4.1.5",
-    "prettier": "^3.3.2",
-    "prettier-plugin-packagejson": "^2.5.0",
+    "prettier": "^3.3.3",
+    "prettier-plugin-packagejson": "^2.5.2",
     "prettier-plugin-sh": "^0.14.0",
-    "ts-jest": "^29.1.5",
+    "ts-jest": "^29.2.5",
     "ts-unused-exports": "^10.1.0",
-    "typescript": "^5.5.3",
-    "wrangler": "^3.61.0"
+    "typescript": "^5.5.4",
+    "wrangler": "^3.75.0"
   },
   "packageManager": "yarn@3.6.0",
   "engines": {

src/current-alias-redirects.ts

@@ -76,7 +76,7 @@ async function getPathInfo(
       const result = PathInfo.decode(JSON.parse(cachedValue))
 
       if (E.isRight(result)) return result.right
-    } catch (e) {
+    } catch {
       // ignore
     }
   }
@@ -122,7 +122,7 @@ async function getPathInfo(
       env,
     )
     apiResponseBody = await apiResponse.json()
-  } catch (e) {
+  } catch {
     return null
   }
 
@@ -166,15 +166,15 @@ async function getPathInfo(
           }
         }
       }
-    } catch (e) {
+    } catch {
       return null
     }
   } else {
     currentPath = isTrashedComment
       ? `error/deleted/${uuid.__typename}`
       : uuid.legacyObject !== undefined
         ? uuid.legacyObject.alias
-        : uuid.alias ?? path
+        : (uuid.alias ?? path)
   }
 
   const result = {

src/embed.ts

@@ -31,7 +31,7 @@ export async function embed(
       case 'wikimedia.org':
         return await getWikimediaThumbnail(videoUrl)
     }
-  } catch (e) {
+  } catch {
     //Invalid URL
   }
 
@@ -94,7 +94,7 @@ async function getVimeoThumbnail(url: URL, sentry: SentryReporter) {
 
   try {
     apiResponseJson = JSON.parse(apiResponseText) as unknown
-  } catch (e) {
+  } catch {
     sentry.setContext(
       'apiResponse',
       responseToContext({ response: apiResponse, text: apiResponseText }),
@@ -121,7 +121,7 @@ async function getVimeoThumbnail(url: URL, sentry: SentryReporter) {
 
   try {
     imgUrl = new Url(vimeoThumbnailUrl)
-  } catch (e) {
+  } catch {
     sentry.setContext(
       'apiResponse',
       responseToContext({ response: apiResponse, json: apiResponseJson }),
@@ -198,7 +198,7 @@ async function getGeogebraThumbnail(url: URL, sentry: SentryReporter) {
 
   try {
     apiResponseJson = JSON.parse(apiResponseText)
-  } catch (e) {
+  } catch {
     sentry.setContext(
       'apiResponse',
       responseToContext({ response: apiResponse, text: apiResponseText }),
@@ -227,7 +227,7 @@ async function getGeogebraThumbnail(url: URL, sentry: SentryReporter) {
 
   try {
     previewUrl = new Url(item.previewUrl)
-  } catch (e) {
+  } catch {
     sentry.setContext(
       'apiResponse',
       responseToContext({ response: apiResponse, json: apiResponseJson }),

src/redirects.ts

@@ -94,10 +94,7 @@ export function redirects(request: Request, env: CFEnvironment) {
       case '/data-wallet':
         return Response.redirect('https://lenabi.serlo-staging.dev/wallet', 302)
       case '/user-journey':
-        return Response.redirect(
-          'https://frontend-git-lenabi-mock-serlo.vercel.app/',
-          302,
-        )
+        return Response.redirect('https://de.serlo-staging.dev/willkommen', 302)
       case '/sso':
         return Response.redirect('https://lenabi.serlo-staging.dev/sso', 302)
       case '/status':