Skip to content

Commit

Permalink
Bump doks for 1.6 to 1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
l10178 committed Sep 22, 2024
1 parent 919cdb1 commit 4945c30
Show file tree
Hide file tree
Showing 9 changed files with 2,116 additions and 1,763 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup Hugo
uses: peaceiris/actions-hugo@v3
with:
hugo-version: '0.132.1'
hugo-version: '0.134.3'
extended: true

- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ done
本文档采用 [CC BY-NC 4.0][] 许可协议。

[Hugo]: https://gohugo.io/
[Doks]: https://github.com/gethyas/doks
[Doks]: https://github.com/thuliteio/doks
[pngquant]: https://pngquant.org/
[CC BY-NC 4.0]: https://creativecommons.org/licenses/by-nc/4.0/
8 changes: 8 additions & 0 deletions assets/jsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"compilerOptions": {
"baseUrl": ".",
"paths": {
"*": ["*", "..\\node_modules\\@thulite\\doks-core\\assets\\*"]
}
}
}
5 changes: 4 additions & 1 deletion config/_default/hugo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ enableEmoji = true
enableGitInfo = true
enableRobotsTXT = true
languageCode = "zh-CN"
paginate = 10
# paginate = 10
pagination.pagerSize = 10
rssLimit = 10
summarylength = 70 # 70 (default)

Expand All @@ -19,6 +20,8 @@ defaultContentLanguageInSubdir = false

copyRight = "Copyright (c) 2020-2024 xlabs.club"



[build.buildStats]
enable = true

Expand Down
30 changes: 15 additions & 15 deletions config/_default/module.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# mounts
## archetypes
[[mounts]]
source = "node_modules/@hyas/doks-core/archetypes"
source = "node_modules/@thulite/doks-core/archetypes"
target = "archetypes"

[[mounts]]
Expand All @@ -10,15 +10,15 @@

## assets
[[mounts]]
source = "node_modules/@hyas/core/assets"
source = "node_modules/@thulite/core/assets"
target = "assets"

[[mounts]]
source = "node_modules/@hyas/images/assets"
source = "node_modules/@thulite/images/assets"
target = "assets"

[[mounts]]
source = "node_modules/@hyas/doks-core/assets"
source = "node_modules/@thulite/doks-core/assets"
target = "assets"

[[mounts]]
Expand All @@ -36,41 +36,41 @@

## data
[[mounts]]
source = "node_modules/@hyas/doks-core/data"
source = "node_modules/@thulite/doks-core/data"
target = "data"

[[mounts]]
source = "data"
target = "data"

## i18n
# [[mounts]]
# source = "node_modules/@hyas/doks-core/i18n"
# target = "i18n"
# i18n
[[mounts]]
source = "node_modules/@thulite/doks-core/i18n"
target = "i18n"

[[mounts]]
source = "i18n"
target = "i18n"

## layouts
[[mounts]]
source = "node_modules/@hyas/core/layouts"
source = "node_modules/@thulite/core/layouts"
target = "layouts"

[[mounts]]
source = "node_modules/@hyas/seo/layouts"
source = "node_modules/@thulite/seo/layouts"
target = "layouts"

[[mounts]]
source = "node_modules/@hyas/images/layouts"
source = "node_modules/@thulite/images/layouts"
target = "layouts"

[[mounts]]
source = "node_modules/@hyas/doks-core/layouts"
source = "node_modules/@thulite/doks-core/layouts"
target = "layouts"

[[mounts]]
source = "node_modules/@hyas/inline-svg/layouts"
source = "node_modules/@thulite/inline-svg/layouts"
target = "layouts"

[[mounts]]
Expand All @@ -83,7 +83,7 @@

## static
[[mounts]]
source = "node_modules/@hyas/doks-core/static"
source = "node_modules/@thulite/doks-core/static"
target = "static"

[[mounts]]
Expand Down
16 changes: 8 additions & 8 deletions config/_default/params.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ footer = "Give Me a <a class=\"text-muted\" href=\"https://github.com/l10178/ida
plausibleDomain = "xlabs.club" # "example.com" (default)
keila = false # false (default) or true

# Doks (@hyas/doks-core)
# Doks (@thulite/doks-core)
[doks]
# Color mode
colorMode = "auto" # auto (default), light or dark
Expand Down Expand Up @@ -113,22 +113,22 @@ footer = "Give Me a <a class=\"text-muted\" href=\"https://github.com/l10178/ida
errorLevel = 'ignore' # ignore (default), warning, or error (fails the build)
highlightBroken = false # true or false (default)

# Images (@hyas/images)
[hyas_images]
[hyas_images.defaults]
# Images (@thulite/images)
[thulite_images]
[thulite_images.defaults]
decoding = "async" # sync, async, or auto (default)
fetchpriority = "auto" # high, low, or auto (default)
fetchpriority = "auto" # high, low, or auto (default)
loading = "lazy" # eager or lazy (default)
widths = [480, 576, 768, 1025, 1200, 1440] # [640, 768, 1024, 1366, 1600, 1920] for example
sizes = "auto" # 100vw (default), 75vw, or auto for example
process = "" # "fill 1600x900" or "fill 2100x900" for example
lqip = "16x webp q20" # "16x webp q20" or "21x webp q20" for example

# Inline SVG (@hyas/inline-svg)
# Inline SVG (@thulite/inline-svg)
[inline_svg]
iconSetDir = "tabler-icons" # "tabler-icons" (default)

# SEO (@hyas/seo)
# SEO (@thulite/seo)
[seo]
[seo.title]
separator = ""
Expand All @@ -143,7 +143,7 @@ footer = "Give Me a <a class=\"text-muted\" href=\"https://github.com/l10178/ida
type = "Organization" # Organization (default) or Person
logo = "favicon-512x512.png" # Logo of Organization — favicon-512x512.png (default)
name = "xlabs" # Name of Organization or Person
sameAs = ["https://github.com/l10178/idaas-book"] # E.g. ["https://github.com/gethyas/hyas", "https://fosstodon.org/@hyas"]
sameAs = ["https://github.com/l10178/idaas-book"] # E.g. ["https://github.com/getthulite/thulite", "https://fosstodon.org/@thulite"]
images = ["cover.png"] # ["cover.png"] (default)
article = [] # Article sections
newsArticle = [] # NewsArticle sections
Expand Down
3 changes: 2 additions & 1 deletion config/postcss.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ module.exports = {
'hiding',
'page-item',
'page-link',
...whitelister(['./assets/scss/**/*.scss', './node_modules/@hyas/doks-core/assets/scss/components/_code.scss', './node_modules/@hyas/doks-core/assets/scss/components/_expressive-code.scss', './node_modules/@hyas/doks-core/assets/scss/common/_syntax.scss'])
'not-content',
...whitelister(['./assets/scss/**/*.scss', './node_modules/@thulite/doks-core/assets/scss/components/_code.scss', './node_modules/@thulite/doks-core/assets/scss/components/_expressive-code.scss', './node_modules/@thulite/doks-core/assets/scss/common/_syntax.scss'])
]
})
]
Expand Down
Loading

0 comments on commit 4945c30

Please sign in to comment.