TrizTech/ohif-viewer
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* fix: 🐛 Enabling workbox to cache webfonts and fonts-stylesheets, add local fonts for UMD build (#906)

Browse Source 
* fix: 🐛 commonjs/umd fonts import

Importing font into index-umd.js and creating a simple font css file
with font-face

Closes: #724

* fix: 🐛 Enabling workbox to cache webfonts and fonts-stylesheets

Closes: #724

* fix: 🐛 Adding all type of fonts from google - Roboto

Closes: #724
This commit is contained in:
Gustavo André Lelis 2019-09-27 06:11:05 -03:00 committed by Erik Ziegler
parent 816666df7b
commit 69b96478cb
11 changed files with 134 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
platform/viewer/.webpack/webpack.pwa.js
View File

@ -102,6 +102,32 @@ module.exports = (env, argv) => {
swDest: 'sw.js', swDest: 'sw.js',
clientsClaim: true, clientsClaim: true,
skipWaiting: true, skipWaiting: true,
exclude: [
new RegExp('^https://fonts.googleapis.com/'),
new RegExp('^https://fonts.gstatic.com/'),
],
runtimeCaching: [
{
urlPattern: new RegExp('^https://fonts.googleapis.com/'),
handler: 'StaleWhileRevalidate',
options: {
cacheName: 'google-fonts-stylesheets',
},
},
{
urlPattern: new RegExp('^https://fonts.gstatic.com/'),
handler: 'CacheFirst',
options: {
cacheName: 'google-fonts-webfonts',
// Only cache 30 images / one year.
expiration: {
maxAgeSeconds: 60 * 60 * 24 * 365,
maxEntries: 30,
},
},
},
],
}), }),
], ],
// https://webpack.js.org/configuration/dev-server/ // https://webpack.js.org/configuration/dev-server/

16
platform/viewer/public/html-templates/rollbar.html
View File

@ -1,27 +1,20 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
<meta name="theme-color" content="#000000" /> <meta name="theme-color" content="#000000" />
<link rel="manifest" href="<%= PUBLIC_URL %>manifest.json" /> <link rel="manifest" href="<%= PUBLIC_URL %>manifest.json" />
<!-- Built with: https://polyfill.io/v3/url-builder/ --> <!-- Built with: https://polyfill.io/v3/url-builder/ -->
<!-- Targets IE11 --> <!-- Targets IE11 -->
<script src="https://polyfill.io/v3/polyfill.min.js?flags=gated&features=default%2CObject.values%2CArray.prototype.flat%2CObject.entries%2CSymbol%2CArray.prototype.includes%2CString.prototype.repeat%2CArray.prototype.find"></script> <script
src="https://polyfill.io/v3/polyfill.min.js?flags=gated&features=default%2CObject.values%2CArray.prototype.flat%2CObject.entries%2CSymbol%2CArray.prototype.includes%2CString.prototype.repeat%2CArray.prototype.find"></script>
<script type="text/javascript" src="<%= PUBLIC_URL %>app-config.js"></script> <script type="text/javascript" src="<%= PUBLIC_URL %>app-config.js"></script>
<title>OHIF Viewer</title> <title>OHIF Viewer</title>
<!-- WEB FONTS -->
<link
href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700|Sanchez&display=swap"
rel="stylesheet"
/>
<!-- EXTENSIONS --> <!-- EXTENSIONS -->
<!-- <script type="text/javascript" src="path/to/some-extension.js"></script> <!-- <script type="text/javascript" src="path/to/some-extension.js"></script>
@ -50,4 +43,5 @@
// End Rollbar Snippet // End Rollbar Snippet
</script> </script>
</body> </body>
</html> </html>

BIN
platform/viewer/src/fonts/KFOmCnqEu92Fr1Mu4WxKKTU1Kvnz.woff2 Normal file
View File

Binary file not shown.

BIN
platform/viewer/src/fonts/KFOmCnqEu92Fr1Mu4mxKKTU1Kg.woff2 Normal file
View File

Binary file not shown.

BIN
platform/viewer/src/fonts/KFOmCnqEu92Fr1Mu5mxKKTU1Kvnz.woff2 Normal file
View File

Binary file not shown.

BIN
platform/viewer/src/fonts/KFOmCnqEu92Fr1Mu72xKKTU1Kvnz.woff2 Normal file
View File

Binary file not shown.

BIN
platform/viewer/src/fonts/KFOmCnqEu92Fr1Mu7GxKKTU1Kvnz.woff2 Normal file
View File

Binary file not shown.

BIN
platform/viewer/src/fonts/KFOmCnqEu92Fr1Mu7WxKKTU1Kvnz.woff2 Normal file
View File

Binary file not shown.

BIN
platform/viewer/src/fonts/KFOmCnqEu92Fr1Mu7mxKKTU1Kvnz.woff2 Normal file
View File

Binary file not shown.

74
platform/viewer/src/fonts/fonts.css Normal file
View File

@ -0,0 +1,74 @@
/* cyrillic-ext */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
font-display: swap;
src: local('Roboto'), local('Roboto-Regular'),
url('./KFOmCnqEu92Fr1Mu72xKKTU1Kvnz.woff2') format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F,
U+FE2E-FE2F;
}
/* cyrillic */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
font-display: swap;
src: local('Roboto'), local('Roboto-Regular'),
url('./KFOmCnqEu92Fr1Mu5mxKKTU1Kvnz.woff2') format('woff2');
unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}
/* greek-ext */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
font-display: swap;
src: local('Roboto'), local('Roboto-Regular'),
url('./KFOmCnqEu92Fr1Mu7mxKKTU1Kvnz.woff2') format('woff2');
unicode-range: U+1F00-1FFF;
}
/* greek */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
font-display: swap;
src: local('Roboto'), local('Roboto-Regular'),
url('./KFOmCnqEu92Fr1Mu4WxKKTU1Kvnz.woff2') format('woff2');
unicode-range: U+0370-03FF;
}
/* vietnamese */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
font-display: swap;
src: local('Roboto'), local('Roboto-Regular'),
url('./KFOmCnqEu92Fr1Mu7WxKKTU1Kvnz.woff2') format('woff2');
unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB;
}
/* latin-ext */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
font-display: swap;
src: local('Roboto'), local('Roboto-Regular'),
url('./KFOmCnqEu92Fr1Mu7GxKKTU1Kvnz.woff2') format('woff2');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB,
U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
font-display: swap;
src: local('Roboto'), local('Roboto-Regular'),
url('./KFOmCnqEu92Fr1Mu4mxKKTU1Kg.woff2') format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215,
U+FEFF, U+FFFD;
}

2
platform/viewer/src/index-umd.js
View File

@ -7,6 +7,8 @@ import React from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import App from './App.js'; import App from './App.js';
import './fonts/fonts.css';
function installViewer(props, containerId = 'root', callback) { function installViewer(props, containerId = 'root', callback) {
const container = document.getElementById(containerId); const container = document.getElementById(containerId);