chore: some code improvements

doczjs · Jul 18, 2018 · 00b7ab4 · 00b7ab4
1 parent 4535aef
commit 00b7ab4
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 36 deletions.
diff --git a/packages/docz-core/src/commands/args.ts b/packages/docz-core/src/commands/args.ts
@@ -7,13 +7,16 @@ import { BabelRC } from '../utils/babelrc'
 import * as paths from '../config/paths'
 
 const removeScope = (name: string) => name.replace(/^@.*\//, '')
-const getInitialTitle = () => {
+const getInitialTitle = (): string => {
   const pkg = fs.readJsonSync(paths.packageJson, { throws: false })
   const name = pkg && pkg.name ? pkg.name : 'MyDoc'
 
   return titleize(humanize(removeScope(name)))
 }
 
+export type Env = 'production' | 'development'
+export type ThemeConfig = Record<string, any>
+
 export interface Argv {
   /* io args */
   base: string
@@ -38,12 +41,6 @@ export interface Argv {
   indexHtml?: string
 }
 
-export type Env = 'production' | 'development'
-
-export interface ThemeConfig {
-  [key: string]: any
-}
-
 export interface Config extends Argv {
   hashRouter: boolean
   plugins: Plugin[]

diff --git a/packages/docz/src/components/DocPreview.tsx b/packages/docz/src/components/DocPreview.tsx
@@ -27,20 +27,6 @@ export const DefaultRender: RenderComponent = ({ component, code }) => (
   </Fragment>
 )
 
-const loadImport = (imports: ImportMap, components: ComponentsMap) => (
-  path: string
-) => async (): Promise<SFC<any>> => {
-  const { default: Component } = await imports[path]()
-  return props => <Component {...props} components={components} />
-}
-
-const defaultComponents: ComponentsMap = {
-  loading: DefaultLoading,
-  render: DefaultRender,
-  page: Identity,
-  notFound: Identity,
-}
-
 export interface ComponentsMap {
   loading?: ComponentType
   page?: ComponentType<PageProps>
@@ -62,6 +48,20 @@ export interface ComponentsMap {
   [key: string]: any
 }
 
+const loadImport = (imports: ImportMap, components: ComponentsMap) => (
+  path: string
+) => async (): Promise<SFC<any>> => {
+  const { default: Component } = await imports[path]()
+  return props => <Component {...props} components={components} />
+}
+
+const defaultComponents: ComponentsMap = {
+  loading: DefaultLoading,
+  render: DefaultRender,
+  page: Identity,
+  notFound: Identity,
+}
+
 export interface DocPreviewProps {
   components: ComponentsMap
 }

diff --git a/packages/docz/src/components/ErrorBoundary.tsx b/packages/docz/src/components/ErrorBoundary.tsx
@@ -4,6 +4,7 @@ import { CSSProperties, Component, SFC } from 'react'
 export interface StylesMap {
   [s: string]: CSSProperties
 }
+
 const styles: StylesMap = {
   wrapper: {
     overflowY: 'auto',

diff --git a/packages/load-cfg/src/index.ts b/packages/load-cfg/src/index.ts
@@ -4,20 +4,7 @@ import findup from 'find-up'
 import merge from 'deepmerge'
 import esm from 'esm'
 
-export const finds = (name: string): string[] => [
-  `${name}.json`,
-  `.${name}rc`,
-  `${name}rc.js`,
-  `${name}rc.json`,
-  `${name}.config.js`,
-  `${name}.config.json`,
-]
-
-export const loadFile = (
-  filepath: string,
-  defaultFile: any = {},
-  noCache?: boolean
-) => {
+export const loadFile = (filepath: string, noCache?: boolean) => {
   let file
   const require = esm(module, {
     mode: 'all',
@@ -50,6 +37,15 @@ export const loadFile = (
   return file
 }
 
+export const finds = (name: string): string[] => [
+  `${name}.json`,
+  `.${name}rc`,
+  `${name}rc.js`,
+  `${name}rc.json`,
+  `${name}.config.js`,
+  `${name}.config.json`,
+]
+
 export const load = (
   name: string,
   defaultConfig: any = {},
@@ -59,7 +55,7 @@ export const load = (
   const filepath = findup.sync(finds(name))
 
   if (filepath) {
-    file = loadFile(filepath, defaultConfig, noCache)
+    file = loadFile(filepath, noCache)
   }
 
   return defaultConfig !== null ? merge(defaultConfig, file) : file