From d1d06af2c6af59944f30bae942e62f1fa4d97288 Mon Sep 17 00:00:00 2001 From: Thomas Ip Date: Wed, 5 Jun 2019 09:45:10 +0800 Subject: [PATCH] dependencies: Upgrade jQuery to 3.4.1. API changes: * Positional selectors (eg :first, :eq) are deprecated in 3.4.0 and will be removed in 4.0. Use positional methods instead. --- package.json | 6 +++++- version.py | 2 +- yarn.lock | 8 ++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 7989e461dc..2e284f0061 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "handlebars": "4.1.2", "i18next": "3.4.4", "imports-loader": "0.8.0", - "jquery": "3.3.1", + "jquery": "3.4.1", "jquery-validation": "1.19.0", "katex": "0.8.3", "lazysizes": "4.1.6", @@ -85,5 +85,9 @@ "repository": { "type": "git", "url": "https://github.com/zulip/zulip.git" + }, + "resolutions": { + "//": "Awaiting jquery-validation/jquery-validation#2248 to be published on NPM.", + "jquery-validation/jquery": "3.4.1" } } diff --git a/version.py b/version.py index 5d3249ddfc..5d5c780bf3 100644 --- a/version.py +++ b/version.py @@ -11,4 +11,4 @@ LATEST_RELEASE_ANNOUNCEMENT = "https://blog.zulip.org/2019/03/01/zulip-2-0-relea # Typically, adding a dependency only requires a minor version bump, and # removing a dependency requires a major version bump. -PROVISION_VERSION = '34.1' +PROVISION_VERSION = '34.2' diff --git a/yarn.lock b/yarn.lock index 20291a51c0..2fae016363 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6014,10 +6014,10 @@ jquery-validation@1.19.0: dependencies: jquery "^1.7 || ^2.0 || ^3.1" -jquery@3.3.1, "jquery@^1.7 || ^2.0 || ^3.1": - version "3.3.1" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca" - integrity sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg== +jquery@3.4.1, "jquery@^1.7 || ^2.0 || ^3.1": + version "3.4.1" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2" + integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw== js-base64@^2.1.8, js-base64@^2.1.9: version "2.4.8"