fix: Fix extensions bundled version issue (#267).

uiwjs · Feb 16, 2022 · cde4438 · cde4438
1 parent 4654922
commit cde4438
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 12 deletions.
diff --git a/.kktrc.ts b/.kktrc.ts
@@ -17,6 +17,53 @@ export default (conf: Configuration, env: 'development' | 'production', options:
       main: 'dist/codemirror.js',
       // webpack externals options
       dependencies: {
+        '@codemirror/basic-setup': {
+          root: ['CM', '@codemirror/basic-setup'],
+          commonjs: '@codemirror/basic-setup',
+          commonjs2: '@codemirror/basic-setup',
+        },
+        '@codemirror/state': {
+          root: ['CM', '@codemirror/state'],
+          commonjs: '@codemirror/state',
+          commonjs2: '@codemirror/state',
+        },
+        '@codemirror/view': {
+          root: ['CM', '@codemirror/view'],
+          commonjs: '@codemirror/view',
+          commonjs2: '@codemirror/view',
+        },
+        '@codemirror/theme-one-dark': {
+          root: ['CM', '@codemirror/theme-one-dark'],
+          commonjs: '@codemirror/theme-one-dark',
+          commonjs2: '@codemirror/theme-one-dark',
+        },
+        oneDark: {
+          root: ['CM', '@codemirror/theme-one-dark', 'oneDark'],
+        },
+        basicSetup: {
+          root: ['CM', '@codemirror/basic-setup', 'basicSetup'],
+        },
+        indentWithTab: {
+          root: ['CM', '@codemirror/commands', 'indentWithTab'],
+        },
+        keymap: {
+          root: ['CM', '@codemirror/view', 'keymap'],
+        },
+        placeholder: {
+          root: ['CM', '@codemirror/view', 'placeholder'],
+        },
+        ViewUpdate: {
+          root: ['CM', '@codemirror/view', 'ViewUpdate'],
+        },
+        EditorView: {
+          root: ['CM', '@codemirror/view', 'EditorView'],
+        },
+        StateEffect: {
+          root: ['CM', '@codemirror/state', 'StateEffect'],
+        },
+        EditorState: {
+          root: ['CM', '@codemirror/basic-setup', 'EditorState'],
+        },
         react: {
           root: 'React',
           commonjs2: 'react',

diff --git a/src/useCodeMirror.ts b/src/useCodeMirror.ts
@@ -1,8 +1,8 @@
 import { useEffect, useState } from 'react';
-import { basicSetup as defaultBasicSetup } from '@codemirror/basic-setup';
+import { basicSetup } from '@codemirror/basic-setup';
 import { EditorState, StateEffect } from '@codemirror/state';
-import { indentWithTab as defaultIndentWithTab } from '@codemirror/commands';
-import { EditorView, keymap, ViewUpdate, placeholder as extendPlaceholder } from '@codemirror/view';
+import { indentWithTab } from '@codemirror/commands';
+import { EditorView, keymap, ViewUpdate, placeholder } from '@codemirror/view';
 import { oneDark } from '@codemirror/theme-one-dark';
 import { ReactCodeMirrorProps } from './';
 import { defaultLightThemeOption } from './theme/light';
@@ -23,13 +23,13 @@ export function useCodeMirror(props: UseCodeMirror) {
     height = '',
     minHeight = '',
     maxHeight = '',
-    placeholder = '',
+    placeholder: placeholderStr = '',
     width = '',
     minWidth = '',
     maxWidth = '',
     editable = true,
-    indentWithTab = true,
-    basicSetup = true,
+    indentWithTab: defaultIndentWithTab = true,
+    basicSetup: defaultBasicSetup = true,
     root,
   } = props;
   const [container, setContainer] = useState(props.container);
@@ -53,15 +53,15 @@ export function useCodeMirror(props: UseCodeMirror) {
     }
   });
   let getExtensions = [updateListener, defaultThemeOption];
-  if (indentWithTab) {
-    getExtensions.unshift(keymap.of([defaultIndentWithTab]));
+  if (defaultIndentWithTab) {
+    getExtensions.unshift(keymap.of([indentWithTab]));
   }
-  if (basicSetup) {
-    getExtensions.unshift(defaultBasicSetup);
+  if (defaultBasicSetup) {
+    getExtensions.unshift(basicSetup);
   }
 
-  if (placeholder) {
-    getExtensions.unshift(extendPlaceholder(placeholder));
+  if (placeholderStr) {
+    getExtensions.unshift(placeholder(placeholderStr));
   }
 
   switch (theme) {