From 338e2e9089473a76a5bcec894f0deeb6eb530017 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Mon, 26 Jun 2023 18:09:56 +0300 Subject: [PATCH] gridstack with amd --- application/Espo/Resources/metadata/app/jsLibs.json | 8 ++++++++ frontend/libs.json | 3 +-- package-lock.json | 8 ++++---- package.json | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/application/Espo/Resources/metadata/app/jsLibs.json b/application/Espo/Resources/metadata/app/jsLibs.json index d8c7033958..3cfdf198d1 100644 --- a/application/Espo/Resources/metadata/app/jsLibs.json +++ b/application/Espo/Resources/metadata/app/jsLibs.json @@ -47,6 +47,14 @@ "exportsAs": "summernote", "sourceMap": true }, + "jquery-ui": { + "exportsTo": "$", + "exportsAs": "ui" + }, + "jquery-ui-touch-punch": { + "exportsTo": "$", + "exportsAs": "ui" + }, "jquery-textcomplete": { "exportsTo": "$.fn", "exportsAs": "textcomplete" diff --git a/frontend/libs.json b/frontend/libs.json index b9ef535a76..b2df733d4a 100644 --- a/frontend/libs.json +++ b/frontend/libs.json @@ -101,8 +101,7 @@ "name": "gridstack", "src": "node_modules/gridstack/dist/gridstack-jq.js", "bundle": true, - "key": "gridstack", - "suppressAmd": true + "key": "gridstack" }, { "src": "node_modules/selectize/dist/js/standalone/selectize.js", diff --git a/package-lock.json b/package-lock.json index bf3f5f41f7..695dcfefc7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "flotr2": "github:yurikuzn/flotr2#0.1.3", "fullcalendar": "^3.10.5", "getobject": ">=1.0.0", - "gridstack": "github:yurikuzn/gridstack.js#5.1.1.e2", + "gridstack": "github:yurikuzn/gridstack.js#5.1.1.e3", "handlebars": "^4.7.7", "jquery": "^3.6.0", "jquery-textcomplete": "^1.8.5", @@ -3689,7 +3689,7 @@ }, "node_modules/gridstack": { "version": "5.1.1", - "resolved": "git+ssh://git@github.com/yurikuzn/gridstack.js.git#c5b4618f8f7581d302113d3893f6450c2b99a4c3", + "resolved": "git+ssh://git@github.com/yurikuzn/gridstack.js.git#f833a4d4bde2eff9efc66c5265714d3b6f514097", "funding": [ { "type": "paypal", @@ -9799,8 +9799,8 @@ "dev": true }, "gridstack": { - "version": "git+ssh://git@github.com/yurikuzn/gridstack.js.git#c5b4618f8f7581d302113d3893f6450c2b99a4c3", - "from": "gridstack@github:yurikuzn/gridstack.js#5.1.1.e2" + "version": "git+ssh://git@github.com/yurikuzn/gridstack.js.git#f833a4d4bde2eff9efc66c5265714d3b6f514097", + "from": "gridstack@github:yurikuzn/gridstack.js#5.1.1.e3" }, "grunt": { "version": "1.5.3", diff --git a/package.json b/package.json index 826202e2f3..9d9cc731db 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "flotr2": "github:yurikuzn/flotr2#0.1.3", "fullcalendar": "^3.10.5", "getobject": ">=1.0.0", - "gridstack": "github:yurikuzn/gridstack.js#5.1.1.e2", + "gridstack": "github:yurikuzn/gridstack.js#5.1.1.e3", "handlebars": "^4.7.7", "jquery": "^3.6.0", "jquery-textcomplete": "^1.8.5",