chore(docz-core): change package structure

.gitignore

@@ -25,7 +25,7 @@ typings/
 .yarn-integrity
 .env
 es
-lib
+core/docz-utils/lib
 stats.html
 build
 dist

core/docz-core/src/webpack/config.ts → core/docz-core/src/bundler/config.ts

@@ -8,7 +8,7 @@ import * as plugins from './plugins'
 import * as paths from '../config/paths'
 import { BabelRC } from '../config/babel'
 import { minifier } from './minifier'
-import { ServerHooks } from '../Bundler'
+import { ServerHooks } from '../lib/Bundler'
 import { Config as Args, Env } from '../config/argv'
 
 export const createConfig = (args: Args, env: Env) => async (

core/docz-core/src/webpack/devserver.ts → core/docz-core/src/bundler/devserver.ts

@@ -6,7 +6,7 @@ import ignoredFiles from 'react-dev-utils/ignoredFiles'
 
 import * as paths from '../config/paths'
 import { Config as Args } from '../config/argv'
-import { ServerHooks } from '../Bundler'
+import { ServerHooks } from '../lib/Bundler'
 
 export const devServerConfig = (hooks: ServerHooks, args: Args) => {
   const srcPath = path.resolve(paths.root, args.src)

core/docz-core/src/webpack/index.ts → core/docz-core/src/bundler/index.ts

@@ -1,6 +1,6 @@
 import { Configuration as CFG } from 'webpack'
 
-import { Bundler } from '../Bundler'
+import { Bundler } from '../lib/Bundler'
 import { Config as Args, Env } from '../config/argv'
 
 import { createConfig } from './config'

core/docz-core/src/webpack/server.ts → core/docz-core/src/bundler/server.ts

@@ -6,7 +6,7 @@ import WebpackDevServer from 'webpack-dev-server'
 import * as paths from '../config/paths'
 import { devServerConfig } from './devserver'
 import { Config as Args } from '../config/argv'
-import { ServerHooks as Hooks } from '../Bundler'
+import { ServerHooks as Hooks } from '../lib/Bundler'
 import * as serverUtils from 'react-dev-utils/WebpackDevServerUtils'
 
 export const server = (args: Args) => async (config: Config, hooks: Hooks) => {

core/docz-core/src/commands/build.ts

@@ -2,11 +2,11 @@ import { Arguments } from 'yargs'
 import logger from 'signale'
 import envDotProp from 'env-dot-prop'
 
-import { Plugin } from '../Plugin'
-import { Entries } from '../Entries'
-import { DataServer } from '../DataServer'
+import { Plugin } from '../lib/Plugin'
+import { Entries } from '../lib/Entries'
+import { DataServer } from '../lib/DataServer'
 import { parseConfig } from '../config/docz'
-import { bundler as webpack } from '../webpack'
+import { bundler as webpack } from '../bundler'
 import * as states from '../states'
 
 export const build = async (args: Arguments) => {

core/docz-core/src/commands/dev.ts

@@ -4,11 +4,11 @@ import { Arguments } from 'yargs'
 import logger from 'signale'
 import envDotProp from 'env-dot-prop'
 
-import { Entries } from '../Entries'
-import { DataServer } from '../DataServer'
+import { Entries } from '../lib/Entries'
+import { DataServer } from '../lib/DataServer'
 import { parseConfig } from '../config/docz'
 import { onSignal } from '../utils/on-signal'
-import { bundler as webpack } from '../webpack'
+import { bundler as webpack } from '../bundler'
 import * as states from '../states'
 
 export const dev = async (args: Arguments) => {

core/docz-core/src/config/argv.ts

@@ -5,7 +5,7 @@ import humanize from 'humanize-string'
 import titleize from 'titleize'
 import get from 'lodash/get'
 
-import { Plugin } from '../Plugin'
+import { Plugin } from '../lib/Plugin'
 import { BabelRC } from '../config/babel'
 import * as paths from '../config/paths'
 

core/docz-core/src/config/babel.ts

@@ -3,7 +3,7 @@ import merge from 'deepmerge'
 import getCacheIdentifier from 'react-dev-utils/getCacheIdentifier'
 
 import { Config, Env } from '../config/argv'
-import { Plugin } from '../Plugin'
+import { Plugin } from '../lib/Plugin'
 
 export interface BabelRC {
   presets: any[]

core/docz-core/src/config/docz.ts

@@ -7,7 +7,7 @@ import detectPort from 'detect-port'
 import * as paths from '../config/paths'
 import { BabelRC } from '../config/babel'
 import { Config } from '../config/argv'
-import { Plugin } from '../Plugin'
+import { Plugin } from '../lib/Plugin'
 
 const toOmit = ['_', '$0', 'version', 'help']
 const htmlContext = {

core/docz-core/src/index.ts

@@ -1,7 +1,7 @@
 export { cli } from './cli'
 export { Config } from './config/argv'
 export { BabelRC } from './config/babel'
-export { Plugin, createPlugin } from './Plugin'
-export { DataServer } from './DataServer'
-export { Entries } from './Entries'
-export { Entry } from './Entry'
+export { Plugin, createPlugin } from './lib/Plugin'
+export { DataServer } from './lib/DataServer'
+export { Entries } from './lib/Entries'
+export { Entry } from './lib/Entry'

core/docz-core/src/Bundler.ts → core/docz-core/src/lib/Bundler.ts

@@ -3,9 +3,9 @@ import * as http from 'http'
 import logger from 'signale'
 
 import { Plugin } from './Plugin'
-import { Config as Args, Env } from './config/argv'
-import { getBabelConfig, BabelRC } from './config/babel'
-import * as paths from './config/paths'
+import { Config as Args, Env } from '../config/argv'
+import { getBabelConfig, BabelRC } from '../config/babel'
+import * as paths from '../config/paths'
 
 export interface ServerHooks {
   onCreateWebpackChain<C>(config: C, dev: boolean, args: Args): void

core/docz-core/src/DataServer.ts → core/docz-core/src/lib/DataServer.ts

@@ -2,8 +2,8 @@ import * as fs from 'fs-extra'
 import WS from 'ws'
 import { isFunction } from 'lodash/fp'
 
-import * as paths from './config/paths'
-import { onSignal } from './utils/on-signal'
+import * as paths from '../config/paths'
+import { onSignal } from '../utils/on-signal'
 
 export type Send = (type: string, payload: any) => void
 export type On = (type: string) => Promise<any>

core/docz-core/src/Entries.ts → core/docz-core/src/lib/Entries.ts

@@ -4,12 +4,12 @@ import { mdast } from 'docz-utils'
 import { touch, compiled } from 'docz-utils/lib/fs'
 import glob from 'fast-glob'
 
-import * as paths from './config/paths'
+import * as paths from '../config/paths'
 
 import { Entry, EntryObj } from './Entry'
 import { Plugin } from './Plugin'
-import { Config } from './config/argv'
-import { getRepoEditUrl } from './utils/repo-info'
+import { Config } from '../config/argv'
+import { getRepoEditUrl } from '../utils/repo-info'
 
 export const fromTemplates = (file: string) => path.join(paths.templates, file)
 

core/docz-core/src/Entry.ts → core/docz-core/src/lib/Entry.ts

@@ -4,7 +4,7 @@ import slugify from '@sindresorhus/slugify'
 import humanize from 'humanize-string'
 import { mdast } from 'docz-utils'
 
-import * as paths from './config/paths'
+import * as paths from '../config/paths'
 
 const createId = (file: string) =>
   crypto

core/docz-core/src/Plugin.ts → core/docz-core/src/lib/Plugin.ts

@@ -2,8 +2,8 @@ import pReduce from 'p-reduce'
 import WebpackChainConfig from 'webpack-chain'
 import { get, isFunction } from 'lodash/fp'
 
-import { Config } from './config/argv'
-import { BabelRC } from './config/babel'
+import { Config } from '../config/argv'
+import { BabelRC } from '../config/babel'
 
 export type SetConfig = (config: Config) => Config | Promise<Config>
 

core/docz-core/src/states/config.ts

@@ -4,7 +4,7 @@ import chokidar from 'chokidar'
 import get from 'lodash/get'
 
 import * as paths from '../config/paths'
-import { Params, State } from '../DataServer'
+import { Params, State } from '../lib/DataServer'
 import { Config, Menu, ThemeConfig } from '../config/argv'
 import { getRepoUrl } from '../utils/repo-info'
 

core/docz-core/src/states/entries.ts

@@ -3,8 +3,8 @@ import chokidar from 'chokidar'
 import equal from 'fast-deep-equal'
 import { touch, compiled } from 'docz-utils/lib/fs'
 
-import { Params, State } from '../DataServer'
-import { Entries, EntryMap, fromTemplates } from '../Entries'
+import { Params, State } from '../lib/DataServer'
+import { Entries, EntryMap, fromTemplates } from '../lib/Entries'
 import { Config } from '../config/argv'
 import * as paths from '../config/paths'
 

core/docz-core/src/states/props.ts

@@ -1,7 +1,7 @@
 import chokidar from 'chokidar'
 import equal from 'fast-deep-equal'
 import fastglob from 'fast-glob'
-import { State, Params } from '../DataServer'
+import { State, Params } from '../lib/DataServer'
 import { get, omit } from 'lodash/fp'
 
 import * as paths from '../config/paths'

core/docz-core/src/utils/parse-html.ts

@@ -8,7 +8,7 @@ import {
 
 import * as paths from '../config/paths'
 import { Config } from '../config/argv'
-import { fromTemplates } from '../Entries'
+import { fromTemplates } from '../lib/Entries'
 
 const wrapItems = (item: any) =>
   Object.keys(item)