Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add loaders for fonts #1765

Closed
wants to merge 10 commits into from
Closed

Add loaders for fonts #1765

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fd260cd
Add loaders for fonts
stefannegele Aug 19, 2016
d92efd6
Merge branch 'master' into webpack-font-support
stefannegele Aug 19, 2016
6b6986c
Merge master
stefannegele Aug 23, 2016
06989a5
Use file loader for svg fonts
stefannegele Aug 23, 2016
dde7bc6
Merge branch 'master' into webpack-font-support
stefannegele Aug 23, 2016
65efd81
Merge branch 'master' into webpack-font-support
stefannegele Aug 24, 2016
ec646c7
Merge with master branch
stefannegele Oct 16, 2016
a737a1f
Merge branch 'master' into webpack-font-support
stefannegele Oct 18, 2016
5a34114
Remove path import for PR merge
stefannegele Oct 18, 2016
083ab54
Remove old webpack config
stefannegele Oct 18, 2016
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
5 changes: 2 additions & 3 deletions packages/angular-cli/models/webpack-build-common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,8 @@ export function getWebpackCommonConfig(
       { test: /\.(jpg|png|gif)$/, loader: 'url-loader?limit=10000' },
       { test: /\.html$/, loader: 'raw-loader' },

{ test: /\.(otf|woff|ttf|svg)$/, loader: 'url?limit=10000' },
{ test: /\.woff2$/, loader: 'url?limit=10000&mimetype=font/woff2' },
{ test: /\.eot$/, loader: 'file' }
{ test: /\.(otf|ttf|woff|woff2)$/, loader: 'url?limit=10000' },
{ test: /\.(eot|svg)$/, loader: 'file' }
]
},
plugins: [
Expand Down