diff --git a/.history/package_20190304172459.json b/.history/package_20190304172459.json new file mode 100644 index 0000000..becf251 --- /dev/null +++ b/.history/package_20190304172459.json @@ -0,0 +1,79 @@ +{ + "name": "react-redux-saga-starter", + "version": "2.0.0", + "private": true, + "keywords": [ + "react", + "redux", + "saga" + ], + "author": "Hugo Nogueira", + "license": "MIT", + "dependencies": { + "axios": "0.18.0", + "connected-react-router": "6.2.2", +<<<<<<< HEAD + "global": "^4.3.2", + "material-ui": "0.20.2", + "react": "16.8.0", + "react-dom": "16.8.0", + "react-redux": "^6.0.0", +======= + "global": "4.3.2", + "material-ui": "0.20.2", + "react": "16.8.0", + "react-dom": "16.8.0", + "react-redux": "6.0.0", +>>>>>>> Update package versions + "react-router-dom": "4.3.1", + "react-scripts": "2.1.3", + "redux": "4.0.1", + "redux-devtools-extension": "2.13.8", + "redux-saga": "1.0.1", +<<<<<<< HEAD + "semantic-ui-react": "^0.85.0", + "serve": "10.1.2", + "typesafe-actions": "^3.0.0", + "typescript": "^3.3.1", + "validator": "^10.11.0" +======= + "semantic-ui-react": "0.85.0", + "serve": "10.1.2", + "typesafe-actions": "3.0.0", + "typescript": "3.3.1", + "validator": "10.11.0" +>>>>>>> Update package versions + }, + "scripts": { + "start": "NODE_PATH=./src react-scripts start", + "build": "NODE_PATH=./src react-scripts build", + "test": "NODE_PATH=./src react-scripts test --env=jsdom --coverage --collectCoverageFrom=src/components/**/*{js,jsx,ts,tsx} ", + "eject": "react-scripts eject" + }, + "devDependencies": { + "@types/history": "^4.7.2", + "@types/jest": "^24.0.0", + "@types/react": "16.8.2", + "@types/react-dom": "16.8.0", + "@types/react-redux": "^7.0.1", + "@types/react-router-dom": "^4.3.1", + "@types/enzyme": "^3.1.16", + "@types/enzyme-adapter-react-16": "^1.0.3", + "@types/node": "^10.12.21", + "@types/redux-mock-store": "^1.0.0", + "enzyme": "^3.8.0", + "enzyme-adapter-react-16": "1.9.1", + "history": "^4.7.2", + "redux-mock-store": "^1.5.3", + "redux-saga-mock": "^1.2.0", + "redux-saga-testing": "^1.0.5", + "ts-jest": "^23.10.5" + }, + "browserslist": [ + ">0.2%", + "not dead", + "not ie <= 11", + "not op_mini all" + ], + "homepage": "." +} diff --git a/.history/package_20190304172527.json b/.history/package_20190304172527.json new file mode 100644 index 0000000..bedfda6 --- /dev/null +++ b/.history/package_20190304172527.json @@ -0,0 +1,63 @@ +{ + "name": "react-redux-saga-starter", + "version": "2.0.0", + "private": true, + "keywords": [ + "react", + "redux", + "saga" + ], + "author": "Hugo Nogueira", + "license": "MIT", + "dependencies": { + "axios": "0.18.0", + "connected-react-router": "6.2.2", + "global": "4.3.2", + "material-ui": "0.20.2", + "react": "16.8.0", + "react-dom": "16.8.0", + "react-redux": "6.0.0", + "react-router-dom": "4.3.1", + "react-scripts": "2.1.3", + "redux": "4.0.1", + "redux-devtools-extension": "2.13.8", + "redux-saga": "1.0.1", + "semantic-ui-react": "0.85.0", + "serve": "10.1.2", + "typesafe-actions": "3.0.0", + "typescript": "3.3.1", + "validator": "10.11.0" + }, + "scripts": { + "start": "NODE_PATH=./src react-scripts start", + "build": "NODE_PATH=./src react-scripts build", + "test": "NODE_PATH=./src react-scripts test --env=jsdom --coverage --collectCoverageFrom=src/components/**/*{js,jsx,ts,tsx} ", + "eject": "react-scripts eject" + }, + "devDependencies": { + "@types/history": "^4.7.2", + "@types/jest": "^24.0.0", + "@types/react": "16.8.2", + "@types/react-dom": "16.8.0", + "@types/react-redux": "^7.0.1", + "@types/react-router-dom": "^4.3.1", + "@types/enzyme": "^3.1.16", + "@types/enzyme-adapter-react-16": "^1.0.3", + "@types/node": "^10.12.21", + "@types/redux-mock-store": "^1.0.0", + "enzyme": "^3.8.0", + "enzyme-adapter-react-16": "1.9.1", + "history": "^4.7.2", + "redux-mock-store": "^1.5.3", + "redux-saga-mock": "^1.2.0", + "redux-saga-testing": "^1.0.5", + "ts-jest": "^23.10.5" + }, + "browserslist": [ + ">0.2%", + "not dead", + "not ie <= 11", + "not op_mini all" + ], + "homepage": "." +} diff --git a/package.json b/package.json index ee8b601..bedfda6 100644 --- a/package.json +++ b/package.json @@ -10,23 +10,23 @@ "author": "Hugo Nogueira", "license": "MIT", "dependencies": { - "axios": "^0.18.0", + "axios": "0.18.0", "connected-react-router": "6.2.2", - "global": "^4.3.2", + "global": "4.3.2", "material-ui": "0.20.2", "react": "16.8.0", "react-dom": "16.8.0", - "react-redux": "^6.0.0", + "react-redux": "6.0.0", "react-router-dom": "4.3.1", "react-scripts": "2.1.3", "redux": "4.0.1", "redux-devtools-extension": "2.13.8", "redux-saga": "1.0.1", - "semantic-ui-react": "^0.85.0", + "semantic-ui-react": "0.85.0", "serve": "10.1.2", - "typesafe-actions": "^3.0.0", - "typescript": "^3.3.1", - "validator": "^10.11.0" + "typesafe-actions": "3.0.0", + "typescript": "3.3.1", + "validator": "10.11.0" }, "scripts": { "start": "NODE_PATH=./src react-scripts start",