Use external self-hosted ForkAwesome fonts

Reduces bundle size by 40kB, and allows caching between different applications on this site that use that font.
This commit is contained in:
Florine W. Dekker 2021-04-18 14:53:42 +02:00
parent 84efe5fcc8
commit ee5da557be
Signed by: FWDekker
GPG Key ID: B1B567AF58D6EE0F
5 changed files with 6 additions and 24 deletions

View File

@ -8,10 +8,10 @@ module.exports = grunt => {
}, },
copy: { copy: {
css: { css: {
files: [{expand: true, cwd: "src/main/css/", src: "**/*.css", dest: "dist/"}], files: [{expand: true, cwd: "src/main/", src: "**/*.css", dest: "dist/", flatten: true}],
}, },
html: { html: {
files: [{expand: true, cwd: "src/main/", src: "**/*.html", dest: "dist/"}], files: [{expand: true, cwd: "src/main/", src: "**/*.html", dest: "dist/", flatten: true}],
}, },
}, },
focus: { focus: {
@ -68,24 +68,10 @@ module.exports = grunt => {
test: /\.js$/, test: /\.js$/,
exclude: /node_modules/, exclude: /node_modules/,
}, },
{
test: /\.css$/i,
use: ["style-loader", "css-loader"],
},
{
test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/,
use: [{
loader: "file-loader",
options: {
name: "[name].[ext]",
outputPath: "./",
},
}],
},
], ],
}, },
resolve: { resolve: {
extensions: [".js", ".css"], extensions: [".js"],
}, },
output: { output: {
filename: "bundle.js", filename: "bundle.js",

BIN
package-lock.json generated

Binary file not shown.

View File

@ -1,6 +1,6 @@
{ {
"name": "interlanguage-checker", "name": "interlanguage-checker",
"version": "1.10.24", "version": "1.10.25",
"description": "Check the consistency of MediaWiki interlanguage links in a simple overview.", "description": "Check the consistency of MediaWiki interlanguage links in a simple overview.",
"author": "Felix W. Dekker", "author": "Felix W. Dekker",
"browser": "dist/bundle.js", "browser": "dist/bundle.js",
@ -16,12 +16,9 @@
"deploy": "grunt deploy" "deploy": "grunt deploy"
}, },
"dependencies": { "dependencies": {
"fetch-jsonp": "^1.1.3", "fetch-jsonp": "^1.1.3"
"fork-awesome": "^1.1.7"
}, },
"devDependencies": { "devDependencies": {
"css-loader": "^5.2.2",
"file-loader": "^6.2.0",
"grunt": "^1.3.0", "grunt": "^1.3.0",
"grunt-cli": "^1.4.2", "grunt-cli": "^1.4.2",
"grunt-contrib-clean": "^2.0.0", "grunt-contrib-clean": "^2.0.0",
@ -30,7 +27,6 @@
"grunt-focus": "^1.0.0", "grunt-focus": "^1.0.0",
"grunt-text-replace": "^0.4.0", "grunt-text-replace": "^0.4.0",
"grunt-webpack": "^4.0.2", "grunt-webpack": "^4.0.2",
"style-loader": "^2.0.0",
"webpack": "^5.33.2", "webpack": "^5.33.2",
"webpack-cli": "^4.6.0" "webpack-cli": "^4.6.0"
} }

View File

@ -11,6 +11,7 @@
<title>Interlanguage Checker | FWDekker</title> <title>Interlanguage Checker | FWDekker</title>
<link rel="stylesheet" href="https://static.fwdekker.com/fonts/roboto.css" crossorigin="anonymous" /> <link rel="stylesheet" href="https://static.fwdekker.com/fonts/roboto.css" crossorigin="anonymous" />
<link rel="stylesheet" href="https://static.fwdekker.com/fonts/fork-awesome.css" crossorigin="anonymous" />
<link rel="stylesheet" href="https://static.fwdekker.com/lib/template/1.x.x/bundle.css" crossorigin="anonymous" /> <link rel="stylesheet" href="https://static.fwdekker.com/lib/template/1.x.x/bundle.css" crossorigin="anonymous" />
<link rel="stylesheet" href="main.css?v=%%VERSION_NUMBER%%" /> <link rel="stylesheet" href="main.css?v=%%VERSION_NUMBER%%" />
</head> </head>

View File

@ -1,6 +1,5 @@
// noinspection JSUnresolvedVariable // noinspection JSUnresolvedVariable
const {$, doAfterLoad, footer, header, nav, showPage, stringToHtml} = window.fwdekker; const {$, doAfterLoad, footer, header, nav, showPage, stringToHtml} = window.fwdekker;
import "fork-awesome/css/fork-awesome.css";
import {InterlangTable, MessageHandler, ValidatableInput} from "./DOM"; import {InterlangTable, MessageHandler, ValidatableInput} from "./DOM";
import {discoverNetwork, InterlangNetwork, MediaWiki, MediaWikiManager} from "./MediaWiki"; import {discoverNetwork, InterlangNetwork, MediaWiki, MediaWikiManager} from "./MediaWiki";