From 5786a603ba8dafa48a479e0e69c3421666a8a90d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 6 Jun 2019 15:27:35 +0000 Subject: [PATCH 1/3] Update dependency react-dom to v16.1.2 [SECURITY] --- package-lock.json | 47 +++++++++++++++++++++++++++++++++++++---------- package.json | 2 +- 2 files changed, 38 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 51d8b07c27..8de257e5d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -106,10 +106,12 @@ "integrity": "sha512-RiNjAgh8ZMX0D5gfN2R09a0RBs/R/Blfs/DiqhLmvCSvyCoeMDGANrDDQXv1w5blxxSJbz8a2awSZkwpv6gWNQ==" }, "@edx/mockprock": { - "version": "git+https://git@github.com/edx/mockprock.git#c9e4814ace9afad7a778e2af372b3125b3e56588", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@edx/mockprock/-/mockprock-1.0.2.tgz", + "integrity": "sha512-ti3ixqci3lZmSoW7SIPH9WfE1fRa2AU48gnLPg0EmR3g1hDh6SU7JsivwnoRghsSKDlCd4kFPDivxltYA2/VXQ==", "dev": true, "requires": { - "@edx/edx-proctoring": "1.5.0" + "@edx/edx-proctoring": "^1.5.0-rc.1" } }, "@edx/paragon": { @@ -149,6 +151,17 @@ "version": "3.3.1", "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==" + }, + "react-dom": { + "version": "16.1.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.1.0.tgz", + "integrity": "sha512-i9in5qW3H2PDinUPD9bnQK7tLAD8LhjYQ+fXi3nJOvVnxOO3ErHq6RNEnKY7pbjTPt155e74q7al8eBUuyLtew==", + "requires": { + "fbjs": "^0.8.16", + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.0" + } } } }, @@ -224,6 +237,17 @@ } } } + }, + "react-dom": { + "version": "16.1.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.1.0.tgz", + "integrity": "sha512-i9in5qW3H2PDinUPD9bnQK7tLAD8LhjYQ+fXi3nJOvVnxOO3ErHq6RNEnKY7pbjTPt155e74q7al8eBUuyLtew==", + "requires": { + "fbjs": "^0.8.16", + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.0" + } } } }, @@ -3360,6 +3384,7 @@ }, "edx-proctoring-proctortrack": { "version": "git+https://git@github.com/joshivj/edx-proctoring-proctortrack.git#c4f49973562bf0e54518b74efce20bafa299616a", + "from": "edx-proctoring-proctortrack@git+https://git@github.com/joshivj/edx-proctoring-proctortrack.git#c4f49973562bf0e54518b74efce20bafa299616a", "requires": { "@edx/edx-proctoring": "1.5.0" } @@ -6414,7 +6439,9 @@ "dev": true }, "jasmine-jquery": { - "version": "git+https://github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/jasmine-jquery/-/jasmine-jquery-2.1.1.tgz", + "integrity": "sha1-1AleZGlEomdjI1dpqwGNnzDw1Hs=", "dev": true }, "jest": { @@ -10233,14 +10260,14 @@ } }, "react-dom": { - "version": "16.1.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.1.0.tgz", - "integrity": "sha512-i9in5qW3H2PDinUPD9bnQK7tLAD8LhjYQ+fXi3nJOvVnxOO3ErHq6RNEnKY7pbjTPt155e74q7al8eBUuyLtew==", + "version": "16.1.2", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.1.2.tgz", + "integrity": "sha512-e2iKeys/pJcIzszO+9EYxnTus6JI3pftzhXGG8K9B9co2SljknimfuY1/VlAG9nDBipDAc8jkIuuhlz+EiGL+g==", "requires": { - "fbjs": "0.8.16", - "loose-envify": "1.3.1", - "object-assign": "4.1.1", - "prop-types": "15.6.0" + "fbjs": "^0.8.16", + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.0" } }, "react-dropzone": { diff --git a/package.json b/package.json index f885ca0bfc..fd1481c566 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "prop-types": "15.6.0", "raw-loader": "0.5.1", "react": "16.1.0", - "react-dom": "16.1.0", + "react-dom": "16.1.2", "react-redux": "5.0.7", "react-slick": "0.16.0", "redux": "3.7.2", From 24d601827a9f830846df3051d267e3cf8f208f87 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Thu, 6 Jun 2019 15:57:51 -0400 Subject: [PATCH 2/3] Go back to what jasmin-jquery was pointing to before. --- package-lock.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8de257e5d8..86e4f93bb0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6439,9 +6439,7 @@ "dev": true }, "jasmine-jquery": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/jasmine-jquery/-/jasmine-jquery-2.1.1.tgz", - "integrity": "sha1-1AleZGlEomdjI1dpqwGNnzDw1Hs=", + "version": "git+https://github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58", "dev": true }, "jest": { From 91f336c1ba54a7d3f15bd7ee1cf8b8cbc68c408d Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Thu, 6 Jun 2019 16:31:43 -0400 Subject: [PATCH 3/3] Run `npm install` locally. Catch other changes to the lock file that should have been made. --- package-lock.json | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 86e4f93bb0..152449a4b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -111,7 +111,7 @@ "integrity": "sha512-ti3ixqci3lZmSoW7SIPH9WfE1fRa2AU48gnLPg0EmR3g1hDh6SU7JsivwnoRghsSKDlCd4kFPDivxltYA2/VXQ==", "dev": true, "requires": { - "@edx/edx-proctoring": "^1.5.0-rc.1" + "@edx/edx-proctoring": "1.5.0" } }, "@edx/paragon": { @@ -157,10 +157,10 @@ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.1.0.tgz", "integrity": "sha512-i9in5qW3H2PDinUPD9bnQK7tLAD8LhjYQ+fXi3nJOvVnxOO3ErHq6RNEnKY7pbjTPt155e74q7al8eBUuyLtew==", "requires": { - "fbjs": "^0.8.16", - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.0" + "fbjs": "0.8.16", + "loose-envify": "1.3.1", + "object-assign": "4.1.1", + "prop-types": "15.6.0" } } } @@ -243,10 +243,10 @@ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.1.0.tgz", "integrity": "sha512-i9in5qW3H2PDinUPD9bnQK7tLAD8LhjYQ+fXi3nJOvVnxOO3ErHq6RNEnKY7pbjTPt155e74q7al8eBUuyLtew==", "requires": { - "fbjs": "^0.8.16", - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.0" + "fbjs": "0.8.16", + "loose-envify": "1.3.1", + "object-assign": "4.1.1", + "prop-types": "15.6.0" } } } @@ -3384,7 +3384,6 @@ }, "edx-proctoring-proctortrack": { "version": "git+https://git@github.com/joshivj/edx-proctoring-proctortrack.git#c4f49973562bf0e54518b74efce20bafa299616a", - "from": "edx-proctoring-proctortrack@git+https://git@github.com/joshivj/edx-proctoring-proctortrack.git#c4f49973562bf0e54518b74efce20bafa299616a", "requires": { "@edx/edx-proctoring": "1.5.0" } @@ -10262,10 +10261,10 @@ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.1.2.tgz", "integrity": "sha512-e2iKeys/pJcIzszO+9EYxnTus6JI3pftzhXGG8K9B9co2SljknimfuY1/VlAG9nDBipDAc8jkIuuhlz+EiGL+g==", "requires": { - "fbjs": "^0.8.16", - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.0" + "fbjs": "0.8.16", + "loose-envify": "1.3.1", + "object-assign": "4.1.1", + "prop-types": "15.6.0" } }, "react-dropzone": {