From ccc77038360df5993493820376ed800f7e131f7a Mon Sep 17 00:00:00 2001 From: Timur Ismagilov Date: Sat, 4 Jun 2022 23:29:40 +0300 Subject: [PATCH] Mycomarkup: Update to v5.0.0 Got to bump it up --- backlinks/hooks.go | 10 +++++----- cfg/header_links.go | 8 ++++---- go.mod | 4 ++-- go.sum | 4 ++-- help/web.go | 4 ++-- interwiki/interwiki.go | 2 +- migration/headings.go | 2 +- migration/rockets.go | 2 +- shroom/mycomarkup_options.go | 3 ++- util/util.go | 2 +- web/mutators.go | 4 ++-- web/readers.go | 6 +++--- 12 files changed, 26 insertions(+), 25 deletions(-) diff --git a/backlinks/hooks.go b/backlinks/hooks.go index 1ad7ebe..80d494a 100644 --- a/backlinks/hooks.go +++ b/backlinks/hooks.go @@ -1,11 +1,11 @@ package backlinks import ( - "github.com/bouncepaw/mycomarkup/v4" - "github.com/bouncepaw/mycomarkup/v4/links" - "github.com/bouncepaw/mycomarkup/v4/mycocontext" - "github.com/bouncepaw/mycomarkup/v4/options" - "github.com/bouncepaw/mycomarkup/v4/tools" + "github.com/bouncepaw/mycomarkup/v5" + "github.com/bouncepaw/mycomarkup/v5/links" + "github.com/bouncepaw/mycomarkup/v5/mycocontext" + "github.com/bouncepaw/mycomarkup/v5/options" + "github.com/bouncepaw/mycomarkup/v5/tools" "github.com/bouncepaw/mycorrhiza/hyphae" ) diff --git a/cfg/header_links.go b/cfg/header_links.go index 7995a57..147b0bc 100644 --- a/cfg/header_links.go +++ b/cfg/header_links.go @@ -1,10 +1,10 @@ package cfg import ( - "github.com/bouncepaw/mycomarkup/v4" - "github.com/bouncepaw/mycomarkup/v4/blocks" - "github.com/bouncepaw/mycomarkup/v4/mycocontext" - "github.com/bouncepaw/mycomarkup/v4/options" + "github.com/bouncepaw/mycomarkup/v5" + "github.com/bouncepaw/mycomarkup/v5/blocks" + "github.com/bouncepaw/mycomarkup/v5/mycocontext" + "github.com/bouncepaw/mycomarkup/v5/options" ) // HeaderLinks is a list off current header links. Feel free to iterate it directly but do not modify it by yourself. Call ParseHeaderLinks if you need to set new header links. diff --git a/go.mod b/go.mod index 2e33a30..fa9f238 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/bouncepaw/mycorrhiza go 1.18 require ( - github.com/bouncepaw/mycomarkup/v4 v4.3.2 + github.com/bouncepaw/mycomarkup/v5 v5.0.0 github.com/go-ini/ini v1.63.2 github.com/gorilla/feeds v1.1.1 github.com/gorilla/mux v1.8.0 @@ -23,7 +23,7 @@ require ( // Use this trick to test local Mycomarkup changes, replace the path with yours, // but do not commit the change to the path: -// replace github.com/bouncepaw/mycomarkup/v4 v4.3.2 => "/Users/bouncepaw/GolandProjects/mycomarkup" +// replace github.com/bouncepaw/mycomarkup/v5 v5.0.0 => "/Users/bouncepaw/GolandProjects/mycomarkup" // Use this utility every time Mycomarkup gets a major update: // https://github.com/marwan-at-work/mod diff --git a/go.sum b/go.sum index e288643..d2315b2 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/bouncepaw/mycomarkup/v4 v4.3.2 h1:2t+7OACv1/ZAsd65A/thOtoJYGGa1shirZJPB4nLsrI= -github.com/bouncepaw/mycomarkup/v4 v4.3.2/go.mod h1:y0b8U6Xfnh3KfNUpG3QuAXRJwqFPPpmS2kYvLzaf688= +github.com/bouncepaw/mycomarkup/v5 v5.0.0 h1:/qS5sehlOltXHHCucqVJnfguSVMtX/qKVPjASGoVi7Q= +github.com/bouncepaw/mycomarkup/v5 v5.0.0/go.mod h1:jyB/vxKe3X8SsN7FjjPf24IZwFM/H1C4LNvQ5UyXwjU= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-ini/ini v1.63.2 h1:kwN3umicd2HF3Tgvap4um1ZG52/WyKT9GGdPx0CJk6Y= diff --git a/help/web.go b/help/web.go index 3f4dca5..70cec7d 100644 --- a/help/web.go +++ b/help/web.go @@ -2,7 +2,7 @@ package help // stuff.go is used for meta stuff about the wiki or all hyphae at once. import ( - "github.com/bouncepaw/mycomarkup/v4" + "github.com/bouncepaw/mycomarkup/v5" "github.com/bouncepaw/mycorrhiza/shroom" "github.com/bouncepaw/mycorrhiza/viewutil" "github.com/gorilla/mux" @@ -10,7 +10,7 @@ import ( "net/http" "strings" - "github.com/bouncepaw/mycomarkup/v4/mycocontext" + "github.com/bouncepaw/mycomarkup/v5/mycocontext" ) var ( diff --git a/interwiki/interwiki.go b/interwiki/interwiki.go index 7d08752..7def369 100644 --- a/interwiki/interwiki.go +++ b/interwiki/interwiki.go @@ -3,7 +3,7 @@ package interwiki import ( "encoding/json" - "github.com/bouncepaw/mycomarkup/v4/options" + "github.com/bouncepaw/mycomarkup/v5/options" "github.com/bouncepaw/mycorrhiza/files" "log" "os" diff --git a/migration/headings.go b/migration/headings.go index 1693ce6..83bec24 100644 --- a/migration/headings.go +++ b/migration/headings.go @@ -1,7 +1,7 @@ package migration import ( - "github.com/bouncepaw/mycomarkup/v4/tools" + "github.com/bouncepaw/mycomarkup/v5/tools" "github.com/bouncepaw/mycorrhiza/files" "io/ioutil" "log" diff --git a/migration/rockets.go b/migration/rockets.go index 1d0ea46..1fc38f9 100644 --- a/migration/rockets.go +++ b/migration/rockets.go @@ -1,7 +1,7 @@ package migration import ( - "github.com/bouncepaw/mycomarkup/v4/tools" + "github.com/bouncepaw/mycomarkup/v5/tools" "github.com/bouncepaw/mycorrhiza/files" "io/ioutil" "log" diff --git a/shroom/mycomarkup_options.go b/shroom/mycomarkup_options.go index 61a71aa..600b35f 100644 --- a/shroom/mycomarkup_options.go +++ b/shroom/mycomarkup_options.go @@ -2,7 +2,7 @@ package shroom import ( "errors" - "github.com/bouncepaw/mycomarkup/v4/options" + "github.com/bouncepaw/mycomarkup/v5/options" "github.com/bouncepaw/mycorrhiza/cfg" "github.com/bouncepaw/mycorrhiza/hyphae" "github.com/bouncepaw/mycorrhiza/interwiki" @@ -42,6 +42,7 @@ func MarkupOptions(hyphaName string) options.Options { } return }, + LocalTargetCanonicalName: util.CanonicalName, LocalLinkHref: func(hyphaName string) string { return "/hypha/" + util.CanonicalName(hyphaName) }, diff --git a/util/util.go b/util/util.go index 9af0361..74d641f 100644 --- a/util/util.go +++ b/util/util.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - "github.com/bouncepaw/mycomarkup/v4/util" + "github.com/bouncepaw/mycomarkup/v5/util" "github.com/bouncepaw/mycorrhiza/cfg" ) diff --git a/web/mutators.go b/web/mutators.go index 8c3ad02..032af46 100644 --- a/web/mutators.go +++ b/web/mutators.go @@ -2,12 +2,12 @@ package web import ( "fmt" - "github.com/bouncepaw/mycomarkup/v4" + "github.com/bouncepaw/mycomarkup/v5" "github.com/bouncepaw/mycorrhiza/viewutil" "log" "net/http" - "github.com/bouncepaw/mycomarkup/v4/mycocontext" + "github.com/bouncepaw/mycomarkup/v5/mycocontext" "github.com/gorilla/mux" diff --git a/web/readers.go b/web/readers.go index e37768b..f43e265 100644 --- a/web/readers.go +++ b/web/readers.go @@ -2,7 +2,7 @@ package web import ( "fmt" - "github.com/bouncepaw/mycomarkup/v4" + "github.com/bouncepaw/mycomarkup/v5" "github.com/bouncepaw/mycorrhiza/files" "github.com/bouncepaw/mycorrhiza/shroom" "github.com/bouncepaw/mycorrhiza/viewutil" @@ -23,8 +23,8 @@ import ( "github.com/bouncepaw/mycorrhiza/util" "github.com/bouncepaw/mycorrhiza/views" - "github.com/bouncepaw/mycomarkup/v4/mycocontext" - "github.com/bouncepaw/mycomarkup/v4/tools" + "github.com/bouncepaw/mycomarkup/v5/mycocontext" + "github.com/bouncepaw/mycomarkup/v5/tools" ) func initReaders(r *mux.Router) {