website: preload vf files. Additionally, update misc/tools/versionize to also patch docs/_includes/preload-font-files.html
This commit is contained in:
parent
e5971f76ea
commit
0ab4a4cb3b
5 changed files with 38 additions and 33 deletions
2
Makefile
2
Makefile
|
|
@ -251,7 +251,7 @@ pre_dist:
|
||||||
|
|
||||||
dist: zip_dist
|
dist: zip_dist
|
||||||
$(MAKE) -j docs
|
$(MAKE) -j docs
|
||||||
misc/tools/versionize-css.py
|
misc/tools/versionize.py
|
||||||
@echo "——————————————————————————————————————————————————————————————————"
|
@echo "——————————————————————————————————————————————————————————————————"
|
||||||
@echo ""
|
@echo ""
|
||||||
@echo "Next steps:"
|
@echo "Next steps:"
|
||||||
|
|
|
||||||
3
docs/_includes/preload-font-files.html
Normal file
3
docs/_includes/preload-font-files.html
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
<link rel="preload" href="font-files/Inter-UI.var.woff2?v=3.2" as="font" type="font/woff2" crossorigin>
|
||||||
|
<link rel="preload" href="font-files/Inter-UI-upright.var.woff2?v=3.2" as="font" type="font/woff2" crossorigin>
|
||||||
|
<link rel="preload" href="font-files/Inter-UI-italic.var.woff2?v=3.2" as="font" type="font/woff2" crossorigin>
|
||||||
|
|
@ -35,6 +35,7 @@ endfor
|
||||||
<link rel="stylesheet" href="{{url_root}}inter-ui.css?v={{ release_version }}">
|
<link rel="stylesheet" href="{{url_root}}inter-ui.css?v={{ release_version }}">
|
||||||
<link rel="stylesheet" href="{{url_root}}res/base.css?v={{ base_css_v }}">
|
<link rel="stylesheet" href="{{url_root}}res/base.css?v={{ base_css_v }}">
|
||||||
<link rel="icon" type="image/png" href="{{url_root}}res/favicon.png">
|
<link rel="icon" type="image/png" href="{{url_root}}res/favicon.png">
|
||||||
|
{% include preload-font-files.html %}
|
||||||
<meta name="format-detection" content="telephone=no">
|
<meta name="format-detection" content="telephone=no">
|
||||||
<meta property="twitter:card" content="summary">
|
<meta property="twitter:card" content="summary">
|
||||||
<meta property="twitter:site" content="@rsms">
|
<meta property="twitter:site" content="@rsms">
|
||||||
|
|
|
||||||
|
|
@ -1,32 +0,0 @@
|
||||||
#!/usr/bin/env python
|
|
||||||
# encoding: utf8
|
|
||||||
#
|
|
||||||
# Updates the "?v=x" in docs/inter-ui.css
|
|
||||||
#
|
|
||||||
import os, sys
|
|
||||||
from os.path import dirname, basename, abspath, relpath, join as pjoin
|
|
||||||
sys.path.append(abspath(pjoin(dirname(__file__), 'tools')))
|
|
||||||
from common import BASEDIR, getVersion
|
|
||||||
|
|
||||||
import re
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
version = getVersion()
|
|
||||||
regex = re.compile(r'(url\("[^"]+?v=)([^"]+)("\))')
|
|
||||||
cssFileName = pjoin(BASEDIR, 'docs', 'inter-ui.css')
|
|
||||||
|
|
||||||
s = ''
|
|
||||||
with open(cssFileName, 'r') as f:
|
|
||||||
s = f.read()
|
|
||||||
|
|
||||||
s = regex.sub(
|
|
||||||
lambda m: '%s%s%s' % (m.group(1), version, m.group(3)),
|
|
||||||
s
|
|
||||||
)
|
|
||||||
|
|
||||||
with open(cssFileName, 'w') as f:
|
|
||||||
f.write(s)
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
main()
|
|
||||||
33
misc/tools/versionize.py
Executable file
33
misc/tools/versionize.py
Executable file
|
|
@ -0,0 +1,33 @@
|
||||||
|
#!/usr/bin/env python
|
||||||
|
# encoding: utf8
|
||||||
|
#
|
||||||
|
# Updates the "?v=x" in docs/inter-ui.css
|
||||||
|
#
|
||||||
|
import os, sys, re
|
||||||
|
from os.path import dirname, basename, abspath, relpath, join as pjoin
|
||||||
|
sys.path.append(abspath(pjoin(dirname(__file__), 'tools')))
|
||||||
|
from common import BASEDIR, getVersion
|
||||||
|
|
||||||
|
version = getVersion()
|
||||||
|
|
||||||
|
|
||||||
|
def updateCSSFile(filename):
|
||||||
|
regex = re.compile(r'(url\("[^"]+?v=)([^"]+)("\))')
|
||||||
|
with open(filename, 'r') as f:
|
||||||
|
s = f.read()
|
||||||
|
s = regex.sub(lambda m: '%s%s%s' % (m.group(1), version, m.group(3)), s)
|
||||||
|
with open(filename, 'w') as f:
|
||||||
|
f.write(s)
|
||||||
|
|
||||||
|
|
||||||
|
def updateHTMLFile(filename):
|
||||||
|
regex = re.compile(r'(href="[^"]+?v=)([^"]+)(")')
|
||||||
|
with open(filename, 'r') as f:
|
||||||
|
s = f.read()
|
||||||
|
s = regex.sub(lambda m: '%s%s%s' % (m.group(1), version, m.group(3)), s)
|
||||||
|
with open(filename, 'w') as f:
|
||||||
|
f.write(s)
|
||||||
|
|
||||||
|
|
||||||
|
updateCSSFile(pjoin(BASEDIR, 'docs', 'inter-ui.css'))
|
||||||
|
updateHTMLFile(pjoin(BASEDIR, 'docs', '_includes', 'preload-font-files.html'))
|
||||||
Reference in a new issue