Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:heyjul3s/artifak into feat/px-to…
Browse files Browse the repository at this point in the history 
…-rem
  • Loading branch information
@heyjul3s
heyjul3s committed Feb 9, 2021
2 parents 60ecd6e + 0f15a90 commit d0ce09d
Show file tree
Hide file tree
Showing 12 changed files with 532 additions and 377 deletions.
28 changes: 14 additions & 14 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,24 @@
"react-dom": ">=17.0.1"
},
"devDependencies": {
"@babel/core": "^7.12.10",
"@babel/plugin-proposal-class-properties": "^7.12.1",
"@babel/plugin-transform-runtime": "^7.12.10",
"@babel/preset-typescript": "^7.12.7",
"@storybook/addon-actions": "^6.1.15",
"@storybook/addon-essentials": "^6.1.15",
"@storybook/addon-links": "^6.1.15",
"@storybook/addon-storyshots": "^6.1.15",
"@storybook/react": "^6.1.15",
"@babel/core": "^7.12.13",
"@babel/plugin-proposal-class-properties": "^7.12.13",
"@babel/plugin-transform-runtime": "^7.12.15",
"@babel/preset-typescript": "^7.12.13",
"@storybook/addon-actions": "^6.1.17",
"@storybook/addon-essentials": "^6.1.17",
"@storybook/addon-links": "^6.1.17",
"@storybook/addon-storyshots": "^6.1.17",
"@storybook/react": "^6.1.17",
"@testing-library/jest-dom": "^5.11.9",
"@testing-library/react": "^11.2.3",
"@testing-library/react": "^11.2.5",
"@types/jest": "^26.0.20",
"@typescript-eslint/eslint-plugin": "^4.14.1",
"@typescript-eslint/parser": "^4.14.1",
"@typescript-eslint/eslint-plugin": "^4.15.0",
"@typescript-eslint/parser": "^4.15.0",
"babel-jest": "^26.6.3",
"babel-loader": "^8.2.2",
"coveralls": "^3.1.0",
"eslint": "^7.18.0",
"eslint": "^7.19.0",
"eslint-config-prettier": "^7.2.0",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-react": "^7.22.0",
Expand All @@ -61,7 +61,7 @@
"typescript": "^4.1.3"
},
"dependencies": {
"@changesets/cli": "^2.14.0"
"@changesets/cli": "^2.14.1"
},
"resolutions": {
"react": ">=17.0.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/block/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
"devDependencies": {
"@artifak/bundler": "^1.1.3",
"@types/react": "^17.0.0",
"@types/react": "^17.0.1",
"@types/react-dom": "^17.0.0",
"@types/styled-components": "^5.1.7",
"@types/styled-system": "^5.1.10",
Expand All @@ -58,6 +58,6 @@
"styled-components": ">=5.2.1"
},
"dependencies": {
"@artifak/component-generator": "^2.0.0"
"@artifak/component-generator": "^2.0.1"
}
}
4 changes: 2 additions & 2 deletions packages/component-generator/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
"homepage": "https://github.com/heyjul3s/artifak#readme",
"devDependencies": {
"@artifak/bundler": "^1.1.3",
"@types/react": "^17.0.0",
"@types/react": "^17.0.1",
"@types/react-dom": "^17.0.0",
"@types/styled-components": "^5.1.7",
"@types/styled-system": "^5.1.10",
"csstype": "^3.0.5",
"csstype": "^3.0.6",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"styled-components": "^5.2.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/flex/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
"homepage": "https://github.com/heyjul3s/artifak#readme",
"devDependencies": {
"@artifak/bundler": "^1.1.3",
"@types/react": "^17.0.0",
"@types/react": "^17.0.1",
"@types/react-dom": "^17.0.0",
"@types/styled-components": "^5.1.7",
"@types/styled-system": "^5.1.10",
"csstype": "^3.0.5",
"csstype": "^3.0.6",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"styled-components": "^5.2.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/grid/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
},
"devDependencies": {
"@artifak/bundler": "^1.1.3",
"@types/react": "^17.0.0",
"@types/react": "^17.0.1",
"@types/react-dom": "^17.0.0",
"@types/styled-components": "^5.1.7",
"@types/styled-system": "^5.1.10",
Expand All @@ -57,6 +57,6 @@
"styled-components": ">=5.2.1"
},
"dependencies": {
"@artifak/component-generator": "^2.0.0"
"@artifak/component-generator": "^2.0.1"
}
}
4 changes: 2 additions & 2 deletions packages/imagery/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"homepage": "https://github.com/heyjul3s/artifak#readme",
"devDependencies": {
"@artifak/bundler": "^1.1.3",
"@types/react": "^17.0.0",
"@types/react": "^17.0.1",
"@types/react-dom": "^17.0.0",
"@types/styled-components": "^5.1.7",
"@types/styled-system": "^5.1.10",
Expand All @@ -55,6 +55,6 @@
"styled-components": ">=5.2.1"
},
"dependencies": {
"@artifak/component-generator": "^2.0.0"
"@artifak/component-generator": "^2.0.1"
}
}
4 changes: 2 additions & 2 deletions packages/media/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"homepage": "https://github.com/heyjul3s/artifak#readme",
"devDependencies": {
"@artifak/bundler": "^1.1.3",
"@testing-library/react-hooks": "^3.7.0",
"@types/react": "^17.0.0",
"@testing-library/react-hooks": "^5.0.3",
"@types/react": "^17.0.1",
"@types/react-dom": "^17.0.0",
"@types/styled-components": "^5.1.7",
"css-mediaquery": "^0.1.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/text-input/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"homepage": "https://github.com/heyjul3s/artifak#readme",
"devDependencies": {
"@artifak/bundler": "^1.1.3",
"@types/react": "^17.0.0",
"@types/react": "^17.0.1",
"@types/react-dom": "^17.0.0",
"@types/styled-components": "^5.1.7",
"@types/styled-system": "^5.1.10",
Expand All @@ -43,6 +43,6 @@
"styled-system": "^5.1.5"
},
"dependencies": {
"@artifak/component-generator": "^2.0.0"
"@artifak/component-generator": "^2.0.1"
}
}
6 changes: 3 additions & 3 deletions packages/typography/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,18 @@
"homepage": "https://github.com/heyjul3s/artifak#readme",
"devDependencies": {
"@artifak/bundler": "^1.1.3",
"@types/react": "^17.0.0",
"@types/react": "^17.0.1",
"@types/react-dom": "^17.0.0",
"@types/styled-components": "^5.1.7",
"@types/styled-system": "^5.1.10",
"csstype": "^3.0.5",
"csstype": "^3.0.6",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"styled-components": "^5.2.1",
"styled-system": "^5.1.5"
},
"dependencies": {
"@artifak/component-generator": "^2.0.0"
"@artifak/component-generator": "^2.0.1"
},
"peerDependencies": {
"react": ">=17.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/usematchmedia/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"homepage": "https://github.com/heyjul3s/artifak#readme",
"devDependencies": {
"@artifak/bundler": "^1.1.3",
"@types/react": "^17.0.0",
"@types/react": "^17.0.1",
"@types/react-dom": "^17.0.0",
"react": "^17.0.1",
"react-dom": "^17.0.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/usewindowsize/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"homepage": "https://github.com/heyjul3s/artifak#readme",
"devDependencies": {
"@artifak/bundler": "^1.1.3",
"@types/react": "^17.0.0",
"@types/react": "^17.0.1",
"@types/react-dom": "^17.0.0",
"react": "^17.0.1",
"react-dom": "^17.0.1"
Expand Down

0 comments on commit d0ce09d

Please sign in to comment.