From 028d33b51d3cee6b1b1606c8d6f469c04ad72026 Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Wed, 29 Jul 2020 13:18:12 +0300 Subject: [PATCH] enable terser and config fixes --- wax-prosemirror-components/rollup.config.js | 37 +++++++------ wax-prosemirror-core/rollup.config.js | 54 +++++++++---------- wax-prosemirror-layouts/rollup.config.js | 54 +++++++++---------- wax-prosemirror-plugins/rollup.config.js | 30 +++++------ wax-prosemirror-schema/rollup.config.js | 30 +++++------ wax-prosemirror-services/rollup.config.js | 53 +++++++++--------- .../src/ShortCutsService/ShortCuts.js | 50 +++++++++-------- wax-prosemirror-themes/rollup.config.js | 30 +++++------ wax-prosemirror-utilities/rollup.config.js | 30 +++++------ 9 files changed, 187 insertions(+), 181 deletions(-) diff --git a/wax-prosemirror-components/rollup.config.js b/wax-prosemirror-components/rollup.config.js index b555afc44..24921acbc 100644 --- a/wax-prosemirror-components/rollup.config.js +++ b/wax-prosemirror-components/rollup.config.js @@ -1,28 +1,33 @@ -import babel from "rollup-plugin-babel"; -import commonjs from "@rollup/plugin-commonjs"; -import external from "rollup-plugin-peer-deps-external"; -import { terser } from "rollup-plugin-terser"; +import babel from 'rollup-plugin-babel'; +import commonjs from '@rollup/plugin-commonjs'; +import external from 'rollup-plugin-peer-deps-external'; +import { terser } from 'rollup-plugin-terser'; export default { - input: "./index.js", + input: './index.js', output: [ { - file: "dist/index.js", - format: "cjs", - sourcemap: true - } + file: 'dist/index.js', + format: 'cjs', + sourcemap: true, + }, ], plugins: [ external({ - includeDependencies: true + includeDependencies: true, }), babel({ - presets: ["react-app"], - exclude: "node_modules/**", - runtimeHelpers: true + presets: ['react-app'], + exclude: 'node_modules/**', + runtimeHelpers: true, }), - commonjs() - // terser() + commonjs(), + terser(), + ], + external: [ + 'wax-prosemirror-themes', + 'wax-prosemirror-core', + 'inversify', + 'prosemirror-tables', ], - external: ["wax-prosemirror-themes", "wax-prosemirror-core", "inversify"] }; diff --git a/wax-prosemirror-core/rollup.config.js b/wax-prosemirror-core/rollup.config.js index 321941091..f2b2c1be2 100644 --- a/wax-prosemirror-core/rollup.config.js +++ b/wax-prosemirror-core/rollup.config.js @@ -1,42 +1,42 @@ -import babel from "rollup-plugin-babel"; -import commonjs from "@rollup/plugin-commonjs"; -import external from "rollup-plugin-peer-deps-external"; -import { terser } from "rollup-plugin-terser"; +import babel from 'rollup-plugin-babel'; +import commonjs from '@rollup/plugin-commonjs'; +import external from 'rollup-plugin-peer-deps-external'; +import { terser } from 'rollup-plugin-terser'; export default { - input: "./index.js", + input: './index.js', output: [ { - file: "dist/index.js", - format: "cjs", - sourcemap: true - } + file: 'dist/index.js', + format: 'cjs', + sourcemap: true, + }, ], plugins: [ external({ - includeDependencies: true + includeDependencies: true, }), babel({ - presets: ["react-app"], + presets: ['react-app'], plugins: [ - ["@babel/plugin-proposal-decorators", { legacy: true }], - "babel-plugin-parameter-decorator" + ['@babel/plugin-proposal-decorators', { legacy: true }], + 'babel-plugin-parameter-decorator', ], - exclude: "node_modules/**", - runtimeHelpers: true + exclude: 'node_modules/**', + runtimeHelpers: true, }), - commonjs() - // terser() + commonjs(), + terser(), ], external: [ - "@fortawesome/react-fontawesome", - "react-dropdown", - "uuid", - "prop-types", - "prosemirror-tables", - "wax-prosemirror-services", - "wax-prosemirror-schema", - "wax-prosemirror-themes", - "wax-prosemirror-layouts" - ] + '@fortawesome/react-fontawesome', + 'react-dropdown', + 'uuid', + 'prop-types', + 'prosemirror-tables', + 'wax-prosemirror-services', + 'wax-prosemirror-schema', + 'wax-prosemirror-themes', + 'wax-prosemirror-layouts', + ], }; diff --git a/wax-prosemirror-layouts/rollup.config.js b/wax-prosemirror-layouts/rollup.config.js index 37bacf92f..15f2b480f 100644 --- a/wax-prosemirror-layouts/rollup.config.js +++ b/wax-prosemirror-layouts/rollup.config.js @@ -1,40 +1,40 @@ -import babel from "rollup-plugin-babel"; -import commonjs from "@rollup/plugin-commonjs"; -import external from "rollup-plugin-peer-deps-external"; -import { terser } from "rollup-plugin-terser"; +import babel from 'rollup-plugin-babel'; +import commonjs from '@rollup/plugin-commonjs'; +import external from 'rollup-plugin-peer-deps-external'; +import { terser } from 'rollup-plugin-terser'; export default { - input: "./index.js", + input: './index.js', output: [ { - file: "dist/index.js", - format: "cjs", - sourcemap: true - } + file: 'dist/index.js', + format: 'cjs', + sourcemap: true, + }, ], plugins: [ external({ - includeDependencies: true + includeDependencies: true, }), babel({ - presets: ["react-app"], - exclude: "node_modules/**", - runtimeHelpers: true + presets: ['react-app'], + exclude: 'node_modules/**', + runtimeHelpers: true, }), - commonjs() - // terser() + commonjs(), + terser(), ], external: [ - "@fortawesome/react-fontawesome", - "react-dropdown", - "inversify", - "prosemirror-dev-tools", - "lodash", - "react-is", - "uuid", - "wax-prosemirror-schema", - "wax-prosemirror-core", - "wax-prosemirror-themes", - "wax-prosemirror-components" - ] + '@fortawesome/react-fontawesome', + 'react-dropdown', + 'inversify', + 'prosemirror-dev-tools', + 'lodash', + 'react-is', + 'uuid', + 'wax-prosemirror-schema', + 'wax-prosemirror-core', + 'wax-prosemirror-themes', + 'wax-prosemirror-components', + ], }; diff --git a/wax-prosemirror-plugins/rollup.config.js b/wax-prosemirror-plugins/rollup.config.js index 3699e7d3f..1f3d57d4d 100644 --- a/wax-prosemirror-plugins/rollup.config.js +++ b/wax-prosemirror-plugins/rollup.config.js @@ -1,26 +1,26 @@ -import babel from "rollup-plugin-babel"; -import commonjs from "@rollup/plugin-commonjs"; -import external from "rollup-plugin-peer-deps-external"; -import { terser } from "rollup-plugin-terser"; +import babel from 'rollup-plugin-babel'; +import commonjs from '@rollup/plugin-commonjs'; +import external from 'rollup-plugin-peer-deps-external'; +import { terser } from 'rollup-plugin-terser'; export default { - input: "./index.js", + input: './index.js', output: [ { - file: "dist/index.js", - format: "cjs", - sourcemap: true - } + file: 'dist/index.js', + format: 'cjs', + sourcemap: true, + }, ], plugins: [ external({ - includeDependencies: true + includeDependencies: true, }), babel({ - exclude: "node_modules/**", - runtimeHelpers: true + exclude: 'node_modules/**', + runtimeHelpers: true, }), - commonjs() - // terser() - ] + commonjs(), + terser(), + ], }; diff --git a/wax-prosemirror-schema/rollup.config.js b/wax-prosemirror-schema/rollup.config.js index f1eafe91d..43dfe7a10 100644 --- a/wax-prosemirror-schema/rollup.config.js +++ b/wax-prosemirror-schema/rollup.config.js @@ -1,27 +1,27 @@ -import babel from "rollup-plugin-babel"; -import commonjs from "@rollup/plugin-commonjs"; -import external from "rollup-plugin-peer-deps-external"; -import { terser } from "rollup-plugin-terser"; +import babel from 'rollup-plugin-babel'; +import commonjs from '@rollup/plugin-commonjs'; +import external from 'rollup-plugin-peer-deps-external'; +import { terser } from 'rollup-plugin-terser'; export default { - input: "./index.js", + input: './index.js', output: [ { - file: "dist/index.js", - format: "cjs", - sourcemap: true - } + file: 'dist/index.js', + format: 'cjs', + sourcemap: true, + }, ], plugins: [ external({ - includeDependencies: true + includeDependencies: true, }), babel({ - exclude: "node_modules/**", - runtimeHelpers: true + exclude: 'node_modules/**', + runtimeHelpers: true, }), - commonjs() - // terser() + commonjs(), + terser(), ], - external: ["uuid"] + external: ['uuid', 'wax-prosemirror-utilities'], }; diff --git a/wax-prosemirror-services/rollup.config.js b/wax-prosemirror-services/rollup.config.js index b739b8eff..7e63479d1 100644 --- a/wax-prosemirror-services/rollup.config.js +++ b/wax-prosemirror-services/rollup.config.js @@ -1,40 +1,43 @@ -import babel from "rollup-plugin-babel"; -import commonjs from "@rollup/plugin-commonjs"; -import external from "rollup-plugin-peer-deps-external"; -import { terser } from "rollup-plugin-terser"; +import babel from 'rollup-plugin-babel'; +import commonjs from '@rollup/plugin-commonjs'; +import external from 'rollup-plugin-peer-deps-external'; +import { terser } from 'rollup-plugin-terser'; export default { - input: "index.js", + input: 'index.js', output: [ { - file: "dist/index.js", - format: "cjs", - sourcemap: true - } + file: 'dist/index.js', + format: 'cjs', + sourcemap: true, + }, ], plugins: [ external({ - includeDependencies: true + includeDependencies: true, }), babel({ - presets: ["react-app"], + presets: ['react-app'], plugins: [ - ["@babel/plugin-proposal-decorators", { legacy: true }], - "babel-plugin-parameter-decorator" + ['@babel/plugin-proposal-decorators', { legacy: true }], + 'babel-plugin-parameter-decorator', ], - exclude: "node_modules/**", - runtimeHelpers: true + exclude: 'node_modules/**', + runtimeHelpers: true, }), - commonjs() - // terser() + commonjs(), + terser(), ], external: [ - "uuid", - "react", - "react-dom", - "wax-prosemirror-schema", - "lodash", - "prosemirror-tables", - "prosemirror-schema-list" - ] + 'uuid', + 'react', + 'react-dom', + 'wax-prosemirror-schema', + 'lodash', + 'prosemirror-tables', + 'prosemirror-schema-list', + 'wax-prosemirror-plugins', + 'prosemirror-model', + 'prosemirror-inputrules', + ], }; diff --git a/wax-prosemirror-services/src/ShortCutsService/ShortCuts.js b/wax-prosemirror-services/src/ShortCutsService/ShortCuts.js index dc8d0b63d..836ae6d08 100644 --- a/wax-prosemirror-services/src/ShortCutsService/ShortCuts.js +++ b/wax-prosemirror-services/src/ShortCutsService/ShortCuts.js @@ -1,44 +1,42 @@ -import { injectable } from "inversify"; -import { keymap } from "prosemirror-keymap"; -import { undoInputRule } from "prosemirror-inputrules"; -import { undo, redo } from "prosemirror-history"; +import { injectable } from 'inversify'; +import { keymap } from 'prosemirror-keymap'; +import { undo, redo } from 'prosemirror-history'; import { wrapInList, splitListItem, liftListItem, - sinkListItem -} from "prosemirror-schema-list"; + sinkListItem, +} from 'prosemirror-schema-list'; import { baseKeymap, - setBlockType, chainCommands, exitCode, selectParentNode, joinBackward, selectNodeBackward, - deleteSelection -} from "prosemirror-commands"; + deleteSelection, +} from 'prosemirror-commands'; const backSpace = chainCommands( deleteSelection, joinBackward, - selectNodeBackward + selectNodeBackward, ); const backSpaceShortCut = (state, dispatch, view) => backSpace( state, - tr => dispatch(tr.setMeta("inputType", "deleteContentBackward")), - view + tr => dispatch(tr.setMeta('inputType', 'deleteContentBackward')), + view, ); const undoShortCut = (state, dispatch, view) => - undo(state, tr => dispatch(tr.setMeta("inputType", "historyUndo")), view); + undo(state, tr => dispatch(tr.setMeta('inputType', 'historyUndo')), view); const redoShortCut = (state, dispatch, view) => - redo(state, tr => dispatch(tr.setMeta("inputType", "historyRedo")), view); + redo(state, tr => dispatch(tr.setMeta('inputType', 'historyRedo')), view); @injectable() class ShortCuts { @@ -64,7 +62,7 @@ class ShortCuts { createShortCuts() { const shortCuts = keymap(this.createKeyBindings()); - this.PmPlugins.add("shortcuts", shortCuts); + this.PmPlugins.add('shortcuts', shortCuts); } addShortCut(shortcut) { @@ -85,20 +83,20 @@ class ShortCuts { getKeys() { return { - "Mod-z": undoShortCut, - "Shift-Mod-z": redoShortCut, + 'Mod-z': undoShortCut, + 'Shift-Mod-z': redoShortCut, Backspace: backSpaceShortCut, - "Mod-y": redoShortCut, + 'Mod-y': redoShortCut, Escape: selectParentNode, - "Mod-Enter": chainCommands(exitCode, this.insertBreak), - "Shift-Enter": chainCommands(exitCode, this.insertBreak), - "Ctrl-Enter": chainCommands(exitCode, this.insertBreak), - "Mod-_": this.insertRule, - "Mod-[": liftListItem(this.schema.nodes.list_item), - "Mod-]": sinkListItem(this.schema.nodes.list_item), + 'Mod-Enter': chainCommands(exitCode, this.insertBreak), + 'Shift-Enter': chainCommands(exitCode, this.insertBreak), + 'Ctrl-Enter': chainCommands(exitCode, this.insertBreak), + 'Mod-_': this.insertRule, + 'Mod-[': liftListItem(this.schema.nodes.list_item), + 'Mod-]': sinkListItem(this.schema.nodes.list_item), Enter: splitListItem(this.schema.nodes.list_item), - "Shift-Ctrl-8": wrapInList(this.schema.nodes.bulletlist), - "Shift-Ctrl-9": wrapInList(this.schema.nodes.orderedlist) + 'Shift-Ctrl-8': wrapInList(this.schema.nodes.bulletlist), + 'Shift-Ctrl-9': wrapInList(this.schema.nodes.orderedlist), }; } } diff --git a/wax-prosemirror-themes/rollup.config.js b/wax-prosemirror-themes/rollup.config.js index 38c552dbc..3c39189e3 100644 --- a/wax-prosemirror-themes/rollup.config.js +++ b/wax-prosemirror-themes/rollup.config.js @@ -1,27 +1,27 @@ -import babel from "rollup-plugin-babel"; -import commonjs from "@rollup/plugin-commonjs"; -import external from "rollup-plugin-peer-deps-external"; -import { terser } from "rollup-plugin-terser"; +import babel from 'rollup-plugin-babel'; +import commonjs from '@rollup/plugin-commonjs'; +import external from 'rollup-plugin-peer-deps-external'; +import { terser } from 'rollup-plugin-terser'; export default { - input: "./index.js", + input: './index.js', output: [ { - file: "dist/index.js", - format: "cjs", - sourcemap: true - } + file: 'dist/index.js', + format: 'cjs', + sourcemap: true, + }, ], plugins: [ external({ - includeDependencies: true + includeDependencies: true, }), babel({ - exclude: "node_modules/**", - runtimeHelpers: true + exclude: 'node_modules/**', + runtimeHelpers: true, }), - commonjs() - // terser() + commonjs(), + terser(), ], - external: ["styled-components"] + external: ['styled-components'], }; diff --git a/wax-prosemirror-utilities/rollup.config.js b/wax-prosemirror-utilities/rollup.config.js index f1eafe91d..be04b1162 100644 --- a/wax-prosemirror-utilities/rollup.config.js +++ b/wax-prosemirror-utilities/rollup.config.js @@ -1,27 +1,27 @@ -import babel from "rollup-plugin-babel"; -import commonjs from "@rollup/plugin-commonjs"; -import external from "rollup-plugin-peer-deps-external"; -import { terser } from "rollup-plugin-terser"; +import babel from 'rollup-plugin-babel'; +import commonjs from '@rollup/plugin-commonjs'; +import external from 'rollup-plugin-peer-deps-external'; +import { terser } from 'rollup-plugin-terser'; export default { - input: "./index.js", + input: './index.js', output: [ { - file: "dist/index.js", - format: "cjs", - sourcemap: true - } + file: 'dist/index.js', + format: 'cjs', + sourcemap: true, + }, ], plugins: [ external({ - includeDependencies: true + includeDependencies: true, }), babel({ - exclude: "node_modules/**", - runtimeHelpers: true + exclude: 'node_modules/**', + runtimeHelpers: true, }), - commonjs() - // terser() + commonjs(), + terser(), ], - external: ["uuid"] + external: ['uuid'], }; -- GitLab