Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 3 additions & 14 deletions config/loaders.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,25 +58,14 @@ const SCSSLoaderProd = {
}

const FontsLoader = {
test: /\.(woff2?|woff|eot|ttf|otf|mp3|wav)(\?.*)?$/,
use: {
loader: 'file-loader',
options: {
name: '[name].[ext]',
outputPath: './fonts/',
},
},
test: /\.(woff|woff2)$/,
type: 'asset/resource',
}

const ImagesLoader = {
test: /\.(png|jpe?g|gif)$/,
type: 'asset/resource',
use: [
{
loader: 'file-loader',
options: {
name: '[path][name].[ext]',
},
},
{
loader: 'image-webpack-loader',
options: {
Expand Down
1 change: 1 addition & 0 deletions config/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ module.exports = {
filename: '[name].js',
path: path.resolve(__dirname, '../dist'),
publicPath: '',
assetModuleFilename: 'assets/[hash][ext][query]',
},
module: {
rules: [loaders.FontsLoader, loaders.ImagesLoader, loaders.JSLoader],
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"esbuild-loader": "^2.13.1",
"eslint": "^7.24.0",
"eslint-webpack-plugin": "^2.5.4",
"file-loader": "^6.2.0",
"image-webpack-loader": "^7.0.1",
"lazysizes": "^5.3.2",
"mini-css-extract-plugin": "^1.5.0",
Expand Down
2 changes: 1 addition & 1 deletion src/scss/abstract/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ $base-border-radius: 3px;
// Font Family
// ----
$primary-font-family: roboto, sans-serif;
$secondary-font-family: sofia-pro, sans-serif;
$secondary-font-family: roboto, sans-serif;

// ----
// Font Size
Expand Down
8 changes: 0 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2570,14 +2570,6 @@ file-entry-cache@^6.0.1:
dependencies:
flat-cache "^3.0.4"

file-loader@^6.2.0:
version "6.2.0"
resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==
dependencies:
loader-utils "^2.0.0"
schema-utils "^3.0.0"

file-type@5.2.0, file-type@^5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6"
Expand Down