From 74451dea060207253dec666d83ef2e0661b46802 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Sun, 11 Oct 2020 19:28:08 +0300
Subject: [PATCH] cleanup and dependencies
---
editors/editoria/package.json | 5 ++++-
wax-prosemirror-components/package.json | 1 -
wax-prosemirror-components/rollup.config.js | 7 +------
wax-prosemirror-core/rollup.config.js | 2 --
wax-prosemirror-plugins/package.json | 1 -
wax-prosemirror-services/package.json | 1 -
yarn.lock | 9 ---------
7 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/editors/editoria/package.json b/editors/editoria/package.json
index 4fb3933d9..df7329a24 100644
--- a/editors/editoria/package.json
+++ b/editors/editoria/package.json
@@ -13,7 +13,10 @@
"wax-prosemirror-core": "^0.0.20",
"wax-prosemirror-components": "^0.0.20",
"wax-prosemirror-plugins": "^0.0.20",
- "wax-prosemirror-services": "^0.0.20"
+ "wax-prosemirror-services": "^0.0.20",
+ "fontsource-merriweather": "^3.0.9",
+ "typeface-fira-sans-condensed": "^0.0.54",
+ "typeface-vollkorn": "^0.0.54"
},
"scripts": {
"start": "react-app-rewired start",
diff --git a/wax-prosemirror-components/package.json b/wax-prosemirror-components/package.json
index 72f5ec582..32140789d 100644
--- a/wax-prosemirror-components/package.json
+++ b/wax-prosemirror-components/package.json
@@ -27,7 +27,6 @@
"use-deep-compare-effect": "^1.3.1",
"uuid": "^7.0.3",
"wax-prosemirror-core": "^0.0.20",
- "wax-prosemirror-themes": "^0.0.20",
"wax-prosemirror-utilities": "^0.0.20"
},
"resolutions": {
diff --git a/wax-prosemirror-components/rollup.config.js b/wax-prosemirror-components/rollup.config.js
index 24921acbc..7d33c4bd5 100644
--- a/wax-prosemirror-components/rollup.config.js
+++ b/wax-prosemirror-components/rollup.config.js
@@ -24,10 +24,5 @@ export default {
commonjs(),
terser(),
],
- external: [
- 'wax-prosemirror-themes',
- 'wax-prosemirror-core',
- 'inversify',
- 'prosemirror-tables',
- ],
+ external: ['wax-prosemirror-core', 'inversify', 'prosemirror-tables'],
};
diff --git a/wax-prosemirror-core/rollup.config.js b/wax-prosemirror-core/rollup.config.js
index f2b2c1be2..5f5ef795a 100644
--- a/wax-prosemirror-core/rollup.config.js
+++ b/wax-prosemirror-core/rollup.config.js
@@ -36,7 +36,5 @@ export default {
'prosemirror-tables',
'wax-prosemirror-services',
'wax-prosemirror-schema',
- 'wax-prosemirror-themes',
- 'wax-prosemirror-layouts',
],
};
diff --git a/wax-prosemirror-plugins/package.json b/wax-prosemirror-plugins/package.json
index 1d72fd394..dfe74a19c 100644
--- a/wax-prosemirror-plugins/package.json
+++ b/wax-prosemirror-plugins/package.json
@@ -20,7 +20,6 @@
"prosemirror-view": "1.15.2",
"wax-prosemirror-components": "^0.0.20",
"wax-prosemirror-core": "^0.0.20",
- "wax-prosemirror-layouts": "^0.0.20",
"wax-prosemirror-utilities": "^0.0.20"
}
}
diff --git a/wax-prosemirror-services/package.json b/wax-prosemirror-services/package.json
index 0cea0c6ca..13876b3a1 100644
--- a/wax-prosemirror-services/package.json
+++ b/wax-prosemirror-services/package.json
@@ -28,7 +28,6 @@
"uuid": "^7.0.3",
"wax-prosemirror-components": "^0.0.20",
"wax-prosemirror-core": "^0.0.20",
- "wax-prosemirror-layouts": "^0.0.20",
"wax-prosemirror-plugins": "^0.0.20",
"wax-prosemirror-schema": "^0.0.20",
"wax-prosemirror-utilities": "^0.0.20"
diff --git a/yarn.lock b/yarn.lock
index 23d5098ae..af9c52dcd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1970,15 +1970,6 @@
dependencies:
mkdirp "^1.0.4"
-"@pubsweet/ui-toolkit@^2.2.13":
- version "2.3.1"
- resolved "https://registry.yarnpkg.com/@pubsweet/ui-toolkit/-/ui-toolkit-2.3.1.tgz#0a3506a4b9eaeb9b54811982dc44cb87ca9892bf"
- integrity sha512-RFtkqCm/SItUEZPuBMM34WHFmiUhGs4EmreNMlNJg1TQnG9d6iirqy911oLEfJYtvR/fbxgeQFbtRle2yre64w==
- dependencies:
- color "^3.0.0"
- lodash "^4.17.4"
- styled-components "^4.1.1"
-
"@pubsweet/ui-toolkit@^2.3.1":
version "2.3.2"
resolved "https://registry.yarnpkg.com/@pubsweet/ui-toolkit/-/ui-toolkit-2.3.2.tgz#44b9b97b399027ef90bf0c30768475284f437fb4"
--
GitLab