From f2c754f7684385b5bbd866fbcb921614e60dd850 Mon Sep 17 00:00:00 2001 From: "Dependencies.io Bot" Date: Tue, 3 Oct 2017 16:21:45 +0000 Subject: [PATCH 1/2] Update enzyme from 3.0.0 to 3.1.0 in / --- package.json | 2 +- yarn.lock | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 97cf55313ef9..8408dd485d84 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "codecov": "^2.3.0", "commander": "^2.11.0", "danger": "^1.2.0", - "enzyme": "^3.0.0", + "enzyme": "^3.1.0", "enzyme-adapter-react-16": "^1.0.0", "eslint": "^4.8.0", "eslint-config-airbnb": "^15.1.0", diff --git a/yarn.lock b/yarn.lock index 8fc522a9fe7e..98ed2867bc53 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3889,6 +3889,21 @@ enzyme@^3.0.0: raf "^3.3.2" rst-selector-parser "^2.2.1" +enzyme@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.1.0.tgz#d8ca84085790fbcec6ed40badd14478faee4c25a" + dependencies: + cheerio "^1.0.0-rc.2" + function.prototype.name "^1.0.3" + is-subset "^0.1.1" + lodash "^4.17.4" + object-is "^1.0.1" + object.assign "^4.0.4" + object.entries "^1.0.4" + object.values "^1.0.4" + raf "^3.3.2" + rst-selector-parser "^2.2.2" + errno@^0.1.3, errno@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d" @@ -10392,7 +10407,7 @@ rndm@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/rndm/-/rndm-1.2.0.tgz#f33fe9cfb52bbfd520aa18323bc65db110a1b76c" -rst-selector-parser@^2.2.1: +rst-selector-parser@^2.2.1, rst-selector-parser@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.2.tgz#9927b619bd5af8dc23a76c64caef04edf90d2c65" dependencies: From 37d81de583a22776c9703f7535ff8e1657358d3e Mon Sep 17 00:00:00 2001 From: hypnos Date: Wed, 4 Oct 2017 00:20:18 +0300 Subject: [PATCH 2/2] Use a single enzyme dependency --- .eslintrc.js | 3 +++ lib/components/package.json | 1 - lib/ui/package.json | 3 --- yarn.lock | 17 +---------------- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index d49b79089cae..53ef9e5ebed3 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -15,6 +15,9 @@ module.exports = { node: true, 'jest/globals': true, }, + settings: { + 'import/core-modules': ['enzyme'], + }, rules: { strict: [error, 'never'], 'prettier/prettier': [ diff --git a/lib/components/package.json b/lib/components/package.json index 84c4bc31486b..b48c4e55b7ab 100644 --- a/lib/components/package.json +++ b/lib/components/package.json @@ -19,7 +19,6 @@ "prop-types": "^15.6.0" }, "devDependencies": { - "enzyme": "^3.0.0", "react": "^16.0.0", "react-dom": "^16.0.0" }, diff --git a/lib/ui/package.json b/lib/ui/package.json index 32bd63a2cedd..fa5d61097518 100644 --- a/lib/ui/package.json +++ b/lib/ui/package.json @@ -38,9 +38,6 @@ "react-treebeard": "^2.0.3", "redux": "^3.7.2" }, - "devDependencies": { - "enzyme": "^3.0.0" - }, "peerDependencies": { "react": "*", "react-dom": "*" diff --git a/yarn.lock b/yarn.lock index 98ed2867bc53..4c809fc5bb30 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3874,21 +3874,6 @@ enzyme-to-json@^3.0.0: dependencies: lodash "^4.17.4" -enzyme@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.0.0.tgz#94ce364254dc654c4e619b25eecc644bf6481de7" - dependencies: - cheerio "^1.0.0-rc.2" - function.prototype.name "^1.0.3" - is-subset "^0.1.1" - lodash "^4.17.4" - object-is "^1.0.1" - object.assign "^4.0.4" - object.entries "^1.0.4" - object.values "^1.0.4" - raf "^3.3.2" - rst-selector-parser "^2.2.1" - enzyme@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.1.0.tgz#d8ca84085790fbcec6ed40badd14478faee4c25a" @@ -10407,7 +10392,7 @@ rndm@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/rndm/-/rndm-1.2.0.tgz#f33fe9cfb52bbfd520aa18323bc65db110a1b76c" -rst-selector-parser@^2.2.1, rst-selector-parser@^2.2.2: +rst-selector-parser@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.2.tgz#9927b619bd5af8dc23a76c64caef04edf90d2c65" dependencies: