From e7286f763ac7974bb24d7362e5b84e3252279646 Mon Sep 17 00:00:00 2001 From: Shulhan Date: Thu, 18 Mar 2021 00:51:50 +0700 Subject: all: pembaruan dependensi Pembaruan ini mempengaruhi cara menggunakan paket ciigo secara keseluruhan. --- cmd/www-golangid/main.go | 5 ++++- generate.go | 10 ++++++++-- go.mod | 8 ++++---- go.sum | 35 ++++++++++++++++------------------- 4 files changed, 32 insertions(+), 26 deletions(-) diff --git a/cmd/www-golangid/main.go b/cmd/www-golangid/main.go index d416e47..9afc042 100644 --- a/cmd/www-golangid/main.go +++ b/cmd/www-golangid/main.go @@ -8,13 +8,16 @@ import ( "flag" "git.sr.ht/~shulhan/ciigo" + "github.com/shuLhan/share/lib/memfs" ) +var memFS *memfs.MemFS + func main() { var port string flag.StringVar(&port, "port", "5000", "HTTP port server") flag.Parse() - ciigo.Serve("./_content", ":"+port, "./_templates/html.tmpl") + ciigo.Serve(memFS, "./_content", ":"+port, "./_templates/html.tmpl") } diff --git a/generate.go b/generate.go index 80dfe35..c2b9e96 100644 --- a/generate.go +++ b/generate.go @@ -11,6 +11,12 @@ import ( ) func main() { - ciigo.Generate("./_content", "cmd/www-golangid/static.go", - "./_templates/html.tmpl") + opts := &ciigo.GenerateOptions{ + Root: "_content", + HTMLTemplate: "./_templates/html.tmpl", + GenPackageName: "main", + GenVarName: "memFS", + GenGoFileName: "cmd/www-golangid/static.go", + } + ciigo.Generate(opts) } diff --git a/go.mod b/go.mod index d0b42c9..bbc32d6 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module github.com/golang-id/web go 1.15 require ( - git.sr.ht/~shulhan/asciidoctor-go v0.0.0-20201226102329-36285ff15434 // indirect - git.sr.ht/~shulhan/ciigo v0.3.1-0.20201213122359-5b4ccb6434d7 - github.com/shuLhan/share v0.21.0 - golang.org/x/net v0.0.0-20201224014010-6772e930b67b // indirect + git.sr.ht/~shulhan/ciigo v0.5.1-0.20210306163938-fe10c3acedac + github.com/shuLhan/share v0.24.0 + golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 // indirect + golang.org/x/sys v0.0.0-20210317091845-390168757d9c // indirect ) diff --git a/go.sum b/go.sum index 0359abe..a1b932d 100644 --- a/go.sum +++ b/go.sum @@ -1,28 +1,25 @@ -git.sr.ht/~shulhan/asciidoctor-go v0.0.0-20201205130914-be765f32b57b/go.mod h1:ejaxKeBMNL5EpP2zjRP4B8zuOr+MM4ZyGwE3y7807WI= -git.sr.ht/~shulhan/asciidoctor-go v0.0.0-20201213122157-9eef9d3dc8fe/go.mod h1:ejaxKeBMNL5EpP2zjRP4B8zuOr+MM4ZyGwE3y7807WI= -git.sr.ht/~shulhan/asciidoctor-go v0.0.0-20201226102329-36285ff15434 h1:1iZnuHKdzhHgZePCmk47xTWoZCmqQG0Vpo/Nwk6SeYo= -git.sr.ht/~shulhan/asciidoctor-go v0.0.0-20201226102329-36285ff15434/go.mod h1:ejaxKeBMNL5EpP2zjRP4B8zuOr+MM4ZyGwE3y7807WI= -git.sr.ht/~shulhan/ciigo v0.3.0/go.mod h1:Y5FvSiJg88qshoR1ktj4fLzM5sk1pZcV0kJGU8GAuTo= -git.sr.ht/~shulhan/ciigo v0.3.1-0.20201213122359-5b4ccb6434d7 h1:ztn8oZacCsk9d+f6E/TWm95hllueW9/rmYkqb1fYeao= -git.sr.ht/~shulhan/ciigo v0.3.1-0.20201213122359-5b4ccb6434d7/go.mod h1:ryeDgVAgJsJ2WS7YQkbKL7FEMjdr6ahn9srJ4K+UT7I= -github.com/shuLhan/share v0.20.2-0.20201122173411-e8b3bf5ee6e9/go.mod h1:oBv+CGHG6u4Sa71+nJJJji8mCgPAadywjsB3I3k/b0o= -github.com/shuLhan/share v0.20.2-0.20201205202022-66069b9e49fe/go.mod h1:oBv+CGHG6u4Sa71+nJJJji8mCgPAadywjsB3I3k/b0o= -github.com/shuLhan/share v0.21.0 h1:q0/XbyRbTEF403wxjK3RLHEawFJEQF+UiqutSMmQ3Ls= -github.com/shuLhan/share v0.21.0/go.mod h1:u9caerexlcxmPVDttj7PnkxCBDY6yBRTZ+gGR+1tO98= +git.sr.ht/~shulhan/asciidoctor-go v0.1.0 h1:8bubpPyi/xzodZLFv+rScXlJR6hxfI3RQTYB9WfUyH8= +git.sr.ht/~shulhan/asciidoctor-go v0.1.0/go.mod h1:Cp7tWzT3GRRO6zZIg1mQ6yM5Nlb9iMK9hVl9aRZwcdo= +git.sr.ht/~shulhan/ciigo v0.5.1-0.20210306163938-fe10c3acedac h1:6mOjQ2Pbva6E+QUSkcu8rrg6QXLLWyaxIIFFGqauwWU= +git.sr.ht/~shulhan/ciigo v0.5.1-0.20210306163938-fe10c3acedac/go.mod h1:pgn91D8+DhI6iW/6k4Bf2/fUiWOFn1vHYhRrBk/30eM= +github.com/shuLhan/share v0.24.0 h1:zl2HcGcqBMZFHxhmH9IqMYudfhwJzYucthE6Z9aRBqQ= +github.com/shuLhan/share v0.24.0/go.mod h1:c6xnA1EctNz2KGVlekfydyXoUjpTPjyUHUIyWSELN/c= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -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/net v0.0.0-20210316092652-d523dce5a7f4 h1:b0LrWgu8+q7z4J+0Y3Umo5q1dL7NXBkKBWkaVkAq17E= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210108172913-0df2131ae363/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210317091845-390168757d9c h1:WGyvPg8lhdtSkb8BiYWdtPlLSommHOmJHFvzWODI7BQ= +golang.org/x/sys v0.0.0-20210317091845-390168757d9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= 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= -- cgit v1.3