@modusoperandi/licit 0.13.24 → 0.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modusoperandi/licit",
-  "version": "0.13.24",
+  "version": "0.14.0",
   "subversion": "1",
   "description": "Rich text editor built with React and ProseMirror",
   "main": "dist/index.js",
@@ -28,74 +28,75 @@
     "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/cli": "^7.19.3",
+    "@babel/core": "^7.19.3",
+    "@babel/eslint-parser": "^7.19.1",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-proposal-decorators": "^7.19.3",
+    "@babel/plugin-proposal-do-expressions": "^7.18.6",
+    "@babel/plugin-proposal-export-default-from": "^7.18.10",
+    "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
+    "@babel/plugin-proposal-function-sent": "^7.18.6",
+    "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
+    "@babel/plugin-proposal-object-rest-spread": "^7.19.4",
+    "@babel/plugin-proposal-pipeline-operator": "^7.18.9",
+    "@babel/plugin-proposal-throw-expressions": "^7.18.6",
     "@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/plugin-transform-parameters": "^7.18.8",
+    "@babel/plugin-transform-runtime": "^7.19.1",
+    "@babel/preset-env": "^7.19.4",
     "@babel/preset-flow": "^7.10.4",
-    "@babel/preset-react": "^7.16.0",
+    "@babel/preset-react": "^7.18.6",
     "@cyclonedx/bom": "^3.10.6",
-    "babel-eslint": "10.1.0",
-    "babel-jest": "^26.6.3",
-    "babel-loader": "8.1.0",
+    "babel-jest": "^29.2.0",
+    "babel-loader": "8.2.5",
     "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",
+    "clean-webpack-plugin": "4.0.0",
+    "copy-webpack-plugin": "^11.0.0",
     "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",
+    "eslint": "^8.25.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-jest": "^27.1.2",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-react": "7.31.10",
     "exports-loader": "^1.1.0",
-    "file-loader": "^6.1.0",
+    "file-loader": "^6.2.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",
+    "husky": "^8.0.1",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^26.6.3",
-    "jest-prosemirror": "^1.0.19",
+    "jest": "^29.2.0",
+    "jest-environment-jsdom": "^29.3.1",
+    "jest-prosemirror": "^2.0.6",
     "jest-sonar-reporter": "^2.0.0",
-    "lint-staged": "^10.4.0",
+    "lint-staged": "^13.0.3",
     "mkdirp": "^1.0.4",
     "prettier": "^2.1.2",
-    "stylelint": "^13.7.2",
-    "stylelint-config-standard": "^20.0.0",
-    "stylelint-prettier": "^1.2.0",
+    "stylelint": "^14.14.0",
+    "stylelint-config-standard": "^29.0.0",
+    "stylelint-prettier": "^2.0.0",
     "terser-webpack-plugin": "^3.1.0",
     "webpack": "^5.74.0",
-    "webpack-cli": "^4.9.1",
+    "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.11.1",
     "write-file-webpack-plugin": "4.5.1"
   },
   "dependencies": {
     "@modusoperandi/licit-doc-attrs-step": "^0.1.3",
-    "@modusoperandi/licit-ui-commands": "^0.1.9",
+    "@modusoperandi/licit-ui-commands": "^0.1.11",
     "@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",
+    "classnames": "2.3.2",
+    "color": "^4.2.3",
     "cors": "^2.8.5",
     "express": "^4.17.1",
     "flatted": "^3.1.0",
@@ -107,29 +108,16 @@
     "mv": "^2.1.1",
     "node-mathquill": "0.10.2",
     "nullthrows": "1.1.1",
-    "prosemirror-collab": "1.2.2",
-    "prosemirror-commands": "1.1.5",
+    "prosemirror-model": "~1.16.0",
+    "prosemirror-view": "1.27.0",
+    "prosemirror-tables": "1.2.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",
+    "prosemirror-collab": "1.2.2",
     "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",
     "url": "^0.11.0",
-    "uuid": "8.2.0",
-    "webfontloader": "1.6.28"
+    "uuid": "9.0.0"
   },
   "importSort": {
     ".js": {
@@ -152,17 +140,5 @@
     "*.json": [
       "prettier --write"
     ]
-  },
-  "jest": {
-    "rootDir": "src",
-    "transform": {
-      "^.+\\.js?$": "babel-jest"
-    },
-    "moduleNameMapper": {
-      "\\.(css|less|scss|sass)$": "identity-obj-proxy"
-    },
-    "setupFiles": [
-      "../jest.setup.js"
-    ]
   }
 }

package/src/client/Licit.js

@@ -57,6 +57,7 @@ class Licit extends React.Component<any, any> {
   _skipSCU: boolean; // Flag to decide whether to skip shouldComponentUpdate
   _defaultEditorSchema: Schema;
   _defaultEditorPlugins: Array<Plugin>;
+  _pasteJSONPlugin: Plugin;
   _devTools: Promise<any>;
   _applyDevTools: any;
 
@@ -118,6 +119,7 @@ class Licit extends React.Component<any, any> {
     this._defaultEditorPlugins = new DefaultEditorPlugins(
       this._defaultEditorSchema
     ).get();
+    this._pasteJSONPlugin = null;
 
     const editorState = this.initEditorState(plugins, dataType, data);
     data = editorState.doc;
@@ -175,6 +177,7 @@ class Licit extends React.Component<any, any> {
       this._defaultEditorPlugins,
       plugins
     );
+    this._pasteJSONPlugin = effectivePlugins.pasteJSONPlugin;
     if (DataType.JSON === dataType) {
       editorState = convertFromJSON(
         data,
@@ -208,8 +211,9 @@ class Licit extends React.Component<any, any> {
     schema: Schema,
     defaultPlugins: Array<Plugin>,
     plugins: Array<Plugin>
-  ): { plugins: Array<Plugin>, schema: Schema } {
+  ): { plugins: Array<Plugin>, schema: Schema, pasteJSONPlugin: Plugin } {
     const effectivePlugins = defaultPlugins;
+    let pasteJSONPlugin = null;
 
     if (plugins) {
       for (const p of plugins) {
@@ -222,10 +226,14 @@ class Licit extends React.Component<any, any> {
           if (p.initKeyCommands) {
             effectivePlugins.push(p.initKeyCommands());
           }
+
+          if (p.insert) {
+            pasteJSONPlugin = p;
+          }
         }
       }
     }
-    return { plugins: effectivePlugins, schema };
+    return { plugins: effectivePlugins, schema, pasteJSONPlugin };
   }
 
   // [FS] IRAD-1578 2021-09-27
@@ -337,6 +345,12 @@ class Licit extends React.Component<any, any> {
     return document;
   }
 
+  insertJSON = (json: { [key: string]: any }): void => {
+    if (this._pasteJSONPlugin && this._pasteJSONPlugin.insert) {
+      this._pasteJSONPlugin.insert(json, this._editorView);
+    }
+  };
+
   setContent = (content: any = {}, dataType: DataType): void => {
     this.skipDataTypeCheck = false;
     // [FS] IRAD-1571 2021-09-27

package/src/ui/ImageNodeView.js

@@ -69,13 +69,13 @@ function getMaxResizeWidth(el: any): number {
   return MAX_SIZE;
 }
 
-function resolveURL(runtime: ?EditorRuntime, src: ?string): ?string {
+async function resolveURL(runtime: ?EditorRuntime, src: ?string): ?string {
   if (!runtime) {
     return src;
   }
   const { canProxyImageSrc, getProxyImageSrc } = runtime;
   if (src && canProxyImageSrc && getProxyImageSrc && canProxyImageSrc(src)) {
-    return getProxyImageSrc(src);
+    return await getProxyImageSrc(src);
   }
   return src;
 }
@@ -274,7 +274,7 @@ class ImageViewBody extends React.PureComponent<any, any> {
 
     this.setState({ originalSize: DEFAULT_ORIGINAL_SIZE });
     const src = this.props.node.attrs.src;
-    const url = resolveURL(this.props.editorView.runtime, src);
+    const url = await resolveURL(this.props.editorView.runtime, src);
     const originalSize = await resolveImage(url);
     if (!this._mounted) {
       // unmounted;

package/src/ui/czi-icon.css

@@ -1,11 +1,11 @@
 .czi-icon {
   direction: ltr;
   display: inline-block;
-  font-family: 'Material Icons', sans-serif;
+  font-family: 'Material Icons', sans-serif !important;
 
   /* Support for IE. */
   font-feature-settings: 'liga';
-  font-size: 20px; /* Preferred icon size */
+  font-size: 20px !important; /* Preferred icon size */
 
   /* Support for all WebKit browsers. */
   -webkit-font-smoothing: subpixel-antialiased;
@@ -54,8 +54,8 @@
 .czi-icon.superscript,
 .czi-icon.subscript {
   display: inline-block;
-  font-family: 'Arial', sans-serif;
-  font-size: 12px;
+  font-family: 'Arial', sans-serif !important;
+  font-size: 12px !important;
   height: 16px;
   text-align: center;
   width: 20px;

package/utils/build_web_server.js

@@ -2,13 +2,7 @@ const WebpackDevServer = require('webpack-dev-server'),
   webpack = require('webpack'),
   config = require('../webpack.config'),
   env = require('./env'),
-  path = require('path'),
-  formidable = require('formidable'),
-  mv = require('mv'),
-  // [FS] IRAD-1005 2020-07-07
-  // Upgrade outdated packages.
-  uuidv4 = require('uuid').v4,
-  express = require('express');
+  path = require('path');
 
 const options = config.chromeExtensionBoilerplate || {};
 const excludeEntriesToHotReload = options.notHotReload || [];

package/webpack.config.js

@@ -94,9 +94,9 @@ var options = {
       'window.jQuery': 'jquery',
     }),
     // type checker
-    ...(isDev
-      ? [new FlowWebpackPlugin({ flowArgs: ['--show-all-errors'] })]
-      : []),
+    // ...(isDev
+    //   ? [new FlowWebpackPlugin({ flowArgs: ['--show-all-errors'] })]
+    //   : []),
     // clean the web folder
     new CleanWebpackPlugin(),
     // expose and write the allowed env vars on the compiled bundle