Merge pull request #1172 from gethyas/restructure

Restructures dependencies+

.eslintignore

@@ -1,2 +1 @@
-assets/js/vendor
 node_modules

.npmignore

@@ -3,4 +3,5 @@ public
 resources
 .netlify
 .hugo_build.lock
-yarn-error.log
+yarn-error.log
+hugo_stats.json

.stylelintignore

@@ -1,2 +1,2 @@
-assets/scss/vendor
+assets/scss/common/_variables-custom.scss
 node_modules

.stylelintrc.json

@@ -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,

LICENSE

@@ -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

assets/js/custom.js

@@ -0,0 +1 @@
+// Put your custom JS code here

config/_default/hugo.toml

@@ -5,7 +5,7 @@ disableAliases = true
 disableHugoGeneratorInject = true
 # disableKinds = ["taxonomy", "term"]
 enableEmoji = true
-enableGitInfo = true
+enableGitInfo = false
 enableRobotsTXT = true
 languageCode = "en-US"
 paginate = 10
@@ -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"]
@@ -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"
@@ -52,7 +49,7 @@ rel  = "sitemap"
 [caches]
   [caches.getjson]
     dir = ":cacheDir/:project"
-    maxAge = "30m"
+    maxAge = -1 # "30m"
 
 [taxonomies]
   contributor = "contributors"
@@ -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"

config/_default/module.toml

@@ -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"
@@ -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"
@@ -102,4 +85,4 @@
 
 [[mounts]]
   source = "static"
-  target = "static"
+  target = "static"

config/_default/params.toml

@@ -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
@@ -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

config/postcss.config.js

@@ -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',

layouts/partials/footer/script-footer-custom.html

@@ -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 -}}
+*/}}

layouts/partials/head/custom-head.html

@@ -0,0 +1 @@
+<!-- Custom head -->

layouts/partials/head/script-header.html

@@ -0,0 +1 @@
+<!-- Insert scripts NOT needed by stylesheets here -->

netlify.toml

@@ -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"