CHANGELOG.md

@@ -2,6 +2,16 @@
 
 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="1.1.5"></a>
+## [1.1.5](https://github.com/webpack/file-loader/compare/v1.1.4...v1.1.5) (2017-10-05)
+
+
+### Bug Fixes
+
+* **schema:** allow `name` to be a `{Function}` (`options.name`) ([#216](https://github.com/webpack/file-loader/issues/216)) ([fbfb160](https://github.com/webpack/file-loader/commit/fbfb160))
+
+
+
 <a name="1.1.4"></a>
 ## [1.1.4](https://github.com/webpack/file-loader/compare/v1.1.3...v1.1.4) (2017-09-30)
 

README.md

@@ -57,7 +57,7 @@ Emits `file.png` as file in the output directory and returns the public URL
 
 |Name|Type|Default|Description|
 |:--:|:--:|:-----:|:----------|
-|**`name`**|`{String}`|`[hash].[ext]`|Configure a custom filename template for your file|
+|**`name`**|`{String\|Function}`|`[hash].[ext]`|Configure a custom filename template for your file|
 |**`context`**|`{String}`|`this.options.context`|Configure a custom file context, defaults to `webpack.config.js` [context](https://webpack.js.org/configuration/entry-context/#context)|
 |**`publicPath`**|`{String\|Function}`|[`__webpack_public_path__ `](https://webpack.js.org/api/module-variables/#__webpack_public_path__-webpack-specific-)|Configure a custom `public` path for your files|
 |**`outputPath`**|`{String\|Function}`|`'undefined'`|Configure a custom `output` path for your files|
@@ -68,6 +68,8 @@ Emits `file.png` as file in the output directory and returns the public URL
 
 You can configure a custom filename template for your file using the query parameter `name`. For instance, to copy a file from your `context` directory into the output directory retaining the full directory structure, you might use
 
+#### `{String}`
+
 **webpack.config.js**
 ```js
 {
@@ -78,6 +80,24 @@ You can configure a custom filename template for your file using the query param
 }
 ```
 
+#### `{Function}`
+
+**webpack.config.js**
+```js
+{
+  loader: 'file-loader',
+  options: {
+    name (file) {
+      if (env === 'development') {
+        return '[path][name].[ext]'
+      }
+
+      return '[hash].[ext]'
+    }
+  }  
+}
+```
+
 #### `placeholders`
 
 |Name|Type|Default|Description|
@@ -123,7 +143,7 @@ You can specify custom `output` and `public` paths by using `outputPath`, `publi
   loader: 'file-loader',
   options: {
     name: '[path][name].[ext]',
-    publicPath: 'assets'
+    publicPath: 'assets/'
   }  
 }
 ```
@@ -136,7 +156,7 @@ You can specify custom `output` and `public` paths by using `outputPath`, `publi
   loader: 'file-loader',
   options: {
     name: '[path][name].[ext]',
-    outputPath: 'images'
+    outputPath: 'images/'
   }  
 }
 ```

package.json

@@ -1,6 +1,6 @@
 {
   "name": "file-loader",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "author": "Tobias Koppers @sokra",
   "description": "file loader module for webpack",
   "license": "MIT",

src/options.json

@@ -1,9 +1,7 @@
 {
   "type": "object",
   "properties": {
-    "name": {
-      "type": "string"
-    },
+    "name": {},
     "regExp": {},
     "context": {
       "type": "string"

test/Errors.test.js

@@ -2,7 +2,10 @@ import loader from '../src';
 
 describe('Errors', () => {
   test('Validation Error', () => {
-    const err = () => loader.call({ query: { name: 1 }, emitFile: true });
+    const err = () => loader.call({
+      query: { useRelativePath: 1 },
+      emitFile: true,
+    });
 
     expect(err).toThrow();
     expect(err).toThrowErrorMatchingSnapshot();

test/__snapshots__/Errors.test.js.snap

@@ -11,6 +11,6 @@ exports[`Errors Validation Error 1`] = `
 
 File Loader Invalid Options
 
-options.name should be string
+options.useRelativePath should be boolean
 "
 `;