diff --git a/editors/default/config-overrides.js b/editors/default/config-overrides.js index 3ef5dcd48d595f422488498af14614765f03f298..82c74c17dd0161dd58670ef1a2c591870a92e789 100644 --- a/editors/default/config-overrides.js +++ b/editors/default/config-overrides.js @@ -22,6 +22,18 @@ module.exports = function override(config, env) { { test: /\.svg$/, use: "svg-inline-loader" + }, + { + test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/, + use: [ + { + loader: "file-loader", + options: { + name: "[name].[ext]", + outputPath: "fonts/" + } + } + ] } ] } diff --git a/editors/editoria/config-overrides.js b/editors/editoria/config-overrides.js index 3ef5dcd48d595f422488498af14614765f03f298..82c74c17dd0161dd58670ef1a2c591870a92e789 100644 --- a/editors/editoria/config-overrides.js +++ b/editors/editoria/config-overrides.js @@ -22,6 +22,18 @@ module.exports = function override(config, env) { { test: /\.svg$/, use: "svg-inline-loader" + }, + { + test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/, + use: [ + { + loader: "file-loader", + options: { + name: "[name].[ext]", + outputPath: "fonts/" + } + } + ] } ] } diff --git a/wax-prosemirror-layouts/package.json b/wax-prosemirror-layouts/package.json index eadd0ca4b7cf824ff9af4f94129e7c49fe6d2309..5fa8b0426273ffc98fe59e0b68c4f563dac7ae0d 100644 --- a/wax-prosemirror-layouts/package.json +++ b/wax-prosemirror-layouts/package.json @@ -7,5 +7,9 @@ "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" + }, + "dependencies": { + "@pubsweet/ui-toolkit": "^2.2.13", + "styled-components": "^4.1.1" } } diff --git a/wax-prosemirror-themes/package.json b/wax-prosemirror-themes/package.json index 5950199f28ba1957d317055e1d1ab0507ee4f56a..7b3decf88f4a4fb8fa78e5448e19b53804cbfd19 100644 --- a/wax-prosemirror-themes/package.json +++ b/wax-prosemirror-themes/package.json @@ -8,5 +8,12 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, - "dependencies": {} + "dependencies": { + "@pubsweet/ui-toolkit": "^2.2.13", + "cokourier-prime-sans": + "git+https://gitlab.coko.foundation/julientaq/cokourier-sans-prime.git", + "styled-components": "^4.1.1", + "typeface-fira-sans-condensed": "^0.0.54", + "typeface-vollkorn": "^0.0.54" + } } diff --git a/wax-prosemirror-themes/src/coko-theme/index.js b/wax-prosemirror-themes/src/coko-theme/index.js index c430fb03e86129df10b6faca95c0b9dc41477366..a8f8b87d9c172b8c5ec5ed9fbd199bd117be63eb 100644 --- a/wax-prosemirror-themes/src/coko-theme/index.js +++ b/wax-prosemirror-themes/src/coko-theme/index.js @@ -1,6 +1,6 @@ /* eslint-disable import/extensions */ -// import "typeface-fira-sans-condensed"; -// import "typeface-vollkorn"; +import "typeface-fira-sans-condensed"; +import "typeface-vollkorn"; const cokoTheme = { /* Colors */