From 4a5a1f4e690a409016fe17e51b075e990130ddfa Mon Sep 17 00:00:00 2001 From: Dan Garner Date: Fri, 27 Dec 2024 08:56:51 +0000 Subject: [PATCH] Fix up after merging develop. --- package-lock.json | 17 +++++------------ package.json | 5 ++--- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 88f212be85..edb419b60c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@mapbox/leaflet-pip": "^1.1.0", "@popperjs/core": "^2.11.8", "@ssddanbrown/codemirror-lang-twig": "^1.0.0", - "@xibosignage/xibo-layout-renderer": "^1.0.4", + "@xibosignage/xibo-layout-renderer": "^1.0.6", "@xiechao/codemirror-lang-handlebars": "^1.0.4", "ajax-bootstrap-select": "^1.4.5", "blueimp-file-upload": "^10.32.0", @@ -76,8 +76,7 @@ "selecto": "^1.26.3", "toastr": "~2.1.4", "underscore": "^1.13.7", - "xibo-interactive-control": "git+https://github.com/xibosignage/xibo-interactive-control.git#44ad744a5a2a0af9e7fcdb828dbdbeff45cc40f0", - "xibo-layout-renderer": "git+https://github.com/xibosignage/xibo-layout-renderer.git#73b357402c5c483befa868889ce710698c34ffb3" + "xibo-interactive-control": "git+https://github.com/xibosignage/xibo-interactive-control.git#44ad744a5a2a0af9e7fcdb828dbdbeff45cc40f0" }, "devDependencies": { "@babel/core": "^7.24.9", @@ -3419,9 +3418,9 @@ } }, "node_modules/@xibosignage/xibo-layout-renderer": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@xibosignage/xibo-layout-renderer/-/xibo-layout-renderer-1.0.4.tgz", - "integrity": "sha512-kW0dTJWIYA3nOjdgn+Rjw7d+To3jsE1sb0z89A+9ovtLqpVkZHpkhgtXs+j7GcxemAqOH70WASb83KTbHGFBbg==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@xibosignage/xibo-layout-renderer/-/xibo-layout-renderer-1.0.6.tgz", + "integrity": "sha512-fYo1vPmhhRC7TIT8aZjVWyhkQAZ0BseWw9Nk8bWkRFK2s7Iy55O1CGYDs8KeffpMX9eODtgvxZwv12RkpnkFxw==", "license": "LGPL-3.0" }, "node_modules/@xiechao/codemirror-lang-handlebars": { @@ -10223,12 +10222,6 @@ "integrity": "sha512-FHyrngjuc2SFxTmB6gQ/Hp7w5hXtoh0kyDNNltlZ2C9x+q1uX1+VWbEO8P7LEQmx/uf8PNM7QoSi0JwfZeTwkA==", "license": "AGPL-3.0" }, - "node_modules/xibo-layout-renderer": { - "version": "1.0.0", - "resolved": "git+ssh://git@github.com/xibosignage/xibo-layout-renderer.git#73b357402c5c483befa868889ce710698c34ffb3", - "integrity": "sha512-dU+b6nz22NLFVepyt5qZUSZyA0rcWh6tqDs5Guajm0Gyn2AFbLs4OFpR5eEiMjWnGzTl1nIAdALMgMOngQsDGw==", - "license": "LGPL-3.0" - }, "node_modules/yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", diff --git a/package.json b/package.json index 79194729ba..8833bdf125 100644 --- a/package.json +++ b/package.json @@ -63,9 +63,9 @@ "@codemirror/state": "^6.4.1", "@fortawesome/fontawesome-free": "^6.6.0", "@mapbox/leaflet-pip": "^1.1.0", - "@xibosignage/xibo-layout-renderer": "^1.0.5", "@popperjs/core": "^2.11.8", "@ssddanbrown/codemirror-lang-twig": "^1.0.0", + "@xibosignage/xibo-layout-renderer": "^1.0.6", "@xiechao/codemirror-lang-handlebars": "^1.0.4", "ajax-bootstrap-select": "^1.4.5", "blueimp-file-upload": "^10.32.0", @@ -124,7 +124,6 @@ "selecto": "^1.26.3", "toastr": "~2.1.4", "underscore": "^1.13.7", - "xibo-interactive-control": "git+https://github.com/xibosignage/xibo-interactive-control.git#44ad744a5a2a0af9e7fcdb828dbdbeff45cc40f0", - "xibo-layout-renderer": "git+https://github.com/xibosignage/xibo-layout-renderer.git#73b357402c5c483befa868889ce710698c34ffb3" + "xibo-interactive-control": "git+https://github.com/xibosignage/xibo-interactive-control.git#44ad744a5a2a0af9e7fcdb828dbdbeff45cc40f0" } }