Skip to content

Commit

Permalink
fix #58 - Address icon, styles, global css, and typescript issues (#59)
Browse files Browse the repository at this point in the history
* fix #58 - Address icon, styles, global css, and typescript issues

* fix #58 - reorder imports

* Update storybook.test.ts.snap

* fix #58 - Regenerate pacakge-lock from clean reinstall

* fix #58 - Add global styles to storybook preview, move rollup deps to dev dep

* fix #58 - Bump version 0.2.3 --> 0.2.4

Co-authored-by: sam-m-m <[email protected]>
  • Loading branch information
parth-dassana and sam-dassana authored Aug 21, 2020
1 parent e12ea02 commit 0fa95d0
Show file tree
Hide file tree
Showing 16 changed files with 103 additions and 57 deletions.
3 changes: 3 additions & 0 deletions src/styles/index.css → .storybook/index.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/* This is the global dassana stylesheet. It should match the global stylesheet in web-orchestrator. */

@import '~normalize.css';
@import url('https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,300;0,400;0,700;0,900;1,300;1,400;1,700;1,900&display=swap');

body {
Expand Down
3 changes: 1 addition & 2 deletions .storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { INITIAL_VIEWPORTS } from '@storybook/addon-viewport'
import 'normalize.css'
import '../src/styles/index.css'
import './index.css'

export const parameters = {
actions: { argTypesRegex: '^on[A-Z].*' },
Expand Down
90 changes: 66 additions & 24 deletions package-lock.json

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

15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dassana-io/web-components",
"version": "0.2.3",
"version": "0.2.4",
"publishConfig": {
"registry": "https://npm.pkg.github.com/dassana-io"
},
Expand All @@ -10,8 +10,6 @@
"directory": "@dassana-io/web-components"
},
"dependencies": {
"@rollup/plugin-commonjs": "^14.0.0",
"@rollup/plugin-node-resolve": "^8.4.0",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.5.0",
"@testing-library/user-event": "^7.2.1",
Expand All @@ -21,14 +19,11 @@
"@types/react-dom": "^16.9.8",
"antd": "^4.5.4",
"classnames": "^2.2.6",
"normalize.css": "^8.0.1",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-jss": "^10.4.0",
"react-loading-skeleton": "^2.1.1",
"react-scripts": "^3.4.3",
"rollup": "^2.23.0",
"rollup-plugin-typescript2": "^0.27.1",
"typescript": "^3.9.7"
},
"scripts": {
Expand Down Expand Up @@ -60,6 +55,9 @@
]
},
"devDependencies": {
"@rollup/plugin-commonjs": "^14.0.0",
"@rollup/plugin-image": "^2.0.5",
"@rollup/plugin-node-resolve": "^8.4.0",
"@storybook/addon-actions": "^6.0.16",
"@storybook/addon-essentials": "^6.0.16",
"@storybook/addon-links": "^6.0.16",
Expand All @@ -76,8 +74,11 @@
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"eslint-plugin-react": "^7.20.5",
"normalize.css": "^8.0.1",
"react-test-renderer": "^16.13.1",
"rollup-plugin-styles": "^3.10.0"
"rollup": "^2.26.4",
"rollup-plugin-styles": "^3.10.0",
"rollup-plugin-typescript2": "^0.27.2"
},
"peerDependencies": {
"react": ">=16.13",
Expand Down
2 changes: 2 additions & 0 deletions rollup.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import commonjs from '@rollup/plugin-commonjs'
import image from '@rollup/plugin-image'
import resolve from '@rollup/plugin-node-resolve'
import styles from 'rollup-plugin-styles'
import typescript from 'rollup-plugin-typescript2'
Expand All @@ -25,6 +26,7 @@ export default {
resolve(),
commonjs(),
styles(),
image(),
typescript({
tsconfig: 'tsconfig.rollup.json',
useTsconfigDeclarationDir: true
Expand Down
Loading

0 comments on commit 0fa95d0

Please sign in to comment.