diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index bef3dbb0..00000000 --- a/.eslintignore +++ /dev/null @@ -1,15 +0,0 @@ -libroot = true - -[*] -end_of_line = lf -trim_trailing_whitespace = true -insert_final_newline = true - -[*.js] -charset = utf-8 -indent_style = space -indent_size = 2 - -[{package.json,.babelrc,.eslintrc}] -indent_style = space -indent_size = 2 \ No newline at end of file diff --git a/.eslintrc b/.eslintrc index 0779b7df..1aa40050 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,12 +1,4 @@ { - "extends": ["@researchgate/rg-base", "@researchgate/rg-react"], - "parser": "babel-eslint", - "rules": { - "import/no-extraneous-dependencies": [ - "error", - { - "devDependencies": true - } - ] - } + "extends": ["@researchgate/rg-react"], + "parser": "babel-eslint" } diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 21256661..00000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* text=auto \ No newline at end of file diff --git a/docs/.eslintrc b/docs/.eslintrc new file mode 100644 index 00000000..d2640627 --- /dev/null +++ b/docs/.eslintrc @@ -0,0 +1,10 @@ +{ + "rules": { + "import/no-extraneous-dependencies": [ + "error", + { + "devDependencies": true + } + ] + } +} diff --git a/package.json b/package.json index 85137986..6b3dac29 100644 --- a/package.json +++ b/package.json @@ -7,12 +7,11 @@ "url": "https://github.com/researchgate/react-intersection-observer/issues" }, "dependencies": { - "prop-types": "^15.5.10 || ^16.0.0", - "rimraf": "^2.6.1" + "invariant": "^2.2.2", + "prop-types": "^15.5.10" }, "devDependencies": { "@researchgate/babel-preset-rg": "^1.0.1", - "@researchgate/eslint-config-rg-base": "^0.3.0", "@researchgate/eslint-config-rg-react": "^0.3.0", "@storybook/addon-actions": "^3.2.0", "@storybook/addon-options": "^3.2.4", @@ -23,17 +22,17 @@ "cross-env": "^5.0.5", "css-loader": "^0.28.4", "eslint": "^4.6.1", + "eslint-plugin-prettier": "^2.3.1", "husky": "^0.14.3", "intersection-observer": "^0.4.2", - "invariant": "^2.2.2", "jest": "^21.0.2", "lint-staged": "^4.0.2", "prettier": "^1.5.3", - "prop-types": "^15.5.10 || ^16.0.0", "raw-loader": "^0.5.1", - "react": "^15.4.0 || ^16.0.0", - "react-dom": "^15.4.0 || ^16.0.0", + "react": "^15.4.0", + "react-dom": "^15.4.0", "react-test-renderer": "^15.6.1", + "rimraf": "^2.6.1", "standard-version": "^4.2.0", "storybook-readme": "^3.0.6", "style-loader": "^0.18.2", diff --git a/yarn.lock b/yarn.lock index b7348a10..11a0ba0b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2838,6 +2838,13 @@ eslint-plugin-prettier@^2.2.0: fast-diff "^1.1.1" jest-docblock "^20.0.1" +eslint-plugin-prettier@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.3.1.tgz#e7a746c67e716f335274b88295a9ead9f544e44d" + dependencies: + fast-diff "^1.1.1" + jest-docblock "^21.0.0" + eslint-plugin-react@^7.3.0: version "7.3.0" resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.3.0.tgz#ca9368da36f733fbdc05718ae4e91f778f38e344" @@ -2855,18 +2862,18 @@ eslint-scope@^3.7.1: estraverse "^4.1.1" eslint@^4.6.1: - version "4.6.1" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.6.1.tgz#ddc7fc7fd70bf93205b0b3449bb16a1e9e7d4950" + version "4.7.1" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.7.1.tgz#849804136953ebe366782f9f8611e2cbd1b54681" dependencies: ajv "^5.2.0" babel-code-frame "^6.22.0" chalk "^2.1.0" concat-stream "^1.6.0" cross-spawn "^5.1.0" - debug "^2.6.8" + debug "^3.0.1" doctrine "^2.0.0" eslint-scope "^3.7.1" - espree "^3.5.0" + espree "^3.5.1" esquery "^1.0.0" estraverse "^4.2.0" esutils "^2.0.2" @@ -2887,7 +2894,7 @@ eslint@^4.6.1: natural-compare "^1.4.0" optionator "^0.8.2" path-is-inside "^1.0.2" - pluralize "^4.0.0" + pluralize "^7.0.0" progress "^2.0.0" require-uncached "^1.0.3" semver "^5.3.0" @@ -2896,9 +2903,9 @@ eslint@^4.6.1: table "^4.0.1" text-table "~0.2.0" -espree@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.0.tgz#98358625bdd055861ea27e2867ea729faf463d8d" +espree@^3.5.1: + version "3.5.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.1.tgz#0c988b8ab46db53100a1954ae4ba995ddd27d87e" dependencies: acorn "^5.1.1" acorn-jsx "^3.0.0" @@ -3008,16 +3015,16 @@ expand-range@^1.8.1: dependencies: fill-range "^2.1.0" -expect@^21.0.2: - version "21.0.2" - resolved "https://registry.yarnpkg.com/expect/-/expect-21.0.2.tgz#b34abf0635ec9d6aea1ce7edb4722afe86c4a38f" +expect@^21.1.0: + version "21.1.0" + resolved "https://registry.yarnpkg.com/expect/-/expect-21.1.0.tgz#1c138ec803c72d28cbd10dfe97104966d967c24a" dependencies: ansi-styles "^3.2.0" - jest-diff "^21.0.2" + jest-diff "^21.1.0" jest-get-type "^21.0.2" - jest-matcher-utils "^21.0.2" - jest-message-util "^21.0.2" - jest-regex-util "^21.0.2" + jest-matcher-utils "^21.1.0" + jest-message-util "^21.1.0" + jest-regex-util "^21.1.0" express@^4.15.3: version "4.15.4" @@ -4057,15 +4064,15 @@ istanbul-reports@^1.1.2: dependencies: handlebars "^4.0.3" -jest-changed-files@^21.0.2: - version "21.0.2" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-21.0.2.tgz#0a74f35cf2d3b7c8ef9ab4fac0a75409f81ec1b0" +jest-changed-files@^21.1.0: + version "21.1.0" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-21.1.0.tgz#e70f6b33b75d5987f4eae07e35bea5525635f92a" dependencies: throat "^4.0.0" -jest-cli@^21.0.2: - version "21.0.2" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-21.0.2.tgz#2e08af63d44fc21284ebf496cf71e381f3cc9786" +jest-cli@^21.1.0: + version "21.1.0" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-21.1.0.tgz#4f671885ea3521803c96a1fd95baaa6a1ba8d70f" dependencies: ansi-escapes "^3.0.0" chalk "^2.0.1" @@ -4076,17 +4083,17 @@ jest-cli@^21.0.2: istanbul-lib-coverage "^1.0.1" istanbul-lib-instrument "^1.4.2" istanbul-lib-source-maps "^1.1.0" - jest-changed-files "^21.0.2" - jest-config "^21.0.2" - jest-environment-jsdom "^21.0.2" - jest-haste-map "^21.0.2" - jest-message-util "^21.0.2" - jest-regex-util "^21.0.2" - jest-resolve-dependencies "^21.0.2" - jest-runner "^21.0.2" - jest-runtime "^21.0.2" - jest-snapshot "^21.0.2" - jest-util "^21.0.2" + jest-changed-files "^21.1.0" + jest-config "^21.1.0" + jest-environment-jsdom "^21.1.0" + jest-haste-map "^21.1.0" + jest-message-util "^21.1.0" + jest-regex-util "^21.1.0" + jest-resolve-dependencies "^21.1.0" + jest-runner "^21.1.0" + jest-runtime "^21.1.0" + jest-snapshot "^21.1.0" + jest-util "^21.1.0" micromatch "^2.3.11" node-notifier "^5.0.2" pify "^3.0.0" @@ -4097,80 +4104,80 @@ jest-cli@^21.0.2: worker-farm "^1.3.1" yargs "^9.0.0" -jest-config@^21.0.2: - version "21.0.2" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-21.0.2.tgz#ea42b94f3c22ae4e4aa11c69f5b45e34e342199d" +jest-config@^21.1.0: + version "21.1.0" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-21.1.0.tgz#7ef8778af679de30dad75e355a0dfbb0330b8d2f" dependencies: chalk "^2.0.1" glob "^7.1.1" - jest-environment-jsdom "^21.0.2" - jest-environment-node "^21.0.2" + jest-environment-jsdom "^21.1.0" + jest-environment-node "^21.1.0" jest-get-type "^21.0.2" - jest-jasmine2 "^21.0.2" - jest-regex-util "^21.0.2" - jest-resolve "^21.0.2" - jest-util "^21.0.2" - jest-validate "^21.0.2" - pretty-format "^21.0.2" - -jest-diff@^21.0.2: - version "21.0.2" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-21.0.2.tgz#751014f36ad5d505f6affce5542fde0e444ee50a" + jest-jasmine2 "^21.1.0" + jest-regex-util "^21.1.0" + jest-resolve "^21.1.0" + jest-util "^21.1.0" + jest-validate "^21.1.0" + pretty-format "^21.1.0" + +jest-diff@^21.1.0: + version "21.1.0" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-21.1.0.tgz#ca4c9d40272a6901dcde6c4c0bb2f568c363cc42" dependencies: chalk "^2.0.1" diff "^3.2.0" jest-get-type "^21.0.2" - pretty-format "^21.0.2" + pretty-format "^21.1.0" jest-docblock@^20.0.1: version "20.0.3" resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.0.3.tgz#17bea984342cc33d83c50fbe1545ea0efaa44712" -jest-docblock@^21.0.2: - version "21.0.2" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.0.2.tgz#66f69ddb440799fc32f91d0ac3d8d35e99e2032f" +jest-docblock@^21.0.0, jest-docblock@^21.1.0: + version "21.1.0" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.1.0.tgz#43154be2441fb91403e36bb35cb791a5017cea81" -jest-environment-jsdom@^21.0.2: - version "21.0.2" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-21.0.2.tgz#6f6ab5bd71970d1900fbd47a46701c0a07fa3be5" +jest-environment-jsdom@^21.1.0: + version "21.1.0" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-21.1.0.tgz#40729a60cd4544625f7d3a33c32bdaad63e57db7" dependencies: - jest-mock "^21.0.2" - jest-util "^21.0.2" + jest-mock "^21.1.0" + jest-util "^21.1.0" jsdom "^9.12.0" -jest-environment-node@^21.0.2: - version "21.0.2" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-21.0.2.tgz#4267ceb39551f8ecaed182ab882a93ef4d5de240" +jest-environment-node@^21.1.0: + version "21.1.0" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-21.1.0.tgz#a11fd611e8ae6c3e02b785aa1b12a3009f4fd0f1" dependencies: - jest-mock "^21.0.2" - jest-util "^21.0.2" + jest-mock "^21.1.0" + jest-util "^21.1.0" jest-get-type@^21.0.2: version "21.0.2" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-21.0.2.tgz#304e6b816dd33cd1f47aba0597bcad258a509fc6" -jest-haste-map@^21.0.2: - version "21.0.2" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-21.0.2.tgz#bd98bc6cd6f207eb029b2f5918da1a9347eb11b7" +jest-haste-map@^21.1.0: + version "21.1.0" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-21.1.0.tgz#08e7a8c584008d4b790b8dddf7dd3e3db03b75d3" dependencies: fb-watchman "^2.0.0" graceful-fs "^4.1.11" - jest-docblock "^21.0.2" + jest-docblock "^21.1.0" micromatch "^2.3.11" sane "^2.0.0" worker-farm "^1.3.1" -jest-jasmine2@^21.0.2: - version "21.0.2" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-21.0.2.tgz#a368abb3a686def4d6e763509a265104943cd469" +jest-jasmine2@^21.1.0: + version "21.1.0" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-21.1.0.tgz#975c3cd3ecd9d50d385bfe3c680dd61979f50c9c" dependencies: chalk "^2.0.1" - expect "^21.0.2" + expect "^21.1.0" graceful-fs "^4.1.11" - jest-diff "^21.0.2" - jest-matcher-utils "^21.0.2" - jest-message-util "^21.0.2" - jest-snapshot "^21.0.2" + jest-diff "^21.1.0" + jest-matcher-utils "^21.1.0" + jest-message-util "^21.1.0" + jest-snapshot "^21.1.0" p-cancelable "^0.3.0" jest-matcher-utils@^20.0.3: @@ -4180,62 +4187,62 @@ jest-matcher-utils@^20.0.3: chalk "^1.1.3" pretty-format "^20.0.3" -jest-matcher-utils@^21.0.2: - version "21.0.2" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-21.0.2.tgz#eb6736a45b698546d71f7e1ffbbd36587eeb27bc" +jest-matcher-utils@^21.1.0: + version "21.1.0" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-21.1.0.tgz#b02e237b287c58915ce9a5bf3c7138dba95125a7" dependencies: chalk "^2.0.1" jest-get-type "^21.0.2" - pretty-format "^21.0.2" + pretty-format "^21.1.0" -jest-message-util@^21.0.2: - version "21.0.2" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-21.0.2.tgz#81242e07d426ad54c15f3d7c55b072e9db7b39a9" +jest-message-util@^21.1.0: + version "21.1.0" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-21.1.0.tgz#7f9a52535d1a640af0d4c800edde737e14ea0526" dependencies: chalk "^2.0.1" micromatch "^2.3.11" slash "^1.0.0" -jest-mock@^21.0.2: - version "21.0.2" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-21.0.2.tgz#5e92902450e1ce78be3864cc4d50dbd5d1582fbd" +jest-mock@^21.1.0: + version "21.1.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-21.1.0.tgz#c4dddfa893a0b120b72b5ae87c7506745213a790" -jest-regex-util@^21.0.2: - version "21.0.2" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-21.0.2.tgz#06248c07b53ff444223ebe8e33a25bc051ac976f" +jest-regex-util@^21.1.0: + version "21.1.0" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-21.1.0.tgz#59e4bad74f5ffd62a3835225f9bc1ee3796b5adb" -jest-resolve-dependencies@^21.0.2: - version "21.0.2" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-21.0.2.tgz#c42cc371034023ac1a226a7a52f86233c8871938" +jest-resolve-dependencies@^21.1.0: + version "21.1.0" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-21.1.0.tgz#9f78852e65d864d04ad0919ac8226b3f1434e7b0" dependencies: - jest-regex-util "^21.0.2" + jest-regex-util "^21.1.0" -jest-resolve@^21.0.2: - version "21.0.2" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-21.0.2.tgz#57b2c20cbeca2357eb5e638d5c28beca7f38c3f8" +jest-resolve@^21.1.0: + version "21.1.0" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-21.1.0.tgz#6bb806ca5ad876c250044fe62f298321d2da5c06" dependencies: browser-resolve "^1.11.2" chalk "^2.0.1" is-builtin-module "^1.0.0" -jest-runner@^21.0.2: - version "21.0.2" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-21.0.2.tgz#1462d431d25f7744e8b5e03837bbf9e268dc8b15" - dependencies: - jest-config "^21.0.2" - jest-docblock "^21.0.2" - jest-haste-map "^21.0.2" - jest-jasmine2 "^21.0.2" - jest-message-util "^21.0.2" - jest-runtime "^21.0.2" - jest-util "^21.0.2" +jest-runner@^21.1.0: + version "21.1.0" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-21.1.0.tgz#d7ea7e2fa10ed673d4dd25ba2f3faae2efb89a07" + dependencies: + jest-config "^21.1.0" + jest-docblock "^21.1.0" + jest-haste-map "^21.1.0" + jest-jasmine2 "^21.1.0" + jest-message-util "^21.1.0" + jest-runtime "^21.1.0" + jest-util "^21.1.0" pify "^3.0.0" throat "^4.0.0" worker-farm "^1.3.1" -jest-runtime@^21.0.2: - version "21.0.2" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-21.0.2.tgz#ce26ba06bcd5501991bd994b1eacc0c7c7913895" +jest-runtime@^21.1.0: + version "21.1.0" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-21.1.0.tgz#c9a180a9e06ef046d0ad157dea52355abb7cbad4" dependencies: babel-core "^6.0.0" babel-jest "^21.0.2" @@ -4243,11 +4250,11 @@ jest-runtime@^21.0.2: chalk "^2.0.1" convert-source-map "^1.4.0" graceful-fs "^4.1.11" - jest-config "^21.0.2" - jest-haste-map "^21.0.2" - jest-regex-util "^21.0.2" - jest-resolve "^21.0.2" - jest-util "^21.0.2" + jest-config "^21.1.0" + jest-haste-map "^21.1.0" + jest-regex-util "^21.1.0" + jest-resolve "^21.1.0" + jest-util "^21.1.0" json-stable-stringify "^1.0.1" micromatch "^2.3.11" slash "^1.0.0" @@ -4255,27 +4262,27 @@ jest-runtime@^21.0.2: write-file-atomic "^2.1.0" yargs "^9.0.0" -jest-snapshot@^21.0.2: - version "21.0.2" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-21.0.2.tgz#5b8f4dd05c1759381db835451fba4bcd85a55611" +jest-snapshot@^21.1.0: + version "21.1.0" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-21.1.0.tgz#a5fa9d52847d8f52e19a1df6ccae9de699193ccc" dependencies: chalk "^2.0.1" - jest-diff "^21.0.2" - jest-matcher-utils "^21.0.2" + jest-diff "^21.1.0" + jest-matcher-utils "^21.1.0" mkdirp "^0.5.1" natural-compare "^1.4.0" - pretty-format "^21.0.2" + pretty-format "^21.1.0" -jest-util@^21.0.2: - version "21.0.2" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-21.0.2.tgz#3ee2380af25c414a39f07b23c84da6f2d5f1f76a" +jest-util@^21.1.0: + version "21.1.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-21.1.0.tgz#f92ff756422cc0609ddf5a9bfa4d34b2835d8c30" dependencies: callsites "^2.0.0" chalk "^2.0.1" graceful-fs "^4.1.11" - jest-message-util "^21.0.2" - jest-mock "^21.0.2" - jest-validate "^21.0.2" + jest-message-util "^21.1.0" + jest-mock "^21.1.0" + jest-validate "^21.1.0" mkdirp "^0.5.1" jest-validate@^20.0.3: @@ -4287,20 +4294,20 @@ jest-validate@^20.0.3: leven "^2.1.0" pretty-format "^20.0.3" -jest-validate@^21.0.2: - version "21.0.2" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-21.0.2.tgz#dd066b257bd102759c214747d73bed6bcfa4349d" +jest-validate@^21.1.0: + version "21.1.0" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-21.1.0.tgz#39d01115544a758bce49f221a5fcbb24ebdecc65" dependencies: chalk "^2.0.1" jest-get-type "^21.0.2" leven "^2.1.0" - pretty-format "^21.0.2" + pretty-format "^21.1.0" jest@^21.0.2: - version "21.0.2" - resolved "https://registry.yarnpkg.com/jest/-/jest-21.0.2.tgz#a5c9bdc9d4322ae672fe8cb3eaf25c268c5f04b2" + version "21.1.0" + resolved "https://registry.yarnpkg.com/jest/-/jest-21.1.0.tgz#77c7baa8aa9e8bace7fe41a30d748ab56e89476a" dependencies: - jest-cli "^21.0.2" + jest-cli "^21.1.0" js-base64@^2.1.9: version "2.3.2" @@ -4451,8 +4458,8 @@ levn@^0.3.0, levn@~0.3.0: type-check "~0.3.2" lint-staged@^4.0.2: - version "4.1.3" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-4.1.3.tgz#07c592e4b8dee914450a183c761187dc53d079e2" + version "4.2.1" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-4.2.1.tgz#5c79818c500d9b24248dccad4ac9609c01951522" dependencies: app-root-path "^2.0.0" chalk "^2.1.0" @@ -5326,9 +5333,9 @@ pkg-dir@^2.0.0: dependencies: find-up "^2.1.0" -pluralize@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-4.0.0.tgz#59b708c1c0190a2f692f1c7618c446b052fd1762" +pluralize@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" podda@^1.2.2: version "1.2.2" @@ -5633,7 +5640,11 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -prettier@^1.5.3, prettier@^1.6.1: +prettier@^1.5.3: + version "1.7.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.7.0.tgz#47481588f41f7c90f63938feb202ac82554e7150" + +prettier@^1.6.1: version "1.6.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.6.1.tgz#850f411a3116226193e32ea5acfc21c0f9a76d7d" @@ -5644,9 +5655,9 @@ pretty-format@^20.0.3: ansi-regex "^2.1.1" ansi-styles "^3.0.0" -pretty-format@^21.0.2: - version "21.0.2" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-21.0.2.tgz#76adcebd836c41ccd2e6b626e70f63050d2a3534" +pretty-format@^21.1.0: + version "21.1.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-21.1.0.tgz#557428254323832ee8b7c971cb613442bea67f61" dependencies: ansi-regex "^3.0.0" ansi-styles "^3.2.0" @@ -5691,7 +5702,7 @@ prop-types@15.5.8: dependencies: fbjs "^0.8.9" -prop-types@^15.5.10, "prop-types@^15.5.10 || ^16.0.0", prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.5.9: +prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.5.9: version "15.5.10" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154" dependencies: @@ -5821,7 +5832,7 @@ react-dom-factories@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/react-dom-factories/-/react-dom-factories-1.0.1.tgz#c50692ac5ff1adb39d86dfe6dbe3485dacf58455" -"react-dom@^15.4.0 || ^16.0.0": +react-dom@^15.4.0: version "15.6.1" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.1.tgz#2cb0ed4191038e53c209eb3a79a23e2a4cf99470" dependencies: @@ -5962,7 +5973,7 @@ react-treebeard@^2.0.3: shallowequal "^0.2.2" velocity-react "^1.3.1" -"react@^15.4.0 || ^16.0.0": +react@^15.4.0: version "15.6.1" resolved "https://registry.yarnpkg.com/react/-/react-15.6.1.tgz#baa8434ec6780bde997cdc380b79cd33b96393df" dependencies: