Skip to content

Commit

Permalink
Merge pull request #29 from dabapps/dependency-fixes
Browse files Browse the repository at this point in the history
Dependency fixes
  • Loading branch information
JakeSidSmith authored Mar 21, 2019
2 parents 30d3263 + 8d72f82 commit 03dff2a
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 49 deletions.
71 changes: 49 additions & 22 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 11 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dabapps/redux-requests",
"version": "0.5.3",
"version": "0.5.4",
"description": "Library for simple redux requests",
"main": "dist/js/index.js",
"directories": {},
Expand All @@ -10,8 +10,8 @@
"scripts": {
"dist": "./scripts/dist",
"lint": "tsc --noEmit --project tsconfig.json && npm run prettier-check && tslint --project tsconfig.json '{src,tests,types,examples,docs}/**/*.@(ts|tsx)'",
"prettier-check": "./scripts/prettier-check",
"prettier": "prettier --write \"{src,tests,types,examples,docs}/**/*.{ts,tsx,js,jsx}\"",
"prettier-check": "prettier --check '{src,tests,types,examples,docs}/**/*.{ts,tsx,js,jsx}'",
"prettier": "prettier --write '{src,tests,types,examples,docs}/**/*.{ts,tsx,js,jsx}'",
"tests": "jest",
"test": "npm run lint && npm run tests -- --runInBand --coverage",
"prepublishOnly": "npm test && npm run dist"
Expand Down Expand Up @@ -41,18 +41,22 @@
"js-cookie": "^2.1.4",
"path": "^0.12.7",
"redux": "^3.7.2",
"typescript": "^2.9.2"
"redux-thunk": "^2.3.0"
},
"devDependencies": {
"@types/jest": "^23.3.1",
"jest": "^23.5.0",
"prettier": "^1.14.2",
"prettier": "^1.16.4",
"request": "^2.88.0",
"ts-jest": "^23.1.4",
"tslint": "^5.11.0",
"tslint-config-dabapps": "github:dabapps/tslint-config-dabapps#v0.5.1"
"tslint-config-dabapps": "github:dabapps/tslint-config-dabapps#v0.5.3",
"typescript": "^3.3.4000"
},
"peerDependencies": {
"redux-thunk": ">= 2 < 3",
"redux": ">= 3 < 4"
},
"peerDependencies": {},
"jest": {
"coverageThreshold": {
"global": {
Expand Down
12 changes: 0 additions & 12 deletions scripts/prettier-check

This file was deleted.

10 changes: 2 additions & 8 deletions tests/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,8 @@ describe('Requests', () => {
});

it('should take a bunch of optional arguments', () => {
const requestWithLotsOfParams = request.bind(
null,
ACTION_SET,
'/api/url/',
METHOD,
{},
{ tag: 'tag' }
);
const requestWithLotsOfParams = () =>
request(ACTION_SET, '/api/url/', METHOD, {}, { tag: 'tag' });

expect(requestWithLotsOfParams).not.toThrowError();
});
Expand Down

0 comments on commit 03dff2a

Please sign in to comment.