CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="0.6.0"></a>
+# [0.6.0](https://github.com/webpack-contrib/url-loader/compare/v0.5.9...v0.6.0) (2017-10-03)
+
+
+### Features
+
+* **index:** add options validation (`schema-utils`) ([#78](https://github.com/webpack-contrib/url-loader/issues/78)) ([ced5990](https://github.com/webpack-contrib/url-loader/commit/ced5990))
+* add `fallback` option ([#88](https://github.com/webpack-contrib/url-loader/issues/88)) ([636ebed](https://github.com/webpack-contrib/url-loader/commit/636ebed))
+
+### Security
+
+* Updates Mime pacakge due to Regex DOS security vulnerability ([#87](https://github.com/webpack-contrib/url-loader/issues/87)) ([d19ee2d](https://github.com/webpack-contrib/url-loader/commit/d19ee2d))
+
+ - Reference issue https://nodesecurity.io/advisories/535
+
+
 <a name="0.5.9"></a>
 ## [0.5.9](https://github.com/webpack/url-loader/compare/v0.5.8...v0.5.9) (2017-06-12)
 

README.md

@@ -38,10 +38,10 @@ module.exports = {
         test: /\.(png|jpg|gif)$/,
         use: [
           {
-            loader: 'url-loader'
+            loader: 'url-loader',
             options: {
               limit: 8192
-            }  
+            }
           }
         ]
       }
@@ -56,11 +56,12 @@ module.exports = {
 |:--:|:--:|:-----:|:----------|
 |**`limit`**|`{Number}`|`undefined`|Byte limit to inline files as Data URL|
 |**`mimetype`**|`{String}`|`extname`|Specify MIME type for the file (Otherwise it's inferred from the file extension)|
-|**`prefix`**|`{String}`|`false`|Parameters for the [`file-loader`](https://github.com/webpack-contrib/file-loader) are valid too. They are passed to the file-loader if used|
+|**`fallback`**|`{String}`|`file-loader`|Specify `loader` for the file when file is greater than the limit (in bytes)|
 
 ### `limit`
 
-If the file is greater than the limit (in bytes) the [`file-loader`](https://github.com/webpack-contrib/file-loader) is used and all query parameters are passed to it.
+If the file is greater than the limit (in bytes) the [`file-loader`](https://github.com/webpack-contrib/file-loader) is used by default and all query parameters are passed to it.
+You can use other loader using `fallback` option.
 
 The limit can be specified via loader options and defaults to no limit.
 
@@ -88,13 +89,14 @@ Set the MIME type for the file. If unspecified the file extensions will be used
 }
 ```
 
-### `prefix`
+### `fallback`
 
+**webpack.config.js**
 ```js
 {
   loader: 'url-loader',
   options: {
-    prefix: 'img'
+    fallback: 'responsive-loader'
   }
 }
 ```

index.js

@@ -3,32 +3,38 @@
  Author Tobias Koppers @sokra
  */
 var loaderUtils = require("loader-utils");
+var validateOptions = require("schema-utils");
+
 var mime = require("mime");
 
 module.exports = function(content) {
-    this.cacheable && this.cacheable();
+  this.cacheable && this.cacheable();
 
-    var options =  loaderUtils.getOptions(this) || {};
-    // Options `dataUrlLimit` is backward compatibility with first loader versions
-    var limit = options.limit || (this.options && this.options.url && this.options.url.dataUrlLimit);
+  var options =  loaderUtils.getOptions(this) || {};
 
-    if(limit) {
-        limit = parseInt(limit, 10);
-    }
+  validateOptions(require("./options"), options, "URL Loader")
+  // Options `dataUrlLimit` is backward compatibility with first loader versions
+  var limit = options.limit || (this.options && this.options.url && this.options.url.dataUrlLimit);
 
-    var mimetype = options.mimetype || options.minetype || mime.lookup(this.resourcePath);
+  if(limit) {
+    limit = parseInt(limit, 10);
+  }
 
-    // No limits or limit more than content length
-    if(!limit || content.length < limit) {
-        if(typeof content === "string") {
-            content = new Buffer(content);
-        }
-        return "module.exports = " + JSON.stringify("data:" + (mimetype ? mimetype + ";" : "") + "base64," + content.toString("base64"));
+  var mimetype = options.mimetype || options.minetype || mime.lookup(this.resourcePath);
+
+  // No limits or limit more than content length
+  if(!limit || content.length < limit) {
+    if(typeof content === "string") {
+      content = new Buffer(content);
     }
 
-    var fileLoader = require("file-loader");
+    return "module.exports = " + JSON.stringify("data:" + (mimetype ? mimetype + ";" : "") + "base64," + content.toString("base64"));
+  }
+
+  var fallback = options.fallback || "file-loader";
+  var fallbackLoader = require(fallback);
 
-    return fileLoader.call(this, content);
+  return fallbackLoader.call(this, content);
 }
 
 module.exports.raw = true;

options.json

@@ -0,0 +1,18 @@
+{
+  "type": "object",
+  "properties": {
+    "limit": {
+      "type": "number"
+    },
+    "prefix": {
+      "type": "string"
+    },
+    "mimetype": {
+      "type": "string"
+    },
+    "encoding": {
+      "type": "string"
+    }
+  },
+  "additionalProperties": false
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "url-loader",
-  "version": "0.5.9",
+  "version": "0.6.0",
   "author": "Tobias Koppers @sokra",
   "description": "url loader module for webpack",
   "license": "MIT",
@@ -9,7 +9,8 @@
   },
   "dependencies": {
     "loader-utils": "^1.0.2",
-    "mime": "1.3.x"
+    "mime": "^1.4.1",
+    "schema-utils": "^0.3.0"
   },
   "devDependencies": {
     "standard-version": "^4.0.0"
@@ -19,6 +20,10 @@
   },
   "repository": {
     "type": "git",
-    "url": "git@github.com:webpack/url-loader.git"
-  }
+    "url": "git+https://github.com/webpack-contrib/url-loader.git"
+  },
+  "bugs": {
+    "url": "https://github.com/webpack-contrib/url-loader/issues"
+  },
+  "homepage": "https://github.com/webpack-contrib/url-loader"
 }