Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update depedencies, ensure tests use the tsconfig.json #2

Merged
merged 1 commit into from
Jan 31, 2020
+1,390 −1,146
Merged

Update depedencies, ensure tests use the tsconfig.json #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/styled-primitives.cjs.development.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/styled-primitives.esm.js.map
View file
Open in desktop

Large diffs are not rendered by default.

31 changes: 17 additions & 14 deletions package.json
View file
Open in desktop
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"
}
}
0 src/index.tsx → src/index.ts
View file
Open in desktop
File renamed without changes.
10 changes: 8 additions & 2 deletions test/blah.test.tsx
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

Large diffs are not rendered by default.