Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(vendor-core): update to jquery 3 #479

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −26
Open

feat(vendor-core): update to jquery 3 #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/vendor-core/lib/customModules/jquery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ window.jquery = jquery;

module.exports = jquery;

require('jquery.cookie');
require('jquery-ujs');
require('multiselect');
require('select2');
Expand Down
31 changes: 13 additions & 18 deletions packages/vendor-core/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions packages/vendor-core/package.json
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of interest, why pin to these specific versions instead of a wider range? And would the latest jquery version work?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, I'm not sure why I used that version, gonna run some tests and update this

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated, had to do one small change for the in the core pr as focusout was removed

Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -52,9 +52,8 @@
"history": "^4.7.2",
"humanize-duration": "3.27.0",
"ipaddr.js": "~1.2.0",
"jquery": "~2.2.4",
"jquery": "^3.7.1",
"jquery-ujs": "~1.2.0",
"jquery.cookie": "~1.4.1",
"jstz": "~1.0.7",
"lodash": "^4.17.14",
"multiselect": "~0.9.12",
Expand Down Expand Up @@ -87,7 +86,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",
Expand Down
4 changes: 2 additions & 2 deletions packages/vendor-core/scss/vendor-core.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Loading