From 6bdf30f0e05186d307f5b6f5934c249893e84429 Mon Sep 17 00:00:00 2001 From: MariaAga Date: Wed, 24 Apr 2024 13:56:09 +0200 Subject: [PATCH] feat(vendor-core): update to jquery 3 BREAKING CHANGE: Updates jquery,datatables,select2. replaces jquery.cookie with js-cookie --- .../vendor-core/lib/customModules/jquery.js | 2 +- packages/vendor-core/package-lock.json | 36 +++++++++---------- packages/vendor-core/package.json | 10 +++--- packages/vendor-core/scss/vendor-core.scss | 4 +-- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/vendor-core/lib/customModules/jquery.js b/packages/vendor-core/lib/customModules/jquery.js index 81a6fc63..8fb62993 100644 --- a/packages/vendor-core/lib/customModules/jquery.js +++ b/packages/vendor-core/lib/customModules/jquery.js @@ -6,7 +6,7 @@ window.jquery = jquery; module.exports = jquery; -require('jquery.cookie'); +require('js-cookie'); require('jquery-ujs'); require('multiselect'); require('select2'); diff --git a/packages/vendor-core/package-lock.json b/packages/vendor-core/package-lock.json index 9ccaee8f..265240ea 100644 --- a/packages/vendor-core/package-lock.json +++ b/packages/vendor-core/package-lock.json @@ -2183,19 +2183,19 @@ "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==" }, "datatables.net": { - "version": "1.10.23", - "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.10.23.tgz", - "integrity": "sha512-we3tlNkzpxvgkKKlTxTMXPCt35untVXNg8zUYWpQyC1U5vJc+lT0+Zdc1ztK8d3lh5CfdnuFde2p8n3XwaGl3Q==", + "version": "1.13.5", + "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.13.5.tgz", + "integrity": "sha512-XoCQHkUM5MwbC3Wx7WpVvt4i880J8pIFDA9HIKD4GhvtalryBfmdd+bZvrc/rEbraZS7U4eR2k8/wFY0NeHVqQ==", "requires": { "jquery": ">=1.7" } }, "datatables.net-bs": { - "version": "1.10.23", - "resolved": "https://registry.npmjs.org/datatables.net-bs/-/datatables.net-bs-1.10.23.tgz", - "integrity": "sha512-O/kJxT93i9hIq8trdbHuIcHhrTodkVPfPqvxOqKK8lJ03XUUrT6V8ZoGyxROFjQGcgbye5CoRLVf7MY+5biOIQ==", + "version": "1.13.5", + "resolved": "https://registry.npmjs.org/datatables.net-bs/-/datatables.net-bs-1.13.5.tgz", + "integrity": "sha512-ZIiQAKwwIV+BoGijH3MHm6Vc7WB0icFxAF8uxx7nyZr5WMw1R7Pt5pqU1MqwjyjWtu81OveXQdRuwHMijey6ww==", "requires": { - "datatables.net": "1.10.23", + "datatables.net": ">=1.13.4", "jquery": ">=1.7" } }, @@ -3852,9 +3852,9 @@ "optional": true }, "jquery": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz", - "integrity": "sha1-LInWiJterFIqfuoywUUhVZxsvwI=" + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", + "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==" }, "jquery-match-height": { "version": "0.7.2", @@ -3870,10 +3870,10 @@ "jquery": ">=1.8.0" } }, - "jquery.cookie": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jquery.cookie/-/jquery.cookie-1.4.1.tgz", - "integrity": "sha1-1j3OIJ6raR/mMxbbCMqeR+D5OFs=" + "js-cookie": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.0.tgz", + "integrity": "sha512-oUbbplKuH07/XX2YD2+Q+GMiPpnVXaRz8npE7suhBH9QEkJe2W7mQ6rwuMXHue3fpfcftQwzgyvGzIHyfCSngQ==" }, "js-tokens": { "version": "4.0.0", @@ -4317,7 +4317,7 @@ "multiselect": { "version": "0.9.12", "resolved": "https://registry.npmjs.org/multiselect/-/multiselect-0.9.12.tgz", - "integrity": "sha1-0VU26YbdagApsWDWYTvO34Hkx+0=", + "integrity": "sha512-JCuFC288lp9m5xNlxsgX10dhZZv+5lIQQt4kM4H8uLysbiMJTYQBi0LuYguRunCvlXlGjFvH8O/YpL8x2lu9EA==", "requires": { "jquery": ">= 1.7.1" } @@ -9367,9 +9367,9 @@ "integrity": "sha512-XiUO1QP4ki4E2PHegiGAlu6r82o5A+6tRh7IkGGTVg/h+UoeX4nFBeCGPOhb4CYjvkqsfm/TUtvOMYC1xmV30A==" }, "select2": { - "version": "3.5.2-browserify", - "resolved": "https://registry.npmjs.org/select2/-/select2-3.5.2-browserify.tgz", - "integrity": "sha1-3E2v2jjWenNOipekbw01Ka4FOR0=" + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/select2/-/select2-4.0.12.tgz", + "integrity": "sha512-mbXC05AvjCboZcRlgJqN4mlI2qmqshpRC76sKNAdxS1lPLOh2m/NTyfL6xsvGoY6eIhjaya4dbumN99MudVQ2w==" }, "semantic-release": { "version": "15.14.0", diff --git a/packages/vendor-core/package.json b/packages/vendor-core/package.json index 486a564a..569e0d33 100644 --- a/packages/vendor-core/package.json +++ b/packages/vendor-core/package.json @@ -42,8 +42,8 @@ "classnames": "^2.2.5", "connected-react-router": "6.6.1", "core-js": "^2.5.7", - "datatables.net": "~1.10.12", - "datatables.net-bs": "~1.10.12", + "datatables.net": "1.13.5", + "datatables.net-bs": "1.13.5", "diff": "^4.0.1", "dsmorse-gridster": "^0.8.0", "file-saver": "^2.0.1", @@ -52,9 +52,9 @@ "history": "^4.7.2", "humanize-duration": "3.27.0", "ipaddr.js": "~1.2.0", - "jquery": "~2.2.4", + "jquery": "3.3.1", "jquery-ujs": "~1.2.0", - "jquery.cookie": "~1.4.1", + "js-cookie": "3.0.0", "jstz": "~1.0.7", "lodash": "^4.17.14", "multiselect": "~0.9.12", @@ -87,7 +87,7 @@ "reselect": "^3.0.1", "sanitize-html": "2.3.2", "seamless-immutable": "^7.1.2", - "select2": "~3.5.2-browserify", + "select2": "4.0.12", "unidiff": "^1.0.0", "urijs": "^1.19.4", "uuid": "^3.3.2", diff --git a/packages/vendor-core/scss/vendor-core.scss b/packages/vendor-core/scss/vendor-core.scss index 5acaa810..d4091173 100644 --- a/packages/vendor-core/scss/vendor-core.scss +++ b/packages/vendor-core/scss/vendor-core.scss @@ -6,8 +6,8 @@ @import '~multiselect/css/multi-select.css'; @import '~react-diff-view/style/index.css'; -@import '~select2/select2-bootstrap.css'; -@import '~select2/select2.css'; +@import '~select2/src/scss/core.scss'; + @import "~dsmorse-gridster/dist/jquery.gridster"; @import "~datatables.net-bs/css/dataTables.bootstrap.css"; @import "~@redhat-cloud-services/frontend-components/index.css";