Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: peerigon/markdown-loader
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0ad4b4c3a5b738a69a54d3ce4ff4bdf5763251ce
Choose a base ref
...
head repository: peerigon/markdown-loader
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2bd1d2465eb5e3551cbc752f3ca26dd31e4be375
Choose a head ref

Commits on Apr 19, 2018

  1. Copy the full SHA
    015243f View commit details
  2. Merge pull request #30 from alex-lit/patch-1

    Changed link to marked.js options documentation
    meaku authored Apr 19, 2018
    Copy the full SHA
    1853cc1 View commit details

Commits on May 29, 2018

  1. Copy the full SHA
    0df2b3d View commit details
  2. Update marked to 0.4.0

    hpohlmeyer committed May 29, 2018
    Copy the full SHA
    f10593b View commit details
  3. Merge pull request #34 from peerigon/update-to-marked-0.4.0

    Update to marked 0.4.0
    meaku authored May 29, 2018
    Copy the full SHA
    84c989b View commit details
  4. Update example

    - update deps
    - use markdown-loader from npm
    - closes #32
    meaku committed May 29, 2018
    Copy the full SHA
    44e4c13 View commit details
  5. Update dependencies

    meaku committed May 29, 2018
    Copy the full SHA
    44fa34b View commit details
  6. Prepare release

    meaku committed May 29, 2018
    Copy the full SHA
    5856bf8 View commit details
  7. Copy the full SHA
    d7d3c38 View commit details
  8. 3.0.0

    meaku committed May 29, 2018
    Copy the full SHA
    962d29d View commit details

Commits on Aug 16, 2018

  1. Copy the full SHA
    3501439 View commit details

Commits on Aug 17, 2018

  1. Merge pull request #40 from styfle/patch-1

    Add badge to display install size
    meaku authored Aug 17, 2018
    Copy the full SHA
    762579e View commit details

Commits on Aug 18, 2018

  1. Update 'marked' dependency

    Rob Cresswell committed Aug 18, 2018
    Copy the full SHA
    e63eb15 View commit details

Commits on Aug 21, 2018

  1. Merge pull request #41 from robcresswell/feat/update-marked

    Update 'marked' dependency
    meaku authored Aug 21, 2018
    Copy the full SHA
    b6991fd View commit details
  2. Update Changelog (4.0.0)

    meaku committed Aug 21, 2018
    Copy the full SHA
    503e217 View commit details
  3. 4.0.0

    meaku committed Aug 21, 2018
    Copy the full SHA
    4f23d3b View commit details

Commits on Dec 11, 2018

  1. Fix url to marked repo

    styfle authored Dec 11, 2018
    Copy the full SHA
    0f57c46 View commit details
  2. Add files key to package.json

    styfle authored Dec 11, 2018
    Copy the full SHA
    e3f35e5 View commit details

Commits on Jan 2, 2019

  1. bump marked version to 0.6.0

    Bump marked version to `^0.6.0`
    tmorehouse authored Jan 2, 2019
    Copy the full SHA
    204e428 View commit details

Commits on Jan 11, 2019

  1. Merge pull request #44 from styfle/patch-1

    Fix url to marked repo
    meaku authored Jan 11, 2019
    Copy the full SHA
    1abd608 View commit details
  2. Merge pull request #45 from styfle/patch-2

    Add files key to package.json
    meaku authored Jan 11, 2019
    Copy the full SHA
    4e15df9 View commit details
  3. Merge pull request #48 from tmorehouse/patch-1

    bump marked version to 0.6.0 (closes #47)
    meaku authored Jan 11, 2019
    Copy the full SHA
    d50b37f View commit details
  4. Update dependencies

    meaku committed Jan 11, 2019
    Copy the full SHA
    799ffe8 View commit details
  5. Copy the full SHA
    f798cd8 View commit details
  6. Simplify exmaple

    meaku committed Jan 11, 2019
    Copy the full SHA
    9525c4d View commit details
  7. Update changelog

    meaku committed Jan 11, 2019
    Copy the full SHA
    e8d693d View commit details
  8. 5.0.0

    meaku committed Jan 11, 2019
    Copy the full SHA
    dccbdd5 View commit details

Commits on Jul 26, 2019

  1. Update dependencies to fix audit breakage.

    Fixes #50.
    jkinkead committed Jul 26, 2019
    Copy the full SHA
    be6e2c2 View commit details

Commits on Jul 31, 2019

  1. Merge pull request #51 from jkinkead/fix_npm_audit

    Update dependencies to fix audit breakage.
    meaku authored Jul 31, 2019
    Copy the full SHA
    b6b35eb View commit details
  2. Update dependencies

    meaku committed Jul 31, 2019
    Copy the full SHA
    3ba52af View commit details
  3. 5.1.0

    meaku committed Jul 31, 2019
    Copy the full SHA
    bfa9087 View commit details
  4. Update deps of example

    meaku committed Jul 31, 2019
    Copy the full SHA
    9cae0d4 View commit details

Commits on Nov 11, 2019

  1. Add LICENSE

    - closes #54
    meaku authored Nov 11, 2019
    Copy the full SHA
    8126005 View commit details

Commits on Sep 17, 2020

  1. Copy the full SHA
    6e2e0ad View commit details

Commits on Sep 28, 2020

  1. Copy the full SHA
    ea6635c View commit details
  2. Copy the full SHA
    513f98b View commit details
  3. Copy the full SHA
    e9e5f26 View commit details

Commits on Sep 29, 2020

  1. Copy the full SHA
    745671c View commit details
  2. 5.2.0

    jhnns committed Sep 29, 2020
    Copy the full SHA
    db637b9 View commit details
  3. 6.0.0

    jhnns committed Sep 29, 2020
    Copy the full SHA
    447c5b7 View commit details

Commits on May 14, 2021

  1. Don't return, export

    Yash-Singh1 authored May 14, 2021
    Copy the full SHA
    a8a32bd View commit details

Commits on Jan 27, 2022

  1. Copy the full SHA
    31e153c View commit details
  2. Update marked@4.0.12

    Fixes #82
    jhnns committed Jan 27, 2022
    Copy the full SHA
    01a63ae View commit details
  3. 7.0.0

    jhnns committed Jan 27, 2022
    Copy the full SHA
    2bd1d24 View commit details
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -2,9 +2,10 @@ os:
- linux
language: node_js
node_js:
- "4"
- "5"
- "7"

- "8"
- "9"
- "10"

script:
- npm test
36 changes: 36 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,42 @@
Changelog
---------

### 7.0.0

- **Breaking:** Update marked@4.0.12 to fix security issues ([#82](https://github.com/peerigon/markdown-loader/issues/82))

### 6.0.0

- Remove Node v6 support

### 5.2.0

- Update dependencies
- Note: This version is deprecated since it already removed official Node v6 support which should have been published as breaking change

### 5.1.0

- Update dependencies

### 5.0.0

- Update dependencies
- **Breaking** marked@0.6.0 @tmorehouse [Changelog](https://github.com/markedjs/marked/releases/tag/v0.6.0)
- switch to snapshot tests @meaku
- reduce shipped files via npm @styfle
- fix URL to marked repo @styfle

### 4.0.0

- Update dependencies
- **Breaking** marked@0.5.0 @robcresswell [Changelog](https://github.com/markedjs/marked/releases/tag/v0.5.0)

### 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)
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2019 Peerigon

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
13 changes: 8 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
markdown-loader
===============

markdown-loader for webpack using [marked](https://github.com/chjj/marked).
markdown-loader for webpack using [marked](https://github.com/markedjs/marked).

[![](https://img.shields.io/npm/v/markdown-loader.svg)](https://www.npmjs.com/package/markdown-loader)
[![install size](https://badgen.net/packagephobia/install/markdown-loader)](https://packagephobia.now.sh/result?p=markdown-loader)
[![](https://img.shields.io/npm/dm/markdown-loader.svg)](https://www.npmjs.com/package/markdown-loader)
[![Dependency Status](https://david-dm.org/peerigon/markdown-loader.svg)](https://david-dm.org/peerigon/markdown-loader)
[![Build Status](https://travis-ci.org/peerigon/markdown-loader.svg?branch=master)](https://travis-ci.org/peerigon/markdown-loader)
@@ -12,11 +13,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
{
@@ -41,16 +44,16 @@ Since marked's output is HTML, it's best served in conjunction with the [html-lo

### Options

Simply pass your marked [options](https://github.com/chjj/marked#options-1) 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

const marked = require("marked");
const renderer = new marked.Renderer();

return {
module.exports = {
module: {
rules: [{
test: /\.md$/,
3 changes: 3 additions & 0 deletions example/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
./node_modules
./dist/*
./bundle.js
9 changes: 3 additions & 6 deletions example/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# Markdown-loader-example

* first
* `npm install`
* second
* `npm start`
* third
* open chrome with url `localhost:4000`
* `npm install`
* `npm start`
* open `localhost:8080`

Loading