Merge 94935dfa90 into abda9bc00a

Closes #5222

composer.json

@@ -16,9 +16,9 @@
         "ext-json": "*",
         "ext-mbstring": "*",
         "ext-xml": "*",
-        "bacon/bacon-qr-code": "^2.0",
+        "bacon/bacon-qr-code": "^3.0",
         "doctrine/dbal": "^3.5",
-        "dompdf/dompdf": "^2.0",
+        "dompdf/dompdf": "^3.0",
         "guzzlehttp/guzzle": "^7.4",
         "intervention/image": "^3.5",
         "knplabs/knp-snappy": "^1.5",

dev/licensing/php-library-licenses.txt

@@ -128,7 +128,7 @@ Link: https://github.com/fruitcake/php-cors
 graham-campbell/result-type
 License: MIT
 License File: vendor/graham-campbell/result-type/LICENSE
-Copyright: Copyright (c) 2020-2023 Graham Campbell <*****@**********.**.**>
+Copyright: Copyright (c) 2020-2024 Graham Campbell <*****@**********.**.**>
 Source: https://github.com/GrahamCampbell/Result-Type.git
 Link: https://github.com/GrahamCampbell/Result-Type.git
 -----------
@@ -676,13 +676,6 @@ Copyright: Copyright (c) 2015-present Fabien Potencier
 Source: https://github.com/symfony/polyfill-mbstring.git
 Link: https://symfony.com
 -----------
-symfony/polyfill-php72
-License: MIT
-License File: vendor/symfony/polyfill-php72/LICENSE
-Copyright: Copyright (c) 2015-present Fabien Potencier
-Source: https://github.com/symfony/polyfill-php72.git
-Link: https://symfony.com
------------
 symfony/polyfill-php80
 License: MIT
 License File: vendor/symfony/polyfill-php80/LICENSE

lang/cy/entities.php

@@ -224,8 +224,8 @@ return [
     'pages_edit_switch_to_markdown_clean' => '(Cynnwys Glân)',
     'pages_edit_switch_to_markdown_stable' => '(Cynnwys Glân)',
     'pages_edit_switch_to_wysiwyg' => 'Newid i Olygydd WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg' => 'Newid i WYSIWYG newydd',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(Mewn Profi Alpha)',
     'pages_edit_set_changelog' => 'Gosod Changelog',
     'pages_edit_enter_changelog_desc' => 'Rhowch ddisgrifiad byr o\'r newidiadau rydych wedi\'u gwneud',
     'pages_edit_enter_changelog' => 'Cofnodwch Changelog',

lang/es/entities.php

@@ -224,8 +224,8 @@ return [
     'pages_edit_switch_to_markdown_clean' => '(Limpiar Contenido)',
     'pages_edit_switch_to_markdown_stable' => '(Contenido Estable)',
     'pages_edit_switch_to_wysiwyg' => 'Cambiar a Editor WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg' => 'Cambiar a nuevo editor WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(En alfa)',
     'pages_edit_set_changelog' => 'Ajustar Log de cambios',
     'pages_edit_enter_changelog_desc' => 'Introduzca una breve descripción de los cambios que ha realizado',
     'pages_edit_enter_changelog' => 'Entrar al Log de cambios',

lang/nl/entities.php

@@ -224,8 +224,8 @@ return [
     'pages_edit_switch_to_markdown_clean' => '(Opgeschoonde Inhoud)',
     'pages_edit_switch_to_markdown_stable' => '(Stabiele Inhoud)',
     'pages_edit_switch_to_wysiwyg' => 'Schakel naar de WYSIWYG Bewerker',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg' => 'Schakel naar de nieuwe WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alfa-testfase)',
     'pages_edit_set_changelog' => 'Logboek instellen',
     'pages_edit_enter_changelog_desc' => 'Geef een korte omschrijving van de wijzigingen die je gemaakt hebt',
     'pages_edit_enter_changelog' => 'Voeg toe aan logboek',

package.json

@@ -20,7 +20,6 @@
   },
   "devDependencies": {
     "@lezer/generator": "^1.5.1",
-    "babel-jest": "^29.7.0",
     "chokidar-cli": "^3.0",
     "esbuild": "^0.23.0",
     "eslint": "^8.55.0",
@@ -33,7 +32,7 @@
     "sass": "^1.69.5",
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
-    "typescript": "^5.4.5"
+    "typescript": "5.6.*"
   },
   "dependencies": {
     "@codemirror/commands": "^6.3.2",

resources/js/markdown/actions.js

@@ -1,4 +1,4 @@
-import * as DrawIO from '../services/drawio';
+import * as DrawIO from '../services/drawio.ts';
 
 export class Actions {
 

resources/js/wysiwyg/lexical/selection/lexical-node.ts

@@ -262,7 +262,7 @@ function $patchStyle(
       }
       return styles;
     },
-    {...prevStyles} || {},
+    {...prevStyles},
   );
   const newCSSText = getCSSFromStyleObject(newStyles);
   target.setStyle(newCSSText);

resources/sass/_content.scss

@@ -163,29 +163,29 @@ body .page-content img,
   }
   &.success {
     @include lightDark(border-color, $positive, $positive-dark);
-    @include lightDark(background-color, lighten($positive, 68%), darken($positive-dark, 36%));
-    @include lightDark(color, darken($positive, 16%), $positive-dark);
+    @include lightDark(background-color, #eafdeb, #122913);
+    @include lightDark(color, #063409, $positive-dark);
   }
   &.success:before {
     background-image: url("data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIGZpbGw9IiMzNzZjMzkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+ICAgIDxwYXRoIGQ9Ik0wIDBoMjR2MjRIMHoiIGZpbGw9Im5vbmUiLz4gICAgPHBhdGggZD0iTTEyIDJDNi40OCAyIDIgNi40OCAyIDEyczQuNDggMTAgMTAgMTAgMTAtNC40OCAxMC0xMFMxNy41MiAyIDEyIDJ6bS0yIDE1bC01LTUgMS40MS0xLjQxTDEwIDE0LjE3bDcuNTktNy41OUwxOSA4bC05IDl6Ii8+PC9zdmc+");
   }
   &.danger {
     @include lightDark(border-color, $negative, $negative-dark);
-    @include lightDark(background-color, lighten($negative, 56%), darken($negative-dark, 55%));
-    @include lightDark(color, darken($negative, 20%), $negative-dark);
+    @include lightDark(background-color, #fcdbdb, #250505);
+    @include lightDark(color, #4d0706, $negative-dark);
   }
   &.danger:before {
     background-image: url("data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIGZpbGw9IiNiOTE4MTgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+ICAgIDxwYXRoIGQ9Ik0xNS43MyAzSDguMjdMMyA4LjI3djcuNDZMOC4yNyAyMWg3LjQ2TDIxIDE1LjczVjguMjdMMTUuNzMgM3pNMTIgMTcuM2MtLjcyIDAtMS4zLS41OC0xLjMtMS4zIDAtLjcyLjU4LTEuMyAxLjMtMS4zLjcyIDAgMS4zLjU4IDEuMyAxLjMgMCAuNzItLjU4IDEuMy0xLjMgMS4zem0xLTQuM2gtMlY3aDJ2NnoiLz4gICAgPHBhdGggZD0iTTAgMGgyNHYyNEgweiIgZmlsbD0ibm9uZSIvPjwvc3ZnPg==");
   }
   &.info {
     @include lightDark(border-color, $info, $info-dark);
-    @include lightDark(color, darken($info, 20%), $info-dark);
-    @include lightDark(background-color, lighten($info, 50%), darken($info-dark, 34%));
+    @include lightDark(background-color, #d3efff, #001825);
+    @include lightDark(color, #01466c, $info-dark);
   }
   &.warning {
     @include lightDark(border-color, $warning, $warning-dark);
-    @include lightDark(background-color, lighten($warning, 50%), darken($warning-dark, 50%));
-    @include lightDark(color, darken($warning, 20%), $warning-dark);
+    @include lightDark(background-color, #fee3d3, #30170a);
+    @include lightDark(color, #6a2802, $warning-dark);
   }
   &.warning:before {
     background-image: url("data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIGZpbGw9IiNiNjUzMWMiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+ICAgIDxwYXRoIGQ9Ik0wIDBoMjR2MjRIMHoiIGZpbGw9Im5vbmUiLz4gICAgPHBhdGggZD0iTTEgMjFoMjJMMTIgMiAxIDIxem0xMi0zaC0ydi0yaDJ2MnptMC00aC0ydi00aDJ2NHoiLz48L3N2Zz4=");

resources/sass/_text.scss

@@ -44,11 +44,6 @@ h1, h2, h3, h4, h5, h6 {
   display: block;
   font-family: var(--font-heading, var(--font-body));
   @include lightDark(color, #222, #BBB);
-  .subheader {
-    font-size: 0.5em;
-    line-height: 1em;
-    color: lighten($text-dark, 32%);
-  }
 }
 
 h5 {
@@ -223,7 +218,7 @@ blockquote {
     position: absolute;
     top: $-s;
     left: $-s;
-    color: lighten($text-dark, 20%);
+    color: #777;
   }
 }
 

version

@@ -1 +1 @@
-v24.03-dev
+v24.10-dev