feat: update for doks 0.3.4

.gitignore

@@ -1,4 +1,3 @@
-bin
 node_modules
 public
 resources

LICENSE

@@ -1,6 +1,7 @@
 MIT License
 
-Copyright (c) 2020-2021 Gridsome, Henk Verlinde
+Copyright (c) 2018-present, Gridsome
+Copyright (c) 2020-present, Henk Verlinde
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

config/_default/config.toml

@@ -1,4 +1,4 @@
-baseurl = "/"
+baseurl = "https://doks-child-theme.netlify.app/"
 canonifyURLs = false
 disableAliases = true
 disableHugoGeneratorInject = true
@@ -42,6 +42,11 @@ isPlainText = true
 noUgly = true
 rel  = "sitemap"
 
+[caches]
+  [caches.getjson]
+    dir = ":cacheDir/:project"
+    maxAge = "10s"
+
 [markup]
   [markup.goldmark]
     [markup.goldmark.extensions]
@@ -76,6 +81,9 @@ rel  = "sitemap"
 [permalinks]
   blog = "/blog/:title/"
 
+[minify.tdewolff.html]
+  keepWhitespace = false
+
 [module]
   [module.hugoVersion]
     extended = true

config/_default/menus.toml

@@ -20,17 +20,17 @@
   url = "/blog/"
   weight = 20
 
-[[social]]
-  name = "Twitter"
-  pre = "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"20\" height=\"20\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\" class=\"feather feather-twitter\"><path d=\"M23 3a10.9 10.9 0 0 1-3.14 1.53 4.48 4.48 0 0 0-7.86 3v1A10.66 10.66 0 0 1 3 4s-4 9 5 13a11.64 11.64 0 0 1-7 2c9 5 20 0 20-11.5a4.5 4.5 0 0 0-.08-.83A7.72 7.72 0 0 0 23 3z\"></path></svg>"
-  url = "https://twitter.com/getdoks"
-  weight = 10
-
 [[social]]
   name = "GitHub"
   pre = "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"20\" height=\"20\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\" class=\"feather feather-github\"><path d=\"M9 19c-5 1.5-5-2.5-7-3m14 6v-3.87a3.37 3.37 0 0 0-.94-2.61c3.14-.35 6.44-1.54 6.44-7A5.44 5.44 0 0 0 20 4.77 5.07 5.07 0 0 0 19.91 1S18.73.65 16 2.48a13.38 13.38 0 0 0-7 0C6.27.65 5.09 1 5.09 1A5.07 5.07 0 0 0 5 4.77a5.44 5.44 0 0 0-1.5 3.78c0 5.42 3.3 6.61 6.44 7A3.37 3.37 0 0 0 9 18.13V22\"></path></svg>"
   url = "https://github.com/h-enk/doks"
   post = "v0.1.0"
+  weight = 10
+
+[[social]]
+  name = "Twitter"
+  pre = "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"20\" height=\"20\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\" class=\"feather feather-twitter\"><path d=\"M23 3a10.9 10.9 0 0 1-3.14 1.53 4.48 4.48 0 0 0-7.86 3v1A10.66 10.66 0 0 1 3 4s-4 9 5 13a11.64 11.64 0 0 1-7 2c9 5 20 0 20-11.5a4.5 4.5 0 0 0-.08-.83A7.72 7.72 0 0 0 23 3z\"></path></svg>"
+  url = "https://twitter.com/getdoks"
   weight = 20
 
 # [[footer]]

config/_default/params.toml

@@ -51,11 +51,15 @@ lqipWidth = "20x"
 
 # Footer
 footer = "Powered by <a href=\"https://www.netlify.com/\">Netlify</a>, <a href=\"https://gohugo.io/\">Hugo</a>, and <a href=\"https://getdoks.org/\">Doks</a>"
+
+# Feed
 copyRight = "Copyright (c) 2020-2021 Henk Verlinde"
 
 # Alert
 alert = false
-alertText = "Like Doks? <a class=\"alert-link\" href=\"https://github.com/h-enk/doks/stargazers\">Star on GitHub</a>. Thanks!</a>"
+alertDismissable = true
+# alertText = "Introducing the Doks child theme, several DX + UX updates, and more! <a class=\"alert-link stretched-link\" href=\"https://getdoks.org/blog/doks-v0.2/\" target=\"_blank\" rel=\"noopener\">Check out Doks v0.2</a>"
+alertText = "Introducing the Doks child theme, several DX + UX updates, and more! <a class=\"alert-link stretched-link\" href=\"https://getdoks.org/blog/doks-v0.2/\">Check out Doks v0.2</a>"
 
 # Edit Page
 docsRepo = "https://github.com/h-enk/doks"
@@ -71,4 +75,6 @@ editPage = false
   breadCrumb = false
   highLight = true
   kaTex = false
-  collapsibleSidebar = false
+  collapsibleSidebar = true
+  multilingualMode = false # Not yet functional
+  docsVersioning = false # Not yet functional

config/next/config.toml

@@ -1,2 +1 @@
-baseurl = "https://doks-child-theme-next.netlify.app/"
+canonifyURLs = false
-canonifyURLs = true

config/postcss.config.js

@@ -21,6 +21,7 @@ module.exports = {
         'th',
         'td',
         'h5',
+        'alert-link',
         ...whitelister([
           './node_modules/@hyas/doks/assets/scss/common/_variables.scss',
           './node_modules/@hyas/doks/assets/scss/components/_buttons.scss',

config/production/config.toml

@@ -1,2 +1 @@
-baseurl = "https://doks-child-theme.netlify.app/"
+canonifyURLs = false
-canonifyURLs = true

content/docs/help/faq.md

@@ -23,7 +23,7 @@ Please keep it in place.
 
 ## Keyboard shortcuts for search?
 
-- focus: `/`
+- focus: `Ctrl + /`
 - select: `↓` and `↑`
 - open: `Enter`
 - close: `Esc`

netlify.toml

@@ -5,26 +5,25 @@
 [build.environment]
   NODE_VERSION = "16.3.0"
   NPM_VERSION = "7.16.0"
-  HUGO_VERSION = "0.84.4"
 
 [context.production]
-  command = "hugo --gc --minify"
+  command = "npm run build"
 
 [context.deploy-preview]
-  command = "hugo --gc --minify -b $DEPLOY_PRIME_URL"
+  command = "npm run build -- -b $DEPLOY_PRIME_URL"
 
 [context.branch-deploy]
-  command = "hugo --gc --minify -b $DEPLOY_PRIME_URL"
+  command = "npm run build -- -b $DEPLOY_PRIME_URL"
 
 [context.next]
-  command = "hugo --gc --minify"
+  command = "npm run build"
 
 [context.next.environment]
   HUGO_ENV = "next"
 
 [dev]
   framework = "#custom"
-  command = "shx rm -rf public resources && hugo server --bind=0.0.0.0 --disableFastRender"
+  command = "npm run start"
   targetPort = 1313
   port = 8888
   publish = "public"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "doks-child-theme",
   "description": "Doks child theme",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "browserslist": [
     "defaults"
   ],
@@ -12,29 +12,29 @@
   },
   "scripts": {
     "init": "shx rm -rf .git && git init -b main",
-    "create": "exec-bin bin/hugo/hugo new",
+    "create": "exec-bin node_modules/.bin/hugo/hugo new",
     "prestart": "npm run clean",
-    "start": "exec-bin bin/hugo/hugo server  --bind=0.0.0.0 --disableFastRender",
+    "start": "exec-bin node_modules/.bin/hugo/hugo server  --bind=0.0.0.0 --disableFastRender",
     "prebuild": "npm run clean",
-    "build": "exec-bin bin/hugo/hugo --gc --minify",
+    "build": "exec-bin node_modules/.bin/hugo/hugo --gc --minify",
     "build:preview": "npm run build -D -F",
     "clean": "shx rm -rf public resources",
-    "clean:install": "shx rm -rf package-lock.json bin node_modules ",
+    "clean:install": "shx rm -rf package-lock.json node_modules ",
     "lint": "npm run -s lint:scripts && npm run -s lint:styles && npm run -s lint:markdown",
     "lint:scripts": "eslint assets/js config functions",
     "lint:styles": "stylelint \"assets/scss/**/*.{css,sass,scss,sss,less}\"",
     "lint:markdown": "markdownlint \"*.md\" \"content/**/*.md\"",
-    "server": "exec-bin bin/hugo/hugo server",
+    "server": "exec-bin node_modules/.bin/hugo/hugo server",
     "test": "npm run -s lint",
     "env": "env",
     "precheck": "npm version",
-    "check": "exec-bin bin/hugo/hugo version",
+    "check": "exec-bin node_modules/.bin/hugo/hugo version",
     "copy:katex-fonts": "shx cp ./node_modules/katex/dist/fonts/* ./static/fonts/",
-    "postinstall": "hugo-installer --version otherDependencies.hugo --extended",
+    "postinstall": "hugo-installer --version otherDependencies.hugo --extended --destination node_modules/.bin/hugo",
     "version": "auto-changelog -p && git add CHANGELOG.md"
   },
   "devDependencies": {
-    "@babel/cli": "^7.14",
+    "@babel/cli": "^7.15",
     "@babel/core": "^7.15",
     "@babel/preset-env": "^7.15",
     "@fullhuman/postcss-purgecss": "^4.0",
@@ -47,12 +47,12 @@
     "exec-bin": "^1.0.0",
     "hugo-installer": "^3.1",
     "flexsearch": "^0.7.21",
-    "highlight.js": "^11.0",
+    "highlight.js": "^11.2",
     "instant.page": "^5.1",
     "katex": "^0.13",
     "lazysizes": "^5.3",
     "markdownlint-cli": "^0.28",
-    "mermaid": "^8.11",
+    "mermaid": "^8.12",
     "postcss": "^8.3",
     "postcss-cli": "^8.3",
     "purgecss-whitelister": "^2.4",
@@ -61,6 +61,6 @@
     "stylelint-config-standard": "^22.0"
   },
   "otherDependencies": {
-    "hugo": "0.87.0"
+    "hugo": "0.88.1"
   }
 }