diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 4cb3623627..90ea84f718 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -8,12 +8,15 @@ "name": "seahub-frontend", "version": "0.1.0", "dependencies": { + "@codemirror/lang-markdown": "6.2.3", + "@codemirror/language-data": "6.3.1", + "@codemirror/view": "6.22.1", "@gatsbyjs/reach-router": "1.3.9", "@seafile/react-image-lightbox": "2.0.2", "@seafile/resumablejs": "1.1.16", "@seafile/sdoc-editor": "0.5.31", "@seafile/seafile-calendar": "0.0.12", - "@seafile/seafile-editor": "1.0.67", + "@seafile/seafile-editor": "1.0.68", "@uiw/codemirror-extensions-langs": "^4.19.4", "@uiw/react-codemirror": "^4.19.4", "chart.js": "2.9.4", @@ -2332,32 +2335,17 @@ "@lezer/lezer": "^1.0.0" } }, - "node_modules/@codemirror/lang-liquid": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@codemirror/lang-liquid/-/lang-liquid-6.2.1.tgz", - "integrity": "sha512-J1Mratcm6JLNEiX+U2OlCDTysGuwbHD76XwuL5o5bo9soJtSbz2g6RU3vGHFyS5DC8rgVmFSzi7i6oBftm7tnA==", - "dependencies": { - "@codemirror/autocomplete": "^6.0.0", - "@codemirror/lang-html": "^6.0.0", - "@codemirror/language": "^6.0.0", - "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.0.0", - "@lezer/common": "^1.0.0", - "@lezer/highlight": "^1.0.0", - "@lezer/lr": "^1.3.1" - } - }, "node_modules/@codemirror/lang-markdown": { - "version": "6.2.4", - "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.2.4.tgz", - "integrity": "sha512-UghkA1vSMs8bT7RSZM6vsIocigyah2bV00eRQuZy76401UmFZdsTsbQNBGdyxRQDOLeEvF5iFwap0BM8LKyd+g==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.2.3.tgz", + "integrity": "sha512-wCewRLWpdefWi7uVkHIDiE8+45Fe4buvMDZkihqEom5uRUQrl76Zb13emjeK3W+8pcRgRfAmwelURBbxNEKCIg==", "dependencies": { "@codemirror/autocomplete": "^6.7.1", "@codemirror/lang-html": "^6.0.0", "@codemirror/language": "^6.3.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", - "@lezer/common": "^1.2.1", + "@lezer/common": "^1.0.0", "@lezer/markdown": "^1.0.0" } }, @@ -2451,18 +2439,6 @@ "@lezer/xml": "^1.0.0" } }, - "node_modules/@codemirror/lang-yaml": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@codemirror/lang-yaml/-/lang-yaml-6.0.0.tgz", - "integrity": "sha512-fVPapdX1oYr5HMC5bou1MHscGnNCvOHuhUW6C+V2gfIeIRcughvVfznV0OuUyHy0AdXoBCjOehjzFcmLRumu2Q==", - "dependencies": { - "@codemirror/autocomplete": "^6.0.0", - "@codemirror/language": "^6.0.0", - "@codemirror/state": "^6.0.0", - "@lezer/common": "^1.2.0", - "@lezer/yaml": "^1.0.0" - } - }, "node_modules/@codemirror/language": { "version": "6.9.0", "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.9.0.tgz", @@ -2477,9 +2453,9 @@ } }, "node_modules/@codemirror/language-data": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/@codemirror/language-data/-/language-data-6.4.1.tgz", - "integrity": "sha512-NYhC3NvEMwUxSWS1sB5AePUtr5g2ASSYOZ37YixicDG8PWHslDV9mmXIX0KvmtEm50V8FT4F5i4HAsk/7i78LA==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@codemirror/language-data/-/language-data-6.3.1.tgz", + "integrity": "sha512-p6jhJmvhGe1TG1EGNhwH7nFWWFSTJ8NDKnB2fVx5g3t+PpO0+63R7GJNxjS0TmmH3cdMxZbzejsik+rlEh1EyQ==", "dependencies": { "@codemirror/lang-angular": "^0.1.0", "@codemirror/lang-cpp": "^6.0.0", @@ -2489,7 +2465,6 @@ "@codemirror/lang-javascript": "^6.0.0", "@codemirror/lang-json": "^6.0.0", "@codemirror/lang-less": "^6.0.0", - "@codemirror/lang-liquid": "^6.0.0", "@codemirror/lang-markdown": "^6.0.0", "@codemirror/lang-php": "^6.0.0", "@codemirror/lang-python": "^6.0.0", @@ -2499,7 +2474,6 @@ "@codemirror/lang-vue": "^0.1.1", "@codemirror/lang-wast": "^6.0.0", "@codemirror/lang-xml": "^6.0.0", - "@codemirror/lang-yaml": "^6.0.0", "@codemirror/language": "^6.0.0", "@codemirror/legacy-modes": "^6.1.0" } @@ -2549,11 +2523,11 @@ } }, "node_modules/@codemirror/view": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.26.0.tgz", - "integrity": "sha512-nSSmzONpqsNzshPOxiKhK203R6BvABepugAe34QfQDbNDslyjkqBuKgrK5ZBvqNXpfxz5iLrlGTmEfhbQyH46A==", + "version": "6.22.1", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.22.1.tgz", + "integrity": "sha512-38BRn1nPqZqiHbmWfI8zri23IbRVbmSpSmh1E/Ysvc+lIGGdBC17K8zlK7ZU6fhfy9x4De9Zyj5JQqScPq5DkA==", "dependencies": { - "@codemirror/state": "^6.4.0", + "@codemirror/state": "^6.1.4", "style-mod": "^4.1.0", "w3c-keyname": "^2.2.4" } @@ -4345,16 +4319,6 @@ "@lezer/lr": "^1.0.0" } }, - "node_modules/@lezer/yaml": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@lezer/yaml/-/yaml-1.0.2.tgz", - "integrity": "sha512-XCkwuxe+eumJ28nA9e1S6XKsXz9W7V/AG+WBiWOtiIuUpKcZ/bHuvN8bLxSDREIcybSRpEd/jvphh4vgm6Ed2g==", - "dependencies": { - "@lezer/common": "^1.2.0", - "@lezer/highlight": "^1.0.0", - "@lezer/lr": "^1.4.0" - } - }, "node_modules/@nextjournal/lang-clojure": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@nextjournal/lang-clojure/-/lang-clojure-1.0.0.tgz", @@ -4849,16 +4813,12 @@ } }, "node_modules/@seafile/seafile-editor": { - "version": "1.0.67", - "resolved": "https://registry.npmjs.org/@seafile/seafile-editor/-/seafile-editor-1.0.67.tgz", - "integrity": "sha512-X/CrOTsLCcu3iou9UJH1dVE7lzCdtiRzA4idYT3hp39M6NfHMSz08c9L/xCBu+1MvJhxse3zISgEqYLcDG5vMg==", + "version": "1.0.68", + "resolved": "https://registry.npmjs.org/@seafile/seafile-editor/-/seafile-editor-1.0.68.tgz", + "integrity": "sha512-XM/V2p8RBGckxRKbT/FoLkgUgyUx0jGInKrHljFSkQHaGA5VPeYBwhaIQTs+lWeht+pe1YR9s5e7NKfXggGtCw==", "dependencies": { - "@codemirror/lang-markdown": "6.2.3", - "@codemirror/language-data": "6.3.1", - "@codemirror/view": "6.22.1", "@seafile/react-image-lightbox": "2.0.5", "classnames": "2.3.2", - "codemirror": "6.0.1", "deep-copy": "1.4.2", "deepmerge": "4.3.1", "is-url": "^1.2.4", @@ -4886,56 +4846,6 @@ "xtend": "4.0.2" } }, - "node_modules/@seafile/seafile-editor/node_modules/@codemirror/lang-markdown": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.2.3.tgz", - "integrity": "sha512-wCewRLWpdefWi7uVkHIDiE8+45Fe4buvMDZkihqEom5uRUQrl76Zb13emjeK3W+8pcRgRfAmwelURBbxNEKCIg==", - "dependencies": { - "@codemirror/autocomplete": "^6.7.1", - "@codemirror/lang-html": "^6.0.0", - "@codemirror/language": "^6.3.0", - "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.0.0", - "@lezer/common": "^1.0.0", - "@lezer/markdown": "^1.0.0" - } - }, - "node_modules/@seafile/seafile-editor/node_modules/@codemirror/language-data": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/@codemirror/language-data/-/language-data-6.3.1.tgz", - "integrity": "sha512-p6jhJmvhGe1TG1EGNhwH7nFWWFSTJ8NDKnB2fVx5g3t+PpO0+63R7GJNxjS0TmmH3cdMxZbzejsik+rlEh1EyQ==", - "dependencies": { - "@codemirror/lang-angular": "^0.1.0", - "@codemirror/lang-cpp": "^6.0.0", - "@codemirror/lang-css": "^6.0.0", - "@codemirror/lang-html": "^6.0.0", - "@codemirror/lang-java": "^6.0.0", - "@codemirror/lang-javascript": "^6.0.0", - "@codemirror/lang-json": "^6.0.0", - "@codemirror/lang-less": "^6.0.0", - "@codemirror/lang-markdown": "^6.0.0", - "@codemirror/lang-php": "^6.0.0", - "@codemirror/lang-python": "^6.0.0", - "@codemirror/lang-rust": "^6.0.0", - "@codemirror/lang-sass": "^6.0.0", - "@codemirror/lang-sql": "^6.0.0", - "@codemirror/lang-vue": "^0.1.1", - "@codemirror/lang-wast": "^6.0.0", - "@codemirror/lang-xml": "^6.0.0", - "@codemirror/language": "^6.0.0", - "@codemirror/legacy-modes": "^6.1.0" - } - }, - "node_modules/@seafile/seafile-editor/node_modules/@codemirror/view": { - "version": "6.22.1", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.22.1.tgz", - "integrity": "sha512-38BRn1nPqZqiHbmWfI8zri23IbRVbmSpSmh1E/Ysvc+lIGGdBC17K8zlK7ZU6fhfy9x4De9Zyj5JQqScPq5DkA==", - "dependencies": { - "@codemirror/state": "^6.1.4", - "style-mod": "^4.1.0", - "w3c-keyname": "^2.2.4" - } - }, "node_modules/@seafile/seafile-editor/node_modules/@seafile/react-image-lightbox": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/@seafile/react-image-lightbox/-/react-image-lightbox-2.0.5.tgz", @@ -29605,32 +29515,17 @@ "@lezer/lezer": "^1.0.0" } }, - "@codemirror/lang-liquid": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@codemirror/lang-liquid/-/lang-liquid-6.2.1.tgz", - "integrity": "sha512-J1Mratcm6JLNEiX+U2OlCDTysGuwbHD76XwuL5o5bo9soJtSbz2g6RU3vGHFyS5DC8rgVmFSzi7i6oBftm7tnA==", - "requires": { - "@codemirror/autocomplete": "^6.0.0", - "@codemirror/lang-html": "^6.0.0", - "@codemirror/language": "^6.0.0", - "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.0.0", - "@lezer/common": "^1.0.0", - "@lezer/highlight": "^1.0.0", - "@lezer/lr": "^1.3.1" - } - }, "@codemirror/lang-markdown": { - "version": "6.2.4", - "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.2.4.tgz", - "integrity": "sha512-UghkA1vSMs8bT7RSZM6vsIocigyah2bV00eRQuZy76401UmFZdsTsbQNBGdyxRQDOLeEvF5iFwap0BM8LKyd+g==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.2.3.tgz", + "integrity": "sha512-wCewRLWpdefWi7uVkHIDiE8+45Fe4buvMDZkihqEom5uRUQrl76Zb13emjeK3W+8pcRgRfAmwelURBbxNEKCIg==", "requires": { "@codemirror/autocomplete": "^6.7.1", "@codemirror/lang-html": "^6.0.0", "@codemirror/language": "^6.3.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", - "@lezer/common": "^1.2.1", + "@lezer/common": "^1.0.0", "@lezer/markdown": "^1.0.0" } }, @@ -29724,18 +29619,6 @@ "@lezer/xml": "^1.0.0" } }, - "@codemirror/lang-yaml": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@codemirror/lang-yaml/-/lang-yaml-6.0.0.tgz", - "integrity": "sha512-fVPapdX1oYr5HMC5bou1MHscGnNCvOHuhUW6C+V2gfIeIRcughvVfznV0OuUyHy0AdXoBCjOehjzFcmLRumu2Q==", - "requires": { - "@codemirror/autocomplete": "^6.0.0", - "@codemirror/language": "^6.0.0", - "@codemirror/state": "^6.0.0", - "@lezer/common": "^1.2.0", - "@lezer/yaml": "^1.0.0" - } - }, "@codemirror/language": { "version": "6.9.0", "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.9.0.tgz", @@ -29750,9 +29633,9 @@ } }, "@codemirror/language-data": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/@codemirror/language-data/-/language-data-6.4.1.tgz", - "integrity": "sha512-NYhC3NvEMwUxSWS1sB5AePUtr5g2ASSYOZ37YixicDG8PWHslDV9mmXIX0KvmtEm50V8FT4F5i4HAsk/7i78LA==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@codemirror/language-data/-/language-data-6.3.1.tgz", + "integrity": "sha512-p6jhJmvhGe1TG1EGNhwH7nFWWFSTJ8NDKnB2fVx5g3t+PpO0+63R7GJNxjS0TmmH3cdMxZbzejsik+rlEh1EyQ==", "requires": { "@codemirror/lang-angular": "^0.1.0", "@codemirror/lang-cpp": "^6.0.0", @@ -29762,7 +29645,6 @@ "@codemirror/lang-javascript": "^6.0.0", "@codemirror/lang-json": "^6.0.0", "@codemirror/lang-less": "^6.0.0", - "@codemirror/lang-liquid": "^6.0.0", "@codemirror/lang-markdown": "^6.0.0", "@codemirror/lang-php": "^6.0.0", "@codemirror/lang-python": "^6.0.0", @@ -29772,7 +29654,6 @@ "@codemirror/lang-vue": "^0.1.1", "@codemirror/lang-wast": "^6.0.0", "@codemirror/lang-xml": "^6.0.0", - "@codemirror/lang-yaml": "^6.0.0", "@codemirror/language": "^6.0.0", "@codemirror/legacy-modes": "^6.1.0" } @@ -29822,11 +29703,11 @@ } }, "@codemirror/view": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.26.0.tgz", - "integrity": "sha512-nSSmzONpqsNzshPOxiKhK203R6BvABepugAe34QfQDbNDslyjkqBuKgrK5ZBvqNXpfxz5iLrlGTmEfhbQyH46A==", + "version": "6.22.1", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.22.1.tgz", + "integrity": "sha512-38BRn1nPqZqiHbmWfI8zri23IbRVbmSpSmh1E/Ysvc+lIGGdBC17K8zlK7ZU6fhfy9x4De9Zyj5JQqScPq5DkA==", "requires": { - "@codemirror/state": "^6.4.0", + "@codemirror/state": "^6.1.4", "style-mod": "^4.1.0", "w3c-keyname": "^2.2.4" } @@ -31149,16 +31030,6 @@ "@lezer/lr": "^1.0.0" } }, - "@lezer/yaml": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@lezer/yaml/-/yaml-1.0.2.tgz", - "integrity": "sha512-XCkwuxe+eumJ28nA9e1S6XKsXz9W7V/AG+WBiWOtiIuUpKcZ/bHuvN8bLxSDREIcybSRpEd/jvphh4vgm6Ed2g==", - "requires": { - "@lezer/common": "^1.2.0", - "@lezer/highlight": "^1.0.0", - "@lezer/lr": "^1.4.0" - } - }, "@nextjournal/lang-clojure": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@nextjournal/lang-clojure/-/lang-clojure-1.0.0.tgz", @@ -31502,16 +31373,12 @@ } }, "@seafile/seafile-editor": { - "version": "1.0.67", - "resolved": "https://registry.npmjs.org/@seafile/seafile-editor/-/seafile-editor-1.0.67.tgz", - "integrity": "sha512-X/CrOTsLCcu3iou9UJH1dVE7lzCdtiRzA4idYT3hp39M6NfHMSz08c9L/xCBu+1MvJhxse3zISgEqYLcDG5vMg==", + "version": "1.0.68", + "resolved": "https://registry.npmjs.org/@seafile/seafile-editor/-/seafile-editor-1.0.68.tgz", + "integrity": "sha512-XM/V2p8RBGckxRKbT/FoLkgUgyUx0jGInKrHljFSkQHaGA5VPeYBwhaIQTs+lWeht+pe1YR9s5e7NKfXggGtCw==", "requires": { - "@codemirror/lang-markdown": "6.2.3", - "@codemirror/language-data": "6.3.1", - "@codemirror/view": "6.22.1", "@seafile/react-image-lightbox": "2.0.5", "classnames": "2.3.2", - "codemirror": "6.0.1", "deep-copy": "1.4.2", "deepmerge": "4.3.1", "is-url": "^1.2.4", @@ -31539,56 +31406,6 @@ "xtend": "4.0.2" }, "dependencies": { - "@codemirror/lang-markdown": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.2.3.tgz", - "integrity": "sha512-wCewRLWpdefWi7uVkHIDiE8+45Fe4buvMDZkihqEom5uRUQrl76Zb13emjeK3W+8pcRgRfAmwelURBbxNEKCIg==", - "requires": { - "@codemirror/autocomplete": "^6.7.1", - "@codemirror/lang-html": "^6.0.0", - "@codemirror/language": "^6.3.0", - "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.0.0", - "@lezer/common": "^1.0.0", - "@lezer/markdown": "^1.0.0" - } - }, - "@codemirror/language-data": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/@codemirror/language-data/-/language-data-6.3.1.tgz", - "integrity": "sha512-p6jhJmvhGe1TG1EGNhwH7nFWWFSTJ8NDKnB2fVx5g3t+PpO0+63R7GJNxjS0TmmH3cdMxZbzejsik+rlEh1EyQ==", - "requires": { - "@codemirror/lang-angular": "^0.1.0", - "@codemirror/lang-cpp": "^6.0.0", - "@codemirror/lang-css": "^6.0.0", - "@codemirror/lang-html": "^6.0.0", - "@codemirror/lang-java": "^6.0.0", - "@codemirror/lang-javascript": "^6.0.0", - "@codemirror/lang-json": "^6.0.0", - "@codemirror/lang-less": "^6.0.0", - "@codemirror/lang-markdown": "^6.0.0", - "@codemirror/lang-php": "^6.0.0", - "@codemirror/lang-python": "^6.0.0", - "@codemirror/lang-rust": "^6.0.0", - "@codemirror/lang-sass": "^6.0.0", - "@codemirror/lang-sql": "^6.0.0", - "@codemirror/lang-vue": "^0.1.1", - "@codemirror/lang-wast": "^6.0.0", - "@codemirror/lang-xml": "^6.0.0", - "@codemirror/language": "^6.0.0", - "@codemirror/legacy-modes": "^6.1.0" - } - }, - "@codemirror/view": { - "version": "6.22.1", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.22.1.tgz", - "integrity": "sha512-38BRn1nPqZqiHbmWfI8zri23IbRVbmSpSmh1E/Ysvc+lIGGdBC17K8zlK7ZU6fhfy9x4De9Zyj5JQqScPq5DkA==", - "requires": { - "@codemirror/state": "^6.1.4", - "style-mod": "^4.1.0", - "w3c-keyname": "^2.2.4" - } - }, "@seafile/react-image-lightbox": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/@seafile/react-image-lightbox/-/react-image-lightbox-2.0.5.tgz", diff --git a/frontend/package.json b/frontend/package.json index 1323e67813..b11c248e6c 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -3,12 +3,15 @@ "version": "0.1.0", "private": true, "dependencies": { + "@codemirror/lang-markdown": "6.2.3", + "@codemirror/language-data": "6.3.1", + "@codemirror/view": "6.22.1", "@gatsbyjs/reach-router": "1.3.9", "@seafile/react-image-lightbox": "2.0.2", "@seafile/resumablejs": "1.1.16", "@seafile/sdoc-editor": "0.5.31", "@seafile/seafile-calendar": "0.0.12", - "@seafile/seafile-editor": "1.0.67", + "@seafile/seafile-editor": "1.0.68", "@uiw/codemirror-extensions-langs": "^4.19.4", "@uiw/react-codemirror": "^4.19.4", "chart.js": "2.9.4", diff --git a/frontend/src/pages/markdown-editor/index.js b/frontend/src/pages/markdown-editor/index.js index b70d6b764b..f9cd6eadc3 100644 --- a/frontend/src/pages/markdown-editor/index.js +++ b/frontend/src/pages/markdown-editor/index.js @@ -1,6 +1,6 @@ import React, { Fragment } from 'react'; import io from 'socket.io-client'; -import { EXTERNAL_EVENTS, EventBus, RichMarkdownEditor } from '@seafile/seafile-editor'; +import { EXTERNAL_EVENTS, EventBus, MarkdownEditor as SeafileMarkdownEditor } from '@seafile/seafile-editor'; import { Utils } from '../../utils/utils'; import { seafileAPI } from '../../utils/seafile-api'; import { gettext, mediaUrl } from '../../utils/constants'; @@ -422,7 +422,7 @@ class MarkdownEditor extends React.Component { }; render() { - const { loading, editorMode, markdownContent, fileInfo, fileTagList } = this.state; + const { loading, markdownContent, fileInfo, fileTagList } = this.state; return ( @@ -446,9 +446,8 @@ class MarkdownEditor extends React.Component { toggleLockFile={this.toggleLockFile} />
- - +
{this.state.showMarkdownEditorDialog && (