diff --git a/package-lock.json b/package-lock.json index 74ec117548..1f559e5c50 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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", diff --git a/package.json b/package.json index 8591f30abf..892b2dfbe2 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/packages/@angular/cli/models/webpack-configs/common.ts b/packages/@angular/cli/models/webpack-configs/common.ts index 3c1659048d..108b7ee3c7 100644 --- a/packages/@angular/cli/models/webpack-configs/common.ts +++ b/packages/@angular/cli/models/webpack-configs/common.ts @@ -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) }, diff --git a/packages/@angular/cli/package.json b/packages/@angular/cli/package.json index 1a19f6bd33..67a37e4094 100644 --- a/packages/@angular/cli/package.json +++ b/packages/@angular/cli/package.json @@ -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",