Commit 606cb6d7 authored by Florent Chehab's avatar Florent Chehab

Fix typefaces

parent f83d9270
......@@ -5,6 +5,7 @@ import createMuiTheme from '@material-ui/core/styles/createMuiTheme';
import { connect } from "react-redux";
import { BrowserRouter as Router, Route } from 'react-router-dom';
import MyComponent from './MyComponent';
import 'typeface-roboto';
import areSameThemes from '../utils/areSameThemes';
......
main.js
main.css
fonts/
\ No newline at end of file
......@@ -3409,6 +3409,29 @@
"object-assign": "^4.0.1"
}
},
"file-loader": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-2.0.0.tgz",
"integrity": "sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ==",
"dev": true,
"requires": {
"loader-utils": "^1.0.2",
"schema-utils": "^1.0.0"
},
"dependencies": {
"schema-utils": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
"integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
"dev": true,
"requires": {
"ajv": "^6.1.0",
"ajv-errors": "^1.0.0",
"ajv-keywords": "^3.1.0"
}
}
}
},
"fill-range": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
......@@ -8319,6 +8342,11 @@
"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
"dev": true
},
"typeface-roboto": {
"version": "0.0.54",
"resolved": "https://registry.npmjs.org/typeface-roboto/-/typeface-roboto-0.0.54.tgz",
"integrity": "sha512-sOFA1FXgP0gOgBYlS6irwq6hHYA370KE3dPlgYEJHL3PJd5X8gQE0RmL79ONif6fL5JZuGDj+rtOrFeOqz5IZQ=="
},
"ua-parser-js": {
"version": "0.7.18",
"resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.18.tgz",
......
......@@ -35,6 +35,7 @@
"redux-logger": "^3.0.6",
"redux-thunk": "^2.3.0",
"style-loader": "^0.23.0",
"typeface-roboto": "0.0.54",
"underscore": "^1.9.1"
},
"devDependencies": {
......@@ -50,6 +51,7 @@
"css-loader": "^1.0.0",
"eslint": "^5.4.0",
"eslint-config-google": "^0.9.1",
"file-loader": "^2.0.0",
"leaflet": "^1.3.4",
"mini-css-extract-plugin": "^0.4.2",
"node-sass": "^4.9.3",
......
......@@ -12,7 +12,7 @@ const config = {
},
},
{
test: /\.(sa|sc|c)ss$/,
test: /\.(sa|sc|c)ss$/,
use: [
{
loader: MiniCssExtractPlugin.loader,
......@@ -27,6 +27,17 @@ const config = {
'sass-loader',
]
},
{
test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/,
use: [{
loader: 'file-loader',
options: {
name: '[name].[ext]',
publicPath: '../frontend/fonts/',
outputPath: 'fonts/'
}
}]
}
],
},
plugins: [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment