1
0
mirror of https://github.com/osmarks/mycorrhiza.git synced 2025-01-07 10:20:26 +00:00

Mycomarkup: Update to v5.0.0

Got to bump it up
This commit is contained in:
Timur Ismagilov 2022-06-04 23:29:40 +03:00 committed by Timur Ismagilov
parent 787882cb80
commit ccc7703836
12 changed files with 26 additions and 25 deletions

View File

@ -1,11 +1,11 @@
package backlinks package backlinks
import ( import (
"github.com/bouncepaw/mycomarkup/v4" "github.com/bouncepaw/mycomarkup/v5"
"github.com/bouncepaw/mycomarkup/v4/links" "github.com/bouncepaw/mycomarkup/v5/links"
"github.com/bouncepaw/mycomarkup/v4/mycocontext" "github.com/bouncepaw/mycomarkup/v5/mycocontext"
"github.com/bouncepaw/mycomarkup/v4/options" "github.com/bouncepaw/mycomarkup/v5/options"
"github.com/bouncepaw/mycomarkup/v4/tools" "github.com/bouncepaw/mycomarkup/v5/tools"
"github.com/bouncepaw/mycorrhiza/hyphae" "github.com/bouncepaw/mycorrhiza/hyphae"
) )

View File

@ -1,10 +1,10 @@
package cfg package cfg
import ( import (
"github.com/bouncepaw/mycomarkup/v4" "github.com/bouncepaw/mycomarkup/v5"
"github.com/bouncepaw/mycomarkup/v4/blocks" "github.com/bouncepaw/mycomarkup/v5/blocks"
"github.com/bouncepaw/mycomarkup/v4/mycocontext" "github.com/bouncepaw/mycomarkup/v5/mycocontext"
"github.com/bouncepaw/mycomarkup/v4/options" "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. // 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.

4
go.mod
View File

@ -3,7 +3,7 @@ module github.com/bouncepaw/mycorrhiza
go 1.18 go 1.18
require ( 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/go-ini/ini v1.63.2
github.com/gorilla/feeds v1.1.1 github.com/gorilla/feeds v1.1.1
github.com/gorilla/mux v1.8.0 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, // Use this trick to test local Mycomarkup changes, replace the path with yours,
// but do not commit the change to the path: // 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: // Use this utility every time Mycomarkup gets a major update:
// https://github.com/marwan-at-work/mod // https://github.com/marwan-at-work/mod

4
go.sum
View File

@ -1,7 +1,7 @@
github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= 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/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/v5 v5.0.0 h1:/qS5sehlOltXHHCucqVJnfguSVMtX/qKVPjASGoVi7Q=
github.com/bouncepaw/mycomarkup/v4 v4.3.2/go.mod h1:y0b8U6Xfnh3KfNUpG3QuAXRJwqFPPpmS2kYvLzaf688= 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 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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= github.com/go-ini/ini v1.63.2 h1:kwN3umicd2HF3Tgvap4um1ZG52/WyKT9GGdPx0CJk6Y=

View File

@ -2,7 +2,7 @@ package help
// stuff.go is used for meta stuff about the wiki or all hyphae at once. // stuff.go is used for meta stuff about the wiki or all hyphae at once.
import ( import (
"github.com/bouncepaw/mycomarkup/v4" "github.com/bouncepaw/mycomarkup/v5"
"github.com/bouncepaw/mycorrhiza/shroom" "github.com/bouncepaw/mycorrhiza/shroom"
"github.com/bouncepaw/mycorrhiza/viewutil" "github.com/bouncepaw/mycorrhiza/viewutil"
"github.com/gorilla/mux" "github.com/gorilla/mux"
@ -10,7 +10,7 @@ import (
"net/http" "net/http"
"strings" "strings"
"github.com/bouncepaw/mycomarkup/v4/mycocontext" "github.com/bouncepaw/mycomarkup/v5/mycocontext"
) )
var ( var (

View File

@ -3,7 +3,7 @@ package interwiki
import ( import (
"encoding/json" "encoding/json"
"github.com/bouncepaw/mycomarkup/v4/options" "github.com/bouncepaw/mycomarkup/v5/options"
"github.com/bouncepaw/mycorrhiza/files" "github.com/bouncepaw/mycorrhiza/files"
"log" "log"
"os" "os"

View File

@ -1,7 +1,7 @@
package migration package migration
import ( import (
"github.com/bouncepaw/mycomarkup/v4/tools" "github.com/bouncepaw/mycomarkup/v5/tools"
"github.com/bouncepaw/mycorrhiza/files" "github.com/bouncepaw/mycorrhiza/files"
"io/ioutil" "io/ioutil"
"log" "log"

View File

@ -1,7 +1,7 @@
package migration package migration
import ( import (
"github.com/bouncepaw/mycomarkup/v4/tools" "github.com/bouncepaw/mycomarkup/v5/tools"
"github.com/bouncepaw/mycorrhiza/files" "github.com/bouncepaw/mycorrhiza/files"
"io/ioutil" "io/ioutil"
"log" "log"

View File

@ -2,7 +2,7 @@ package shroom
import ( import (
"errors" "errors"
"github.com/bouncepaw/mycomarkup/v4/options" "github.com/bouncepaw/mycomarkup/v5/options"
"github.com/bouncepaw/mycorrhiza/cfg" "github.com/bouncepaw/mycorrhiza/cfg"
"github.com/bouncepaw/mycorrhiza/hyphae" "github.com/bouncepaw/mycorrhiza/hyphae"
"github.com/bouncepaw/mycorrhiza/interwiki" "github.com/bouncepaw/mycorrhiza/interwiki"
@ -42,6 +42,7 @@ func MarkupOptions(hyphaName string) options.Options {
} }
return return
}, },
LocalTargetCanonicalName: util.CanonicalName,
LocalLinkHref: func(hyphaName string) string { LocalLinkHref: func(hyphaName string) string {
return "/hypha/" + util.CanonicalName(hyphaName) return "/hypha/" + util.CanonicalName(hyphaName)
}, },

View File

@ -8,7 +8,7 @@ import (
"net/http" "net/http"
"strings" "strings"
"github.com/bouncepaw/mycomarkup/v4/util" "github.com/bouncepaw/mycomarkup/v5/util"
"github.com/bouncepaw/mycorrhiza/cfg" "github.com/bouncepaw/mycorrhiza/cfg"
) )

View File

@ -2,12 +2,12 @@ package web
import ( import (
"fmt" "fmt"
"github.com/bouncepaw/mycomarkup/v4" "github.com/bouncepaw/mycomarkup/v5"
"github.com/bouncepaw/mycorrhiza/viewutil" "github.com/bouncepaw/mycorrhiza/viewutil"
"log" "log"
"net/http" "net/http"
"github.com/bouncepaw/mycomarkup/v4/mycocontext" "github.com/bouncepaw/mycomarkup/v5/mycocontext"
"github.com/gorilla/mux" "github.com/gorilla/mux"

View File

@ -2,7 +2,7 @@ package web
import ( import (
"fmt" "fmt"
"github.com/bouncepaw/mycomarkup/v4" "github.com/bouncepaw/mycomarkup/v5"
"github.com/bouncepaw/mycorrhiza/files" "github.com/bouncepaw/mycorrhiza/files"
"github.com/bouncepaw/mycorrhiza/shroom" "github.com/bouncepaw/mycorrhiza/shroom"
"github.com/bouncepaw/mycorrhiza/viewutil" "github.com/bouncepaw/mycorrhiza/viewutil"
@ -23,8 +23,8 @@ import (
"github.com/bouncepaw/mycorrhiza/util" "github.com/bouncepaw/mycorrhiza/util"
"github.com/bouncepaw/mycorrhiza/views" "github.com/bouncepaw/mycorrhiza/views"
"github.com/bouncepaw/mycomarkup/v4/mycocontext" "github.com/bouncepaw/mycomarkup/v5/mycocontext"
"github.com/bouncepaw/mycomarkup/v4/tools" "github.com/bouncepaw/mycomarkup/v5/tools"
) )
func initReaders(r *mux.Router) { func initReaders(r *mux.Router) {