fix(build): fix rollup config and circular deps (#893)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
FrontendRangers · Aug 26, 2020 · 3f312d3 · 3f312d3
1 parent 1c46dbf
commit 3f312d3
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/.changeset/fair-doors-drum.md b/.changeset/fair-doors-drum.md
@@ -0,0 +1,5 @@
+---
+"@platoon/react": patch
+---
+
+fix(react): cleanup component
diff --git a/packages/react/rollup.config.js b/packages/react/rollup.config.js
@@ -1,8 +1,6 @@
 import configure from '../../config/rollup.config';
-import pkg from './package.json';
 
 export default configure({
-    pkg: pkg,
     input: './src/index.ts',
     output: [
         {

diff --git a/packages/react/src/components/checkbox/Checkbox.tsx b/packages/react/src/components/checkbox/Checkbox.tsx
@@ -1,6 +1,6 @@
 import React, { forwardRef } from 'react';
 import { Box } from '../../primitives/box';
-import { Label } from '..';
+import { Label } from '../label';
 import styled from 'styled-components';
 
 const CheckboxComponent = styled.input.attrs(() => ({ type: 'checkbox' }))({});

diff --git a/packages/react/src/components/form-element/FormElement.tsx b/packages/react/src/components/form-element/FormElement.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { Box } from '../../primitives/box';
-import { Label, Text } from '..';
+import { Label } from '../label';
+import { Text } from '../text';
 
 export interface FormElementProps {
     label?: string;

diff --git a/packages/react/src/components/modal/Modal.tsx b/packages/react/src/components/modal/Modal.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Box, BoxProps } from '../../primitives/box';
 import { Overlay } from '../../primitives/overlay';
 import { Portal } from '../../primitives/portal';
-import { Fade } from '../..';
+import { Fade } from '../fade';
 import { IconButton } from '../button';
 import ModalHeader from './ModalHeader';
 import ModalFooter from './ModalFooter';

diff --git a/packages/react/src/components/radio/Radio.tsx b/packages/react/src/components/radio/Radio.tsx
@@ -1,6 +1,6 @@
 import React, { forwardRef } from 'react';
 import { Box } from '../../primitives/box';
-import { Label } from '..';
+import { Label } from '../label';
 import styled from 'styled-components';
 
 const RadioElement = styled.input.attrs(() => ({ type: 'radio' }))({});

diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json
@@ -3,7 +3,7 @@
         "outDir": "dist",
         "rootDir": "src",
         "lib": ["ES2019", "DOM"],
-        "module": "commonjs",
+        "module": "ESNext",
         "target": "ES2019",
         "sourceMap": true,
         "allowJs": false,