@modusoperandi/licit 0.13.1 → 0.13.10

package/licit/server/image/start.js

@@ -1,58 +1,58 @@
-// @flow
-
-const express = require('express');
-const cors = require('cors');
-const formidable = require('formidable');
-const mv = require('mv');
-const uuidv4 = require('uuid').v4;
-
-const app = express();
-
-const PORT = process.env.PORT || 3004;
-
-//allow OPTIONS on all resources
-app.options('*', cors());
-app.use(cors());
-
-// Handle asset GET url.
-app.use('/assets', express.static('../images/'));
-// Handle image upload.
-app.post('/saveimage', function (req, res) {
-  const form = new formidable.IncomingForm();
-  form.parse(req, function (err, fields, blob) {
-    const oldpath = blob.file.path;
-    const fileid = uuidv4();
-    const filename = fileid + '_' + req.query['fn'];
-    const newpath = '../images/' + filename;
-    mv(oldpath, newpath, function (err) {
-      if (err) {
-        res.writeHead(500, {
-          'Content-Type': 'application/json',
-          'Access-Control-Allow-Origin': '*',
-        });
-        res.json({error: err});
-      } else {
-        const host = req.headers['host'];
-        const proto = req.connection.encrypted ? 'https' : 'http';
-        const imgSrc = proto + '://' + host + '/assets/' + filename;
-        res.writeHead(200, {
-          'Content-Type': 'application/json',
-          'Access-Control-Allow-Origin': '*',
-        });
-        res.write(
-          JSON.stringify({
-            id: fileid,
-            width: 0,
-            height: 0,
-            src: imgSrc,
-          })
-        );
-      }
-      res.end();
-    });
-  });
-});
-
-app.listen(PORT, () =>
-  console.log('Image Server running on port ' + PORT + '!...')
-);
+// @flow
+
+const express = require('express');
+const cors = require('cors');
+const formidable = require('formidable');
+const mv = require('mv');
+const uuidv4 = require('uuid').v4;
+
+const app = express();
+
+const PORT = process.env.PORT || 3004;
+
+//allow OPTIONS on all resources
+app.options('*', cors());
+app.use(cors());
+
+// Handle asset GET url.
+app.use('/assets', express.static('../images/'));
+// Handle image upload.
+app.post('/saveimage', function (req, res) {
+  const form = new formidable.IncomingForm();
+  form.parse(req, function (err, fields, blob) {
+    const oldpath = blob.file.path;
+    const fileid = uuidv4();
+    const filename = fileid + '_' + req.query['fn'];
+    const newpath = '../images/' + filename;
+    mv(oldpath, newpath, function (err) {
+      if (err) {
+        res.writeHead(500, {
+          'Content-Type': 'application/json',
+          'Access-Control-Allow-Origin': '*',
+        });
+        res.json({error: err});
+      } else {
+        const host = req.headers['host'];
+        const proto = req.connection.encrypted ? 'https' : 'http';
+        const imgSrc = proto + '://' + host + '/assets/' + filename;
+        res.writeHead(200, {
+          'Content-Type': 'application/json',
+          'Access-Control-Allow-Origin': '*',
+        });
+        res.write(
+          JSON.stringify({
+            id: fileid,
+            width: 0,
+            height: 0,
+            src: imgSrc,
+          })
+        );
+      }
+      res.end();
+    });
+  });
+});
+
+app.listen(PORT, () =>
+  console.log('Image Server running on port ' + PORT + '!...')
+);

package/lint.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
-
-node node_modules/eslint/bin/eslint.js --fix src/
-
+#!/bin/bash
+
+node node_modules/eslint/bin/eslint.js --fix src/
+

package/package.json

@@ -1,163 +1,167 @@
-{
-  "name": "@modusoperandi/licit",
-  "version": "0.13.1",
-  "subversion": "1",
-  "description": "Rich text editor built with React and ProseMirror",
-  "main": "dist/index.js",
-  "style": "dist/styles.css",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/MO-Movia/licit.git"
-  },
-  "scripts": {
-    "test": "jest",
-    "build:bom": "cyclonedx-bom -o dist/bom.xml",
-    "build:clean": "rm -rf dist/ && rm -f modusoperandi-licit-*.*.*.tgz",
-    "build:css": "cp src/ui/*.css dist/ui && cp src/ui/mathquill-editor/*.css dist/ui/mathquill-editor && cp src/client/*.css dist/client && cp src/*.css dist",
-    "build:fonts": "mkdirp ./dist/fonts && cp -r fonts/* dist/fonts",
-    "build:babel": "babel src --out-dir dist",
-    "build:flow": "flow-copy-source -v -i '**/__tests__/**' src dist",
-    "build:dist": "npm run build:clean && npm run build:babel && npm run build:flow && npm run build:css && npm run build:fonts && npm run build:bom",
-    "build:licit": "node utils/build_bin.js",
-    "flow": "flow --show-all-errors",
-    "lint:css": "stylelint \"**/*.css\"",
-    "lint:js": "eslint \"src/**/*.js\" \"licit/**/*.js\"",
-    "start": "node scripts/webserver.js",
-    "prepare": "npm run build:dist",
-    "prebuild:style-service-docker": "node utils/build_customstyle_server.js",
-    "build:style-service-docker": "docker build . -f style-service.Dockerfile -t style-service:latest"
-  },
-  "devDependencies": {
-    "@babel/cli": "^7.11.6",
-    "@babel/core": "^7.11.6",
-    "@babel/plugin-proposal-class-properties": "^7.10.4",
-    "@babel/plugin-proposal-decorators": "^7.10.5",
-    "@babel/plugin-proposal-do-expressions": "^7.10.4",
-    "@babel/plugin-proposal-export-default-from": "^7.10.4",
-    "@babel/plugin-proposal-export-namespace-from": "^7.10.4",
-    "@babel/plugin-proposal-function-sent": "^7.10.4",
-    "@babel/plugin-proposal-logical-assignment-operators": "^7.11.0",
-    "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
-    "@babel/plugin-proposal-pipeline-operator": "^7.10.5",
-    "@babel/plugin-proposal-throw-expressions": "^7.10.4",
-    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-syntax-import-meta": "^7.10.4",
-    "@babel/plugin-transform-flow-strip-types": "^7.10.4",
-    "@babel/plugin-transform-parameters": "^7.10.5",
-    "@babel/plugin-transform-runtime": "^7.11.5",
-    "@babel/preset-env": "^7.11.5",
-    "@babel/preset-flow": "^7.10.4",
-    "@babel/preset-react": "^7.10.4",
-    "@cyclonedx/bom": "^2.0.1",
-    "babel-eslint": "10.1.0",
-    "babel-jest": "^26.6.3",
-    "babel-loader": "8.1.0",
-    "babel-plugin-flow-react-proptypes": "26.0.0",
-    "babel-plugin-transform-react-remove-prop-types": "0.4.24",
-    "clean-webpack-plugin": "^4.0.0",
-    "copy-webpack-plugin": "^10.2.4",
-    "css-loader": "3.6.0",
-    "enzyme": "^3.11.0",
-    "enzyme-adapter-react-16": "^1.15.6",
-    "eslint": "7.4.0",
-    "eslint-config-prettier": "^6.12.0",
-    "eslint-plugin-jest": "^24.3.2",
-    "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-react": "7.20.3",
-    "exports-loader": "^1.1.0",
-    "flow-bin": "0.128.0",
-    "flow-copy-source": "2.0.9",
-    "flow-webpack-plugin": "1.2.0",
-    "html-loader": "1.1.0",
-    "husky": "^4.3.0",
-    "identity-obj-proxy": "^3.0.0",
-    "jest": "^26.6.3",
-    "lint-staged": "^10.4.0",
-    "mkdirp": "^1.0.4",
-    "prettier": "^2.1.2",
-    "react-test-renderer": "^17.0.1",
-    "stylelint": "^13.7.2",
-    "stylelint-config-standard": "^20.0.0",
-    "stylelint-prettier": "^1.2.0",
-    "terser-webpack-plugin": "^5.3.1",
-    "webpack": "^5.64.4",
-    "webpack-dev-server": "^3.11.0"
-  },
-  "dependencies": {
-    "@modusoperandi/licit-doc-attrs-step": "^0.1.1",
-    "body-parser": "^1.19.0",
-    "browserkeymap": "2.0.2",
-    "classnames": "2.2.6",
-    "color": "3.1.2",
-    "cors": "^2.8.5",
-    "express": "^4.17.1",
-    "flatted": "^3.1.0",
-    "flow-typed": "^3.3.1",
-    "formidable": "^1.2.2",
-    "html-webpack-plugin": "^5.5.0",
-    "invariant": "2.2.4",
-    "jquery": "^3.5.1",
-    "katex": "0.11.1",
-    "mv": "^2.1.1",
-    "node-mathquill": "0.10.2",
-    "nullthrows": "1.1.1",
-    "prosemirror-collab": "1.2.2",
-    "prosemirror-commands": "1.1.5",
-    "prosemirror-dev-tools": "3.0.2",
-    "prosemirror-dropcursor": "^1.3.5",
-    "prosemirror-gapcursor": "1.1.5",
-    "prosemirror-history": "1.1.3",
-    "prosemirror-inputrules": "1.1.3",
-    "prosemirror-keymap": "^1.1.4",
-    "prosemirror-model": "^1.13.1",
-    "prosemirror-state": "^1.3.4",
-    "prosemirror-tables": "^1.1.1",
-    "prosemirror-transform": "^1.2.9",
-    "prosemirror-utils": "0.9.6",
-    "prosemirror-view": "^1.17.3",
-    "query-string": "6.13.1",
-    "react": "^16.13.1",
-    "react-dom": "^16.13.1",
-    "resize-observer-polyfill": "1.5.1",
-    "smooth-scroll-into-view-if-needed": "1.1.28",
-    "stable": "0.1.8",
-    "style-loader": "^1.2.1",
-    "url": "^0.11.0",
-    "uuid": "8.2.0",
-    "webfontloader": "1.6.28"
-  },
-  "importSort": {
-    ".js": {
-      "parser": "babylon",
-      "style": "module-grouping"
-    }
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "*.css": [
-      "stylelint --fix"
-    ],
-    "!(*test|*.setup).js": [
-      "eslint --fix"
-    ],
-    "*.json": [
-      "prettier --write"
-    ]
-  },
-  "jest": {
-    "rootDir": "src",
-    "transform": {
-      "^.+\\.jsx?$": "babel-jest"
-    },
-    "moduleNameMapper": {
-      "\\.(css|less|scss|sass)$": "identity-obj-proxy"
-    },
-    "setupFiles": [
-      "../jest.setup.js"
-    ]
-  }
-}
+{
+  "name": "@modusoperandi/licit",
+  "version": "0.13.10",
+  "subversion": "1",
+  "description": "Rich text editor built with React and ProseMirror",
+  "main": "dist/index.js",
+  "style": "dist/styles.css",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/MO-Movia/licit.git"
+  },
+  "scripts": {
+    "test": "jest --coverage",
+    "build:bom": "cyclonedx-bom -o dist/bom.xml",
+    "build:clean": "rm -rf dist/ && rm -f modusoperandi-licit-*.*.*.tgz",
+    "build:css": "cp src/ui/*.css dist/ui && cp src/ui/mathquill-editor/*.css dist/ui/mathquill-editor && cp src/client/*.css dist/client && cp src/*.css dist",
+    "build:fonts": "mkdirp ./dist/fonts && cp -r fonts/* dist/fonts",
+    "build:babel": "babel src --out-dir dist",
+    "build:flow": "flow-copy-source -v -i '**/__tests__/**' src dist",
+    "build:dist": "npm run build:clean && npm run build:babel && npm run build:flow && npm run build:css && npm run build:fonts && npm run build:bom",
+    "build:licit": "node utils/build_bin.js",
+    "flow": "flow --show-all-errors",
+    "lint:css": "stylelint \"**/*.css\"",
+    "lint:js": "eslint \"src/**/*.js\" \"licit/**/*.js\"",
+    "start": "node scripts/webserver.js",
+    "prepare": "npm run build:dist",
+    "prebuild:style-service-docker": "node utils/build_customstyle_server.js",
+    "build:style-service-docker": "docker build . -f style-service.Dockerfile -t style-service:latest"
+  },
+  "devDependencies": {
+    "@babel/cli": "^7.11.6",
+    "@babel/core": "^7.11.6",
+    "@babel/plugin-proposal-class-properties": "^7.10.4",
+    "@babel/plugin-proposal-decorators": "^7.10.5",
+    "@babel/plugin-proposal-do-expressions": "^7.10.4",
+    "@babel/plugin-proposal-export-default-from": "^7.10.4",
+    "@babel/plugin-proposal-export-namespace-from": "^7.10.4",
+    "@babel/plugin-proposal-function-sent": "^7.10.4",
+    "@babel/plugin-proposal-logical-assignment-operators": "^7.11.0",
+    "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
+    "@babel/plugin-proposal-pipeline-operator": "^7.10.5",
+    "@babel/plugin-proposal-throw-expressions": "^7.10.4",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+    "@babel/plugin-syntax-import-meta": "^7.10.4",
+    "@babel/plugin-transform-flow-strip-types": "^7.10.4",
+    "@babel/plugin-transform-parameters": "^7.10.5",
+    "@babel/plugin-transform-runtime": "^7.11.5",
+    "@babel/preset-env": "^7.11.5",
+    "@babel/preset-flow": "^7.10.4",
+    "@babel/preset-react": "^7.16.0",
+    "@cyclonedx/bom": "^2.0.1",
+    "babel-eslint": "10.1.0",
+    "babel-jest": "^26.6.3",
+    "babel-loader": "8.1.0",
+    "babel-plugin-flow-react-proptypes": "26.0.0",
+    "babel-plugin-transform-react-remove-prop-types": "0.4.24",
+    "clean-webpack-plugin": "3.0.0",
+    "copy-webpack-plugin": "6.0.3",
+    "css-loader": "3.6.0",
+    "enzyme": "^3.11.0",
+    "eslint": "7.4.0",
+    "eslint-config-prettier": "^6.12.0",
+    "eslint-plugin-jest": "^24.3.2",
+    "eslint-plugin-prettier": "^3.1.4",
+    "eslint-plugin-react": "7.27.0",
+    "exports-loader": "^1.1.0",
+    "file-loader": "^6.1.0",
+    "flow-bin": "0.128.0",
+    "flow-copy-source": "2.0.9",
+    "flow-webpack-plugin": "1.2.0",
+    "html-loader": "1.1.0",
+    "html-webpack-inline-source-plugin": "1.0.0-beta.2",
+    "html-webpack-plugin": "^4.5.0",
+    "husky": "^4.3.0",
+    "identity-obj-proxy": "^3.0.0",
+    "jest": "^26.6.3",
+    "jest-prosemirror": "^1.0.19",
+    "jest-sonar-reporter": "^2.0.0",
+    "lint-staged": "^10.4.0",
+    "mkdirp": "^1.0.4",
+    "prettier": "^2.1.2",
+    "stylelint": "^13.7.2",
+    "stylelint-config-standard": "^20.0.0",
+    "stylelint-prettier": "^1.2.0",
+    "terser-webpack-plugin": "^3.1.0",
+    "webpack": "^4.44.2",
+    "webpack-cli": "^4.9.1",
+    "webpack-dev-server": "^3.11.0",
+    "write-file-webpack-plugin": "4.5.1"
+  },
+  "dependencies": {
+    "@modusoperandi/licit-doc-attrs-step": "^0.1.2",
+    "@modusoperandi/licit-ui-commands": "^0.1.5",
+    "@wojtekmaj/enzyme-adapter-react-17": "^0.6.7",
+    "body-parser": "^1.19.0",
+    "browserkeymap": "2.0.2",
+    "classnames": "2.2.6",
+    "color": "3.1.2",
+    "cors": "^2.8.5",
+    "express": "^4.17.1",
+    "flatted": "^3.1.0",
+    "flow-typed": "^3.3.1",
+    "formidable": "^1.2.2",
+    "invariant": "2.2.4",
+    "jquery": "^3.5.1",
+    "katex": "0.11.1",
+    "mv": "^2.1.1",
+    "node-mathquill": "0.10.2",
+    "nullthrows": "1.1.1",
+    "prosemirror-collab": "1.2.2",
+    "prosemirror-commands": "1.1.5",
+    "prosemirror-dev-tools": "3.0.2",
+    "prosemirror-dropcursor": "^1.3.5",
+    "prosemirror-gapcursor": "^1.2.2",
+    "prosemirror-history": "1.1.3",
+    "prosemirror-inputrules": "1.1.3",
+    "prosemirror-keymap": "^1.1.4",
+    "prosemirror-model": "^1.16.1",
+    "prosemirror-state": "^1.3.4",
+    "prosemirror-tables": "^1.1.1",
+    "prosemirror-transform": "^1.2.9",
+    "prosemirror-utils": "^1.0.0-0",
+    "prosemirror-view": "^1.17.3",
+    "query-string": "6.13.1",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "resize-observer-polyfill": "1.5.1",
+    "smooth-scroll-into-view-if-needed": "1.1.28",
+    "style-loader": "^1.2.1",
+    "uuid": "8.2.0",
+    "webfontloader": "1.6.28"
+  },
+  "importSort": {
+    ".js": {
+      "parser": "babylon",
+      "style": "module-grouping"
+    }
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "*.css": [
+      "stylelint --fix"
+    ],
+    "!(*test|*.setup).js": [
+      "eslint --fix"
+    ],
+    "*.json": [
+      "prettier --write"
+    ]
+  },
+  "jest": {
+    "rootDir": "src",
+    "transform": {
+      "^.+\\.js?$": "babel-jest"
+    },
+    "moduleNameMapper": {
+      "\\.(css|less|scss|sass)$": "identity-obj-proxy"
+    },
+    "setupFiles": [
+      "../jest.setup.js"
+    ]
+  }
+}

package/run_collab_server.py

@@ -1,21 +1,21 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import os
-import platform
-import socket
-
-# [FS] IRAD-892 2020-03-03
-# Correct licit windows build
-# gracefully handling commands WRT OS.
-hostname = socket.gethostname()    
-IPAddr = socket.gethostbyname(hostname)  
-port = '3002'
-
-if platform.system()=="Windows": cmd = 'node servers/collab/run_licit_collab_server.bundle.js ' + ' PORT=' + port + ' IP='+ IPAddr
-else: cmd = 'PORT=' + port + ' IP=' + IPAddr + ' node servers/collab/run_licit_collab_server.bundle.js'
-
-print('=' * 80)
-print(cmd)
-print('=' * 80)
-os.system(cmd)
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import os
+import platform
+import socket
+
+# [FS] IRAD-892 2020-03-03
+# Correct licit windows build
+# gracefully handling commands WRT OS.
+hostname = socket.gethostname()    
+IPAddr = socket.gethostbyname(hostname)  
+port = '3002'
+
+if platform.system()=="Windows": cmd = 'node servers/collab/run_licit_collab_server.bundle.js ' + ' PORT=' + port + ' IP='+ IPAddr
+else: cmd = 'PORT=' + port + ' IP=' + IPAddr + ' node servers/collab/run_licit_collab_server.bundle.js'
+
+print('=' * 80)
+print(cmd)
+print('=' * 80)
+os.system(cmd)

package/run_image_server.py

@@ -1,20 +1,20 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import os
-import platform
-import socket
-
-# [FS] IRAD-991 2020-07-17
-# gracefully handling commands WRT OS.
-hostname = socket.gethostname()    
-IPAddr = socket.gethostbyname(hostname)  
-port = '3004'
-
-if platform.system()=="Windows": cmd = 'node servers/image/run_image_server.bundle.js ' + ' PORT=' + port + ' IP='+ IPAddr
-else: cmd = 'PORT=' + port + ' IP=' + IPAddr + ' node servers/image/run_image_server.bundle.js'
-
-print('=' * 80)
-print(cmd)
-print('=' * 80)
-os.system(cmd)
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import os
+import platform
+import socket
+
+# [FS] IRAD-991 2020-07-17
+# gracefully handling commands WRT OS.
+hostname = socket.gethostname()    
+IPAddr = socket.gethostbyname(hostname)  
+port = '3004'
+
+if platform.system()=="Windows": cmd = 'node servers/image/run_image_server.bundle.js ' + ' PORT=' + port + ' IP='+ IPAddr
+else: cmd = 'PORT=' + port + ' IP=' + IPAddr + ' node servers/image/run_image_server.bundle.js'
+
+print('=' * 80)
+print(cmd)
+print('=' * 80)
+os.system(cmd)

package/run_web_server.py

@@ -1,25 +1,25 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import os
-import platform
-import logging
-import socket    
-from subprocess import check_output
-
-# [FS][03-MAR-2020]
-# IRAD-892 Correct licit windows build
-# gracefully handling commands WRT OS.
-hostname = socket.gethostname()    
-IPAddr = socket.gethostbyname(hostname)  
-port = '3001'
-
-if platform.system()=="Windows": cmd = 'node utils/build_web_server.js ' + ' PORT=' + port + ' IP='+ IPAddr
-else: cmd = 'PORT=' + port + ' IP=' + IPAddr + ' node utils/build_web_server.js'
-
-print('=' * 80)
-print(cmd)
-print('=' * 80)
-print('run web server at http://' + IPAddr + ':' + port)
-print('=' * 80)
-os.system(cmd)
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import os
+import platform
+import logging
+import socket    
+from subprocess import check_output
+
+# [FS][03-MAR-2020]
+# IRAD-892 Correct licit windows build
+# gracefully handling commands WRT OS.
+hostname = socket.gethostname()    
+IPAddr = socket.gethostbyname(hostname)  
+port = '3001'
+
+if platform.system()=="Windows": cmd = 'node utils/build_web_server.js ' + ' PORT=' + port + ' IP='+ IPAddr
+else: cmd = 'PORT=' + port + ' IP=' + IPAddr + ' node utils/build_web_server.js'
+
+print('=' * 80)
+print(cmd)
+print('=' * 80)
+print('run web server at http://' + IPAddr + ':' + port)
+print('=' * 80)
+os.system(cmd)

package/scripts/build_bin.js

@@ -1,10 +1,10 @@
-/*eslint-env node*/
-
-const webpack = require('webpack'),
-  config = require('../webpack.config');
-
-delete config.chromeExtensionBoilerplate;
-
-webpack(config, function(err) {
-  if (err) throw err;
-});
+/*eslint-env node*/
+
+const webpack = require('webpack'),
+  config = require('../webpack.config');
+
+delete config.chromeExtensionBoilerplate;
+
+webpack(config, function(err) {
+  if (err) throw err;
+});