From 810abb5c306b0c25df0abc1f4d1532299cb2d1a0 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 28 Nov 2023 14:24:21 -0800 Subject: [PATCH 1/2] Replace jquery-ui-bundle with jquery-ui-dist --- package-lock.json | 33 ++++++++++++++++++--------------- package.json | 2 +- webpack.mix.js | 4 ++-- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index d17ec73df4..faa7623dec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3191,7 +3191,7 @@ "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3912,7 +3912,7 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, "connect-history-api-fallback": { "version": "1.6.0", @@ -4261,7 +4261,7 @@ "cssesc": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha1-N3QZGZA7hoVl4cCep0dEXNGJg+4=" + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==" }, "cssnano": { "version": "5.1.12", @@ -4771,7 +4771,7 @@ "end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha1-WuZKX0UFe682JuwU2gyl5LJDHrA=", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", "requires": { "once": "^1.4.0" } @@ -5329,7 +5329,7 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "fsevents": { "version": "2.3.2", @@ -14977,7 +14977,7 @@ "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "dev": true }, "has-property-descriptors": { @@ -15395,7 +15395,7 @@ "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "requires": { "once": "^1.3.0", "wrappy": "1" @@ -15891,10 +15891,13 @@ "jquery": ">=1.8.0 <4.0.0" } }, - "jquery-ui-bundle": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/jquery-ui-bundle/-/jquery-ui-bundle-1.12.1.tgz", - "integrity": "sha1-1r4uTDd0lOI3ixyuKSCpHRGC2MQ=" + "jquery-ui-dist": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.13.2.tgz", + "integrity": "sha512-oVDRd1NLtTbBwpRKAYdIRgpWVDzeBhfy7Gu0RmY6JEaZtmBq6kDn1pm5SgDiAotrnDS+RoTRXO6xvcNTxA9tOA==", + "requires": { + "jquery": ">=1.8.0 <4.0.0" + } }, "jquery.iframe-transport": { "version": "1.0.0", @@ -17406,7 +17409,7 @@ "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", "optional": true }, "picocolors": { @@ -18050,7 +18053,7 @@ "pseudomap": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", + "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==", "dev": true }, "public-encrypt": { @@ -18429,7 +18432,7 @@ "rgbcolor": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/rgbcolor/-/rgbcolor-1.0.1.tgz", - "integrity": "sha512-9aZLIrhRaD97sgVhtJOW6ckOEh6/GnvQtdVNfdZ6s67+3/XwLS9lBcQYzEEhYVeUowN7pRzMLsyGhK2i/xvWbw==", + "integrity": "sha1-1lBezbMEplldom+ktDMHMGd1lF0=", "optional": true }, "rimraf": { @@ -19382,7 +19385,7 @@ "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" + "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==" }, "umd": { "version": "3.0.3", diff --git a/package.json b/package.json index 4c53d04eba..14cbd25588 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "jquery-form-validator": "^2.3.79", "jquery-slimscroll": "^1.3.8", "jquery-ui": "^1.13.2", - "jquery-ui-bundle": "^1.12.1", + "jquery-ui-dist": "^1.13.2", "jquery.iframe-transport": "^1.0.0", "jspdf-autotable": "^3.7.1", "less": "^4.2.0", diff --git a/webpack.mix.js b/webpack.mix.js index 0aaa0f632c..d121227d66 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -17,7 +17,7 @@ mix "./node_modules/bootstrap/dist/css/bootstrap.css", "./node_modules/@fortawesome/fontawesome-free/css/all.css", "./public/css/build/AdminLTE.css", - "./node_modules/jquery-ui-bundle/jquery-ui.css", + "./node_modules/jquery-ui-dist/jquery-ui.css", "./node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.standalone.css", "./node_modules/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css", "./node_modules/blueimp-file-upload/css/jquery.fileupload.css", @@ -159,7 +159,7 @@ mix.combine( "./node_modules/select2/dist/js/select2.full.min.js", "./node_modules/admin-lte/dist/js/adminlte.min.js", "./node_modules/tether/dist/js/tether.js", - "./node_modules/jquery-ui-bundle/jquery-ui.js", + "./node_modules/jquery-ui-dist/jquery-ui.js", "./node_modules/jquery-slimscroll/jquery.slimscroll.js", "./node_modules/jquery.iframe-transport/jquery.iframe-transport.js", "./node_modules/blueimp-file-upload/js/jquery.fileupload.js", From 4a975ebe29672584f99362b65390944f9eb04f8a Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 28 Nov 2023 15:01:41 -0800 Subject: [PATCH 2/2] Remove jquery-ui-dist --- package-lock.json | 8 -------- package.json | 1 - webpack.mix.js | 3 +-- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index faa7623dec..af8c3296f9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15891,14 +15891,6 @@ "jquery": ">=1.8.0 <4.0.0" } }, - "jquery-ui-dist": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.13.2.tgz", - "integrity": "sha512-oVDRd1NLtTbBwpRKAYdIRgpWVDzeBhfy7Gu0RmY6JEaZtmBq6kDn1pm5SgDiAotrnDS+RoTRXO6xvcNTxA9tOA==", - "requires": { - "jquery": ">=1.8.0 <4.0.0" - } - }, "jquery.iframe-transport": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/jquery.iframe-transport/-/jquery.iframe-transport-1.0.0.tgz", diff --git a/package.json b/package.json index 14cbd25588..a2e00552c2 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,6 @@ "jquery-form-validator": "^2.3.79", "jquery-slimscroll": "^1.3.8", "jquery-ui": "^1.13.2", - "jquery-ui-dist": "^1.13.2", "jquery.iframe-transport": "^1.0.0", "jspdf-autotable": "^3.7.1", "less": "^4.2.0", diff --git a/webpack.mix.js b/webpack.mix.js index d121227d66..fdda6618ab 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -17,7 +17,6 @@ mix "./node_modules/bootstrap/dist/css/bootstrap.css", "./node_modules/@fortawesome/fontawesome-free/css/all.css", "./public/css/build/AdminLTE.css", - "./node_modules/jquery-ui-dist/jquery-ui.css", "./node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.standalone.css", "./node_modules/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css", "./node_modules/blueimp-file-upload/css/jquery.fileupload.css", @@ -159,7 +158,7 @@ mix.combine( "./node_modules/select2/dist/js/select2.full.min.js", "./node_modules/admin-lte/dist/js/adminlte.min.js", "./node_modules/tether/dist/js/tether.js", - "./node_modules/jquery-ui-dist/jquery-ui.js", + "./node_modules/jquery-ui/dist/jquery-ui.js", "./node_modules/jquery-slimscroll/jquery.slimscroll.js", "./node_modules/jquery.iframe-transport/jquery.iframe-transport.js", "./node_modules/blueimp-file-upload/js/jquery.fileupload.js",