@modusoperandi/licit 0.13.1 → 0.13.2

package/utils/build_licit_collab_server.js

@@ -1,74 +1,76 @@
-const webpack = require('webpack');
-// [FS] IRAD-1005 2020-07-07
-// Upgrade outdated packages.
-const { CleanWebpackPlugin } = require('clean-webpack-plugin');
-const FlowWebpackPlugin = require('flow-webpack-plugin');
-const env = require('./env');
-const path = require('path');
-
-const config = {
-  mode: 'production',//development
-  entry: {// [FS] IRAD-901 2020-07-15 New collab server reusing base PM collab server
-    run_licit_collab_server: path.join(__dirname, '../licit', 'server/collab', 'start.js'),
-  },
-  target: 'node',
-  output: {
-    path: path.join(__dirname, '../servers/collab'),
-    filename: '[name].bundle.js'
-  },
-  module: {
-    rules: [
-      {
-        test: /\.(js|jsx)$/,
-        exclude: /node_modules/,
-        loader: 'babel-loader',
-        options: {
-          presets: [['@babel/preset-env', { 'targets': { 'esmodules': true } }], '@babel/preset-react', '@babel/preset-flow'],
-          plugins: [
-            '@babel/plugin-proposal-class-properties',
-            '@babel/plugin-proposal-export-default-from',
-            [
-              '@babel/plugin-transform-runtime',
-              {
-                helpers: true,
-                regenerator: true,
-              },
-            ],
-            'flow-react-proptypes',
-            '@babel/plugin-proposal-object-rest-spread',
-            '@babel/plugin-transform-flow-strip-types',
-            '@babel/plugin-syntax-dynamic-import',
-          ],
-        },
-      },
-    ],
-  },
-  plugins: [
-    // type checker
-    ... (env.NODE_ENV === 'development') ? [new FlowWebpackPlugin()] : [],
-    // [FS] 2020-07-13
-    // To take care of formidable.
-    new webpack.DefinePlugin({ 'global.GENTLY': false }),
-    // clean the web folder
-    new CleanWebpackPlugin(),
-    // expose and write the allowed env vars on the compiled bundle
-    new webpack.DefinePlugin({
-      'process.env.NODE_ENV': JSON.stringify(env.NODE_ENV)
-    }),
-  ],
-  // to enable debug
-  //devtool: 'source-map'
-};
-
-webpack(
-  config,
-  function (err) {
-    if (err) {
-      throw err;
-    }
-  }
-);
-
-// [FS] 2020-07-13
-// To take care of formidable.
+const webpack = require('webpack');
+// [FS] IRAD-1005 2020-07-07
+// Upgrade outdated packages.
+const { CleanWebpackPlugin } = require('clean-webpack-plugin');
+const FlowWebpackPlugin = require('flow-webpack-plugin');
+const WriteFilePlugin = require('write-file-webpack-plugin');
+const env = require('./env');
+const path = require('path');
+
+const config = {
+  mode: 'production',//development
+  entry: {// [FS] IRAD-901 2020-07-15 New collab server reusing base PM collab server
+    run_licit_collab_server: path.join(__dirname, '../licit', 'server/collab', 'start.js'),
+  },
+  target: 'node',
+  output: {
+    path: path.join(__dirname, '../servers/collab'),
+    filename: '[name].bundle.js'
+  },
+  module: {
+    rules: [
+      {
+        test: /\.(js|jsx)$/,
+        exclude: /node_modules/,
+        loader: 'babel-loader',
+        options: {
+          presets: [['@babel/preset-env', { 'targets': { 'esmodules': true } }], '@babel/preset-react', '@babel/preset-flow'],
+          plugins: [
+            '@babel/plugin-proposal-class-properties',
+            '@babel/plugin-proposal-export-default-from',
+            [
+              '@babel/plugin-transform-runtime',
+              {
+                helpers: true,
+                regenerator: true,
+              },
+            ],
+            'flow-react-proptypes',
+            '@babel/plugin-proposal-object-rest-spread',
+            '@babel/plugin-transform-flow-strip-types',
+            '@babel/plugin-syntax-dynamic-import',
+          ],
+        },
+      },
+    ],
+  },
+  plugins: [
+    // type checker
+    ... (env.NODE_ENV === 'development') ? [new FlowWebpackPlugin()] : [],
+    // [FS] 2020-07-13
+    // To take care of formidable.
+    new webpack.DefinePlugin({ 'global.GENTLY': false }),
+    // clean the web folder
+    new CleanWebpackPlugin(),
+    // expose and write the allowed env vars on the compiled bundle
+    new webpack.DefinePlugin({
+      'process.env.NODE_ENV': JSON.stringify(env.NODE_ENV)
+    }),
+    new WriteFilePlugin(),
+  ],
+  // to enable debug
+  //devtool: 'source-map'
+};
+
+webpack(
+  config,
+  function (err) {
+    if (err) {
+      throw err;
+    }
+  }
+);
+
+// [FS] 2020-07-13
+// To take care of formidable.
 module.exports = config;

package/utils/build_web_server.js

@@ -1,40 +1,40 @@
-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');
-
-const options = (config.chromeExtensionBoilerplate || {});
-const excludeEntriesToHotReload = (options.notHotReload || []);
-
-for (const entryName in config.entry) {
-  if (excludeEntriesToHotReload.indexOf(entryName) === -1) {
-    config.entry[entryName] =
-      [
-        ('webpack-dev-server/client?http://localhost:' + env.PORT),
-        'webpack/hot/dev-server'
-      ].concat(config.entry[entryName]);
-  }
-}
-
-config.plugins =
-  [new webpack.HotModuleReplacementPlugin()].concat(config.plugins || []);
-
-delete config.chromeExtensionBoilerplate;
-
-const compiler = webpack(config);
-
-const server =
-  new WebpackDevServer(compiler, {
-    hot: true,
-    contentBase: path.join(__dirname, '../bin'),
-    headers: { 'Access-Control-Allow-Origin': '*' },
-  });
-
-server.listen(env.PORT);
+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');
+
+const options = (config.chromeExtensionBoilerplate || {});
+const excludeEntriesToHotReload = (options.notHotReload || []);
+
+for (const entryName in config.entry) {
+  if (excludeEntriesToHotReload.indexOf(entryName) === -1) {
+    config.entry[entryName] =
+      [
+        ('webpack-dev-server/client?http://localhost:' + env.PORT),
+        'webpack/hot/dev-server'
+      ].concat(config.entry[entryName]);
+  }
+}
+
+config.plugins =
+  [new webpack.HotModuleReplacementPlugin()].concat(config.plugins || []);
+
+delete config.chromeExtensionBoilerplate;
+
+const compiler = webpack(config);
+
+const server =
+  new WebpackDevServer(compiler, {
+    hot: true,
+    contentBase: path.join(__dirname, '../bin'),
+    headers: { 'Access-Control-Allow-Origin': '*' },
+  });
+
+server.listen(env.PORT);

package/utils/env.js

@@ -1,6 +1,6 @@
-// tiny wrapper with default env vars
-module.exports = {
-  NODE_ENV: (process.env.NODE_ENV || 'production'),
-  PORT: (process.env.PORT || '3001'),
-  IP: (process.env.IP || '127.0.0.1')
-};
+// tiny wrapper with default env vars
+module.exports = {
+  NODE_ENV: (process.env.NODE_ENV || 'production'),
+  PORT: (process.env.PORT || '3001'),
+  IP: (process.env.IP || '127.0.0.1')
+};

package/webpack.config.js

@@ -1,120 +1,126 @@
-/*eslint-disable */
-
-var webpack = require('webpack'),
-  CopyWebpackPlugin = require('copy-webpack-plugin'),
-  FlowWebpackPlugin = require('flow-webpack-plugin'),
-  HtmlWebpackPlugin = require('html-webpack-plugin'),
-  TerserPlugin = require('terser-webpack-plugin'),
- 
-
-  env = require('./utils/env'),
-  fileSystem = require('fs'),
-  path = require('path');
-
-// [FS] IRAD-1005 2020-07-07
-// Upgrade outdated packages.
-const { CleanWebpackPlugin } = require('clean-webpack-plugin');
-
-var isDev = env.NODE_ENV === 'development' || 0;
-// isDev = false;
-
-var options = {
-  mode: 'production',
-  entry: {
-    licit: path.join(__dirname, 'licit', 'client', 'index.js'),
-  },
-  output: {
-    path: path.join(__dirname, 'bin'),
-    filename: '[name].bundle.js'
-  },
-  module: {
-    rules: [
-      {
-        test: /\.(js|jsx)$/,
-        exclude: /node_modules/,
-        loader: 'babel-loader',
-        options: {
-        // https://stackoverflow.com/questions/51860043/javascript-es6-typeerror-class-constructor-client-cannot-be-invoked-without-ne
-        // ES6 classes are supported in any recent Node version, they shouldn't be transpiled. es2015 should be excluded from Babel configuration, it's preferable to use env preset set to node target.
-          presets: [['@babel/preset-env', { 'targets': { 'node': true } }], '@babel/preset-react', '@babel/preset-flow'],
-          plugins: [
-            '@babel/plugin-proposal-class-properties',
-            '@babel/plugin-proposal-export-default-from',
-            [
-              '@babel/plugin-transform-runtime',
-              {
-                helpers: true,
-                regenerator: true,
-              },
-            ],
-            'flow-react-proptypes',
-            '@babel/plugin-proposal-object-rest-spread',
-            '@babel/plugin-transform-flow-strip-types',
-            '@babel/plugin-syntax-dynamic-import',
-          ],
-        },
-      },
-      {
-        test: /\.(woff(2)?|ttf|otf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/,
-        type: 'asset/resource',
-       
-      },
-      {
-        test: /\.css$/,
-        use: [
-          'style-loader',
-          'css-loader',
-        ],
-      },
-      {
-        test: /\.(jpe?g|png|gif|svg)$/i,
-        type: 'asset/resource',
-
-      },
-      {
-        test: /\.html$/,
-        loader: 'html-loader',
-        exclude: /node_modules/
-      },
-    ]
-  },
-  resolve: {
-    alias: {},
-    fallback: {
-      url: require.resolve("url/")
-    }
-  },
-  plugins: [
-    new webpack.ProvidePlugin({
-      // jQuery (for Mathquill)
-      'window.jQuery': 'jquery',
-    }),
-    // type checker 
-    ... (env.NODE_ENV === 'development') ? [new FlowWebpackPlugin({flowArgs: ['--show-all-errors']})] : [],
-    // clean the web folder
-    new CleanWebpackPlugin(),
-    // expose and write the allowed env vars on the compiled bundle
-    new webpack.DefinePlugin({
-      'process.env.NODE_ENV': JSON.stringify(env.NODE_ENV)
-    }),
-    new HtmlWebpackPlugin({
-      template: path.join(__dirname, 'licit', 'index.html'),
-      filename: 'index.html',
-      chunks: ['licit'],
-      inlineSource: isDev ? '$^' : '.(js|css)$'
-    }),
-  ]
-};
-
-if (env.NODE_ENV === 'development') {
-  options.devtool = 'source-map';
-} else {
-// [FS] IRAD-1005 2020-07-10
-// Upgrade outdated packages.  
-  options.optimization =  {
-    minimize: true,
-    minimizer: [new TerserPlugin()],
-  }
-}
-
-module.exports = options;
+/*eslint-disable */
+
+var webpack = require('webpack'),
+  CopyWebpackPlugin = require('copy-webpack-plugin'),
+  FlowWebpackPlugin = require('flow-webpack-plugin'),
+  HtmlWebpackInlineSourcePlugin = require('html-webpack-inline-source-plugin'),
+  HtmlWebpackPlugin = require('html-webpack-plugin'),
+  TerserPlugin = require('terser-webpack-plugin'),
+  
+  WriteFilePlugin = require('write-file-webpack-plugin'),
+  env = require('./utils/env'),
+  fileSystem = require('fs'),
+  path = require('path');
+
+// [FS] IRAD-1005 2020-07-07
+// Upgrade outdated packages.
+const { CleanWebpackPlugin } = require('clean-webpack-plugin');
+
+var isDev = env.NODE_ENV === 'development' || 0;
+// isDev = false;
+
+var options = {
+  mode: 'production',
+  entry: {
+    licit: path.join(__dirname, 'licit', 'client', 'index.js'),
+  },
+  output: {
+    path: path.join(__dirname, 'bin'),
+    filename: '[name].bundle.js'
+  },
+  module: {
+    rules: [
+      {
+        test: /\.(js|jsx)$/,
+        exclude: /node_modules/,
+        loader: 'babel-loader',
+        options: {
+        // https://stackoverflow.com/questions/51860043/javascript-es6-typeerror-class-constructor-client-cannot-be-invoked-without-ne
+        // ES6 classes are supported in any recent Node version, they shouldn't be transpiled. es2015 should be excluded from Babel configuration, it's preferable to use env preset set to node target.
+          presets: [['@babel/preset-env', { 'targets': { 'node': true } }], '@babel/preset-react', '@babel/preset-flow'],
+          plugins: [
+            '@babel/plugin-proposal-class-properties',
+            '@babel/plugin-proposal-export-default-from',
+            [
+              '@babel/plugin-transform-runtime',
+              {
+                helpers: true,
+                regenerator: true,
+              },
+            ],
+            'flow-react-proptypes',
+            '@babel/plugin-proposal-object-rest-spread',
+            '@babel/plugin-transform-flow-strip-types',
+            '@babel/plugin-syntax-dynamic-import',
+          ],
+        },
+      },
+      {
+        test: /\.(woff(2)?|ttf|otf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/,
+        use: [
+          {
+            loader: 'file-loader',
+            options: {
+              name: '[name].[ext]',
+              outputPath: 'fonts/'
+            }
+          }
+        ]
+      },
+      {
+        test: /\.css$/,
+        use: [
+          'style-loader',
+          'css-loader',
+        ],
+      },
+      {
+        test: /\.(jpe?g|png|gif|svg)$/i, 
+        loader: 'file-loader'
+      },
+      {
+        test: /\.html$/,
+        loader: 'html-loader',
+        exclude: /node_modules/
+      },
+    ]
+  },
+  resolve: {
+    alias: {}
+  },
+  plugins: [
+    new webpack.ProvidePlugin({
+      // jQuery (for Mathquill)
+      'window.jQuery': 'jquery',
+    }),
+    // type checker 
+    ... (env.NODE_ENV === 'development') ? [new FlowWebpackPlugin({flowArgs: ['--show-all-errors']})] : [],
+    // clean the web folder
+    new CleanWebpackPlugin(),
+    // expose and write the allowed env vars on the compiled bundle
+    new webpack.DefinePlugin({
+      'process.env.NODE_ENV': JSON.stringify(env.NODE_ENV)
+    }),
+    new HtmlWebpackPlugin({
+      template: path.join(__dirname, 'licit', 'index.html'),
+      filename: 'index.html',
+      chunks: ['licit'],
+      inlineSource: isDev ? '$^' : '.(js|css)$'
+    }),
+    new HtmlWebpackInlineSourcePlugin(HtmlWebpackPlugin),
+    new WriteFilePlugin()
+  ]
+};
+
+if (env.NODE_ENV === 'development') {
+  options.devtool = 'source-map';
+} else {
+// [FS] IRAD-1005 2020-07-10
+// Upgrade outdated packages.  
+  options.optimization =  {
+    minimize: true,
+    minimizer: [new TerserPlugin()],
+  }
+}
+
+module.exports = options;

package/build_customstyle_server.py

@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import os 
-
-os.system('node utils/build_customstyle_server.js')
-print("Completed") 

package/dist/FontSizeCommand.js

@@ -1,80 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _licitDocAttrsStep = require("@modusoperandi/licit-doc-attrs-step");
-
-var _applyMark = _interopRequireDefault(require("./applyMark"));
-
-var _isTextStyleMarkCommandEnabled = _interopRequireDefault(require("./isTextStyleMarkCommandEnabled"));
-
-var _prosemirrorState = require("prosemirror-state");
-
-var _prosemirrorView = require("prosemirror-view");
-
-var _MarkNames = require("./MarkNames");
-
-var _prosemirrorModel = require("prosemirror-model");
-
-var _prosemirrorTransform = require("prosemirror-transform");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-function setFontSize(tr, schema, pt) {
-  const markType = schema.marks[_MarkNames.MARK_FONT_SIZE];
-
-  if (!markType) {
-    return tr;
-  }
-
-  const attrs = pt ? {
-    pt
-  } : null;
-  tr = (0, _applyMark.default)(tr, schema, markType, attrs);
-  return tr;
-}
-
-class FontSizeCommand extends _licitDocAttrsStep.UICommand {
-  constructor(pt) {
-    super();
-
-    _defineProperty(this, "_popUp", null);
-
-    _defineProperty(this, "_pt", 0);
-
-    _defineProperty(this, "isEnabled", state => {
-      return (0, _isTextStyleMarkCommandEnabled.default)(state, _MarkNames.MARK_FONT_SIZE);
-    });
-
-    _defineProperty(this, "execute", (state, dispatch, view) => {
-      const {
-        schema
-      } = state; // commnted selection because selection removes the storedMarks;
-      // {selection}
-      // const tr = setFontSize(state.tr.setSelection(selection), schema, this._pt);
-
-      const tr = setFontSize(state.tr, schema, this._pt);
-
-      if (tr.docChanged || tr.storedMarksSet) {
-        // If selection is empty, the color is added to `storedMarks`, which
-        // works like `toggleMark`
-        // (see https://prosemirror.net/docs/ref/#commands.toggleMark).
-        dispatch && dispatch(tr);
-        return true;
-      }
-
-      return false;
-    });
-
-    this._pt = pt;
-  }
-
-}
-
-var _default = FontSizeCommand;
-exports.default = _default;

package/dist/FontSizeCommand.js.flow

@@ -1,57 +0,0 @@
-// @flow
-
-import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
-import applyMark from './applyMark';
-import isTextStyleMarkCommandEnabled from './isTextStyleMarkCommandEnabled';
-import { EditorState } from 'prosemirror-state';
-import { EditorView } from 'prosemirror-view';
-import { MARK_FONT_SIZE } from './MarkNames';
-import { Schema } from 'prosemirror-model';
-import { Transform } from 'prosemirror-transform';
-
-function setFontSize(tr: Transform, schema: Schema, pt: number): Transform {
-  const markType = schema.marks[MARK_FONT_SIZE];
-  if (!markType) {
-    return tr;
-  }
-  const attrs = pt ? { pt } : null;
-  tr = applyMark(tr, schema, markType, attrs);
-  return tr;
-}
-
-class FontSizeCommand extends UICommand {
-  _popUp = null;
-  _pt = 0;
-
-  constructor(pt: number) {
-    super();
-    this._pt = pt;
-  }
-
-  isEnabled = (state: EditorState): boolean => {
-    return isTextStyleMarkCommandEnabled(state, MARK_FONT_SIZE);
-  };
-
-  execute = (
-    state: EditorState,
-    dispatch: ?(tr: Transform) => void,
-    view: ?EditorView
-  ): boolean => {
-    const { schema } = state;
-    // commnted selection because selection removes the storedMarks;
-    // {selection}
-    // const tr = setFontSize(state.tr.setSelection(selection), schema, this._pt);
-    const tr = setFontSize(state.tr, schema, this._pt);
-    if (tr.docChanged || tr.storedMarksSet) {
-      // If selection is empty, the color is added to `storedMarks`, which
-      // works like `toggleMark`
-      // (see https://prosemirror.net/docs/ref/#commands.toggleMark).
-      dispatch && dispatch(tr);
-      return true;
-    }
-    return false;
-  };
-
-}
-
-export default FontSizeCommand;