Просмотр исходного кода

reorganize package dependencies

Yuki Takei 2 лет назад
Родитель
Сommit
9693676c50
3 измененных файлов с 14 добавлено и 4 удалено
  1. 7 2
      apps/app/src/components/PageEditor/PageEditor.tsx
  2. 6 1
      packages/editor/package.json
  3. 1 1
      yarn.lock

+ 7 - 2
apps/app/src/components/PageEditor/PageEditor.tsx

@@ -8,6 +8,7 @@ import nodePath from 'path';
 
 import type { IPageHasId } from '@growi/core';
 import { pathUtils } from '@growi/core/dist/utils';
+import { CodeMirrorEditor } from '@growi/editor';
 import detectIndent from 'detect-indent';
 import { useTranslation } from 'next-i18next';
 import { useRouter } from 'next/router';
@@ -57,6 +58,9 @@ import Preview from './Preview';
 import scrollSyncHelper from './ScrollSyncHelper';
 
 
+import '@growi/editor/dist/style.css';
+
+
 const logger = loggerFactory('growi:PageEditor');
 
 
@@ -556,7 +560,7 @@ export const PageEditor = React.memo((): JSX.Element => {
   return (
     <div className="d-flex flex-wrap">
       <div className="page-editor-editor-container flex-grow-1 flex-basis-0 mw-0">
-        <Editor
+        {/* <Editor
           ref={editorRef}
           value={initialValue}
           isUploadable={isUploadable}
@@ -567,7 +571,8 @@ export const PageEditor = React.memo((): JSX.Element => {
           onChange={markdownChangedHandler}
           onUpload={uploadHandler}
           onSave={saveWithShortcut}
-        />
+        /> */}
+        <CodeMirrorEditor />
       </div>
       <div className="d-none d-lg-block page-editor-preview-container flex-grow-1 flex-basis-0 mw-0">
         <Preview

+ 6 - 1
packages/editor/package.json

@@ -1,8 +1,10 @@
 {
   "name": "@growi/editor",
-  "version": "0.0.0",
+  "version": "6.2.0-RC.0",
   "license": "MIT",
   "type": "module",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc && vite build",
     "clean": "shx rm -rf dist",
@@ -19,11 +21,14 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
+    "@codemirror/state": "^6.2.1",
+    "@codemirror/view": "^6.15.3",
     "@codemirror/lang-markdown": "^6.2.0",
     "@codemirror/language-data": "^6.3.1",
     "@types/react": "^18.2.14",
     "@types/react-dom": "^18.2.6",
     "@uiw/react-codemirror": "^4.21.8",
+    "codemirror": "^6.0.1",
     "eslint-plugin-react-refresh": "^0.4.1"
   }
 }

+ 1 - 1
yarn.lock

@@ -2904,7 +2904,7 @@
     escape-string-regexp "^4.0.0"
 
 "@growi/editor@link:packages/editor":
-  version "0.0.0"
+  version "6.2.0-RC.0"
   dependencies:
     react "^18.2.0"
     react-dom "^18.2.0"