Merge branch 'main' into refactor/ds-1176-unsafe-classname

lmc-eu · Jan 28, 2025 · e91fbec · e91fbec
2 parents f759c87 + 2b5daa9
commit e91fbec
Show file tree

Hide file tree

Showing 11 changed files with 1,532 additions and 2,734 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -66,7 +66,7 @@ jobs:
         run: echo "site_url=${{ env.NETLIFY_DEPLOYED_URL }}" >> "$GITHUB_OUTPUT"
 
       - name: Run Playwright tests
-        uses: docker://mcr.microsoft.com/playwright:v1.50.0-jammy
+        uses: docker://mcr.microsoft.com/playwright:v1.49.1-jammy
         with:
           args: 'sh -c "corepack install && corepack enable && yarn test:e2e"'
         env:

diff --git a/apps/web-twig-demo/composer.json b/apps/web-twig-demo/composer.json
@@ -18,16 +18,16 @@
     "php": "^8.3",
     "ext-ctype": "*",
     "ext-iconv": "*",
-    "lmc/spirit-web-twig-bundle": "^3.0",
-    "symfony/asset": "5.4.*",
-    "symfony/console": "5.4.*",
-    "symfony/dotenv": "^5.4",
+    "lmc/spirit-web-twig-bundle": "^4.0",
+    "symfony/asset": "^6.4",
+    "symfony/console": "^6.4",
+    "symfony/dotenv": "^6.4",
     "symfony/flex": "^1",
-    "symfony/framework-bundle": "^5.4",
-    "symfony/runtime": "^5.4",
-    "symfony/twig-bundle": "5.4.*",
-    "symfony/webpack-encore-bundle": "^1.16",
-    "symfony/yaml": "^5.4"
+    "symfony/framework-bundle": "^6.4",
+    "symfony/runtime": "^6.4",
+    "symfony/twig-bundle": "^6.4",
+    "symfony/webpack-encore-bundle": "^2.2",
+    "symfony/yaml": "^6.4"
   },
   "config": {
     "allow-plugins": {
@@ -62,12 +62,12 @@
   "extra": {
     "symfony": {
       "allow-contrib": false,
-      "require": "5.4.*"
+      "require": "6.4.*"
     }
   },
   "require-dev": {
-    "symfony/debug-bundle": "5.4.*",
-    "symfony/stopwatch": "5.4.*",
-    "symfony/web-profiler-bundle": "5.4.*"
+    "symfony/debug-bundle": "6.4.*",
+    "symfony/stopwatch": "6.4.*",
+    "symfony/web-profiler-bundle": "6.4.*"
   }
 }