[TikiWiki-commits] [Git][tikiwiki/tiki][29.x] 3 commits: [UPD] Partial backport of 345ea9e4 (MR 8097) to update uuid and avoid extra node_modules dirs

"Rodriguez Nyiringabo \(@rodriguezny\) via TikiWiki-cvs" <[email protected]>
Newsgroups gmane.comp.cms.tiki.cvs
Message-ID <697a85afa240e_3b10e2c74655dd@gitlab-sidekiq-low-urgency-cpu-bound-v2-96cd9b87c-p6mtp.mail>

Rodriguez Nyiringabo pushed to branch 29.x at Tiki Wiki CMS Groupware / Tiki


Commits:
9b3a8bf3 by Benoit Grégoire at 2026-01-28T21:36:20+00:00
[UPD] Partial backport of 345ea9e4 (MR 8097) to update uuid and avoid extra node_modules dirs

- - - - -
036ed911 by Merci Jacob at 2026-01-28T21:36:20+00:00
[UPD] Upgrade element-plus version to 2.11.3
---
* [UPD] Upgrade element-plus version to 2.11.3

See merge request tikiwiki/tiki!8651

- - - - -
a19bb553 by Benoit Grégoire at 2026-01-28T21:36:20+00:00
[UPD] Regenerate entire package-lock , except for element-plus, as the problematic patches are still there.  Updated the patches to the versions in master, but even that is too old and the version isn't locked, it will break again...

- - - - -


4 changed files:

- package-lock.json
- src/js/patches/element-plus+2.9.7.patch → src/js/patches/element-plus+2.11.3.patch
- src/js/vue-mf/tiki-offline/package.json
- src/js/vue-widgets/element-plus-ui/package.json


Changes:

=====================================
package-lock.json
=====================================
The diff for this file was not included because it is too large.

=====================================
src/js/patches/element-plus+2.9.7.patch → src/js/patches/element-plus+2.11.3.patch
=====================================
@@ -1,17 +1,17 @@
 diff --git a/node_modules/element-plus/es/components/tooltip/src/content2.mjs b/node_modules/element-plus/es/components/tooltip/src/content2.mjs
-index b02ab74..9ba9119 100644
+index 00f7e8c..d4235dc 100644
 --- a/node_modules/element-plus/es/components/tooltip/src/content2.mjs
 +++ b/node_modules/element-plus/es/components/tooltip/src/content2.mjs
-@@ -64,7 +64,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
+@@ -66,7 +66,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
      const ariaHidden = ref(true);
      const onTransitionLeave = () => {
        onHide();
--      isFocusInsideContent() && tryFocus(document.body);
-+      isFocusInsideContent() && tryFocus(document.activeElement.parentElement);
+-      isFocusInsideContent() && focusElement(document.body, { preventScroll: true });
++      isFocusInsideContent() && focusElement(document.activeElement.parentElement, { preventScroll: true });
        ariaHidden.value = true;
      };
      const stopWhenControlled = () => {
-@@ -112,7 +112,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
+@@ -103,7 +103,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
        var _a;
        const popperContent = (_a = contentRef.value) == null ? void 0 : _a.popperContentRef;
        const activeElement = (event == null ? void 0 : event.relatedTarget) || document.activeElement;


=====================================
src/js/vue-mf/tiki-offline/package.json
=====================================
@@ -8,7 +8,7 @@
   "dependencies": {
     "moment-timezone": "^0.5.45",
     "strftime": "^0.10.2",
-    "uuid": "^9.0.1",
+    "uuid": "^11.0.0",
     "vue-upload-component": "^3.1.15",
     "vuex": "^4.1.0"
   }


=====================================
src/js/vue-widgets/element-plus-ui/package.json
=====================================
@@ -8,7 +8,7 @@
     "author": "Tiki Wiki CMS",
     "license": "LGPL-2.0-only",
     "devDependencies": {
-        "element-plus": "^2.8.5",
+        "element-plus": "^2.11.3",
         "sortablejs": "1.14.0"
     },
     "devDependenciesComment": {



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/compare/5aec78efef58eff1ea42b4d4eda0a291aa6916f6...a19bb553630b6d8c4811a4938da9d702e280d8f7

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/compare/5aec78efef58eff1ea42b4d4eda0a291aa6916f6...a19bb553630b6d8c4811a4938da9d702e280d8f7
You're receiving this email because of your account on gitlab.com.

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.