Skip to content

Commit 698b8dd

Browse files
authored
Merge pull request #13 from laurazenc/feature/resetCSS
feature/resetCSS
2 parents 0d2a454 + 1cd2dd4 commit 698b8dd

File tree

8 files changed

+607
-25
lines changed

8 files changed

+607
-25
lines changed

package.json

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@
7575
"dependencies": {
7676
"@commitlint/cli": "^12.0.1",
7777
"@commitlint/config-conventional": "^12.0.1",
78-
"husky": "^5.1.3",
78+
"husky": "^4.3.8",
79+
"lint-staged": "^10.5.4",
7980
"typescript": "^4.0.3"
8081
},
8182
"jest": {
@@ -88,16 +89,18 @@
8889
"husky": {
8990
"hooks": {
9091
"pre-commit": "lint-staged",
91-
"commit-msg": "commitlint --edit $1"
92+
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
9293
}
9394
},
9495
"lint-staged": {
95-
"*.(ts|tsx)": [
96+
"packages/**/*.{js,ts,tsx}": [
9697
"eslint --fix",
9798
"prettier --write --ignore-path .eslintignore"
98-
],
99-
"*.md": [
100-
"prettier --write --ignore-path .eslintignore"
99+
]
100+
},
101+
"commitlint": {
102+
"extends": [
103+
"@commitlint/config-conventional"
101104
]
102105
}
103106
}

packages/core/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export * from "./Provider"
22
export * from "./useTheme"
3-
export { Global, css } from "@emotion/react"
3+
export { Global } from "@emotion/react"

packages/theme/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,8 @@
4343
},
4444
"peerDependencies": {
4545
"react": "16.x"
46+
},
47+
"dependencies": {
48+
"@emotion/react": "^11.1.5"
4649
}
4750
}

packages/theme/src/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
export * from "./"
1+
export { css } from "@emotion/react"
2+
export { resetCSS } from "./reset"
3+
export { raui } from "./raui"

packages/theme/src/raui.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const raui = null

0 commit comments

Comments
 (0)