chore: some improvements

doczjs · Dec 21, 2018 · 96937a9 · 96937a9
1 parent 8e0cab6
commit 96937a9
Show file tree

Hide file tree

Showing 22 changed files with 1,194 additions and 471 deletions.
diff --git a/core/babel-preset-docz/CHANGELOG.md b/core/babel-preset-docz/CHANGELOG.md
diff --git a/core/babel-preset-docz/package.json b/core/babel-preset-docz/package.json
diff --git a/core/babel-preset-docz/src/config.ts b/core/babel-preset-docz/src/config.ts
diff --git a/core/babel-preset-docz/src/index.ts b/core/babel-preset-docz/src/index.ts
diff --git a/core/babel-preset-docz/src/types.d.ts b/core/babel-preset-docz/src/types.d.ts
diff --git a/core/babel-preset-docz/tsconfig.json b/core/babel-preset-docz/tsconfig.json
diff --git a/core/babel-preset-docz/tslint.json b/core/babel-preset-docz/tslint.json
diff --git a/core/docz-core/librc.js b/core/docz-core/librc.js
@@ -14,6 +14,7 @@ module.exports = {
   plugins: [copy('templates/*.{js,html,json}', 'dist/templates')],
   external: Object.keys(pkg.dependencies).concat([
     'crypto',
+    'lodash/fp',
     'react-dev-utils/errorOverlayMiddleware',
     'react-dev-utils/evalSourceMapMiddleware',
     'react-dev-utils/FileSizeReporter',

diff --git a/core/docz-core/package.json b/core/docz-core/package.json
@@ -33,6 +33,7 @@
     "art-template": "^4.13.2",
     "babel-loader": "^8.0.2",
     "babel-preset-docz": "^0.13.5",
+    "babel-plugin-export-metadata": "^0.13.5",
     "babylon": "^6.18.0",
     "cache-loader": "^1.2.5",
     "chalk": "^2.4.1",
@@ -60,6 +61,7 @@
     "lodash": "^4.17.11",
     "mini-html-webpack-plugin": "^0.2.3",
     "p-reduce": "^1.0.0",
+    "poi": "^12.2.4",
     "progress-estimator": "^0.2.2",
     "react-dev-utils": "^6.1.1",
     "react-docgen-typescript-loader": "^3.0.0-rc.0",

diff --git a/core/docz-core/src/Bundler.ts b/core/docz-core/src/Bundler.ts
@@ -4,7 +4,7 @@ import WebpackDevServer from 'webpack-dev-server'
 
 import { Plugin } from './Plugin'
 import { Config as Args, Env } from './commands/args'
-import { getBabelConfig, BabelRC } from './utils/babel-config'
+import { getBabelConfig, BabelRC } from './config/babel'
 import * as paths from './config/paths'
 
 export interface ServerHooks {

diff --git a/core/docz-core/src/DataServer.ts b/core/docz-core/src/DataServer.ts
@@ -1,7 +1,7 @@
 import WS from 'ws'
+import { isFunction } from 'lodash/fp'
 
 import { touch } from './utils/fs'
-import { isFn } from './utils/helpers'
 import * as paths from './config/paths'
 import { onSignal } from './utils/on-signal'
 
@@ -58,7 +58,7 @@ export class DataServer {
     await Promise.all(
       Array.from(this.states).map(
         async state =>
-          isFn(state.init) &&
+          isFunction(state.init) &&
           state.init({
             state: { ...this.state },
             setState: this.setState(),
@@ -88,7 +88,7 @@ export class DataServer {
     await Promise.all(
       Array.from(this.states).map(
         async state =>
-          isFn(state.close) &&
+          isFunction(state.close) &&
           state.close({
             state: { ...this.state },
             setState: this.setState(),
@@ -100,7 +100,7 @@ export class DataServer {
   private handleConnection(socket: WS): () => void {
     const states = Array.from(this.states).map(
       async state =>
-        isFn(state.update) &&
+        isFunction(state.update) &&
         state.update({
           state: this.state,
           setState: this.setState(socket),
@@ -109,7 +109,7 @@ export class DataServer {
 
     return async () => {
       const fns = await Promise.all(states.filter(Boolean))
-      for (const fn of fns) isFn(fn) && fn()
+      for (const fn of fns) isFunction(fn) && fn()
     }
   }
 

diff --git a/core/docz-core/src/Entries.ts b/core/docz-core/src/Entries.ts
@@ -5,7 +5,6 @@ import glob from 'fast-glob'
 
 import * as paths from './config/paths'
 import { touch, compiled } from './utils/fs'
-import { mapToObj } from './utils/helpers'
 
 import { Entry, EntryObj } from './Entry'
 import { Plugin } from './Plugin'
@@ -14,6 +13,12 @@ import { getRepoEditUrl } from './utils/repo-info'
 
 export const fromTemplates = (file: string) => path.join(paths.templates, file)
 
+const mapToObj = (map: Map<any, any>) =>
+  Array.from(map.entries()).reduce(
+    (obj, [key, value]) => ({ ...obj, [`${key}`]: value }),
+    {}
+  )
+
 const matchFilesWithSrc = (config: Config) => (files: string[]) => {
   const src = path.relative(paths.root, config.src)
   return files.map(file => (file.startsWith(src) ? file : path.join(src, file)))