diff --git a/editors/editoria/package.json b/editors/editoria/package.json index 4fb3933d942a55f81eefc95998e5fa25668c3f8e..df7329a24eb0b2d1d99ed0ffc4a3f1ef9759ee5d 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 72f5ec582a8ae451b4cf838e84e28aca8e79bb2f..32140789d22a471c2e2c28ad4085f98a0e134922 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 24921acbc8a720ca8d890a5d305cc732e8cb991f..7d33c4bd500ffac40ef475bbb6d35caef3982d98 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 f2b2c1be262df063f9b65f54b44ac8f463e43e14..5f5ef795aae63e05513c9d0143309ab69f6e190c 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 1d72fd394b69a0d2cafdada3f8fc2f9101ee43be..dfe74a19c2d578d96b3528b53b70c79dfaff675a 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 0cea0c6ca80ff30082fe868ae20216c2eb4f0dd4..13876b3a1ef9da9287998c8a1fbee9e73933e41e 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 23d5098aed69fa0a6a36616b68b1763de25fbda6..af9c52dcdbfa1966b6c5aff21c29b08120fffedf 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"