fix: prevent codemirror bug on build

doczjs · Aug 13, 2018 · 3d0894e · 3d0894e
1 parent e2eb8cd
commit 3d0894e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/packages/docz-core/src/utils/parse-html.ts b/packages/docz-core/src/utils/parse-html.ts
@@ -74,6 +74,7 @@ export const parseHtml = ({ config, ctx, dev, template }: ParseHtmlParams) => {
   } = ctx
 
   const headStr = `
+    <link rel="stylesheet" type="text/css" href="https://unpkg.com/codemirror@5.39.2/lib/codemirror.css" />
     ${favicon ? `<link rel="icon" type="image/x-icon" href="${favicon}">` : ''}
     ${head.meta ? generateMetaTags(head.meta) : ''}
     ${head.links ? generateLinkTags(head.links) : ''}

diff --git a/packages/docz-theme-default/librc.js b/packages/docz-theme-default/librc.js
@@ -12,7 +12,14 @@ const internal = [
 
 const depsExternal = [
   '@mdx-js/tag',
+  'react-codemirror',
+  'codemirror',
   'react-dom/server',
+  'codemirror/mode/markdown/markdown',
+  'codemirror/mode/javascript/javascript',
+  'codemirror/mode/jsx/jsx',
+  'codemirror/mode/css/css',
+  'codemirror/addon/edit/matchbrackets',
   'polished/lib/color/rgba',
   'polished/lib/color/lighten',
   'polished/lib/color/darken',

diff --git a/packages/docz-theme-default/src/components/ui/Pre.tsx b/packages/docz-theme-default/src/components/ui/Pre.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import { SFC, Component } from 'react'
 import { ThemeConfig } from 'docz'
-import styled, { injectGlobal } from 'react-emotion'
+import styled from 'react-emotion'
 import rgba from 'polished/lib/color/rgba'
 import BaseCheck from 'react-feather/dist/icons/check'
 import Clipboard from 'react-feather/dist/icons/clipboard'
@@ -13,17 +13,11 @@ import { ButtonSwap } from './ButtonSwap'
 import { ButtonLink } from './Button'
 import * as themes from '../../styles/codemirror'
 
-// tslint:disable
-declare var require: any
-require('codemirror/mode/markdown/markdown')
-require('codemirror/mode/javascript/javascript')
-require('codemirror/mode/jsx/jsx')
-require('codemirror/mode/css/css')
-require('codemirror/addon/edit/matchbrackets')
-
-injectGlobal(`
-  @import url('https://unpkg.com/codemirror@5.39.2/lib/codemirror.css');
-`)
+import 'codemirror/mode/markdown/markdown'
+import 'codemirror/mode/javascript/javascript'
+import 'codemirror/mode/jsx/jsx'
+import 'codemirror/mode/css/css'
+import 'codemirror/addon/edit/matchbrackets'
 
 const getLanguage = (children: any) => {
   const defaultLanguage = 'jsx'
@@ -173,7 +167,10 @@ export class Pre extends Component<PreProps> {
               value={code}
               options={{
                 ...options,
-                theme: config.themeConfig.codemirrorTheme,
+                theme:
+                  config && config.themeConfig
+                    ? config.themeConfig.codemirrorTheme
+                    : options.theme,
               }}
             />
           )}