From 051a000bac480260a4a98e7b0f6366e419d5222a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 7 Jun 2019 16:02:27 +0000 Subject: [PATCH 1/2] Update dependency @edx/edx-bootstrap to v1.0.4 --- package-lock.json | 46 ++++++++++++++++++++++++++++++++++------------ package.json | 2 +- 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index e85e7ba301..4ae2d97e09 100644 --- a/package-lock.json +++ b/package-lock.json @@ -79,24 +79,24 @@ } }, "@edx/edx-bootstrap": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@edx/edx-bootstrap/-/edx-bootstrap-1.0.3.tgz", - "integrity": "sha512-3T6yYiLK9WdIn0iwjLoWfrsDqgfd0byiVB3aXK7w4oaltdVzA/fB/qU3iKrJ8cy4T6ZgDA2uFP726fU0StmxUw==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@edx/edx-bootstrap/-/edx-bootstrap-1.0.4.tgz", + "integrity": "sha512-h1tQxrSfOJEf60oPhCHcPClO260N+XnZX3Pnw6cKeYgWi5kiZT1ElqDerYpoV3Lj6xdhhDYeWHptgRPZnUCnxg==", "requires": { - "bootstrap": "4.0.0", - "jquery": "3.3.1", - "popper.js": "1.12.9" + "bootstrap": "^4.3.1", + "jquery": "^3.2.1", + "popper.js": "^1.12.6" }, "dependencies": { "bootstrap": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.0.0.tgz", - "integrity": "sha512-gulJE5dGFo6Q61V/whS6VM4WIyrlydXfCgkE+Gxe5hjrJ8rXLLZlALq7zq2RPhOc45PSwQpJkrTnc2KgD6cvmA==" + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz", + "integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==" }, "jquery": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", - "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==" + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz", + "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==" } } }, @@ -195,6 +195,16 @@ "whatwg-fetch": "2.0.3" }, "dependencies": { + "@edx/edx-bootstrap": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@edx/edx-bootstrap/-/edx-bootstrap-1.0.3.tgz", + "integrity": "sha512-3T6yYiLK9WdIn0iwjLoWfrsDqgfd0byiVB3aXK7w4oaltdVzA/fB/qU3iKrJ8cy4T6ZgDA2uFP726fU0StmxUw==", + "requires": { + "bootstrap": "4.0.0", + "jquery": "^3.2.1", + "popper.js": "^1.12.6" + } + }, "@edx/paragon": { "version": "3.4.8", "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-3.4.8.tgz", @@ -216,6 +226,16 @@ "sanitize-html": "1.20.0" } }, + "bootstrap": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.0.0.tgz", + "integrity": "sha512-gulJE5dGFo6Q61V/whS6VM4WIyrlydXfCgkE+Gxe5hjrJ8rXLLZlALq7zq2RPhOc45PSwQpJkrTnc2KgD6cvmA==" + }, + "jquery": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz", + "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==" + }, "react": { "version": "16.7.0", "resolved": "https://registry.npmjs.org/react/-/react-16.7.0.tgz", @@ -3384,6 +3404,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" } @@ -6444,6 +6465,7 @@ }, "jasmine-jquery": { "version": "git+https://github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58", + "from": "jasmine-jquery@git+https://github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58", "dev": true }, "jest": { diff --git a/package.json b/package.json index e9ac06f79a..a96e26ed6a 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "dependencies": { "@edx/cookie-policy-banner": "1.1.10", - "@edx/edx-bootstrap": "1.0.3", + "@edx/edx-bootstrap": "1.0.4", "@edx/edx-proctoring": "^1.5.0", "@edx/paragon": "2.6.4", "@edx/studio-frontend": "1.16.14", From d75f98a0a12243e0e73326ed479d3d61b19d59cd Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Fri, 7 Jun 2019 13:42:19 -0400 Subject: [PATCH 2/2] Run `npm install` in devstack. The output that renovate generates is different from what the version of npm we're using generates. --- package-lock.json | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4ae2d97e09..818e240179 100644 --- a/package-lock.json +++ b/package-lock.json @@ -83,9 +83,9 @@ "resolved": "https://registry.npmjs.org/@edx/edx-bootstrap/-/edx-bootstrap-1.0.4.tgz", "integrity": "sha512-h1tQxrSfOJEf60oPhCHcPClO260N+XnZX3Pnw6cKeYgWi5kiZT1ElqDerYpoV3Lj6xdhhDYeWHptgRPZnUCnxg==", "requires": { - "bootstrap": "^4.3.1", - "jquery": "^3.2.1", - "popper.js": "^1.12.6" + "bootstrap": "4.3.1", + "jquery": "3.4.1", + "popper.js": "1.12.9" }, "dependencies": { "bootstrap": { @@ -201,8 +201,8 @@ "integrity": "sha512-3T6yYiLK9WdIn0iwjLoWfrsDqgfd0byiVB3aXK7w4oaltdVzA/fB/qU3iKrJ8cy4T6ZgDA2uFP726fU0StmxUw==", "requires": { "bootstrap": "4.0.0", - "jquery": "^3.2.1", - "popper.js": "^1.12.6" + "jquery": "3.4.1", + "popper.js": "1.12.9" } }, "@edx/paragon": { @@ -3404,7 +3404,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" } @@ -6465,7 +6464,6 @@ }, "jasmine-jquery": { "version": "git+https://github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58", - "from": "jasmine-jquery@git+https://github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58", "dev": true }, "jest": {