Merge pull request #33 from CoreMedia/release-2404

Changes for Release 2404.0.0

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Use pnpm
-      uses: pnpm/action-setup@v2
+      uses: pnpm/action-setup@v3
       with:
         version: 8
 

.husky/post-checkout

@@ -1,4 +1,2 @@
 #!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 . "$(dirname "$0")/packages-check.sh"

.husky/post-merge

@@ -1,4 +1,2 @@
 #!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 . "$(dirname "$0")/packages-check.sh"

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## v2404.0.0
+
+*Released 02.04.2024*
+
+### Breaking Changes:
+
+- Updated `schema.json` to CoreMedia Content Cloud v12 - 2404.1
+
+### Bugfixes and Changes:
+
+- Updated minor versions of dependencies
+
+---
+
 ## v2401.0.0
 
 *Released 07.02.2024*

README.md

@@ -1,6 +1,6 @@
 ![CoreMedia Labs Logo](https://documentation.coremedia.com/badges/banner_coremedia_labs_wide.png)
 
-![CoreMedia Content Cloud Version](https://img.shields.io/static/v1?message=2401&label=CoreMedia%20Content%20Cloud&style=for-the-badge&labelColor=666666&color=672779 
+![CoreMedia Content Cloud Version](https://img.shields.io/static/v1?message=2404&label=CoreMedia%20Content%20Cloud&style=for-the-badge&labelColor=666666&color=672779 
 "This badge shows the CoreMedia version this project is compatible with. 
 Please read the versioning section of the project to see what other CoreMedia versions are supported and how to find them."
 )

apps/spark/package.json

@@ -17,68 +17,68 @@
     "build-storybook": "storybook build -o dist/storybook"
   },
   "dependencies": {
-    "@apollo/client": "^3.9.3",
+    "@apollo/client": "^3.9.10",
     "@coremedia-labs/graphql-layer": "workspace:^",
     "@coremedia-labs/preview-integration": "workspace:^",
     "@coremedia-labs/view-dispatcher": "workspace:^",
-    "@js-joda/core": "^5.6.1",
-    "@js-joda/timezone": "^2.18.2",
-    "country-flag-icons": "^1.5.9",
+    "@js-joda/core": "^5.6.2",
+    "@js-joda/timezone": "^2.18.3",
+    "country-flag-icons": "^1.5.10",
     "crypto-hash": "^2.0.1",
     "graphql": "^16.8.1",
-    "i18next": "^23.8.2",
-    "i18next-browser-languagedetector": "^7.2.0",
-    "i18next-http-backend": "^2.4.3",
+    "i18next": "^23.10.1",
+    "i18next-browser-languagedetector": "^7.2.1",
+    "i18next-http-backend": "^2.5.0",
     "loglevel": "^1.9.1",
     "query-string": "^7.1.3",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-helmet-async": "^1.3.0",
     "react-i18next": "^11.18.6",
     "react-is": "^18.2.0",
-    "react-player": "^2.14.1",
+    "react-player": "^2.15.1",
     "react-responsive": "^9.0.2",
     "react-router-dom": "^5.3.4",
-    "react-slick": "^0.30.1",
+    "react-slick": "^0.30.2",
     "require-from-string": "^2.0.2",
     "slick-carousel": "^1.8.1",
     "styled-components": "^5.3.11"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "^7.6.13",
-    "@storybook/addon-backgrounds": "^7.6.13",
-    "@storybook/addon-docs": "^7.6.13",
-    "@storybook/addon-essentials": "^7.6.13",
-    "@storybook/addon-links": "^7.6.13",
-    "@storybook/addon-measure": "^7.6.13",
-    "@storybook/addon-outline": "^7.6.13",
-    "@storybook/client-api": "^7.6.13",
-    "@storybook/client-logger": "^7.6.13",
-    "@storybook/node-logger": "^7.6.13",
-    "@storybook/react": "^7.6.13",
-    "@storybook/react-vite": "^7.6.13",
-    "@types/node": "^20.11.16",
-    "@types/react": "^17.0.75",
+    "@storybook/addon-actions": "^7.6.17",
+    "@storybook/addon-backgrounds": "^7.6.17",
+    "@storybook/addon-docs": "^7.6.17",
+    "@storybook/addon-essentials": "^7.6.17",
+    "@storybook/addon-links": "^7.6.17",
+    "@storybook/addon-measure": "^7.6.17",
+    "@storybook/addon-outline": "^7.6.17",
+    "@storybook/client-api": "^7.6.17",
+    "@storybook/client-logger": "^7.6.17",
+    "@storybook/node-logger": "^7.6.17",
+    "@storybook/react": "^7.6.17",
+    "@storybook/react-vite": "^7.6.17",
+    "@types/node": "^20.12.2",
+    "@types/react": "^17.0.80",
     "@types/react-dom": "^17.0.25",
     "@types/react-router-dom": "^5.3.3",
     "@types/react-slick": "^0.23.13",
     "@types/styled-components": "^5.1.34",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
-    "@typescript-eslint/parser": "^6.21.0",
+    "@typescript-eslint/eslint-plugin": "^7.5.0",
+    "@typescript-eslint/parser": "^7.5.0",
     "@vitejs/plugin-react-swc": "^3.6.0",
-    "dotenv": "^16.4.1",
-    "eslint": "^8.56.0",
+    "dotenv": "^16.4.5",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-storybook": "^0.6.15",
+    "eslint-plugin-react": "^7.34.1",
+    "eslint-plugin-storybook": "^0.8.0",
     "prettier": "^3.2.5",
-    "storybook": "^7.6.13",
-    "typedoc": "^0.25.7",
+    "storybook": "^7.6.17",
+    "typedoc": "^0.25.12",
     "typescript": "~5.2.2",
-    "vite": "^4.5.2",
+    "vite": "^4.5.3",
     "vitest": "^0.34.6"
   },
   "browserslist": {

apps/spark/src/utils/Campaign/CampaignUtil.ts

@@ -64,11 +64,15 @@ export const getCurrentNavigationUuid = (
 ): string => {
   let currentUuid = "";
   const currentNavigationAsString = currentNavigation?.length > 0 ? "/" + currentNavigation.join("/") + "/" : undefined;
+  let navigationLinkTarget = navigation?.linkTarget || "";
+  if (navigationLinkTarget.indexOf("?") > 0) {
+    navigationLinkTarget = navigationLinkTarget?.substring(0, navigationLinkTarget?.indexOf("?")); // ignore query parameters
+  }
 
   if (currentNavigationAsString) {
     // check if the link target of the given navigation object is the same as the
     // current navigation, otherwise check the navigation objects of the children items
-    if (navigation?.linkTarget === currentNavigationAsString) {
+    if (navigationLinkTarget === currentNavigationAsString) {
       currentUuid = navigation?.uuid || "";
     } else if (navigation?.items && navigation?.items.length > 0) {
       // if the navigation has children items, loop over them recursively until

apps/standalone-fragment/package.json

@@ -9,30 +9,30 @@
     "lint:ci": "eslint \"src/**/*.+(ts|tsx)\""
   },
   "dependencies": {
-    "@apollo/client": "^3.9.3",
+    "@apollo/client": "^3.9.10",
     "@coremedia-labs/graphql-layer": "workspace:^",
     "graphql": "^16.8.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.9",
-    "@types/react": "^17.0.75",
+    "@babel/core": "^7.24.3",
+    "@types/react": "^17.0.80",
     "@types/react-dom": "^17.0.25",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
-    "@typescript-eslint/parser": "^6.21.0",
+    "@typescript-eslint/eslint-plugin": "^7.5.0",
+    "@typescript-eslint/parser": "^7.5.0",
     "babel-loader": "^9.1.3",
     "babel-preset-react-app": "^10.0.1",
-    "copy-webpack-plugin": "^11.0.0",
+    "copy-webpack-plugin": "^12.0.2",
     "css-loader": "^6.10.0",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-react": "^7.33.2",
+    "eslint-plugin-react": "^7.34.1",
     "prettier": "^3.2.5",
     "style-loader": "^3.3.4",
     "typescript": "~5.2.2",
-    "webpack": "^5.90.1",
+    "webpack": "^5.91.0",
     "webpack-cli": "^5.1.4"
   },
   "browserslist": {

package.json

@@ -1,11 +1,11 @@
 {
   "name": "@coremedia-labs/headless-client-workspace",
-  "version": "2401.0.0",
+  "version": "2404.0.0",
   "description": "Spark - The React client workspace for the CoreMedia Headless Server",
   "private": true,
   "license": "CoreMedia Open Source License",
   "scripts": {
-    "prepare": "husky install",
+    "prepare": "husky",
     "preinstall": "node ./bin/pnpm-check.js",
     "build": "pnpm -r build",
     "test": "pnpm -r test",
@@ -15,7 +15,7 @@
     "start": "concurrently \"pnpm --filter @coremedia-labs/headless-server-mocking start\" \"pnpm --filter @coremedia-labs/headless-server-stitching start\" \"pnpm --filter @coremedia-labs/spark start\""
   },
   "engines": {
-    "node": "^18 || ^20",
+    "node": "^20",
     "pnpm": "^8"
   },
   "packageManager": "[email protected]",
@@ -37,11 +37,9 @@
     "react",
     "spark"
   ],
-  "dependencies": {
-    "concurrently": "^8.2.2"
-  },
   "devDependencies": {
-    "husky": "^9.0.10"
+    "concurrently": "^8.2.2",
+    "husky": "^9.0.11"
   },
   "pnpm": {
     "peerDependencyRules": {

packages/graphql-layer/package.json

@@ -27,22 +27,22 @@
     "./dist/__downloaded__/schema.json": "./dist/__downloaded__/schema.json"
   },
   "dependencies": {
-    "@apollo/client": "^3.9.3",
-    "dotenv": "^16.4.1",
+    "@apollo/client": "^3.9.10",
+    "dotenv": "^16.4.5",
     "graphql": "^16.8.1",
     "graphql-tag": "^2.12.6",
     "typescript": "~5.2.2"
   },
   "devDependencies": {
     "@graphql-codegen/cli": "^5.0.2",
     "@graphql-codegen/near-operation-file-preset": "^3.0.0",
-    "@graphql-codegen/typescript": "^4.0.4",
-    "@graphql-codegen/typescript-operations": "^4.1.2",
-    "@graphql-codegen/typescript-react-apollo": "^4.2.0",
-    "@types/node": "^20.11.16",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
-    "@typescript-eslint/parser": "^6.21.0",
-    "eslint": "^8.56.0",
+    "@graphql-codegen/typescript": "^4.0.6",
+    "@graphql-codegen/typescript-operations": "^4.2.0",
+    "@graphql-codegen/typescript-react-apollo": "^4.3.0",
+    "@types/node": "^20.12.2",
+    "@typescript-eslint/eslint-plugin": "^7.5.0",
+    "@typescript-eslint/parser": "^7.5.0",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
     "prettier": "^3.2.5",