@modusoperandi/licit 0.13.18 → 0.13.20

package/dist/convertFromHTML.js

@@ -15,14 +15,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function convertFromHTML(html, schema, plugins) {
   const root = document.createElement('html');
-  root.innerHTML = unEscape(html ? html : ' ');
+  root.innerHTML = html ? html : ' ';
   return (0, _convertFromDOMElement.default)(root, schema, plugins);
-}
-
-function unEscape(htmlStr) {
-  if (htmlStr) {
-    htmlStr = htmlStr.replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"').replace(/&#39;/g, "'").replace(/&amp;/g, '&');
-  }
-
-  return htmlStr;
 }

package/dist/convertFromHTML.js.flow

@@ -12,18 +12,6 @@ export default function convertFromHTML(
   plugins: Array<Plugin>
 ): EditorState {
   const root = document.createElement('html');
-  root.innerHTML = unEscape(html ? html : ' ');
+  root.innerHTML = html ? html : ' ';
   return convertFromDOMElement(root, schema, plugins);
 }
-
-function unEscape(htmlStr) {
-  if (htmlStr) {
-    htmlStr = htmlStr
-      .replace(/&lt;/g, '<')
-      .replace(/&gt;/g, '>')
-      .replace(/&quot;/g, '"')
-      .replace(/&#39;/g, "'")
-      .replace(/&amp;/g, '&');
-  }
-  return htmlStr;
-}

package/licit/server/collab/server.js

@@ -93,7 +93,12 @@ function readStreamAsJSON(stream, callback) {
   stream.on('end', () => {
     let result, error;
     try {
-      result = JSON.parse(data);
+      if (typeof data === 'string') {
+        result = JSON.parse(data);
+      }
+      else {
+        result = data;
+      }
     } catch (e) {
       error = e;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modusoperandi/licit",
-  "version": "0.13.18",
+  "version": "0.13.20",
   "subversion": "1",
   "description": "Rich text editor built with React and ProseMirror",
   "main": "dist/index.js",
@@ -89,8 +89,8 @@
     "write-file-webpack-plugin": "4.5.1"
   },
   "dependencies": {
-    "@modusoperandi/licit-doc-attrs-step": "^0.1.2",
-    "@modusoperandi/licit-ui-commands": "^0.1.5",
+    "@modusoperandi/licit-doc-attrs-step": "^0.1.3",
+    "@modusoperandi/licit-ui-commands": "^0.1.6",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.6.7",
     "body-parser": "^1.19.0",
     "browserkeymap": "2.0.2",

package/src/ListItemNodeSpec.js

@@ -29,7 +29,7 @@ const ListItemNodeSpec: NodeSpec = {
   // This spec does not support nested lists (e.g. `'paragraph block*'`)
   // as content because of the complexity of dealing with indentation
   // (context: https://github.com/ProseMirror/prosemirror/issues/92).
-  content: 'paragraph',
+  content: '(bullet_list|paragraph)+',
 
   parseDOM: [{ tag: 'li', getAttrs }],
 

package/src/convertFromHTML.js

@@ -12,18 +12,6 @@ export default function convertFromHTML(
   plugins: Array<Plugin>
 ): EditorState {
   const root = document.createElement('html');
-  root.innerHTML = unEscape(html ? html : ' ');
+  root.innerHTML = html ? html : ' ';
   return convertFromDOMElement(root, schema, plugins);
 }
-
-function unEscape(htmlStr) {
-  if (htmlStr) {
-    htmlStr = htmlStr
-      .replace(/&lt;/g, '<')
-      .replace(/&gt;/g, '>')
-      .replace(/&quot;/g, '"')
-      .replace(/&#39;/g, "'")
-      .replace(/&amp;/g, '&');
-  }
-  return htmlStr;
-}