Skip to content

Commit

Permalink
Merge pull request #2 from RobbyUitbeijerse/master
Browse files Browse the repository at this point in the history
Update depedencies, ensure tests use the tsconfig.json
  • Loading branch information
tpdewolf authored Jan 31, 2020
2 parents 6f48d7a + e49e038 commit cd8025a
Show file tree
Hide file tree
Showing 7 changed files with 1,390 additions and 1,146 deletions.
2 changes: 1 addition & 1 deletion dist/styled-primitives.cjs.development.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/styled-primitives.esm.js.map

Large diffs are not rendered by default.

31 changes: 17 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,22 @@
"scripts": {
"start": "tsdx watch",
"build": "tsdx build",
"test": "tsdx test --env=jsdom",
"test": "tsdx test",
"lint": "tsdx lint"
},
"peerDependencies": {
"react": ">=16.8",
"styled-components": ">=4",
"react": ">=16.12",
"styled-components": ">=5",
"styled-system": ">=5.1.0"
},
"husky": {
"hooks": {
"pre-commit": "tsdx lint"
}
},
"jest": {
"verbose": true
},
"prettier": {
"printWidth": 80,
"semi": false,
Expand All @@ -34,18 +37,18 @@
},
"devDependencies": {
"@types/jest": "^24.0.23",
"@types/react": "^16.9.11",
"@types/react-dom": "^16.9.4",
"@types/styled-components": "^4.4.0",
"@types/styled-system": "^5.1.3",
"babel-plugin-styled-components": "^1.10.6",
"@types/react": "^16.9.19",
"@types/react-dom": "^16.9.5",
"@types/styled-components": "^4.4.2",
"@types/styled-system": "^5.1.6",
"babel-plugin-styled-components": "^1.10.7",
"husky": "^3.0.9",
"react": "^16.11.0",
"react-dom": "^16.11.0",
"styled-components": "^4.4.1",
"styled-system": "^5.1.2",
"tsdx": "^0.11.0",
"react": "^16.12.0",
"react-dom": "^16.12.0",
"styled-components": "^5.0.0",
"styled-system": "^5.1.4",
"tsdx": "^0.12.3",
"tslib": "^1.10.0",
"typescript": "^3.7.2"
"typescript": "^3.7.5"
}
}
File renamed without changes.
10 changes: 8 additions & 2 deletions test/blah.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
describe('it', () => {
import * as React from 'react'
import * as ReactDOM from 'react-dom'
import { Box } from '../src/Box'

describe('Box', () => {
it('renders without crashing', () => {
return
const div = document.createElement('div')
ReactDOM.render(<Box />, div)
ReactDOM.unmountComponentAtNode(div)
})
})
2 changes: 1 addition & 1 deletion src/tsconfig.json → tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"include": [
"src",
"types",
"test"
"test",
],
"compilerOptions": {
"target": "es5",
Expand Down
2,489 changes: 1,362 additions & 1,127 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit cd8025a

Please sign in to comment.