Merge branch 'master' of github.com:stakefish/stakefish-ui

package.json

@@ -11,7 +11,7 @@
   "scripts": {
     "lint": "eslint 'src/**/*.{ts,tsx}'",
     "format": "prettier --config .prettierrc 'src/**/*.{ts,tsx}'",
-    "pack": "rollup -c",
+    "build": "rollup -c",
     "storybook": "start-storybook -p 6006 -s public",
     "build-storybook": "build-storybook -s public"
   },

rollup.config.js

@@ -8,10 +8,9 @@ import remove from "rollup-plugin-delete";
 import multi from "rollup-plugin-multi-input";
 
 const config = {
-  input: ["./src/*.tsx"],
+  input: ["./src/**/*.ts(x)?"],
   output: [{ dir: "lib", format: "esm", exports: "named" }],
   plugins: [
-    remove({ targets: ["lib/*"] }),
     multi(),
     peerDepsExternal(),
     resolve(),
@@ -33,6 +32,9 @@ const config = {
         { src: "LICENSE.md", dest: "lib/" },
       ],
     }),
+    remove({
+      targets: ["lib/*"],
+    }),
   ],
 };
 

src/ThemeProvider.tsx → src/core/ThemeProvider.tsx

@@ -4,14 +4,14 @@ import createPalette from "@material-ui/core/styles/createPalette";
 import { ThemeProvider as MuiThemeProvider } from "@material-ui/core/styles";
 import { CssBaseline } from "@material-ui/core";
 
-import colors from "./theme/colors";
-import lineHeight from "./theme/lineHeight";
-import fontSize from "./theme/fontSize";
-import fontFamily from "./theme/fontFamily";
-import fontWeight from "./theme/fontWeight";
+import colors from "../theme/colors";
+import lineHeight from "../theme/lineHeight";
+import fontSize from "../theme/fontSize";
+import fontFamily from "../theme/fontFamily";
+import fontWeight from "../theme/fontWeight";
 
-import MuiCssBaseline from "./overrides/MuiCssBaseline";
-import MuiTypography from "./overrides/MuiTypography";
+import MuiCssBaseline from "../overrides/MuiCssBaseline";
+import MuiTypography from "../overrides/MuiTypography";
 
 /**
  * Types

src/index.ts

@@ -1,2 +1,4 @@
-export { default as ThemeProvider, ThemeProviderProps } from "./ThemeProvider";
-export { default as Typography, TypographyProps } from "./Typography";
+export { default as makeStyles } from "@material-ui/core/styles/createStyles";
+
+export { default as ThemeProvider, ThemeProviderProps } from "./core/ThemeProvider";
+export { default as Typography, TypographyProps } from "./components/Typography";

tsconfig.json

@@ -24,7 +24,6 @@
   },
   "include": [
     "src",
-    "stories", 
     "definitions",
   ]
 }