Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-21 22:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(@angular/cli): update file-loader and url-loader

Browse Source 
This should fix errors like the one below for 0.6.0:
```
URL Loader Invalid Options

options['name'] should NOT have additional properties
options.limit should be number
```
This commit is contained in:
Filipe Silva 2017-10-18 16:27:02 +01:00 committed by Hans
parent 451f17cc04
commit 62c858c39a
4 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package-lock.json generated
View File

@ -2747,11 +2747,12 @@
}
},
"file-loader": {
"version": "0.10.1",
"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.10.1.tgz",
"integrity": "sha1-gVA0EZiR/GRB+1pkwRvJPCLd2EI=",
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.5.tgz",
"integrity": "sha512-RzGHDatcVNpGISTvCpfUfOGpYuSR7HSsSg87ki+wF6rw1Hm0RALPTiAdsxAq1UwLf0RRhbe22/eHK6nhXspiOQ==",
"requires": {
"loader-utils": "1.1.0"
"loader-utils": "1.1.0",
"schema-utils": "0.3.0"
}
},
"filename-regex": {
@ -7758,9 +7759,9 @@
}
},
"url-loader": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.6.0.tgz",
"integrity": "sha512-4OOHgcBkTZhgn6PQGAbKxlQgQd6E3IwQGYWZX8letBbQpfaDARAlm6sWckaOBpIN5WIHzUatweuiimBKZm99oA==",
"version": "0.6.2",
"resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.6.2.tgz",
"integrity": "sha512-h3qf9TNn53BpuXTTcpC+UehiRrl0Cv45Yr/xWayApjw6G8Bg2dGke7rIwDQ39piciWCWrC+WiqLjOh3SUp9n0Q==",
"requires": {
"loader-utils": "1.1.0",
"mime": "1.4.1",

4
package.json
View File

@ -57,7 +57,7 @@
"enhanced-resolve": "^3.4.1",
"exports-loader": "^0.6.3",
"extract-text-webpack-plugin": "3.0.0",
"file-loader": "^0.10.0",
"file-loader": "^1.1.5",
"fs-extra": "^4.0.0",
"glob": "^7.0.3",
"html-webpack-plugin": "^2.29.0",
@ -92,7 +92,7 @@
"tree-kill": "^1.0.0",
"typescript": "~2.4.2",
"uglifyjs-webpack-plugin": "1.0.0-beta.1",
"url-loader": "^0.6.0",
"url-loader": "^0.6.2",
"webpack": "~3.7.1",
"webpack-concat-plugin": "1.4.0",
"webpack-dev-middleware": "~1.12.0",

15
packages/@angular/cli/models/webpack-configs/common.ts
View File

@ -179,10 +179,21 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
module: {
rules: [
{ test: /\.html$/, loader: 'raw-loader' },
{ test: /\.(eot|svg|cur)$/, loader: `file-loader?name=[name]${hashFormat.file}.[ext]` },
{
test: /\.(eot|svg|cur)$/,
loader: 'file-loader',
options: {
name: `[name]${hashFormat.file}.[ext]`,
limit: 10000
}
},
{
test: /\.(jpg|png|webp|gif|otf|ttf|woff|woff2|ani)$/,
loader: `url-loader?name=[name]${hashFormat.file}.[ext]&limit=10000`
loader: 'url-loader',
options: {
name: `[name]${hashFormat.file}`,
limit: 10000
}
}
].concat(extraRules)
},

4
packages/@angular/cli/package.json
View File

@ -44,7 +44,7 @@
"ember-cli-string-utils": "^1.0.0",
"exports-loader": "^0.6.3",
"extract-text-webpack-plugin": "3.0.0",
"file-loader": "^0.10.0",
"file-loader": "^1.1.5",
"fs-extra": "^4.0.0",
"glob": "^7.0.3",
"html-webpack-plugin": "^2.29.0",
@ -75,7 +75,7 @@
"stylus-loader": "^3.0.1",
"typescript": ">=2.0.0 <2.6.0",
"uglifyjs-webpack-plugin": "1.0.0-beta.1",
"url-loader": "^0.6.0",
"url-loader": "^0.6.2",
"webpack": "~3.7.1",
"webpack-concat-plugin": "1.4.0",
"webpack-dev-middleware": "~1.12.0",