From 15284a24b3685a4500df178328c514e20ab92c7b Mon Sep 17 00:00:00 2001 From: RRosio Date: Thu, 15 Sep 2022 14:19:56 -0700 Subject: [PATCH 1/3] updating js dependencies --- bower.json | 8 ++++---- nbclassic/templates/page.html | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bower.json b/bower.json index 5f72f6ff0..7d78fae5a 100644 --- a/bower.json +++ b/bower.json @@ -5,7 +5,7 @@ "backbone": "components/backbone#~1.2", "bootstrap": "bootstrap#~3.4", "bootstrap-tour": "0.9.0", - "codemirror": "components/codemirror#5.56.0+components1", + "codemirror": "components/codemirror#5.58.2+components1", "create-react-class": "https://cdn.jsdelivr.net/npm/create-react-class@15.6.3/create-react-class.min.js", "es6-promise": "~1.0", "font-awesome": "components/font-awesome#~4.7.0", @@ -13,8 +13,8 @@ "jed": "~1.1.1", "jquery": "components/jquery#~3.5.0", "jquery-typeahead": "~2.10.6", - "jquery-ui": "components/jqueryui#~1.12", - "marked": "~0.7", + "jquery-ui": "jquery/jquery-ui#~1.13.2", + "marked": "~1.1.1", "MathJax": "^2.7.4", "moment": "~2.19.3", "react": "~16.0.0", @@ -22,7 +22,7 @@ "requirejs-text": "~2.0.15", "requirejs-plugins": "~1.0.3", "text-encoding": "~0.1", - "underscore": "components/underscore#~1.8.3", + "underscore": "jashkenas/underscore#~1.13.4", "xterm.js": "https://unpkg.com/xterm@~3.1.0/dist/xterm.js", "xterm.js-css": "https://unpkg.com/xterm@~3.1.0/dist/xterm.css", "xterm.js-fit": "https://unpkg.com/xterm@~3.1.0/dist/addons/fit/fit.js" diff --git a/nbclassic/templates/page.html b/nbclassic/templates/page.html index a45180d8d..a8d71807d 100644 --- a/nbclassic/templates/page.html +++ b/nbclassic/templates/page.html @@ -7,7 +7,7 @@ {% block title %}Jupyter Notebook{% endblock %} {% block favicon %}{% endblock %} - + @@ -40,7 +40,7 @@ text: 'components/requirejs-text/text', bootstrap: 'components/bootstrap/dist/js/bootstrap.min', bootstraptour: 'components/bootstrap-tour/build/js/bootstrap-tour.min', - 'jquery-ui': 'components/jquery-ui/jquery-ui.min', + 'jquery-ui': 'components/jquery-ui/dist/jquery-ui.min', moment: 'components/moment/min/moment-with-locales', codemirror: 'components/codemirror', termjs: 'components/xterm.js/xterm', From 2d636c3427af1f7c33f5b73214c5e68ee968221e Mon Sep 17 00:00:00 2001 From: RRosio Date: Fri, 16 Sep 2022 07:32:26 -0700 Subject: [PATCH 2/3] updating file path to jquery dependency --- tools/build-main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build-main.js b/tools/build-main.js index 973868680..6a5b29f23 100644 --- a/tools/build-main.js +++ b/tools/build-main.js @@ -21,7 +21,7 @@ var rjs_config = { text: 'components/requirejs-text/text', bootstrap: 'components/bootstrap/dist/js/bootstrap.min', bootstraptour: 'components/bootstrap-tour/build/js/bootstrap-tour.min', - "jquery-ui": 'components/jquery-ui/jquery-ui.min', + "jquery-ui": 'components/jquery-ui/dist/jquery-ui.min', moment: 'components/moment/min/moment-with-locales', codemirror: 'components/codemirror', xterm: 'components/xterm.js/index', From 4252336b1d0567e6a12e2881b6d00a5dee690ebd Mon Sep 17 00:00:00 2001 From: RRosio Date: Fri, 16 Sep 2022 07:54:23 -0700 Subject: [PATCH 3/3] update more dependency file paths --- setupbase.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setupbase.py b/setupbase.py index 8cd7a48be..6e534c990 100644 --- a/setupbase.py +++ b/setupbase.py @@ -142,9 +142,9 @@ def find_package_data(): pjoin(components, "jquery", "jquery.min.js"), pjoin(components, "jquery-typeahead", "dist", "jquery.typeahead.min.js"), pjoin(components, "jquery-typeahead", "dist", "jquery.typeahead.min.css"), - pjoin(components, "jquery-ui", "jquery-ui.min.js"), - pjoin(components, "jquery-ui", "themes", "smoothness", "jquery-ui.min.css"), - pjoin(components, "jquery-ui", "themes", "smoothness", "images", "*"), + pjoin(components, "jquery-ui", "dist", "jquery-ui.min.js"), + pjoin(components, "jquery-ui", "dist", "themes", "smoothness", "jquery-ui.min.css"), + pjoin(components, "jquery-ui", "dist", "themes", "smoothness", "images", "*"), pjoin(components, "marked", "lib", "marked.js"), pjoin(components, "react", "react.production.min.js"), pjoin(components, "react", "react-dom.production.min.js"),