From 67951ec664793273a3fd08964353eacf7bed5041 Mon Sep 17 00:00:00 2001 From: Niklas Fasching Date: Mon, 30 May 2022 17:16:31 +0200 Subject: [PATCH] Update chroma: v0.10.0 -> v2 --- blorg/testdata/public.md5 | 2 +- blorg/testdata/public/about.html | 176 +++++++++++++++---------------- blorg/util.go | 8 +- go.mod | 9 +- go.sum | 17 +-- main.go | 8 +- 6 files changed, 113 insertions(+), 107 deletions(-) diff --git a/blorg/testdata/public.md5 b/blorg/testdata/public.md5 index 3b653b8..a9abe17 100644 --- a/blorg/testdata/public.md5 +++ b/blorg/testdata/public.md5 @@ -1,4 +1,4 @@ -2ca8531fdbcfcae02959ba8c810dda76 testdata/public/about.html +8a40ba056a514e37926f908c65f76ffe testdata/public/about.html b93d8331258932e6bb18d866329b5e4e testdata/public/another-post.html a4e5753838107f8cf44f8dfabc577c04 testdata/public/index.html 6e770ea67bb154191530585cc60c8c2f testdata/public/some-post.html diff --git a/blorg/testdata/public/about.html b/blorg/testdata/public/about.html index d19d1e6..c7e6abf 100644 --- a/blorg/testdata/public/about.html +++ b/blorg/testdata/public/about.html @@ -29,110 +29,110 @@ This site is generated from go-org/blorg/testdata/content using the configuration in blorg.org

-
#+AUTHOR: testdata
-#+TITLE: blorg
-#+BASE_URL: /go-org/blorg
-#+OPTIONS: toc:nil title:nil
-#+CONTENT: ./content
-#+PUBLIC: ./public
+
#+AUTHOR: testdata
+#+TITLE: blorg
+#+BASE_URL: /go-org/blorg
+#+OPTIONS: toc:nil title:nil
+#+CONTENT: ./content
+#+PUBLIC: ./public
 
-* templates
-** head
-#+name: head
-#+begin_src html
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <link rel="stylesheet" href="/go-org/blorg/style.css" type="text/css" />
-  <title>{{ .Title }}</title>
-</head>
-#+end_src
-** header
-#+name: header
-#+begin_src html
-<header class='header'>
-  <a class="logo" href="/go-org/blorg">home</a>
-  <nav>
-    <a href="https://www.github.com/niklasfasching/go-org">github</a>
-  </nav>
-</header>
-#+end_src
-** item
-#+name: item
-#+begin_src html
-<!doctype html>
-<html>
+* templates
+** head
+#+name: head
+#+begin_src html
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <link rel="stylesheet" href="/go-org/blorg/style.css" type="text/css" />
+  <title>{{ .Title }}</title>
+</head>
+#+end_src
+** header
+#+name: header
+#+begin_src html
+<header class='header'>
+  <a class="logo" href="/go-org/blorg">home</a>
+  <nav>
+    <a href="https://www.github.com/niklasfasching/go-org">github</a>
+  </nav>
+</header>
+#+end_src
+** item
+#+name: item
+#+begin_src html
+<!doctype html>
+<html>
   {{ template "head" . }}
-  <body>
+  <body>
     {{ template "header" . }}
-    <div class="container">
-      <h1 class="title">{{ .Title }}
-        <br>
-        <span class="subtitle">{{ .Subtitle }}</span>
-      </h1>
-      <ul class="tags">
+    <div class="container">
+      <h1 class="title">{{ .Title }}
+        <br>
+        <span class="subtitle">{{ .Subtitle }}</span>
+      </h1>
+      <ul class="tags">
         {{ range .Tags }}
-        <li><a href="/go-org/blorg/tags/{{ . | Slugify }}">{{ . }}</a></li>
+        <li><a href="/go-org/blorg/tags/{{ . | Slugify }}">{{ . }}</a></li>
         {{ end }}
-      </ul>
+      </ul>
       {{ .Content }}
-    </div>
-  </body>
-</html>
-#+end_src
+    </div>
+  </body>
+</html>
+#+end_src
 
-** list
-#+name: list
-#+begin_src html
-<!doctype html>
-<html>
+** list
+#+name: list
+#+begin_src html
+<!doctype html>
+<html>
   {{ template "head" . }}
-  <body>
+  <body>
     {{ template "header" . }}
-    <div class="container">
-      <h1 class="title">{{ .Title }}</h1>
-      <ul class="posts">
+    <div class="container">
+      <h1 class="title">{{ .Title }}</h1>
+      <ul class="posts">
         {{ range .Pages }}
-        <li class="post">
-          <a href="{{ .PermaLink }}">
-            <date>{{ .Date.Format "02.01.2006" }}</date>
-            <span>{{ .Title }}</span>
-          </a>
-        </li>
+        <li class="post">
+          <a href="{{ .PermaLink }}">
+            <date>{{ .Date.Format "02.01.2006" }}</date>
+            <span>{{ .Title }}</span>
+          </a>
+        </li>
         {{ end }}
-      </ul>
-      <ul>
-    </div>
-  </body>
-</html>
-#+end_src
+      </ul>
+      <ul>
+    </div>
+  </body>
+</html>
+#+end_src
 
-** index
-#+name: index
-#+begin_src html
-<!doctype html>
-<html>
+** index
+#+name: index
+#+begin_src html
+<!doctype html>
+<html>
   {{ template "head" . }}
-  <body>
+  <body>
     {{ template "header" . }}
-    <div class="container">
-      <h1 class="title">{{ .Title }}</h1>
-      <p>Only pages that have a date will be listed here - e.g. not <a href="about.html">about.html</a>
-      <ul class="posts">
+    <div class="container">
+      <h1 class="title">{{ .Title }}</h1>
+      <p>Only pages that have a date will be listed here - e.g. not <a href="about.html">about.html</a>
+      <ul class="posts">
         {{ range .Pages }}
-        <li class="post">
-          <a href="{{ .PermaLink }}">
-            <date>{{ .Date.Format "02.01.2006" }}</date>
-            <span>{{ .Title }}</span>
-          </a>
-        </li>
+        <li class="post">
+          <a href="{{ .PermaLink }}">
+            <date>{{ .Date.Format "02.01.2006" }}</date>
+            <span>{{ .Title }}</span>
+          </a>
+        </li>
         {{ end }}
-      </ul>
-      <ul>
-    </div>
-  </body>
-</html>
-#+end_src

+      </ul>
+      <ul>
+    </div>
+  </body>
+</html>
+#+end_src
diff --git a/blorg/util.go b/blorg/util.go index 9f88ee0..05d74e2 100644 --- a/blorg/util.go +++ b/blorg/util.go @@ -5,10 +5,10 @@ import ( "regexp" "strings" - "github.com/alecthomas/chroma" - "github.com/alecthomas/chroma/formatters/html" - "github.com/alecthomas/chroma/lexers" - "github.com/alecthomas/chroma/styles" + "github.com/alecthomas/chroma/v2" + "github.com/alecthomas/chroma/v2/formatters/html" + "github.com/alecthomas/chroma/v2/lexers" + "github.com/alecthomas/chroma/v2/styles" "github.com/niklasfasching/go-org/org" ) diff --git a/go.mod b/go.mod index ea085ed..6570316 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,14 @@ module github.com/niklasfasching/go-org go 1.18 require ( - github.com/alecthomas/chroma v0.10.0 + github.com/alecthomas/chroma/v2 v2.0.1 + github.com/chaseadamsio/goorgeous v2.0.0+incompatible github.com/pmezard/go-difflib v1.0.0 + github.com/russross/blackfriday v1.6.0 golang.org/x/net v0.0.0-20201224014010-6772e930b67b ) -require github.com/dlclark/regexp2 v1.4.0 // indirect +require ( + github.com/dlclark/regexp2 v1.4.0 // indirect + github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect +) diff --git a/go.sum b/go.sum index ea8f04d..efd8bda 100644 --- a/go.sum +++ b/go.sum @@ -1,21 +1,22 @@ -github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek= -github.com/alecthomas/chroma v0.10.0/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/alecthomas/chroma/v2 v2.0.1 h1:dyR7d3Dj5r3FoVabR91FTdM7SKc8RrJJ1KBTke+ipG4= +github.com/alecthomas/chroma/v2 v2.0.1/go.mod h1:vf4zrexSH54oEjJ7EdB65tGNHmH3pGZmVkgTP5RHvAs= +github.com/alecthomas/repr v0.0.0-20220113201626-b1b626ac65ae h1:zzGwJfFlFGD94CyyYwCJeSuD32Gj9GTaSi5y9hoVzdY= +github.com/chaseadamsio/goorgeous v2.0.0+incompatible h1:yVG26EN0GdD0LnYyLg6jHA+eMvfC1Q4fAp8HlrcAvsk= +github.com/chaseadamsio/goorgeous v2.0.0+incompatible/go.mod h1:6QaC0vFoKWYDth94dHFNgRT2YkT5FHdQp/Yx15aAAi0= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E= github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww= +github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY= +github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b h1:iFwSg7t5GZmB/Q5TjiEAsdoLDrdJRC1RiF2WhuV29Qw= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/main.go b/main.go index 4cb20fa..0b0a21a 100644 --- a/main.go +++ b/main.go @@ -9,10 +9,10 @@ import ( "runtime/debug" "strings" - "github.com/alecthomas/chroma" - "github.com/alecthomas/chroma/formatters/html" - "github.com/alecthomas/chroma/lexers" - "github.com/alecthomas/chroma/styles" + "github.com/alecthomas/chroma/v2" + "github.com/alecthomas/chroma/v2/formatters/html" + "github.com/alecthomas/chroma/v2/lexers" + "github.com/alecthomas/chroma/v2/styles" "github.com/niklasfasching/go-org/blorg" "github.com/niklasfasching/go-org/org" )