Skip to content

Commit

Permalink
Prepare release
Browse files Browse the repository at this point in the history
  • Loading branch information
meaku committed May 29, 2018
1 parent 44fa34b commit 5856bf8
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
@@ -1,6 +1,12 @@
Changelog
---------

### 3.0.0
- Update dependencies
- **Breaking** marked@4.0.0 (@hpohlmeyer) [Changelog](https://github.com/markedjs/marked/releases/tag/0.4.0)
- use webpack 4.x for tests
- update example to use npm version of `markdown-loader`

### 2.0.2
- Update dependencies
- marked@0.3.9 (@xuopled)
Expand Down
8 changes: 5 additions & 3 deletions README.md
Expand Up @@ -12,11 +12,13 @@ markdown-loader for webpack using [marked](https://github.com/chjj/marked).

`npm install markdown-loader`

## [Changelog](CHANGELOG.md)

## Usage

Since marked's output is HTML, it's best served in conjunction with the [html-loader](https://github.com/webpack/html-loader).

### Webpack 2
### Webpack 2+

```javascript
{
Expand All @@ -41,8 +43,8 @@ Since marked's output is HTML, it's best served in conjunction with the [html-lo

### Options

Simply pass your marked [options](https://marked.js.org/#/USING_ADVANCED.md#options) as shown above.
In order to specify [custom renderers](https://github.com/peerigon/markdown-loader/issues/5), simply set the `options.renderer`-option on your webpack options.
Pass your marked [options](https://marked.js.org/#/USING_ADVANCED.md#options) as shown above.
In order to specify [custom renderers](https://github.com/peerigon/markdown-loader/issues/5), set the `options.renderer`-option in your webpack config.

```javascript
// webpack.config.js
Expand Down

0 comments on commit 5856bf8

Please sign in to comment.