Skip to content

Commit 776af86

Browse files
committed
fix(@angular/cli): update file-loader and url-loader
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 ```
1 parent 2a3490f commit 776af86

File tree

4 files changed

+24
-12
lines changed

4 files changed

+24
-12
lines changed

package-lock.json

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"enhanced-resolve": "^3.4.1",
5858
"exports-loader": "^0.6.3",
5959
"extract-text-webpack-plugin": "3.0.0",
60-
"file-loader": "^0.10.0",
60+
"file-loader": "^1.1.5",
6161
"fs-extra": "^4.0.0",
6262
"glob": "^7.0.3",
6363
"html-webpack-plugin": "^2.29.0",
@@ -89,8 +89,8 @@
8989
"stylus": "^0.54.5",
9090
"stylus-loader": "^3.0.1",
9191
"typescript": "~2.4.2",
92-
"url-loader": "^0.6.0",
93-
"webpack": "~3.6.0",
92+
"url-loader": "^0.6.2",
93+
"webpack": "~3.7.1",
9494
"webpack-concat-plugin": "1.4.0",
9595
"webpack-dev-middleware": "~1.12.0",
9696
"webpack-dev-server": "~2.7.1",

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,21 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
178178
rules: [
179179
{ enforce: 'pre', test: /\.js$/, loader: 'source-map-loader', exclude: [nodeModules] },
180180
{ test: /\.html$/, loader: 'raw-loader' },
181-
{ test: /\.(eot|svg|cur)$/, loader: `file-loader?name=[name]${hashFormat.file}.[ext]` },
181+
{
182+
test: /\.(eot|svg|cur)$/,
183+
loader: 'file-loader',
184+
options: {
185+
name: `[name]${hashFormat.file}.[ext]`,
186+
limit: 10000
187+
}
188+
},
182189
{
183190
test: /\.(jpg|png|webp|gif|otf|ttf|woff|woff2|ani)$/,
184-
loader: `url-loader?name=[name]${hashFormat.file}.[ext]&limit=10000`
191+
loader: 'url-loader',
192+
options: {
193+
name: `[name]${hashFormat.file}`,
194+
limit: 10000
195+
}
185196
}
186197
].concat(extraRules)
187198
},

packages/@angular/cli/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"ember-cli-string-utils": "^1.0.0",
4545
"exports-loader": "^0.6.3",
4646
"extract-text-webpack-plugin": "3.0.0",
47-
"file-loader": "^0.10.0",
47+
"file-loader": "^1.1.5",
4848
"fs-extra": "^4.0.0",
4949
"glob": "^7.0.3",
5050
"html-webpack-plugin": "^2.29.0",
@@ -73,8 +73,8 @@
7373
"stylus": "^0.54.5",
7474
"stylus-loader": "^3.0.1",
7575
"typescript": ">=2.0.0 <2.6.0",
76-
"url-loader": "^0.6.0",
77-
"webpack": "~3.6.0",
76+
"url-loader": "^0.6.2",
77+
"webpack": "~3.7.1",
7878
"webpack-concat-plugin": "1.4.0",
7979
"webpack-dev-middleware": "~1.12.0",
8080
"webpack-dev-server": "~2.7.1",

0 commit comments

Comments
 (0)