fix: add regex for typescript support loader

wilsson · Dec 27, 2019 · 77d85c6 · 77d85c6
1 parent bddf534
commit 77d85c6
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 18 deletions.
diff --git a/examples/typescript/package.json b/examples/typescript/package.json
@@ -11,6 +11,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@papyrum/cli": "^1.0.1-alpha.0"
+    "@papyrum/cli": "^1.0.1-alpha.0",
+    "@papyrum/ui-docs": "^1.0.1-alpha.0"
   }
 }
diff --git a/examples/typescript/src/Button.js b/examples/typescript/src/Button.js
diff --git a/examples/typescript/src/Button.mdx b/examples/typescript/src/Button.mdx
@@ -1,9 +1,13 @@
 ---
 route: /
+status: ready
 ---
 
-import{ Button } from './Button';
+import { Props } from '@papyrum/ui-docs';
+import { Button } from './Button';
 
 # Button
 
-<Button>My Button</Button>
+<Button>My Button</Button>
+
+<Props of={Button} />
diff --git a/examples/typescript/src/Button.tsx b/examples/typescript/src/Button.tsx
@@ -1,9 +1,14 @@
 import * as React from 'react';
+import p from 'prop-types';
 
 interface Props {
   variants: any;
 }
 
 export const Button: React.FC<Props> = ({ children }) => {
-    return <button>{children}</button>
+  return <button>{children}</button>
+};
+
+Button.propTypes = {
+  primary: p.bool
 };
diff --git a/packages/papyrum-cli/src/commands/dev.ts b/packages/papyrum-cli/src/commands/dev.ts
@@ -4,10 +4,10 @@ import * as  chokidar from 'chokidar';
 export const dev = async (argv) => {
   await init(argv);
   server(argv);
-  const watch = chokidar.watch(['**/*.mdx', '**/*.{js,jsx,mjs}'], {
+  const watch = chokidar.watch(['**/*.mdx', '**/*.{ts,tsx,js,jsx,}'], {
     ignored: 'node_modules'
   });
   watch.on('change', async (path) => {
     await init(argv);
   });
-}
+};
diff --git a/packages/papyrum-core/src/webpack/loaders.ts b/packages/papyrum-core/src/webpack/loaders.ts
@@ -21,7 +21,7 @@ const getConfigBabel = argv => {
 };
 
 export const babel = argv => ({
-  test: argv.typescript ? /\.(ts|tsx)$/ : /\.(js|jsx)$/,
+  test: /\.(ts|tsx|js|jsx)$/,
   exclude: /node_modules/,
   use: [
     {

diff --git a/packages/papyrum-ui-docs/src/components/Props/styled.ts b/packages/papyrum-ui-docs/src/components/Props/styled.ts
@@ -6,7 +6,7 @@ export const Prop = styled.div`
 `;
 
 export const Wrapper = styled.div`
-  margin: 0 0 40px;
+  margin: 20px 0 40px;
   border: 1px solid ${props => props.theme.colors.gray};
   background-color: ${props => props.theme.colors.grayLight};
   border-radius: 5px;

diff --git a/packages/papyrum-ui/src/components/Blockquote/styled.ts b/packages/papyrum-ui/src/components/Blockquote/styled.ts
@@ -1,6 +1,7 @@
 import styled from 'styled-components';
 
 export const Blockquote = styled.div`
+  margin: 20px 0 40px;
   border-left: 5px solid ${props => props.theme.colors.gray};
   padding-left: 20px;
   box-sizing: border-box;

diff --git a/packages/papyrum-ui/src/components/Table/styled.ts b/packages/papyrum-ui/src/components/Table/styled.ts
@@ -2,8 +2,8 @@ import styled from 'styled-components';
 
 export const Table = styled.table`
   border-collapse: collapse; 
-  font-size: 16px;
-  margin: 0 0 40px;
+  font-size: 18px;
+  margin: 20px 0 40px;
 `;
 
 export const TableRow = styled.tr`
@@ -17,7 +17,6 @@ export const TableTd = styled.td`
 `;
 
 export const TableTh = styled.th`
-  font-size: 18px;
   color: ${props => props.theme.colors.darkGray};
   background-color: ${props => props.theme.colors.grayLight};
   border: 1px solid ${props => props.theme.colors.gray};