Skip to content

Commit 7d73884

Browse files
AlecRustAlecRust
authored
Improve how FA webfont path is overridden (hestiacp#3216)
- Allow ESLint to check all files the config applies to, not just files in `web/js` - Disable `@typescript-eslint/no-var-requires` ESLint rule for now
1 parent e90ab65 commit 7d73884

File tree

8 files changed

+66
-59
lines changed

8 files changed

+66
-59
lines changed

‎.eslintrc.cjs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ module.exports = {
3434
],
3535
'@typescript-eslint/no-empty-function': 'warn',
3636
'@typescript-eslint/no-this-alias': 'warn',
37+
'@typescript-eslint/no-var-requires': 'off',
3738
'no-redeclare': 'off',
3839
'no-undef': 'off',
3940
},

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
uses: ./.github/actions/yarn-nm-install
7474

7575
- name: Run ESLint
76-
run: yarn eslint web/js/
76+
run: yarn eslint .
7777

7878
stylelint:
7979
name: Stylelint

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"docs:build": "vitepress build docs",
1111
"docs:serve": "vitepress serve docs",
1212
"build": "postcss web/css/src/themes/*.css --dir web/css/themes --ext .min.css",
13-
"lint": "prettier --check . && eslint web/js/ && stylelint web/css/src/**/*.css && markdownlint-cli2 *.md docs/**/*.md",
13+
"lint": "prettier --check . && eslint . && stylelint web/css/src/**/*.css && markdownlint-cli2 *.md docs/**/*.md",
1414
"lint-staged": "lint-staged",
1515
"format": "prettier --write .",
1616
"preinstall": "npx only-allow yarn",
@@ -35,6 +35,7 @@
3535
"postcss": "^8.4.21",
3636
"postcss-cli": "^10.1.0",
3737
"postcss-import": "^15.1.0",
38+
"postcss-path-replace": "^1.0.4",
3839
"postcss-preset-env": "^7.8.3",
3940
"postcss-size": "^4.0.1",
4041
"prettier": "^2.8.3",
@@ -45,7 +46,7 @@
4546
"stylelint-config-prettier": "^9.0.4",
4647
"stylelint-config-standard": "^29.0.0",
4748
"typescript": "^4.9.4",
48-
"vitepress": "1.0.0-alpha.38",
49+
"vitepress": "1.0.0-alpha.40",
4950
"vue": "^3.2.45"
5051
}
5152
}

‎postcss.config.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
module.exports = {
22
plugins: [
33
require('postcss-import'),
4+
require('postcss-path-replace')({
5+
publicPath: '/webfonts/',
6+
matched: '../webfonts/',
7+
mode: 'replace',
8+
}),
49
require('postcss-size'),
510
require('cssnano'),
611
require('postcss-preset-env')({

‎web/css/src/base.css‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ html {
88
scroll-behavior: smooth;
99
}
1010

11-
[x-cloak] {
12-
display: none !important;
13-
}
14-
1511
*,
1612
*::before,
1713
*::after {
@@ -22,6 +18,10 @@ html {
2218
outline: none;
2319
}
2420

21+
[x-cloak] {
22+
display: none !important;
23+
}
24+
2525
html,
2626
input,
2727
textarea,

‎web/css/src/fonts.css‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,3 @@
1-
/* Overrides for Font Awesome Free 6.2.1 to change webfont paths
2-
========================================================================== */
3-
4-
@font-face {
5-
font-family: "Font Awesome 6 Free";
6-
font-style: normal;
7-
font-weight: 900;
8-
font-display: block;
9-
src: url("/webfonts/fa-solid-900.woff2") format("woff2"),
10-
url("/webfonts/fa-solid-900.ttf") format("truetype");
11-
}
12-
13-
@font-face {
14-
font-family: "Font Awesome 6 Brands";
15-
font-style: normal;
16-
font-weight: 400;
17-
font-display: block;
18-
src: url("/webfonts/fa-brands-400.woff2") format("woff2"),
19-
url("/webfonts/fa-brands-400.ttf") format("truetype");
20-
}
21-
221
/* Exo primary font
232
========================================================================== */
243

‎web/css/themes/default.min.css‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎yarn.lock‎

Lines changed: 50 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -947,9 +947,9 @@ __metadata:
947947
linkType: hard
948948

949949
"@vue/devtools-api@npm:^6.4.5":
950-
version: 6.4.5
951-
resolution: "@vue/devtools-api@npm:6.4.5"
952-
checksum: 40c5adc8788cb283972ce09ba7ce105fa894f4decec9168829cc8e6211462763402442e6c31be76f9da62b0e74ae724971b924571367b4ac89b94dc6894e2d07
950+
version: 6.5.0
951+
resolution: "@vue/devtools-api@npm:6.5.0"
952+
checksum: ec819ef3a426e91d09e9cfefd2827e9ed8ec9d62bb3b3e0674f3da8c7e92a4b879c3b777dc7329172ca6fe2670b62dd5580d23160339208f0f5ae038f2e504ad
953953
languageName: node
954954
linkType: hard
955955

@@ -1016,30 +1016,30 @@ __metadata:
10161016
linkType: hard
10171017

10181018
"@vueuse/core@npm:^9.9.0":
1019-
version: 9.11.0
1020-
resolution: "@vueuse/core@npm:9.11.0"
1019+
version: 9.11.1
1020+
resolution: "@vueuse/core@npm:9.11.1"
10211021
dependencies:
10221022
"@types/web-bluetooth": ^0.0.16
1023-
"@vueuse/metadata": 9.11.0
1024-
"@vueuse/shared": 9.11.0
1023+
"@vueuse/metadata": 9.11.1
1024+
"@vueuse/shared": 9.11.1
10251025
vue-demi: "*"
1026-
checksum: 469bacd20709c3e68de1edf726edae3d68ad2c2cb6f37f197250a42e2ff12d2bd267b9f3c212a55e06a5351d6708fb59dd54d9eac2746ca0482b0aac1767b5b1
1026+
checksum: c9b4d65d50441d19d452dfebe4e13c8b56a8ea296b31b9cd93b5a52ee1b461c40ebc530415d3869083852eb874c99d5742311fd8bf750d405f4d52a768aebaa3
10271027
languageName: node
10281028
linkType: hard
10291029

1030-
"@vueuse/metadata@npm:9.11.0":
1031-
version: 9.11.0
1032-
resolution: "@vueuse/metadata@npm:9.11.0"
1033-
checksum: 262ba0cfe89b65ead26b7d9bdb47221c6d8bf3e5a67dc6ff5fb2a67d5fe849b8854749f9bfa337bab6597d2f7e596f01a24028507cc511b9d198ea403f46f6ed
1030+
"@vueuse/metadata@npm:9.11.1":
1031+
version: 9.11.1
1032+
resolution: "@vueuse/metadata@npm:9.11.1"
1033+
checksum: d4025257dc891b4ae3712a68b881409e7a58517f7b96f8949a74a99cec5e46f202fc2c326765eed9bffc8fbde6417ee737d3c2ac650799dd9e99fa5a7f9c2363
10341034
languageName: node
10351035
linkType: hard
10361036

1037-
"@vueuse/shared@npm:9.11.0":
1038-
version: 9.11.0
1039-
resolution: "@vueuse/shared@npm:9.11.0"
1037+
"@vueuse/shared@npm:9.11.1":
1038+
version: 9.11.1
1039+
resolution: "@vueuse/shared@npm:9.11.1"
10401040
dependencies:
10411041
vue-demi: "*"
1042-
checksum: 6ede8f66df880be27b447b4b95085ae223916328e10f86a87b2a9d69baf51184c313a7be6136b0c9ad0d38b68c5616fad64cf535911f3695aa53629d9ccaacba
1042+
checksum: 373a725ba87dd84eec3882cef4dc92706f28b53256f1c23a800444c12de675c71c1773c254def5d9c3096e54b9830154d13540264c1f017770395f04b07d789f
10431043
languageName: node
10441044
linkType: hard
10451045

@@ -1419,7 +1419,7 @@ __metadata:
14191419
languageName: node
14201420
linkType: hard
14211421

1422-
"chalk@npm:^2.0.0":
1422+
"chalk@npm:^2.0.0, chalk@npm:^2.4.1":
14231423
version: 2.4.2
14241424
resolution: "chalk@npm:2.4.2"
14251425
dependencies:
@@ -2700,6 +2700,7 @@ __metadata:
27002700
postcss: ^8.4.21
27012701
postcss-cli: ^10.1.0
27022702
postcss-import: ^15.1.0
2703+
postcss-path-replace: ^1.0.4
27032704
postcss-preset-env: ^7.8.3
27042705
postcss-size: ^4.0.1
27052706
prettier: ^2.8.3
@@ -2710,7 +2711,7 @@ __metadata:
27102711
stylelint-config-prettier: ^9.0.4
27112712
stylelint-config-standard: ^29.0.0
27122713
typescript: ^4.9.4
2713-
vitepress: 1.0.0-alpha.38
2714+
vitepress: 1.0.0-alpha.40
27142715
vue: ^3.2.45
27152716
languageName: unknown
27162717
linkType: soft
@@ -2999,9 +3000,9 @@ __metadata:
29993000
linkType: hard
30003001

30013002
"js-sdsl@npm:^4.1.4":
3002-
version: 4.2.0
3003-
resolution: "js-sdsl@npm:4.2.0"
3004-
checksum: 2cd0885f7212afb355929d72ca105cb37de7e95ad6031e6a32619eaefa46735a7d0fb682641a0ba666e1519cb138fe76abc1eea8a34e224140c9d94c995171f1
3003+
version: 4.3.0
3004+
resolution: "js-sdsl@npm:4.3.0"
3005+
checksum: ce908257cf6909e213af580af3a691a736f5ee8b16315454768f917a682a4ea0c11bde1b241bbfaecedc0eb67b72101b2c2df2ffaed32aed5d539fca816f054e
30053006
languageName: node
30063007
linkType: hard
30073008

@@ -4583,6 +4584,15 @@ __metadata:
45834584
languageName: node
45844585
linkType: hard
45854586

4587+
"postcss-path-replace@npm:^1.0.4":
4588+
version: 1.0.4
4589+
resolution: "postcss-path-replace@npm:1.0.4"
4590+
dependencies:
4591+
postcss: ^6.0.21
4592+
checksum: f6b698c62b80a112a1a3c82ea121fba6096222e53adb9caaee752384792437278b1b476d80bbf5d0bbe047e06de04b8f18fff4120537ef24f4d172e5c3626f61
4593+
languageName: node
4594+
linkType: hard
4595+
45864596
"postcss-place@npm:^7.0.5":
45874597
version: 7.0.5
45884598
resolution: "postcss-place@npm:7.0.5"
@@ -4784,6 +4794,17 @@ __metadata:
47844794
languageName: node
47854795
linkType: hard
47864796

4797+
"postcss@npm:^6.0.21":
4798+
version: 6.0.23
4799+
resolution: "postcss@npm:6.0.23"
4800+
dependencies:
4801+
chalk: ^2.4.1
4802+
source-map: ^0.6.1
4803+
supports-color: ^5.4.0
4804+
checksum: cc6cb2c1dbcdefa6f57a71d67fe535c9e96543298bbe28f9a6a64c4f1e21b6127113890dd4cda8873d3f4e6613a0566b7b4bbb230204f3a9a309190bda065d81
4805+
languageName: node
4806+
linkType: hard
4807+
47874808
"postcss@npm:^8.1.10, postcss@npm:^8.4.19, postcss@npm:^8.4.20, postcss@npm:^8.4.21":
47884809
version: 8.4.21
47894810
resolution: "postcss@npm:8.4.21"
@@ -5093,16 +5114,16 @@ __metadata:
50935114
linkType: hard
50945115

50955116
"rollup@npm:^3.7.0":
5096-
version: 3.10.0
5097-
resolution: "rollup@npm:3.10.0"
5117+
version: 3.10.1
5118+
resolution: "rollup@npm:3.10.1"
50985119
dependencies:
50995120
fsevents: ~2.3.2
51005121
dependenciesMeta:
51015122
fsevents:
51025123
optional: true
51035124
bin:
51045125
rollup: dist/bin/rollup
5105-
checksum: 31a882689c58d084ac36362aeaf2422dc4b80d671bd88c856693c37d63a26ddac9b9819dfba7f79c2d50d5207868b0e3d75f728fe551bbc347cf5dedf8ece18e
5126+
checksum: 69c2bba82833f2977db08a5c10da651e0668f1335652499543c297633eb44eaf1473575973025a07cffd78903be8d10626e5abac063e49fb47d3f7dd8c18bf00
51065127
languageName: node
51075128
linkType: hard
51085129

@@ -5564,7 +5585,7 @@ __metadata:
55645585
languageName: node
55655586
linkType: hard
55665587

5567-
"supports-color@npm:^5.3.0":
5588+
"supports-color@npm:^5.3.0, supports-color@npm:^5.4.0":
55685589
version: 5.5.0
55695590
resolution: "supports-color@npm:5.5.0"
55705591
dependencies:
@@ -5920,9 +5941,9 @@ __metadata:
59205941
languageName: node
59215942
linkType: hard
59225943

5923-
"vitepress@npm:1.0.0-alpha.38":
5924-
version: 1.0.0-alpha.38
5925-
resolution: "vitepress@npm:1.0.0-alpha.38"
5944+
"vitepress@npm:1.0.0-alpha.40":
5945+
version: 1.0.0-alpha.40
5946+
resolution: "vitepress@npm:1.0.0-alpha.40"
59265947
dependencies:
59275948
"@docsearch/css": ^3.3.1
59285949
"@docsearch/js": ^3.3.1
@@ -5935,7 +5956,7 @@ __metadata:
59355956
vue: ^3.2.45
59365957
bin:
59375958
vitepress: bin/vitepress.js
5938-
checksum: 451869726be2ce64b6fad28d6f3a7f7247f1a8600b1eac9437dfb27bc16e740d5bb8c308ab4259b21cd275fa67a23a3d64363f59b0b59cb9b68212de75f9d658
5959+
checksum: 7748d8bfcaa45c3360a3c00dffd9b4083587af243fdc5fd70cc2b85e119a60e31560e5730748d465f7698d56fc6e6d74b6cdd077e54ea9933a74a0bfedc25f10
59395960
languageName: node
59405961
linkType: hard
59415962

0 commit comments

Comments
 (0)