Merge pull request #5378 from jay-hodgson/SWC-6761

SWC-6761: small amount of progress with dependencies

package.json

@@ -4,7 +4,8 @@
     "@sage-bionetworks/react-base-table": "1.13.4",
     "croppie": "2.6.5",
     "font-awesome": "4.7.0",
-    "jquery": "3.5.1",
+    "jquery": "3.7.1",
+    "jquery-ui": "1.13.3",
     "jsplumb": "2.13.2",
     "katex": "^0.16.10",
     "markdown-it": "^14.1.0",

pom.xml

@@ -397,6 +397,14 @@
                   file="${project.basedir}/node_modules/jquery/dist/jquery.min.js"
                   tofile="src/main/webapp/generated/jquery.min.js"
                 />
+                <copy
+                  file="${project.basedir}/node_modules/jquery-ui/dist/jquery-ui.min.js"
+                  tofile="src/main/webapp/generated/jquery-ui.min.js"
+                />
+                <copy
+                  file="${project.basedir}/node_modules/jquery-ui/dist/themes/base/jquery-ui.min.css"
+                  tofile="src/main/webapp/generated/jquery-ui.min.css"
+                />
                 <copy
                   file="${project.basedir}/node_modules/jsplumb/dist/js/jsplumb.min.js"
                   tofile="src/main/webapp/generated/jsplumb.min.js"

src/main/webapp/Portal.html

@@ -179,7 +179,7 @@
 
       loadCss(cdnEndpoint + 'generated/swc.css')
       loadJs(cdnEndpoint + 'generated/jquery.min.js')
-      loadJs('//ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js')
+      loadJs(cdnEndpoint + 'generated/jquery-ui.min.js')
       loadJs(cdnEndpoint + 'js/back-forward-nav-handler.js')
       loadJs(cdnEndpoint + 'generated/moment.min.js')
       loadJs(cdnEndpoint + 'generated/jsplumb.min.js')
@@ -223,9 +223,7 @@
       loadCss(cdnEndpoint + 'js/diff/diffview.css')
       loadCss(cdnEndpoint + 'generated/croppie.css')
       loadCss(cdnEndpoint + 'css/highlight-js-default.css')
-      loadCss(
-        '//ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/base/jquery-ui.css',
-      )
+      loadCss(cdnEndpoint + 'generated/jquery-ui.min.css')
       loadJs(cdnEndpoint + 'js/linkify.min.js')
       loadJs(cdnEndpoint + 'js/linkify-string.min.js')
       loadJs('//cdn.statuspage.io/se-v2.js')

yarn.lock

@@ -3167,10 +3167,17 @@ jotai@^2.7.0:
   resolved "https://registry.yarnpkg.com/jotai/-/jotai-2.8.0.tgz#5a6585cd5576c400c2c5f8e157b83ad2ba70b2ab"
   integrity sha512-yZNMC36FdLOksOr8qga0yLf14miCJlEThlp5DeFJNnqzm2+ZG7wLcJzoOyij5K6U6Xlc5ljQqPDlJRgqW0Y18g==
 
-[email protected]:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
-  integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
+[email protected]:
+  version "1.13.3"
+  resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.3.tgz#d9f5292b2857fa1f2fdbbe8f2e66081664eb9bc5"
+  integrity sha512-D2YJfswSJRh/B8M/zCowDpNFfwsDmtfnMPwjJTyvl+CBqzpYwQ+gFYIbUUlzijy/Qvoy30H1YhoSui4MNYpRwA==
+  dependencies:
+    jquery ">=1.8.0 <4.0.0"
+
+[email protected], "jquery@>=1.8.0 <4.0.0":
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de"
+  integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"