From ee5da557be2c746c6243f8cc3da79cbd0a64ac3b Mon Sep 17 00:00:00 2001 From: "Felix W. Dekker" Date: Sun, 18 Apr 2021 14:53:42 +0200 Subject: [PATCH] Use external self-hosted ForkAwesome fonts Reduces bundle size by 40kB, and allows caching between different applications on this site that use that font. --- Gruntfile.js | 20 +++----------------- package-lock.json | Bin 330386 -> 308593 bytes package.json | 8 ++------ src/main/index.html | 1 + src/main/js/Main.js | 1 - 5 files changed, 6 insertions(+), 24 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 409ed7a..fa9e201 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -8,10 +8,10 @@ module.exports = grunt => { }, copy: { 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: { - files: [{expand: true, cwd: "src/main/", src: "**/*.html", dest: "dist/"}], + files: [{expand: true, cwd: "src/main/", src: "**/*.html", dest: "dist/", flatten: true}], }, }, focus: { @@ -68,24 +68,10 @@ module.exports = grunt => { test: /\.js$/, 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: { - extensions: [".js", ".css"], + extensions: [".js"], }, output: { filename: "bundle.js", diff --git a/package-lock.json b/package-lock.json index 0c80566f8fea8d9e132b672dfbc492e9cc6383a2..00c5d41e7773c124272d19a2553f98ff62949f12 100644 GIT binary patch delta 399 zcmV;A0dW43l@#&n5|BLsHIY7X0X31ZNSD+c0UeV+0VR_#0tK_W0b2o=aH0YSm%y3= z1hYy5c~!GFTCx(eX>K(gvjdVw5wp*vxjVCz;))TolJ)FZw-8VPVFI^rQvrT1xBPw&2?8=7w-qY_pg5NfBLOOta0LXHFrxxE zw<=}=K^>Rhi2@0?V1xp!FSkFn0?AFcD+B}G5R(~X4YPJ`Gy%7D7Xu|2mwKNA4VT4v z0UozNGy^&hx2!}1!85lTdIK&GmpW(z5SPj(1Rj&X^~jeH&H^5nFrWk!lfL#2lh8dC zx3G%?;!BrFp8^iI&)5T=0k>Y;0~{!q3gZJ9wgm(~8Mh1|1hfOUIVA*}4Y&O>1f>PH z$2tW0F1OEh1WX#YjgbW7GM8E+0T7oSBLNzda0LXHFrxxEmnvog&X*9*0v?x;;sgYj t9%lj_mw?U$7MJUp0tuJLX8{_QK&k>fw+YAuB^b92;RG-zw_^zfF9Dedl2iZy delta 9365 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 Checker | FWDekker + diff --git a/src/main/js/Main.js b/src/main/js/Main.js index 5b209c4..81355c0 100644 --- a/src/main/js/Main.js +++ b/src/main/js/Main.js @@ -1,6 +1,5 @@ // noinspection JSUnresolvedVariable const {$, doAfterLoad, footer, header, nav, showPage, stringToHtml} = window.fwdekker; -import "fork-awesome/css/fork-awesome.css"; import {InterlangTable, MessageHandler, ValidatableInput} from "./DOM"; import {discoverNetwork, InterlangNetwork, MediaWiki, MediaWikiManager} from "./MediaWiki";