Skip to content

Commit

Permalink
Merge pull request #8 from cmr-informatik/pr
Browse files Browse the repository at this point in the history
Use github version of blackfriday/v2 and remove dep files
  • Loading branch information
depado authored Oct 14, 2019
2 parents b3ac81f + a92e7ad commit d2f3a0a
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 151 deletions.
90 changes: 0 additions & 90 deletions Gopkg.lock

This file was deleted.

42 changes: 0 additions & 42 deletions Gopkg.toml

This file was deleted.

18 changes: 5 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,13 @@ a [Blackfriday](https://github.com/russross/blackfriday) renderer.
## Install and prerequisites

This project requires and uses the `v2` version of
[Blackfriday](https://github.com/russross/blackfriday/tree/v2). After
[this issue](https://github.com/Depado/bfchroma/issues/3) I decided to rollback
to the `gopkg.in` version so the lib can be go gettable.
[Blackfriday](https://github.com/russross/blackfriday/tree/v2).

```
$ go get -u github.com/Depado/bfchroma
```

You can also install it directly by using dep in your project:

```
$ dep ensure -add github.com/Depado/bfchroma
```

_Additionnaly, this project uses the module approach of go 1.11_
_This project uses the module approach of go 1.11_

## Features

Expand Down Expand Up @@ -111,7 +103,7 @@ import (

"github.com/Depado/bfchroma"

bf "gopkg.in/russross/blackfriday.v2"
bf "github.com/russross/blackfriday/v2"
)

var md = "This is some sample code.\n\n```go\n" +
Expand Down Expand Up @@ -149,7 +141,7 @@ package main
import (
"github.com/Depado/bfchroma"
"github.com/alecthomas/chroma/formatters/html"
bf "github.com/russross/blackfriday"
bf "github.com/russross/blackfriday/v2"
)

// Defines the extensions that are used
Expand Down Expand Up @@ -212,4 +204,4 @@ bf.Run(input, bf.WithRenderer(r), bf.WithExtensions(exts))
```

This way, you can pass your `css` var to any template and render it along the
rendered markdown.
rendered markdown.
2 changes: 1 addition & 1 deletion example/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/Depado/bfchroma"
"github.com/alecthomas/chroma/formatters/html"

bf "gopkg.in/russross/blackfriday.v2"
bf "github.com/russross/blackfriday/v2"
)

var md = "This is some sample code.\n\n```go\n" +
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,9 @@ require (
github.com/dlclark/regexp2 v1.1.6 // indirect
github.com/mattn/go-isatty v0.0.4 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/russross/blackfriday/v2 v2.0.1
github.com/sergi/go-diff v1.0.0 // indirect
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
github.com/stretchr/testify v1.2.2
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 // indirect
gopkg.in/russross/blackfriday.v2 v2.0.1
)

replace gopkg.in/russross/blackfriday.v2 => github.com/russross/blackfriday/v2 v2.0.1
2 changes: 1 addition & 1 deletion renderer.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/alecthomas/chroma/formatters/html"
"github.com/alecthomas/chroma/lexers"
"github.com/alecthomas/chroma/styles"
bf "gopkg.in/russross/blackfriday.v2"
bf "github.com/russross/blackfriday/v2"
)

// Option defines the functional option type
Expand Down
2 changes: 1 addition & 1 deletion renderer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/alecthomas/chroma/formatters/html"
"github.com/alecthomas/chroma/styles"
"github.com/stretchr/testify/assert"
bf "gopkg.in/russross/blackfriday.v2"
bf "github.com/russross/blackfriday/v2"
)

func TestExtend(t *testing.T) {
Expand Down

0 comments on commit d2f3a0a

Please sign in to comment.