Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restructures dependencies+ #1172

Merged
merged 1 commit into from
Jan 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
assets/js/vendor
node_modules
3 changes: 2 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ public
resources
.netlify
.hugo_build.lock
yarn-error.log
yarn-error.log
hugo_stats.json
2 changes: 1 addition & 1 deletion .stylelintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
assets/scss/vendor
assets/scss/common/_variables-custom.scss
node_modules
2 changes: 0 additions & 2 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
"extends": "stylelint-config-standard-scss",
"rules": {
"no-empty-source": null,
"string-quotes": "double",
"scss/comment-no-empty": null,
"max-line-length": null,
"scss/at-extend-no-missing-placeholder": null,
"at-rule-no-unknown": [
true,
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Hyas
Copyright (c) 2020-2024 Hyas

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
1 change: 1 addition & 0 deletions assets/js/custom.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// Put your custom JS code here
Empty file added assets/svgs/.gitkeep
Empty file.
39 changes: 18 additions & 21 deletions config/_default/hugo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ disableAliases = true
disableHugoGeneratorInject = true
# disableKinds = ["taxonomy", "term"]
enableEmoji = true
enableGitInfo = true
enableGitInfo = false
enableRobotsTXT = true
languageCode = "en-US"
paginate = 10
Expand All @@ -17,14 +17,11 @@ defaultContentLanguage = "en"
disableLanguages = ["de", "nl"]
defaultContentLanguageInSubdir = false

copyRight = "Copyright (c) 2020-2023 Henk Verlinde"
copyRight = "Copyright (c) 2020-2024 Hyas"

[build.buildStats]
enable = true

[social]
twitter = "getdoks"

[outputs]
home = ["HTML", "RSS", "searchIndex"]
section = ["HTML", "RSS", "SITEMAP"]
Expand All @@ -37,12 +34,12 @@ copyRight = "Copyright (c) 2020-2023 Henk Verlinde"

# Add output format for section sitemap.xml
[outputFormats.SITEMAP]
mediaType = "application/xml"
baseName = "sitemap"
isHTML = false
isPlainText = true
noUgly = true
rel = "sitemap"
mediaType = "application/xml"
baseName = "sitemap"
isHTML = false
isPlainText = true
noUgly = true
rel = "sitemap"

[sitemap]
changefreq = "monthly"
Expand All @@ -52,7 +49,7 @@ rel = "sitemap"
[caches]
[caches.getjson]
dir = ":cacheDir/:project"
maxAge = "30m"
maxAge = -1 # "30m"

[taxonomies]
contributor = "contributors"
Expand All @@ -72,18 +69,18 @@ rel = "sitemap"
includeNewer = true
toLower = false
[[related.indices]]
name = "categories"
weight = 100
name = "categories"
weight = 100
[[related.indices]]
name = "tags"
weight = 80
name = "tags"
weight = 80
[[related.indices]]
name = "date"
weight = 10
name = "date"
weight = 10

[imaging]
anchor = "Smart"
anchor = "Center"
bgColor = "#ffffff"
hint = "photo"
quality = 75
resampleFilter = "Box"
quality = 85
resampleFilter = "Lanczos"
14 changes: 0 additions & 14 deletions config/_default/menus.toml

This file was deleted.

19 changes: 1 addition & 18 deletions config/_default/module.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,6 @@
[[mounts]]
source = "node_modules/@hyas/doks-core/assets"
target = "assets"
excludeFiles = ["scss/common/_variables-custom.scss", "scss/common/_custom.scss"]

[[mounts]]
source = "node_modules/flexsearch"
target = "assets/js/vendor/flexsearch"

[[mounts]]
source = "node_modules/katex"
target = "assets/js/vendor/katex"

[[mounts]]
source = "node_modules/mermaid"
target = "assets/js/vendor/mermaid"

[[mounts]]
source = "node_modules/@tabler/icons/icons"
Expand All @@ -53,10 +40,6 @@
source = "node_modules/@hyas/doks-core/data"
target = "data"

[[mounts]]
source = "config/_default/hyas"
target = "data"

[[mounts]]
source = "data"
target = "data"
Expand Down Expand Up @@ -102,4 +85,4 @@

[[mounts]]
source = "static"
target = "static"
target = "static"
9 changes: 6 additions & 3 deletions config/_default/params.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ title = "My Docs"
description = "Congrats on setting up a new Doks project!"
images = ["cover.png"]

# mainSections
mainSections = ["docs"]

[social]
twitter = "getdoks"

# Doks (@hyas/doks-core)
[doks]
# Color mode
Expand Down Expand Up @@ -64,9 +70,6 @@ images = ["cover.png"]
imageList = true # true (default) or false
imageSingle = true # true (default) or false

# KaTex
katex = false

# Repository
editPage = false # false (default) or true
lastMod = false # false (default) or true
Expand Down
14 changes: 12 additions & 2 deletions config/postcss.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,22 @@ module.exports = {
'show',
'img-fluid',
'blur-up',
'lazyload',
'lazyloaded',
'alert-link',
'container-fw ',
'container-lg',
'container-fluid',
'offcanvas-backdrop',
'figcaption',
'dt',
'dd',
'showing',
'hiding',
'page-item',
'page-link',
...whitelister([
'./assets/scss/**/*.css',
'./assets/scss/**/*.scss',
// './node_modules/katex/dist/katex.css',
'./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',
Expand Down
13 changes: 13 additions & 0 deletions layouts/partials/footer/script-footer-custom.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{{/* Put your custom <script></script> tags here */}}

{{/* EXAMPLE - only load script for production
{{ if eq (hugo.Environment) "production" -}}
{{ partial "footer/esbuild" (dict "src" "js/instantpage.js" "load" "async" "transpile" false) -}}
{{ end -}}
*/}}

{{/* EXAMPLE - only load script for a page type e.g. contact or gallery
{{ if eq .Type "gallery" -}}
{{ partial "footer/esbuild" (dict "src" "js/gallery.js" "load" "async" "transpile" false) -}}
{{ end -}}
*/}}
1 change: 1 addition & 0 deletions layouts/partials/head/custom-head.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!-- Custom head -->
1 change: 1 addition & 0 deletions layouts/partials/head/script-header.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!-- Insert scripts NOT needed by stylesheets here -->
4 changes: 2 additions & 2 deletions netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
functions = "functions"

[build.environment]
NODE_VERSION = "18.12.1"
NPM_VERSION = "8.19.2"
NODE_VERSION = "18.16.1"
NPM_VERSION = "9.5.1"

[context.production]
command = "pnpm build"
Expand Down
Loading