mirrors/mycorrhiza
1
0
Fork 0
mirror of https://github.com/osmarks/mycorrhiza.git synced 2025-01-07 10:20:26 +00:00
Code Issues Releases Wiki Activity

Migrate to Mycomarkup v3

Browse Source 
Some stuff is broken, but at least it compiles. Funnily enough, the API turned out to be not broken. This is surprising.
This commit is contained in:
Timur Ismagilov 2021-10-05 23:10:28 +03:00
parent 8091638181
commit 5dd74da8ed
10 changed files with 462 additions and 460 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cfg/header_links.go
View File

@ -2,7 +2,7 @@ package cfg
// See https://mycorrhiza.wiki/hypha/configuration/header
import (
"github.com/bouncepaw/mycomarkup/v2/blocks"
"github.com/bouncepaw/mycomarkup/v3/blocks"
"strings"
)
@ -31,7 +31,7 @@ func ParseHeaderLinks(text string) {
//
// I do not really care.
if strings.HasPrefix(line, "=>") {
rl := blocks.MakeRocketLink(line, HeaderLinksHypha)
rl := blocks.ParseRocketLink(line, HeaderLinksHypha)
href, display := rl.Href(), rl.Display()
HeaderLinks = append(HeaderLinks, HeaderLink{
Href: href,

10
go.mod
View File

@ -3,7 +3,7 @@ module github.com/bouncepaw/mycorrhiza
go 1.16
require (
github.com/bouncepaw/mycomarkup/v2 v2.1.3
github.com/bouncepaw/mycomarkup/v3 v3.0.0
github.com/go-ini/ini v1.62.0
github.com/gorilla/feeds v1.1.1
github.com/gorilla/mux v1.8.0
@ -17,8 +17,10 @@ require (
gopkg.in/ini.v1 v1.62.0 // indirect
)
// Use this trick to test mycomarkup:
// replace github.com/bouncepaw/mycomarkup/v2 v2.1.1 => "/Users/bouncepaw/GolandProjects/mycomarkup"
// 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/v3 v3.0.0 => "/Users/bouncepaw/GolandProjects/mycomarkup"
// Use this utility every time Mycomarkup gets broken:
// Use this utility every time Mycomarkup gets a major update:
// https://github.com/marwan-at-work/mod
// Or maybe just ⌘⇧R every time, the utility is kinda weird.

4
go.sum
View File

@ -1,6 +1,6 @@
github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
github.com/bouncepaw/mycomarkup/v2 v2.1.3 h1:kMpuOO8TlHlAycqxYHLQMBnYjwE8UEO+ubpA6Z9/sVw=
github.com/bouncepaw/mycomarkup/v2 v2.1.3/go.mod h1:sIvtvJFGG61ZeSUC+fNBrFmrQ2xBpTMZezk/QtxiQbk=
github.com/bouncepaw/mycomarkup/v3 v3.0.0 h1:DEDgCYwmytEQe/wgINn7/41RMwLbVrWhOSEfc36N1BU=
github.com/bouncepaw/mycomarkup/v3 v3.0.0/go.mod h1:BpiGUVsYCgRZCDxF0iIdc08LJokm/Ab36S/Hif0J6D0=
github.com/go-ini/ini v1.62.0 h1:7VJT/ZXjzqSrvtraFp4ONq80hTcRQth1c9ZnQ3uNQvU=
github.com/go-ini/ini v1.62.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=

8
hyphae/backlinks.go
View File

@ -1,14 +1,14 @@
package hyphae
import (
"github.com/bouncepaw/mycomarkup/v2/tools"
"github.com/bouncepaw/mycomarkup/v3/tools"
"os"
"github.com/bouncepaw/mycorrhiza/util"
"github.com/bouncepaw/mycomarkup/v2"
"github.com/bouncepaw/mycomarkup/v2/links"
"github.com/bouncepaw/mycomarkup/v2/mycocontext"
"github.com/bouncepaw/mycomarkup/v3"
"github.com/bouncepaw/mycomarkup/v3/links"
"github.com/bouncepaw/mycomarkup/v3/mycocontext"
)
// Using set here seems like the most appropriate solution

2
l18n/l18n.go
View File

@ -1,6 +1,6 @@
// Code generated by go-localize; DO NOT EDIT.
// This file was generated by robots at
// 2021-10-01 01:05:27.197649651 -0400 EDT m=+0.002749572
// 2021-10-05 23:07:42.331894 +0300 MSK m=+0.003049418
package l18n

2
shroom/init.go
View File

@ -6,7 +6,7 @@ import (
"github.com/bouncepaw/mycorrhiza/hyphae"
"github.com/bouncepaw/mycorrhiza/views"
"github.com/bouncepaw/mycomarkup/v2/globals"
"github.com/bouncepaw/mycomarkup/v3/globals"
)
func init() {

2
util/util.go
View File

@ -9,7 +9,7 @@ import (
"regexp"
"strings"
"github.com/bouncepaw/mycomarkup/v2/util"
"github.com/bouncepaw/mycomarkup/v3/util"
"github.com/bouncepaw/mycorrhiza/cfg"
)

4
web/mutators.go
View File

@ -5,8 +5,8 @@ import (
"log"
"net/http"
"github.com/bouncepaw/mycomarkup/v2"
"github.com/bouncepaw/mycomarkup/v2/mycocontext"
"github.com/bouncepaw/mycomarkup/v3"
"github.com/bouncepaw/mycomarkup/v3/mycocontext"
"github.com/gorilla/mux"

6
web/readers.go
View File

@ -20,9 +20,9 @@ import (
"github.com/bouncepaw/mycorrhiza/util"
"github.com/bouncepaw/mycorrhiza/views"
"github.com/bouncepaw/mycomarkup/v2"
"github.com/bouncepaw/mycomarkup/v2/mycocontext"
"github.com/bouncepaw/mycomarkup/v2/tools"
"github.com/bouncepaw/mycomarkup/v3"
"github.com/bouncepaw/mycomarkup/v3/mycocontext"
"github.com/bouncepaw/mycomarkup/v3/tools"
)
func initReaders(r *mux.Router) {

4
web/stuff.go
View File

@ -20,8 +20,8 @@ import (
"github.com/bouncepaw/mycorrhiza/util"
"github.com/bouncepaw/mycorrhiza/views"
"github.com/bouncepaw/mycomarkup/v2"
"github.com/bouncepaw/mycomarkup/v2/mycocontext"
"github.com/bouncepaw/mycomarkup/v3"
"github.com/bouncepaw/mycomarkup/v3/mycocontext"
)
func initStuff(r *mux.Router) {