Merge pull request #703 from glints-dev/feature/next-folder-refactoring

chore: restructure @next folder

Author: marthayaputra

.gitignore

@@ -3,7 +3,7 @@ dist
 es
 lib
 src/General/Icon/components
-src/General/@next/Icon/components
+src/@next/Icon/components
 *.log
 .out
 .DS_Store

package.json

@@ -14,7 +14,7 @@
     "build:es": "rm -rf es && cross-env BABEL_ENV=es babel src -d es --extensions .ts,.tsx --ignore src/**/*.test.tsx,src/**/*.test.ts",
     "build:ts": "tsc --project tsconfig.declaration.json -d --declarationDir lib && tsc --project tsconfig.declaration.json -d --declarationDir es",
     "build:icon": "rm -rf src/General/Icon/components && babel-node --extensions .ts,.tsx src/Utils/Icon/generateIcons.ts && npm run format:icon",
-    "build:next:icon": "npx @svgr/cli --typescript --out-dir src/General/@next/Icon/components -- src/General/@next/Icon/icons",
+    "build:next:icon": "npx @svgr/cli --typescript --out-dir src/@next/Icon/components -- src/@next/Icon/icons",
     "format:icon": "prettier --write src/General/Icon/components/*.tsx",
     "imports": "babel-node --extensions .ts scripts/count-imports/index.ts",
     "lint": "npm run lint:css && npm run lint:ts",

…/General/@next/Button/Button.stories.tsx src/@next/Button/Button.stories.tsxsrc/General/@next/Button/Button.stories.tsx renamed to src/@next/Button/Button.stories.tsx src/General/@next/Button/Button.stories.tsx renamed to src/@next/Button/Button.stories.tsx

@@ -2,14 +2,14 @@ import React from 'react';
 import { Story, Meta } from '@storybook/react';
 
 import { Button, ButtonProps } from './Button';
-import { BaseContainer } from '../../../Layout/GlintsContainer/GlintsContainer';
+import { BaseContainer } from '../../Layout/GlintsContainer/GlintsContainer';
 
 (Button as React.FunctionComponent<ButtonProps>).displayName = 'Button';
 
 const defaultText = 'Label';
 
 export default {
-  title: 'Button/@next/Button',
+  title: '@next/Button',
   component: Button,
   decorators: [Story => <BaseContainer>{Story()}</BaseContainer>],
   argTypes: {

src/General/@next/Button/Button.tsx src/@next/Button/Button.tsxsrc/General/@next/Button/Button.tsx renamed to src/@next/Button/Button.tsx

@@ -1,20 +1,20 @@
 import { CSSProperties } from 'react';
 import styled from 'styled-components';
-import * as Breakpoints from '../../../Utils/@next/breakpoints';
-import { borderRadius4 } from '../../../Utils/@next/borderRadius';
-import { Neutral } from '../../../Utils/@next/colors';
+import * as Breakpoints from '../utilities/breakpoints';
+import { borderRadius4 } from '../utilities/borderRadius';
+import { Neutral } from '../utilities/colors';
 import {
   button,
   buttonFocused,
   insetButtonPressed,
-} from '../../../Utils/@next/dropShadow';
+} from '../utilities/dropShadow';
 import {
   space12,
   space16,
   space24,
   space4,
   space8,
-} from '../../../Utils/@next/spacing';
+} from '../utilities/spacing';
 import { ButtonProps, ButtonSize } from './Button';
 
 const defaultButtonSizeStyle = `

src/General/@next/Button/ButtonStyle.ts src/@next/Button/ButtonStyle.tssrc/General/@next/Button/ButtonStyle.ts renamed to src/@next/Button/ButtonStyle.ts

@@ -3,15 +3,15 @@ import { Story, Meta } from '@storybook/react';
 
 import { ButtonProps } from './Button';
 import { DestructiveButton } from './DesctructiveButtonStyle';
-import { BaseContainer } from '../../../Layout/GlintsContainer/GlintsContainer';
+import { BaseContainer } from '../../Layout/GlintsContainer/GlintsContainer';
 
 (DestructiveButton as React.FunctionComponent<ButtonProps>).displayName =
   'DestructiveButton';
 
 const defaultText = 'Label';
 
 export default {
-  title: 'Button/@next/DestructiveButton',
+  title: '@next/DestructiveButton',
   component: DestructiveButton,
   decorators: [Story => <BaseContainer>{Story()}</BaseContainer>],
 } as Meta;

…xt/Button/DesctructiveButton.stories.tsx …xt/Button/DesctructiveButton.stories.tsxsrc/General/@next/Button/DesctructiveButton.stories.tsx renamed to src/@next/Button/DesctructiveButton.stories.tsx src/General/@next/Button/DesctructiveButton.stories.tsx renamed to src/@next/Button/DesctructiveButton.stories.tsx

@@ -1,6 +1,6 @@
 import styled from 'styled-components';
-import { Neutral, Red } from '../../../Utils/@next/colors';
-import { insetButtonPressed } from '../../../Utils/@next/dropShadow';
+import { Neutral, Red } from '../utilities/colors';
+import { insetButtonPressed } from '../utilities/dropShadow';
 import { Button } from './Button';
 
 export const DestructiveButton = styled(Button)`

…/@next/Button/DesctructiveButtonStyle.ts …/@next/Button/DesctructiveButtonStyle.tssrc/General/@next/Button/DesctructiveButtonStyle.ts renamed to src/@next/Button/DesctructiveButtonStyle.ts src/General/@next/Button/DesctructiveButtonStyle.ts renamed to src/@next/Button/DesctructiveButtonStyle.ts

@@ -3,15 +3,15 @@ import { Story, Meta } from '@storybook/react';
 
 import { ButtonProps } from './Button';
 import { OutlineButton } from './OutlineButtonStyle';
-import { BaseContainer } from '../../../Layout/GlintsContainer/GlintsContainer';
+import { BaseContainer } from '../../Layout/GlintsContainer/GlintsContainer';
 
 (OutlineButton as React.FunctionComponent<ButtonProps>).displayName =
   'OutlineButton';
 
 const defaultText = 'Label';
 
 export default {
-  title: 'Button/@next/OutlineButton',
+  title: '@next/OutlineButton',
   component: OutlineButton,
   decorators: [Story => <BaseContainer>{Story()}</BaseContainer>],
 } as Meta;

…l/@next/Button/OutlineButton.stories.tsx …c/@next/Button/OutlineButton.stories.tsxsrc/General/@next/Button/OutlineButton.stories.tsx renamed to src/@next/Button/OutlineButton.stories.tsx src/General/@next/Button/OutlineButton.stories.tsx renamed to src/@next/Button/OutlineButton.stories.tsx

@@ -1,5 +1,5 @@
 import styled from 'styled-components';
-import { button } from '../../../Utils/@next/dropShadow';
+import { button } from '../utilities/dropShadow';
 import { Button } from './Button';
 
 export const OutlineButton = styled(Button)`

…neral/@next/Button/OutlineButtonStyle.ts src/@next/Button/OutlineButtonStyle.tssrc/General/@next/Button/OutlineButtonStyle.ts renamed to src/@next/Button/OutlineButtonStyle.ts src/General/@next/Button/OutlineButtonStyle.ts renamed to src/@next/Button/OutlineButtonStyle.ts

@@ -3,15 +3,15 @@ import { Story, Meta } from '@storybook/react';
 
 import { ButtonProps } from './Button';
 import { OutlineMonochromeButton } from './OutlineMonochromeStyle';
-import { BaseContainer } from '../../../Layout/GlintsContainer/GlintsContainer';
+import { BaseContainer } from '../../Layout/GlintsContainer/GlintsContainer';
 
 (OutlineMonochromeButton as React.FunctionComponent<ButtonProps>).displayName =
   'OutlineMonochromeButton';
 
 const defaultText = 'Label';
 
 export default {
-  title: 'Button/@next/OutlineMonochromeButton',
+  title: '@next/OutlineMonochromeButton',
   component: OutlineMonochromeButton,
   decorators: [Story => <BaseContainer>{Story()}</BaseContainer>],
 } as Meta;