Skip to content
Snippets Groups Projects

Load fonts from a file instead of inline

Merged Angelina Filippova requested to merge linafilippova/admin-fe:chore/env-assets-path into master
5 files
+ 11
7
Compare changes
  • Side-by-side
  • Inline
Files
5
+ 4
2
@@ -16,6 +16,8 @@ function resolve(dir) {
const HOST = process.env.HOST
const PORT = process.env.PORT && Number(process.env.PORT)
const devEnv = require('../config/dev.env')
const devWebpackConfig = merge(baseWebpackConfig, {
mode: 'development',
module: {
@@ -39,7 +41,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
overlay: config.dev.errorOverlay
? { warnings: false, errors: true }
: false,
publicPath: config.dev.assetsPublicPath,
publicPath: devEnv.ASSETS_PUBLIC_PATH,
proxy: config.dev.proxyTable,
quiet: true, // necessary for FriendlyErrorsPlugin
watchOptions: {
@@ -59,7 +61,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
favicon: resolve('favicon.ico'),
title: 'Admin FE',
templateParameters: {
BASE_URL: config.dev.assetsPublicPath + config.dev.assetsSubDirectory,
BASE_URL: devEnv.ASSETS_PUBLIC_PATH + config.dev.assetsSubDirectory,
},
}),
]
Loading