From 5fe4a4d23a830d261642bf9551fe04f3579410f9 Mon Sep 17 00:00:00 2001 From: Mike Jumper Date: Thu, 5 Oct 2023 09:44:17 -0700 Subject: [PATCH] GUACAMOLE-1859: Update to latest compatible versions of JavaScript dependencies. The Pickr library also has an update (v1.9.0), but that update does not successfully build, possibly due to a different level of JavaScript version compatibility. --- doc/licenses/jquery-3.6.4/dep-coordinates.txt | 1 - .../LICENSE.txt | 0 .../{jquery-3.6.4 => jquery-3.7.1}/README | 4 +- doc/licenses/jquery-3.7.1/dep-coordinates.txt | 1 + .../webpack-4.46.0/dep-coordinates.txt | 1 - .../LICENSE | 0 .../{webpack-4.46.0 => webpack-4.47.0}/README | 4 +- .../webpack-4.47.0/dep-coordinates.txt | 1 + guacamole/src/main/frontend/package-lock.json | 86 ++++++++++--------- guacamole/src/main/frontend/package.json | 4 +- 10 files changed, 53 insertions(+), 49 deletions(-) delete mode 100644 doc/licenses/jquery-3.6.4/dep-coordinates.txt rename doc/licenses/{jquery-3.6.4 => jquery-3.7.1}/LICENSE.txt (100%) rename doc/licenses/{jquery-3.6.4 => jquery-3.7.1}/README (65%) create mode 100644 doc/licenses/jquery-3.7.1/dep-coordinates.txt delete mode 100644 doc/licenses/webpack-4.46.0/dep-coordinates.txt rename doc/licenses/{webpack-4.46.0 => webpack-4.47.0}/LICENSE (100%) rename doc/licenses/{webpack-4.46.0 => webpack-4.47.0}/README (67%) create mode 100644 doc/licenses/webpack-4.47.0/dep-coordinates.txt diff --git a/doc/licenses/jquery-3.6.4/dep-coordinates.txt b/doc/licenses/jquery-3.6.4/dep-coordinates.txt deleted file mode 100644 index 620a5f8b1..000000000 --- a/doc/licenses/jquery-3.6.4/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -jquery:3.6.4 diff --git a/doc/licenses/jquery-3.6.4/LICENSE.txt b/doc/licenses/jquery-3.7.1/LICENSE.txt similarity index 100% rename from doc/licenses/jquery-3.6.4/LICENSE.txt rename to doc/licenses/jquery-3.7.1/LICENSE.txt diff --git a/doc/licenses/jquery-3.6.4/README b/doc/licenses/jquery-3.7.1/README similarity index 65% rename from doc/licenses/jquery-3.6.4/README rename to doc/licenses/jquery-3.7.1/README index a15bc0976..5e5cec423 100644 --- a/doc/licenses/jquery-3.6.4/README +++ b/doc/licenses/jquery-3.7.1/README @@ -1,8 +1,8 @@ jQuery (http://jquery.com/) --------------------------- - Version: 3.6.4 + Version: 3.7.1 From: 'OpenJS Foundation' (https://openjsf.org/) License(s): - MIT (bundled/jquery-3.6.4/LICENSE.txt) + MIT (bundled/jquery-3.7.1/LICENSE.txt) diff --git a/doc/licenses/jquery-3.7.1/dep-coordinates.txt b/doc/licenses/jquery-3.7.1/dep-coordinates.txt new file mode 100644 index 000000000..12b56f771 --- /dev/null +++ b/doc/licenses/jquery-3.7.1/dep-coordinates.txt @@ -0,0 +1 @@ +jquery:3.7.1 diff --git a/doc/licenses/webpack-4.46.0/dep-coordinates.txt b/doc/licenses/webpack-4.46.0/dep-coordinates.txt deleted file mode 100644 index bc6b6d1cb..000000000 --- a/doc/licenses/webpack-4.46.0/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -webpack:4.46.0 diff --git a/doc/licenses/webpack-4.46.0/LICENSE b/doc/licenses/webpack-4.47.0/LICENSE similarity index 100% rename from doc/licenses/webpack-4.46.0/LICENSE rename to doc/licenses/webpack-4.47.0/LICENSE diff --git a/doc/licenses/webpack-4.46.0/README b/doc/licenses/webpack-4.47.0/README similarity index 67% rename from doc/licenses/webpack-4.46.0/README rename to doc/licenses/webpack-4.47.0/README index 0e4043b5d..1420e33ba 100644 --- a/doc/licenses/webpack-4.46.0/README +++ b/doc/licenses/webpack-4.47.0/README @@ -1,8 +1,8 @@ Webpack (https://webpack.js.org/) --------------------------------- - Version: 4.46.0 + Version: 4.47.0 From: 'JS Foundation and other contributors' License(s): - MIT (bundled/webpack-4.46.0/LICENSE) + MIT (bundled/webpack-4.47.0/LICENSE) diff --git a/doc/licenses/webpack-4.47.0/dep-coordinates.txt b/doc/licenses/webpack-4.47.0/dep-coordinates.txt new file mode 100644 index 000000000..59c0515b0 --- /dev/null +++ b/doc/licenses/webpack-4.47.0/dep-coordinates.txt @@ -0,0 +1 @@ +webpack:4.47.0 diff --git a/guacamole/src/main/frontend/package-lock.json b/guacamole/src/main/frontend/package-lock.json index a9f041274..671f31124 100644 --- a/guacamole/src/main/frontend/package-lock.json +++ b/guacamole/src/main/frontend/package-lock.json @@ -12,10 +12,10 @@ "angular-translate": "^2.19.0", "angular-translate-interpolation-messageformat": "^2.19.0", "angular-translate-loader-static-files": "^2.19.0", - "blob-polyfill": "^7.0.20220408", + "blob-polyfill": ">=7.0.20220408", "datalist-polyfill": "^1.25.1", "file-saver": "^2.0.5", - "jquery": "^3.6.4", + "jquery": "^3.7.1", "jstz": "^2.1.1", "lodash": "^4.17.21" }, @@ -30,7 +30,7 @@ "google-closure-compiler": "20221004.0.0", "html-webpack-plugin": "^4.5.2", "mini-css-extract-plugin": "^1.6.2", - "webpack": "^4.46.0", + "webpack": "^4.47.0", "webpack-cli": "^4.10.0" } }, @@ -2255,9 +2255,9 @@ } }, "node_modules/css-minimizer-webpack-plugin/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -4642,9 +4642,9 @@ } }, "node_modules/jquery": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.4.tgz", - "integrity": "sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ==" + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", + "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" }, "node_modules/js-yaml": { "version": "3.14.1", @@ -4809,9 +4809,9 @@ } }, "node_modules/make-dir/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -5803,9 +5803,9 @@ } }, "node_modules/postcss": { - "version": "8.4.21", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", - "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "dev": true, "funding": [ { @@ -5815,10 +5815,14 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" }, @@ -7442,9 +7446,9 @@ } }, "node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -8910,9 +8914,9 @@ } }, "node_modules/webpack": { - "version": "4.46.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", - "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", + "version": "4.47.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.47.0.tgz", + "integrity": "sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ==", "dependencies": { "@webassemblyjs/ast": "1.9.0", "@webassemblyjs/helper-module-context": "1.9.0", @@ -10930,9 +10934,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true }, "serialize-javascript": { @@ -12731,9 +12735,9 @@ } }, "jquery": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.4.tgz", - "integrity": "sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ==" + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", + "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" }, "js-yaml": { "version": "3.14.1", @@ -12868,9 +12872,9 @@ }, "dependencies": { "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" } } }, @@ -13661,12 +13665,12 @@ "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==" }, "postcss": { - "version": "8.4.21", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", - "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "dev": true, "requires": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" } @@ -14976,9 +14980,9 @@ } }, "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -16179,9 +16183,9 @@ } }, "webpack": { - "version": "4.46.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", - "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", + "version": "4.47.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.47.0.tgz", + "integrity": "sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ==", "requires": { "@webassemblyjs/ast": "1.9.0", "@webassemblyjs/helper-module-context": "1.9.0", diff --git a/guacamole/src/main/frontend/package.json b/guacamole/src/main/frontend/package.json index cb4982da0..2bd72e04e 100644 --- a/guacamole/src/main/frontend/package.json +++ b/guacamole/src/main/frontend/package.json @@ -14,7 +14,7 @@ "blob-polyfill": ">=7.0.20220408", "datalist-polyfill": "^1.25.1", "file-saver": "^2.0.5", - "jquery": "^3.6.4", + "jquery": "^3.7.1", "jstz": "^2.1.1", "lodash": "^4.17.21" }, @@ -29,7 +29,7 @@ "google-closure-compiler": "20221004.0.0", "html-webpack-plugin": "^4.5.2", "mini-css-extract-plugin": "^1.6.2", - "webpack": "^4.46.0", + "webpack": "^4.47.0", "webpack-cli": "^4.10.0" } }