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.

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

[Checkmarx] Resolve "Client Use Of JQuery Outdated Version" warnings #6020

Merged
merged 14 commits into from
Sep 28, 2020
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
2 changes: 1 addition & 1 deletion cfgov/agreements/jinja2/agreements/base_agreements.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

{% block javascript scoped %}
{{ super() }}
<script src="{{ static( 'agreements/js/jquery-1.9.1.min.js' ) }}"></script>
<script src="{{ static( 'jquery/jquery.min.js' ) }}"></script>
<script src="{{ static( 'agreements/js/chosen.jquery.js' ) }}"></script>
<script type="text/javascript">
$(document).ready(function () {
Expand Down
5 changes: 0 additions & 5 deletions cfgov/agreements/static/agreements/js/jquery-1.9.1.min.js

This file was deleted.

5 changes: 0 additions & 5 deletions cfgov/legacy/static/nemo/_/js/jquery-1.9.1.min.js

This file was deleted.

2 changes: 1 addition & 1 deletion cfgov/legacy/templates/front/base_update.html
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<script src="{% static 'nemo/_/js/html5shim.js' %}"></script>
<![endif]-->

<script src="{% static 'nemo/_/js/jquery-1.9.1.min.js' %}"></script>
<script src="{% static 'jquery/jquery.min.js}"></script>

{% block analytics_js %}
{% endblock %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% load static from staticfiles %}

{% block jquery %}
<script src="{% static 'nemo/_/js/jquery-1.9.1.min.js' %}"></script>
<script src="{% static 'jquery/jquery.min.js' %}"></script>
{% endblock %}

{% block nemo_js %}
Expand Down
2 changes: 1 addition & 1 deletion cfgov/templates/jobmanager/supervision.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% load static from staticfiles %}

{% block jquery %}
<script src="{% static 'nemo/_/js/jquery-1.9.1.min.js' %}"></script>
<script src="{% static 'jquery/jquery.min.js' %}"></script>
{% endblock %}

{% block page_meta %}
Expand Down
12 changes: 11 additions & 1 deletion gulp/tasks/copy.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,15 @@ gulp.task( 'copy:lightbox2', () => {
return stream;
} );

gulp.task( 'copy:jquery', () => {
console.log( 'COPY' );
const stream = _genericCopy(
`${ paths.modules }/jquery/dist/**/*`,
`${ paths.processed }/jquery`
);
return stream;
} );


gulp.task( 'copy:icons',
gulp.parallel(
Expand All @@ -76,6 +85,7 @@ gulp.task( 'copy',
gulp.parallel(
'copy:icons',
'copy:lightbox2',
'copy:root'
'copy:root',
'copy:jquery'
)
);
Binary file added npm-packages-offline-cache/jquery-3.5.1.tgz
Binary file not shown.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
"gulp-terser": "1.4.0",
"highcharts": "7.2.2",
"immutable": "3.x.x",
"jquery": "3.5.1",
"less": "3.12.2",
"lightbox2": "2.11.0",
"lodash.throttle": "4.1.1",
Expand Down
7 changes: 6 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7083,6 +7083,11 @@ jest@26.4.2:
import-local "^3.0.2"
jest-cli "^26.4.2"

jquery@3.5.1:
version "3.5.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==

js-base64@^2.1.9:
version "2.6.4"
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
Expand Down Expand Up @@ -11822,7 +11827,7 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=

ua-parser-js@0.7.22, ua-parser-js@^0.7.18, ua-parser-js@^0.7.22:
ua-parser-js@^0.7.18, ua-parser-js@^0.7.22:
alexhoffman617 marked this conversation as resolved.
Show resolved Hide resolved
version "0.7.22"
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.22.tgz#960df60a5f911ea8f1c818f3747b99c6e177eae3"
integrity sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q==
Expand Down