diff --git a/editors/editoria/package.json b/editors/editoria/package.json
index d676d01c3f046c8f6323485657a6ba5e680ee9af..2ab7378dbf047c638901986139f0c2622672a7ae 100644
--- a/editors/editoria/package.json
+++ b/editors/editoria/package.json
@@ -18,19 +18,13 @@
},
"scripts": {
"start": "react-app-rewired start",
- "build": "react-app-rewired build",
"test": "react-app-rewired test --env=jsdom",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": "react-app"
},
- "browserslist": [
- ">0.2%",
- "not dead",
- "not ie <= 11",
- "not op_mini all"
- ],
+ "browserslist": [">0.2%", "not dead", "not ie <= 11", "not op_mini all"],
"devDependencies": {
"babel-eslint": "10.0.3",
"babel-loader": "8.0.6",
diff --git a/package.json b/package.json
index 14bf72f6f47b1b18561b4ac6f320b290cd2915c9..0c73f8f3bfe65fe4c0a6a1a25026fb1e5b0ba8f9 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,15 @@
"react-app-rewired": "^2.1.2",
"style-loader": "^0.23.1",
"stylelint": "^8.2.0",
- "svg-inline-loader": "^0.8.0"
+ "svg-inline-loader": "^0.8.0",
+ "rollup": "^2.2.0",
+ "rollup-plugin-babel": "^4.4.0",
+ "rollup-plugin-peer-deps-external": "^2.2.2",
+ "rollup-plugin-postcss": "^2.5.0",
+ "rollup-plugin-terser": "^5.3.0",
+ "@rollup/plugin-commonjs": "^11.0.2",
+ "@rollup/plugin-node-resolve": "^7.1.1",
+ "@rollup/plugin-url": "^4.0.2"
},
"resolutions": {
"styled-components": "4.2.0",
diff --git a/wax-prosemirror-components/package.json b/wax-prosemirror-components/package.json
index 2391d7e4f944aabc8a9058f1c87c89dedf6d17d1..6c4acea9785aea6a1619224a40e8a561f20fa226 100644
--- a/wax-prosemirror-components/package.json
+++ b/wax-prosemirror-components/package.json
@@ -6,7 +6,8 @@
"license": "MIT",
"main": "index.js",
"scripts": {
- "test": "echo \"Error: no test specified\" && exit 1"
+ "test": "echo \"Error: no test specified\" && exit 1",
+ "build": "BABEL_ENV=production rollup -c"
},
"dependencies": {
"@fortawesome/fontawesome": "^1.1.2",
@@ -18,6 +19,6 @@
"react-dropdown": "^1.6.2",
"react-transition-group": "^4.3.0",
"styled-components": "^4.2.0",
- "uuid": "^3.3.2"
+ "uuid": "^7.0.3"
}
}
diff --git a/wax-prosemirror-components/rollup.config.js b/wax-prosemirror-components/rollup.config.js
new file mode 100644
index 0000000000000000000000000000000000000000..642c08508ab2e030c466219a202ce2848fed8e00
--- /dev/null
+++ b/wax-prosemirror-components/rollup.config.js
@@ -0,0 +1,45 @@
+import babel from "rollup-plugin-babel";
+import commonjs from "@rollup/plugin-commonjs";
+import external from "rollup-plugin-peer-deps-external";
+import postcss from "rollup-plugin-postcss";
+import resolve from "@rollup/plugin-node-resolve";
+import url from "@rollup/plugin-url";
+import { terser } from "rollup-plugin-terser";
+
+export default {
+ input: "./index.js",
+ output: [
+ {
+ file: "dist/index.js",
+ format: "cjs",
+ sourcemap: true
+ }
+ ],
+ plugins: [
+ postcss({
+ plugins: [],
+ minimize: true,
+ sourceMap: "inline"
+ }),
+ external({
+ includeDependencies: true
+ }),
+ url(),
+ resolve(),
+ babel({
+ presets: [
+ [require("@babel/preset-env"), { modules: false }],
+ require("@babel/preset-react")
+ ],
+ plugins: [
+ ["@babel/plugin-proposal-decorators", { legacy: true }],
+ "babel-plugin-parameter-decorator",
+ ["@babel/plugin-proposal-class-properties", { loose: true }]
+ ],
+ exclude: "node_modules/**",
+ runtimeHelpers: true
+ }),
+ commonjs(),
+ terser()
+ ]
+};
diff --git a/wax-prosemirror-components/src/components/comments/CommentComponent.js b/wax-prosemirror-components/src/components/comments/CommentComponent.js
index 7a588618b8fce2530c5f2dc7179a9c62884cbec3..b7f50e5fa683b7ea73d7215aa6bbe999b0fe6c90 100644
--- a/wax-prosemirror-components/src/components/comments/CommentComponent.js
+++ b/wax-prosemirror-components/src/components/comments/CommentComponent.js
@@ -7,7 +7,6 @@ import React, {
useCallback
} from "react";
import styled from "styled-components";
-import { groupBy } from "lodash";
import { WaxContext } from "wax-prosemirror-core/src/ioc-react";
import { DocumentHelpers } from "wax-prosemirror-utilities";
import CommentsBoxList from "./CommentsBoxList";
diff --git a/wax-prosemirror-core/package.json b/wax-prosemirror-core/package.json
index 52fcc83e2362cd68742f8d71a429dac7f9799826..9e0d1436481353af5390bf7d5b526701bcbbc764 100644
--- a/wax-prosemirror-core/package.json
+++ b/wax-prosemirror-core/package.json
@@ -6,7 +6,8 @@
"license": "MIT",
"main": "index.js",
"scripts": {
- "test": "echo \"Error: no test specified\" && exit 1"
+ "test": "echo \"Error: no test specified\" && exit 1",
+ "build": "BABEL_ENV=production rollup -c"
},
"dependencies": {
"deepmerge": "^4.2.2",
diff --git a/wax-prosemirror-core/rollup.config.js b/wax-prosemirror-core/rollup.config.js
new file mode 100644
index 0000000000000000000000000000000000000000..5180ef8a1166388eaccb3a8681f2207a195ccdd1
--- /dev/null
+++ b/wax-prosemirror-core/rollup.config.js
@@ -0,0 +1,51 @@
+import babel from "rollup-plugin-babel";
+import commonjs from "@rollup/plugin-commonjs";
+import external from "rollup-plugin-peer-deps-external";
+import postcss from "rollup-plugin-postcss";
+import resolve from "@rollup/plugin-node-resolve";
+import { terser } from "rollup-plugin-terser";
+
+export default {
+ input: "./index.js",
+ output: [
+ {
+ file: "dist/index.js",
+ format: "cjs",
+ sourcemap: true
+ }
+ ],
+ plugins: [
+ postcss({
+ plugins: [],
+ minimize: true,
+ sourceMap: "inline"
+ }),
+ external({
+ includeDependencies: true
+ }),
+ resolve(),
+ babel({
+ presets: [
+ [require("@babel/preset-env"), { modules: false }],
+ require("@babel/preset-react")
+ ],
+ plugins: [
+ ["@babel/plugin-proposal-decorators", { legacy: true }],
+ "babel-plugin-parameter-decorator",
+ ["@babel/plugin-proposal-class-properties", { loose: true }]
+ ],
+ exclude: "node_modules/**",
+ runtimeHelpers: true
+ }),
+ commonjs(),
+ terser()
+ ],
+ external: [
+ "@fortawesome/react-fontawesome",
+ "react-dropdown",
+ "uuid",
+ "prop-types",
+ "prosemirror-tables",
+ "wax-prosemirror-schema"
+ ]
+};
diff --git a/wax-prosemirror-core/src/Application.js b/wax-prosemirror-core/src/Application.js
index 5113c263bfe0d6282bf184b1bc0f2f8cfca22721..fbe681b5c98b31c0f0d5dee7d39fd2901d41d387 100644
--- a/wax-prosemirror-core/src/Application.js
+++ b/wax-prosemirror-core/src/Application.js
@@ -1,6 +1,6 @@
import { Container } from "inversify";
import "reflect-metadata";
-import deepmerge from "deepmerge";
+//import deepmerge from "deepmerge";
import Config from "./config/Config";
import defaultConfig from "./config/defaultConfig";
import PmPlugins from "./PmPlugins";
diff --git a/wax-prosemirror-layouts/package.json b/wax-prosemirror-layouts/package.json
index 9142698cd8919c031b1308b711efc30cf89d744b..3c7a6cf8ecb1781beb96f9d4fedb25ae5213e135 100644
--- a/wax-prosemirror-layouts/package.json
+++ b/wax-prosemirror-layouts/package.json
@@ -6,10 +6,13 @@
"license": "MIT",
"main": "index.js",
"scripts": {
- "test": "echo \"Error: no test specified\" && exit 1"
+ "test": "echo \"Error: no test specified\" && exit 1",
+ "build": "BABEL_ENV=production rollup -c"
},
"dependencies": {
- "@pubsweet/ui-toolkit": "^2.2.13",
- "react-panelgroup": "^1.0.10"
+ "react-panelgroup": "^1.0.10",
+ "react": "^16.8.6",
+ "react-dom": "^16.8.6",
+ "styled-components": "^4.2.0"
}
}
diff --git a/wax-prosemirror-layouts/rollup.config.js b/wax-prosemirror-layouts/rollup.config.js
new file mode 100644
index 0000000000000000000000000000000000000000..ae5c52fc0853d8da47362581a9f50df3f4795d8f
--- /dev/null
+++ b/wax-prosemirror-layouts/rollup.config.js
@@ -0,0 +1,55 @@
+import babel from "rollup-plugin-babel";
+import commonjs from "@rollup/plugin-commonjs";
+import external from "rollup-plugin-peer-deps-external";
+import postcss from "rollup-plugin-postcss";
+import resolve from "@rollup/plugin-node-resolve";
+import url from "@rollup/plugin-url";
+import { terser } from "rollup-plugin-terser";
+
+export default {
+ input: "./index.js",
+ output: [
+ {
+ file: "dist/index.js",
+ format: "cjs",
+ sourcemap: true
+ }
+ ],
+ plugins: [
+ postcss({
+ plugins: [],
+ minimize: true,
+ sourceMap: "inline"
+ }),
+ external({
+ includeDependencies: true
+ }),
+ url(),
+ resolve(),
+ babel({
+ presets: [
+ [require("@babel/preset-env"), { modules: false }],
+ require("@babel/preset-react")
+ ],
+ plugins: [
+ ["@babel/plugin-proposal-decorators", { legacy: true }],
+ "babel-plugin-parameter-decorator",
+ ["@babel/plugin-proposal-class-properties", { loose: true }]
+ ],
+ exclude: "node_modules/**",
+ runtimeHelpers: true
+ }),
+ commonjs(),
+ terser()
+ ],
+ external: [
+ "@fortawesome/react-fontawesome",
+ "react-dropdown",
+ "inversify",
+ "prosemirror-dev-tools",
+ "lodash",
+ "react-is",
+ "uuid",
+ "wax-prosemirror-schema"
+ ]
+};
diff --git a/wax-prosemirror-plugins/package.json b/wax-prosemirror-plugins/package.json
index d402aedcadea0dca77816637baf788ebcd907c1f..0163f800dcbdbff477a43f96839ae047486a4881 100644
--- a/wax-prosemirror-plugins/package.json
+++ b/wax-prosemirror-plugins/package.json
@@ -6,7 +6,8 @@
"license": "MIT",
"main": "index.js",
"scripts": {
- "test": "echo \"Error: no test specified\" && exit 1"
+ "test": "echo \"Error: no test specified\" && exit 1",
+ "build": "BABEL_ENV=production rollup -c"
},
"dependencies": {
"wax-prosemirror-components": "^0.0.6",
diff --git a/wax-prosemirror-plugins/rollup.config.js b/wax-prosemirror-plugins/rollup.config.js
new file mode 100644
index 0000000000000000000000000000000000000000..642c08508ab2e030c466219a202ce2848fed8e00
--- /dev/null
+++ b/wax-prosemirror-plugins/rollup.config.js
@@ -0,0 +1,45 @@
+import babel from "rollup-plugin-babel";
+import commonjs from "@rollup/plugin-commonjs";
+import external from "rollup-plugin-peer-deps-external";
+import postcss from "rollup-plugin-postcss";
+import resolve from "@rollup/plugin-node-resolve";
+import url from "@rollup/plugin-url";
+import { terser } from "rollup-plugin-terser";
+
+export default {
+ input: "./index.js",
+ output: [
+ {
+ file: "dist/index.js",
+ format: "cjs",
+ sourcemap: true
+ }
+ ],
+ plugins: [
+ postcss({
+ plugins: [],
+ minimize: true,
+ sourceMap: "inline"
+ }),
+ external({
+ includeDependencies: true
+ }),
+ url(),
+ resolve(),
+ babel({
+ presets: [
+ [require("@babel/preset-env"), { modules: false }],
+ require("@babel/preset-react")
+ ],
+ plugins: [
+ ["@babel/plugin-proposal-decorators", { legacy: true }],
+ "babel-plugin-parameter-decorator",
+ ["@babel/plugin-proposal-class-properties", { loose: true }]
+ ],
+ exclude: "node_modules/**",
+ runtimeHelpers: true
+ }),
+ commonjs(),
+ terser()
+ ]
+};
diff --git a/wax-prosemirror-schema/package.json b/wax-prosemirror-schema/package.json
index 2218b79c927c8a428fa3b26604d6e16e2026546f..12e48e608abadc10d42034946bc667bf325fdee6 100644
--- a/wax-prosemirror-schema/package.json
+++ b/wax-prosemirror-schema/package.json
@@ -6,7 +6,8 @@
"license": "MIT",
"main": "index.js",
"scripts": {
- "test": "echo \"Error: no test specified\" && exit 1"
+ "test": "echo \"Error: no test specified\" && exit 1",
+ "build": "BABEL_ENV=production rollup -c"
},
"dependencies": {
"prosemirror-schema-list": "^1.1.2",
diff --git a/wax-prosemirror-schema/rollup.config.js b/wax-prosemirror-schema/rollup.config.js
new file mode 100644
index 0000000000000000000000000000000000000000..09fcf43a85a1298aee3566459cdc61b13b57a134
--- /dev/null
+++ b/wax-prosemirror-schema/rollup.config.js
@@ -0,0 +1,46 @@
+import babel from "rollup-plugin-babel";
+import commonjs from "@rollup/plugin-commonjs";
+import external from "rollup-plugin-peer-deps-external";
+import postcss from "rollup-plugin-postcss";
+import resolve from "@rollup/plugin-node-resolve";
+import url from "@rollup/plugin-url";
+import { terser } from "rollup-plugin-terser";
+
+export default {
+ input: "./index.js",
+ output: [
+ {
+ file: "dist/index.js",
+ format: "cjs",
+ sourcemap: true
+ }
+ ],
+ plugins: [
+ postcss({
+ plugins: [],
+ minimize: true,
+ sourceMap: "inline"
+ }),
+ external({
+ includeDependencies: true
+ }),
+ url(),
+ resolve(),
+ babel({
+ presets: [
+ [require("@babel/preset-env"), { modules: false }],
+ require("@babel/preset-react")
+ ],
+ plugins: [
+ ["@babel/plugin-proposal-decorators", { legacy: true }],
+ "babel-plugin-parameter-decorator",
+ ["@babel/plugin-proposal-class-properties", { loose: true }]
+ ],
+ exclude: "node_modules/**",
+ runtimeHelpers: true
+ }),
+ commonjs(),
+ terser()
+ ],
+ external: ["uuid"]
+};
diff --git a/wax-prosemirror-services/package.json b/wax-prosemirror-services/package.json
index 0b91ffce020765a657ca1c763a71fa3272bc11a3..58f298f743baa777387737e3a590443049250d23 100644
--- a/wax-prosemirror-services/package.json
+++ b/wax-prosemirror-services/package.json
@@ -6,7 +6,8 @@
"license": "MIT",
"main": "index.js",
"scripts": {
- "test": "echo \"Error: no test specified\" && exit 1"
+ "test": "echo \"Error: no test specified\" && exit 1",
+ "build": "BABEL_ENV=production rollup -c"
},
"dependencies": {
"inversify": "^5.0.1",
diff --git a/wax-prosemirror-services/rollup.config.js b/wax-prosemirror-services/rollup.config.js
new file mode 100644
index 0000000000000000000000000000000000000000..8551d0e30f6a985426cad70a3756bca519f705fd
--- /dev/null
+++ b/wax-prosemirror-services/rollup.config.js
@@ -0,0 +1,44 @@
+import babel from "rollup-plugin-babel";
+import commonjs from "@rollup/plugin-commonjs";
+import external from "rollup-plugin-peer-deps-external";
+import postcss from "rollup-plugin-postcss";
+import resolve from "@rollup/plugin-node-resolve";
+import { terser } from "rollup-plugin-terser";
+
+export default {
+ input: "./index.js",
+ output: [
+ {
+ file: "dist/index.js",
+ format: "cjs",
+ sourcemap: true
+ }
+ ],
+ plugins: [
+ postcss({
+ plugins: [],
+ minimize: true,
+ sourceMap: "inline"
+ }),
+ external({
+ includeDependencies: true
+ }),
+ resolve(),
+ babel({
+ presets: [
+ [require("@babel/preset-env"), { modules: false }],
+ require("@babel/preset-react")
+ ],
+ plugins: [
+ ["@babel/plugin-proposal-decorators", { legacy: true }],
+ "babel-plugin-parameter-decorator",
+ ["@babel/plugin-proposal-class-properties", { loose: true }]
+ ],
+ exclude: "node_modules/**",
+ runtimeHelpers: true
+ }),
+ commonjs(),
+ terser()
+ ],
+ external: ["uuid", "react", "react-dom", "wax-prosemirror-schema", "lodash"]
+};
diff --git a/wax-prosemirror-services/src/CommentsService/CommentsService.js b/wax-prosemirror-services/src/CommentsService/CommentsService.js
index 047ca42b181af6f3f2e1db8422ad9bb638b33727..e9256725ace8fd070727fda5ae72a2fc26cff245 100644
--- a/wax-prosemirror-services/src/CommentsService/CommentsService.js
+++ b/wax-prosemirror-services/src/CommentsService/CommentsService.js
@@ -4,7 +4,6 @@ import {
CommentComponent,
CommentBubbleComponent
} from "wax-prosemirror-components";
-import { OverlayService } from "../..";
export default class CommentsService extends Service {
name = "CommentsService";
diff --git a/wax-prosemirror-services/src/ImageService/Image.js b/wax-prosemirror-services/src/ImageService/Image.js
index 86c00ab3577c4544b0768d5f37af092e0ac3c407..19d5643001312762319ff92de458dda5847892ed 100644
--- a/wax-prosemirror-services/src/ImageService/Image.js
+++ b/wax-prosemirror-services/src/ImageService/Image.js
@@ -1,5 +1,5 @@
import React from "react";
-import { v4 as uuid } from "uuid";
+import { v4 as uuidv4 } from "uuid";
import { isEmpty } from "lodash";
import { injectable } from "inversify";
import { icons, ImageUpload } from "wax-prosemirror-components";
@@ -30,7 +30,7 @@ export default class Image extends Tools {
this.pmplugins.get("imagePlaceHolder")
);
return this._isDisplayed ? (
- <ImageUpload key={uuid()} item={this.toJSON()} fileUpload={upload} />
+ <ImageUpload key={uuidv4()} item={this.toJSON()} fileUpload={upload} />
) : null;
}
}
diff --git a/wax-prosemirror-services/src/LinkService/LinkTool.js b/wax-prosemirror-services/src/LinkService/LinkTool.js
index 40061c47ec2aa9712ef407b9839e815a92e94826..424444dc10ebe7dfb291a9a75dae804e73f6e2b2 100644
--- a/wax-prosemirror-services/src/LinkService/LinkTool.js
+++ b/wax-prosemirror-services/src/LinkService/LinkTool.js
@@ -1,5 +1,4 @@
import { injectable } from "inversify";
-import { isEqual } from "lodash";
import { toggleMark } from "prosemirror-commands";
import { Commands } from "wax-prosemirror-utilities";
import Tools from "../lib/Tools";
diff --git a/wax-prosemirror-services/src/NoteService/Note.js b/wax-prosemirror-services/src/NoteService/Note.js
index 399b44245a7eb2ad4a26d5e674d9108093a908c9..a676d1cf054f6ac66fafdccbd7791a4d14174b57 100644
--- a/wax-prosemirror-services/src/NoteService/Note.js
+++ b/wax-prosemirror-services/src/NoteService/Note.js
@@ -2,7 +2,7 @@ import Tools from "../lib/Tools";
import { injectable } from "inversify";
import { icons } from "wax-prosemirror-components";
import { Fragment } from "prosemirror-model";
-import { v4 as uuid } from "uuid";
+import { v4 as uuidv4 } from "uuid";
@injectable()
export default class Note extends Tools {
@@ -19,7 +19,7 @@ export default class Note extends Tools {
$to.parentOffset
);
const footnote = state.config.schema.nodes.footnote.create(
- { id: uuid() },
+ { id: uuidv4() },
content
);
dispatch(state.tr.replaceSelectionWith(footnote));
diff --git a/wax-prosemirror-services/src/NoteService/NoteComponent.js b/wax-prosemirror-services/src/NoteService/NoteComponent.js
index 22eceb31f6c587ec2b9d3ee7c032177720b50e72..a5c15771a1d87074182315c0c179ab6dc87ab2f4 100644
--- a/wax-prosemirror-services/src/NoteService/NoteComponent.js
+++ b/wax-prosemirror-services/src/NoteService/NoteComponent.js
@@ -7,7 +7,6 @@ import React, {
} from "react";
import { WaxContext } from "wax-prosemirror-core/src/ioc-react";
import { DocumentHelpers } from "wax-prosemirror-utilities";
-import { isEqual } from "lodash";
import NoteEditor from "./NoteEditor";
export default () => {
diff --git a/wax-prosemirror-services/src/TablesService/EditTableService/TableDropDownOptions.js b/wax-prosemirror-services/src/TablesService/EditTableService/TableDropDownOptions.js
index 8e930ab9dd0a511e198f605e60c2f51d17b654f8..c08f229bb9caad1e51d23ce04f2774f9de1ec743 100644
--- a/wax-prosemirror-services/src/TablesService/EditTableService/TableDropDownOptions.js
+++ b/wax-prosemirror-services/src/TablesService/EditTableService/TableDropDownOptions.js
@@ -1,5 +1,5 @@
import React from "react";
-import { v4 as uuid } from "uuid";
+import { v4 as uuidv4 } from "uuid";
import { injectable } from "inversify";
import { isEmpty } from "lodash";
import { TableDropDown } from "wax-prosemirror-components";
@@ -31,7 +31,7 @@ export default class TableDropDownOptions extends Tools {
renderTool(view) {
if (isEmpty(view)) return null;
return this._isDisplayed ? (
- <TableDropDown key={uuid()} item={this.toJSON()} view={view} />
+ <TableDropDown key={uuidv4()} item={this.toJSON()} view={view} />
) : null;
}
}
diff --git a/wax-prosemirror-services/src/lib/Tools.js b/wax-prosemirror-services/src/lib/Tools.js
index fbe24276cc65e673a93ebb75f8cdd2d6f02773a5..35aac00082077b2cc890a0f8514e9bc856c1925a 100644
--- a/wax-prosemirror-services/src/lib/Tools.js
+++ b/wax-prosemirror-services/src/lib/Tools.js
@@ -1,5 +1,5 @@
import React from "react";
-import { v4 as uuid } from "uuid";
+import { v4 as uuidv4 } from "uuid";
import { isEmpty } from "lodash";
import { injectable, inject } from "inversify";
import { Button } from "wax-prosemirror-components";
@@ -51,7 +51,7 @@ export default class Tools {
if (isEmpty(view)) return null;
return this._isDisplayed ? (
- <Button key={uuid()} item={this.toJSON()} view={view} />
+ <Button key={uuidv4()} item={this.toJSON()} view={view} />
) : null;
}
diff --git a/wax-prosemirror-themes/package.json b/wax-prosemirror-themes/package.json
index 922ac76f374bf7788d89b5994dfa55ff656345f4..cea50ad61a67c8af7d7eca432130bea3ece4ef23 100644
--- a/wax-prosemirror-themes/package.json
+++ b/wax-prosemirror-themes/package.json
@@ -6,11 +6,13 @@
"license": "MIT",
"main": "index.js",
"scripts": {
- "test": "echo \"Error: no test specified\" && exit 1"
+ "test": "echo \"Error: no test specified\" && exit 1",
+ "build": "BABEL_ENV=production rollup -c"
},
"dependencies": {
"@pubsweet/ui-toolkit": "^2.2.13",
- "cokourier-prime-sans": "git+https://gitlab.coko.foundation/julientaq/cokourier-sans-prime.git",
+ "cokourier-prime-sans":
+ "git+https://gitlab.coko.foundation/julientaq/cokourier-sans-prime.git",
"typeface-fira-sans-condensed": "^0.0.54",
"typeface-vollkorn": "^0.0.54"
}
diff --git a/wax-prosemirror-themes/rollup.config.js b/wax-prosemirror-themes/rollup.config.js
new file mode 100644
index 0000000000000000000000000000000000000000..57c69e1347723bc32344ea645a783be4b686eb3d
--- /dev/null
+++ b/wax-prosemirror-themes/rollup.config.js
@@ -0,0 +1,46 @@
+import babel from "rollup-plugin-babel";
+import commonjs from "@rollup/plugin-commonjs";
+import external from "rollup-plugin-peer-deps-external";
+import postcss from "rollup-plugin-postcss";
+import resolve from "@rollup/plugin-node-resolve";
+import url from "@rollup/plugin-url";
+import { terser } from "rollup-plugin-terser";
+
+export default {
+ input: "./index.js",
+ output: [
+ {
+ file: "dist/index.js",
+ format: "cjs",
+ sourcemap: true
+ }
+ ],
+ plugins: [
+ postcss({
+ plugins: [],
+ minimize: true,
+ sourceMap: "inline"
+ }),
+ external({
+ includeDependencies: true
+ }),
+ url(),
+ resolve(),
+ babel({
+ presets: [
+ [require("@babel/preset-env"), { modules: false }],
+ require("@babel/preset-react")
+ ],
+ plugins: [
+ ["@babel/plugin-proposal-decorators", { legacy: true }],
+ "babel-plugin-parameter-decorator",
+ ["@babel/plugin-proposal-class-properties", { loose: true }]
+ ],
+ exclude: "node_modules/**",
+ runtimeHelpers: true
+ }),
+ commonjs(),
+ terser()
+ ],
+ external: ["styled-components"]
+};
diff --git a/wax-prosemirror-utilities/package.json b/wax-prosemirror-utilities/package.json
index 7b144523c3308e87aaa7428c674d0d04e09e0cf4..30d494349a2f483a8d147bf4e8c8768399604f3b 100644
--- a/wax-prosemirror-utilities/package.json
+++ b/wax-prosemirror-utilities/package.json
@@ -6,7 +6,8 @@
"license": "MIT",
"main": "index.js",
"scripts": {
- "test": "echo \"Error: no test specified\" && exit 1"
+ "test": "echo \"Error: no test specified\" && exit 1",
+ "build": "BABEL_ENV=production rollup -c"
},
"dependencies": {
"prosemirror-utils": "^0.9.6"
diff --git a/wax-prosemirror-utilities/rollup.config.js b/wax-prosemirror-utilities/rollup.config.js
new file mode 100644
index 0000000000000000000000000000000000000000..09fcf43a85a1298aee3566459cdc61b13b57a134
--- /dev/null
+++ b/wax-prosemirror-utilities/rollup.config.js
@@ -0,0 +1,46 @@
+import babel from "rollup-plugin-babel";
+import commonjs from "@rollup/plugin-commonjs";
+import external from "rollup-plugin-peer-deps-external";
+import postcss from "rollup-plugin-postcss";
+import resolve from "@rollup/plugin-node-resolve";
+import url from "@rollup/plugin-url";
+import { terser } from "rollup-plugin-terser";
+
+export default {
+ input: "./index.js",
+ output: [
+ {
+ file: "dist/index.js",
+ format: "cjs",
+ sourcemap: true
+ }
+ ],
+ plugins: [
+ postcss({
+ plugins: [],
+ minimize: true,
+ sourceMap: "inline"
+ }),
+ external({
+ includeDependencies: true
+ }),
+ url(),
+ resolve(),
+ babel({
+ presets: [
+ [require("@babel/preset-env"), { modules: false }],
+ require("@babel/preset-react")
+ ],
+ plugins: [
+ ["@babel/plugin-proposal-decorators", { legacy: true }],
+ "babel-plugin-parameter-decorator",
+ ["@babel/plugin-proposal-class-properties", { loose: true }]
+ ],
+ exclude: "node_modules/**",
+ runtimeHelpers: true
+ }),
+ commonjs(),
+ terser()
+ ],
+ external: ["uuid"]
+};
diff --git a/wax-prosemirror-utilities/src/commands/Commands.js b/wax-prosemirror-utilities/src/commands/Commands.js
index 2c0a98dea290706c7303f8eabb2327f461139900..74d926b4dfe87fc73f790f632b2463d1048afe74 100644
--- a/wax-prosemirror-utilities/src/commands/Commands.js
+++ b/wax-prosemirror-utilities/src/commands/Commands.js
@@ -1,4 +1,4 @@
-import { v4 as uuid } from "uuid";
+import { v4 as uuidv4 } from "uuid";
const markActive = type => state => {
const { from, $from, to, empty } = state.selection;
@@ -74,7 +74,7 @@ const createComment = (state, dispatch, group) => {
$from.pos,
$to.pos,
state.schema.marks.comment.create({
- id: uuid(),
+ id: uuidv4(),
group,
conversation: []
})