From 0082ed837ed0b4b9a047520460782562bad0d8aa Mon Sep 17 00:00:00 2001
From: taehoon
Date: Sun, 1 Dec 2019 12:56:53 -0500
Subject: versioning the font resources through webpack
---
static/font/LICENSE.txt | 39 ----
static/font/README.txt | 75 -------
static/font/config.json | 308 ---------------------------
static/font/css/animation.css | 85 --------
static/font/css/fontello-codes.css | 48 -----
static/font/css/fontello-embedded.css | 101 ---------
static/font/css/fontello-ie7-codes.css | 48 -----
static/font/css/fontello-ie7.css | 59 ------
static/font/css/fontello.css | 104 ---------
static/font/demo.html | 374 ---------------------------------
static/font/font/fontello.eot | Bin 20152 -> 0 bytes
static/font/font/fontello.svg | 104 ---------
static/font/font/fontello.ttf | Bin 19984 -> 0 bytes
static/font/font/fontello.woff | Bin 12248 -> 0 bytes
static/font/font/fontello.woff2 | Bin 10392 -> 0 bytes
15 files changed, 1345 deletions(-)
delete mode 100755 static/font/LICENSE.txt
delete mode 100755 static/font/README.txt
delete mode 100755 static/font/config.json
delete mode 100755 static/font/css/animation.css
delete mode 100755 static/font/css/fontello-codes.css
delete mode 100755 static/font/css/fontello-embedded.css
delete mode 100755 static/font/css/fontello-ie7-codes.css
delete mode 100755 static/font/css/fontello-ie7.css
delete mode 100755 static/font/css/fontello.css
delete mode 100755 static/font/demo.html
delete mode 100755 static/font/font/fontello.eot
delete mode 100755 static/font/font/fontello.svg
delete mode 100755 static/font/font/fontello.ttf
delete mode 100755 static/font/font/fontello.woff
delete mode 100755 static/font/font/fontello.woff2
(limited to 'static')
diff --git a/static/font/LICENSE.txt b/static/font/LICENSE.txt
deleted file mode 100755
index 95966f00..00000000
--- a/static/font/LICENSE.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-Font license info
-
-
-## Font Awesome
-
- Copyright (C) 2016 by Dave Gandy
-
- Author: Dave Gandy
- License: SIL ()
- Homepage: http://fortawesome.github.com/Font-Awesome/
-
-
-## Entypo
-
- Copyright (C) 2012 by Daniel Bruce
-
- Author: Daniel Bruce
- License: SIL (http://scripts.sil.org/OFL)
- Homepage: http://www.entypo.com
-
-
-## Iconic
-
- Copyright (C) 2012 by P.J. Onori
-
- Author: P.J. Onori
- License: SIL (http://scripts.sil.org/OFL)
- Homepage: http://somerandomdude.com/work/iconic/
-
-
-## Fontelico
-
- Copyright (C) 2012 by Fontello project
-
- Author: Crowdsourced, for Fontello project
- License: SIL (http://scripts.sil.org/OFL)
- Homepage: http://fontello.com
-
-
diff --git a/static/font/README.txt b/static/font/README.txt
deleted file mode 100755
index beaab336..00000000
--- a/static/font/README.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-This webfont is generated by http://fontello.com open source project.
-
-
-================================================================================
-Please, note, that you should obey original font licenses, used to make this
-webfont pack. Details available in LICENSE.txt file.
-
-- Usually, it's enough to publish content of LICENSE.txt file somewhere on your
- site in "About" section.
-
-- If your project is open-source, usually, it will be ok to make LICENSE.txt
- file publicly available in your repository.
-
-- Fonts, used in Fontello, don't require a clickable link on your site.
- But any kind of additional authors crediting is welcome.
-================================================================================
-
-
-Comments on archive content
----------------------------
-
-- /font/* - fonts in different formats
-
-- /css/* - different kinds of css, for all situations. Should be ok with
- twitter bootstrap. Also, you can skip style and assign icon classes
- directly to text elements, if you don't mind about IE7.
-
-- demo.html - demo file, to show your webfont content
-
-- LICENSE.txt - license info about source fonts, used to build your one.
-
-- config.json - keeps your settings. You can import it back into fontello
- anytime, to continue your work
-
-
-Why so many CSS files ?
------------------------
-
-Because we like to fit all your needs :)
-
-- basic file, .css - is usually enough, it contains @font-face
- and character code definitions
-
-- *-ie7.css - if you need IE7 support, but still don't wish to put char codes
- directly into html
-
-- *-codes.css and *-ie7-codes.css - if you like to use your own @font-face
- rules, but still wish to benefit from css generation. That can be very
- convenient for automated asset build systems. When you need to update font -
- no need to manually edit files, just override old version with archive
- content. See fontello source code for examples.
-
-- *-embedded.css - basic css file, but with embedded WOFF font, to avoid
- CORS issues in Firefox and IE9+, when fonts are hosted on the separate domain.
- We strongly recommend to resolve this issue by `Access-Control-Allow-Origin`
- server headers. But if you ok with dirty hack - this file is for you. Note,
- that data url moved to separate @font-face to avoid problems with
-
-
-
-
-
-
-
-
-
fontello font demo
-
-
-
-
-
icon-cancel0xe800
-
icon-upload0xe801
-
icon-star0xe802
-
icon-star-empty0xe803
-
-
-
icon-retweet0xe804
-
icon-eye-off0xe805
-
icon-search0xe806
-
icon-cog0xe807
-
-
-
icon-logout0xe808
-
icon-down-open0xe809
-
icon-attach0xe80a
-
icon-picture0xe80b
-
-
-
icon-video0xe80c
-
icon-right-open0xe80d
-
icon-left-open0xe80e
-
icon-up-open0xe80f
-
-
-
icon-bell-ringing-o0xe810
-
icon-lock0xe811
-
icon-globe0xe812
-
icon-brush0xe813
-
-
-
icon-attention0xe814
-
icon-plus0xe815
-
icon-adjust0xe816
-
icon-edit0xe817
-
-
-
icon-pencil0xe818
-
icon-pin0xe819
-
icon-wrench0xe81a
-
icon-chart-bar0xe81b
-
-
-
icon-zoom-in0xe81c
-
icon-spin30xe832
-
icon-spin40xe834
-
icon-link-ext0xf08e
-
-
-
icon-link-ext-alt0xf08f
-
icon-menu0xf0c9
-
icon-mail-alt0xf0e0
-
icon-gauge0xf0e4
-
-
-
icon-comment-empty0xf0e5
-
icon-bell-alt0xf0f3
-
icon-plus-squared0xf0fe
-
icon-reply0xf112
-
-
-
icon-smile0xf118
-
icon-lock-open-alt0xf13e
-
icon-ellipsis0xf141
-
icon-play-circled0xf144
-
-
-
icon-thumbs-up-alt0xf164
-
icon-binoculars0xf1e5
-
icon-user-plus0xf234
-
-
-
-
-
\ No newline at end of file
diff --git a/static/font/font/fontello.eot b/static/font/font/fontello.eot
deleted file mode 100755
index 1703fd97..00000000
Binary files a/static/font/font/fontello.eot and /dev/null differ
diff --git a/static/font/font/fontello.svg b/static/font/font/fontello.svg
deleted file mode 100755
index f5e497ce..00000000
--- a/static/font/font/fontello.svg
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/static/font/font/fontello.ttf b/static/font/font/fontello.ttf
deleted file mode 100755
index e9ed7803..00000000
Binary files a/static/font/font/fontello.ttf and /dev/null differ
diff --git a/static/font/font/fontello.woff b/static/font/font/fontello.woff
deleted file mode 100755
index 1d5025d3..00000000
Binary files a/static/font/font/fontello.woff and /dev/null differ
diff --git a/static/font/font/fontello.woff2 b/static/font/font/fontello.woff2
deleted file mode 100755
index 078991eb..00000000
Binary files a/static/font/font/fontello.woff2 and /dev/null differ
--
cgit v1.2.3-70-g09d2
From afd4524c3920f8426051e0673b42f022cb3627fe Mon Sep 17 00:00:00 2001
From: taehoon
Date: Tue, 3 Dec 2019 10:32:46 -0500
Subject: use another approach for versioning font files
---
build/webpack.base.conf.js | 11 ++
package.json | 1 +
src/font/LICENSE.txt | 39 ----
src/font/README.txt | 75 --------
src/font/config.json | 308 -----------------------------
src/font/css/animation.css | 85 --------
src/font/css/fontello-codes.css | 48 -----
src/font/css/fontello-embedded.css | 101 ----------
src/font/css/fontello-ie7-codes.css | 48 -----
src/font/css/fontello-ie7.css | 59 ------
src/font/css/fontello.css | 104 ----------
src/font/demo.html | 374 ------------------------------------
src/font/font/fontello.eot | Bin 20152 -> 0 bytes
src/font/font/fontello.svg | 104 ----------
src/font/font/fontello.ttf | Bin 19984 -> 0 bytes
src/font/font/fontello.woff | Bin 12248 -> 0 bytes
src/font/font/fontello.woff2 | Bin 10392 -> 0 bytes
src/main.js | 4 +-
static/fontello.json | 308 +++++++++++++++++++++++++++++
yarn.lock | 191 +++++++++++++++++-
20 files changed, 506 insertions(+), 1354 deletions(-)
delete mode 100755 src/font/LICENSE.txt
delete mode 100755 src/font/README.txt
delete mode 100755 src/font/config.json
delete mode 100755 src/font/css/animation.css
delete mode 100755 src/font/css/fontello-codes.css
delete mode 100755 src/font/css/fontello-embedded.css
delete mode 100755 src/font/css/fontello-ie7-codes.css
delete mode 100755 src/font/css/fontello-ie7.css
delete mode 100755 src/font/css/fontello.css
delete mode 100755 src/font/demo.html
delete mode 100755 src/font/font/fontello.eot
delete mode 100755 src/font/font/fontello.svg
delete mode 100755 src/font/font/fontello.ttf
delete mode 100755 src/font/font/fontello.woff
delete mode 100755 src/font/font/fontello.woff2
create mode 100755 static/fontello.json
(limited to 'static')
diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
index f8968966..9313ec20 100644
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -3,6 +3,7 @@ var config = require('../config')
var utils = require('./utils')
var projectRoot = path.resolve(__dirname, '../')
var ServiceWorkerWebpackPlugin = require('serviceworker-webpack-plugin')
+var FontelloPlugin = require("fontello-webpack-plugin")
var env = process.env.NODE_ENV
// check env & config/index.js to decide weither to enable CSS Sourcemaps for the
@@ -11,6 +12,8 @@ var cssSourceMapDev = (env === 'development' && config.dev.cssSourceMap)
var cssSourceMapProd = (env === 'production' && config.build.productionSourceMap)
var useCssSourceMap = cssSourceMapDev || cssSourceMapProd
+var now = Date.now()
+
module.exports = {
entry: {
app: './src/main.js'
@@ -90,6 +93,14 @@ module.exports = {
new ServiceWorkerWebpackPlugin({
entry: path.join(__dirname, '..', 'src/sw.js'),
filename: 'sw-pleroma.js'
+ }),
+ new FontelloPlugin({
+ config: require('../static/fontello.json'),
+ name: 'fontello',
+ output: {
+ css: '[name].' + now + '.css', // [hash] is not supported. Use the current timestamp instead for versioning.
+ font: 'font/[name].' + now + '.[ext]'
+ }
})
]
}
diff --git a/package.json b/package.json
index f039d412..648ffbdb 100644
--- a/package.json
+++ b/package.json
@@ -72,6 +72,7 @@
"eventsource-polyfill": "^0.9.6",
"express": "^4.13.3",
"file-loader": "^3.0.1",
+ "fontello-webpack-plugin": "https://github.com/sypl/fontello-webpack-plugin.git#35dac8cfd851bc1b3be19fd97e361516a1be6633",
"function-bind": "^1.0.2",
"html-webpack-plugin": "^3.0.0",
"http-proxy-middleware": "^0.17.2",
diff --git a/src/font/LICENSE.txt b/src/font/LICENSE.txt
deleted file mode 100755
index 95966f00..00000000
--- a/src/font/LICENSE.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-Font license info
-
-
-## Font Awesome
-
- Copyright (C) 2016 by Dave Gandy
-
- Author: Dave Gandy
- License: SIL ()
- Homepage: http://fortawesome.github.com/Font-Awesome/
-
-
-## Entypo
-
- Copyright (C) 2012 by Daniel Bruce
-
- Author: Daniel Bruce
- License: SIL (http://scripts.sil.org/OFL)
- Homepage: http://www.entypo.com
-
-
-## Iconic
-
- Copyright (C) 2012 by P.J. Onori
-
- Author: P.J. Onori
- License: SIL (http://scripts.sil.org/OFL)
- Homepage: http://somerandomdude.com/work/iconic/
-
-
-## Fontelico
-
- Copyright (C) 2012 by Fontello project
-
- Author: Crowdsourced, for Fontello project
- License: SIL (http://scripts.sil.org/OFL)
- Homepage: http://fontello.com
-
-
diff --git a/src/font/README.txt b/src/font/README.txt
deleted file mode 100755
index beaab336..00000000
--- a/src/font/README.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-This webfont is generated by http://fontello.com open source project.
-
-
-================================================================================
-Please, note, that you should obey original font licenses, used to make this
-webfont pack. Details available in LICENSE.txt file.
-
-- Usually, it's enough to publish content of LICENSE.txt file somewhere on your
- site in "About" section.
-
-- If your project is open-source, usually, it will be ok to make LICENSE.txt
- file publicly available in your repository.
-
-- Fonts, used in Fontello, don't require a clickable link on your site.
- But any kind of additional authors crediting is welcome.
-================================================================================
-
-
-Comments on archive content
----------------------------
-
-- /font/* - fonts in different formats
-
-- /css/* - different kinds of css, for all situations. Should be ok with
- twitter bootstrap. Also, you can skip style and assign icon classes
- directly to text elements, if you don't mind about IE7.
-
-- demo.html - demo file, to show your webfont content
-
-- LICENSE.txt - license info about source fonts, used to build your one.
-
-- config.json - keeps your settings. You can import it back into fontello
- anytime, to continue your work
-
-
-Why so many CSS files ?
------------------------
-
-Because we like to fit all your needs :)
-
-- basic file, .css - is usually enough, it contains @font-face
- and character code definitions
-
-- *-ie7.css - if you need IE7 support, but still don't wish to put char codes
- directly into html
-
-- *-codes.css and *-ie7-codes.css - if you like to use your own @font-face
- rules, but still wish to benefit from css generation. That can be very
- convenient for automated asset build systems. When you need to update font -
- no need to manually edit files, just override old version with archive
- content. See fontello source code for examples.
-
-- *-embedded.css - basic css file, but with embedded WOFF font, to avoid
- CORS issues in Firefox and IE9+, when fonts are hosted on the separate domain.
- We strongly recommend to resolve this issue by `Access-Control-Allow-Origin`
- server headers. But if you ok with dirty hack - this file is for you. Note,
- that data url moved to separate @font-face to avoid problems with
-
-
-
-
-
-
-
-