From a5ae50c4a8a7c8796de587f949488b10bb035fe8 Mon Sep 17 00:00:00 2001 From: Maxim Sukharev Date: Fri, 26 Apr 2019 15:26:35 +0200 Subject: [PATCH 1/7] upgrade to react-scripts v3 Signed-off-by: Maxim Sukharev --- .eslintrc.json | 8 +- package.json | 18 +- .../__snapshots__/Header.test.js.snap | 12 - .../__snapshots__/Notifications.test.js.snap | 1 - .../__snapshots__/Options.test.js.snap | 4 - .../__snapshots__/SearchPanel.test.js.snap | 3 - yarn.lock | 9161 ++++++++++------- 7 files changed, 5432 insertions(+), 3775 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index afbb8481..028b7d9f 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -12,9 +12,8 @@ "prettier/react" ], "parserOptions": { - "ecmaVersion": 8, + "ecmaVersion": 9, "ecmaFeatures": { - "experimentalObjectRestSpread": true, "jsx": true }, "sourceType": "module" @@ -23,5 +22,10 @@ "rules": { "react/prop-types": 0, "no-case-declarations": 0 + }, + "settings": { + "react": { + "version": "detect" + } } } diff --git a/package.json b/package.json index 83bd7861..c0d2f3bc 100644 --- a/package.json +++ b/package.json @@ -26,23 +26,27 @@ "enzyme": "^3.3.0", "enzyme-adapter-react-16": "^1.1.1", "enzyme-to-json": "^3.3.4", - "eslint": "^4.12.1", - "eslint-config-prettier": "^2.9.0", - "eslint-plugin-jest": "^21.3.2", - "eslint-plugin-react": "^7.5.1", + "eslint-config-prettier": "^4.2.0", + "eslint-plugin-jest": "^22.5.1", "jest-fetch-mock": "^1.1.1", "jest-styled-components": "^5.0.1", "prettier": "1.8.2", - "react-scripts": "1.0.17", + "react-scripts": "^3.0.0", "react-test-renderer": "^16.4.1", "redux-mock-store": "^1.3.0" }, "scripts": { "start": "react-scripts start", "build": "react-scripts build", - "test": "react-scripts test --env=jsdom", + "test": "react-scripts test", "eject": "react-scripts eject", "lint": "eslint 'src/**/*.js' && prettier -l 'src/**/*.js'", "fix-lint-errors": "eslint --fix 'src/**/*.js'; prettier --write 'src/**/*.js'" - } + }, + "browserslist": [ + ">0.2%", + "not dead", + "not ie <= 11", + "not op_mini all" + ] } diff --git a/src/components/__snapshots__/Header.test.js.snap b/src/components/__snapshots__/Header.test.js.snap index 06e9f776..88ad4321 100644 --- a/src/components/__snapshots__/Header.test.js.snap +++ b/src/components/__snapshots__/Header.test.js.snap @@ -455,7 +455,6 @@ exports[`Header has the button disabled if canParse is false 1`] = ` className="c7" id="examples-selector" onChange={[Function]} - value={undefined} >