Merge pull request #177 from gethinode/sass

Sass
Add js support
2025-10-07 10:04:22 +00:00 · 2023-03-18 06:33:40 +01:00 · 2023-03-18 06:25:54 +01:00 · 2023-03-18 06:24:38 +01:00 · 2023-03-18 06:22:51 +01:00 · 2023-03-18 06:22:36 +01:00
6 changed files with 97 additions and 51 deletions
--- a/config/_default/config.toml
+++ b/config/_default/config.toml
@@ -16,9 +16,9 @@ enableInlineShortcodes = true
 # See https://github.com/gohugoio/hugo/issues/7228#issuecomment-714490456
 ignoreErrors = ["error-remote-getjson"]

-# toml-docs-start build
+# toml-docs-start timeout
 timeout = "60s"
-# toml-docs-end build
+# toml-docs-end timeout

 # toml-docs-start language
 languageCode = "en-us"
--- a/config/postcss.config.js
+++ b/config/postcss.config.js
@@ -9,15 +9,18 @@ const purgecss = require('@fullhuman/postcss-purgecss')({
    const els = JSON.parse(content).htmlElements
    return [...(els.tags || []), ...(els.classes || []), ...(els.ids || [])]
  },
+  dynamicAttributes: ['data-bs-theme'],
  safelist: [
    ...whitelister([
      './assets/scss/components/_clipboard.scss',
      './assets/scss/components/_command.scss',
-      './assets/scss/components/_fonts.scss',
+      './assets/scss/components/_navbar.scss',
      './assets/scss/components/_search.scss',
      './assets/scss/components/_syntax.scss',
      './assets/scss/components/_syntax-dark.scss',
      './assets/scss/components/_syntax-light.scss',
+      './assets/scss/theme/fonts.scss',
+      './assets/scss/theme/theme.scss',
      './node_modules/bootstrap/scss/_carousel.scss',
      './node_modules/bootstrap/scss/_dropdown.scss',
      './node_modules/bootstrap/scss/_reboot.scss',
--- a/layouts/partials/head/stylesheet.html
+++ b/layouts/partials/head/stylesheet.html
@@ -32,7 +32,7 @@
 {{- if not hugo.IsProduction -}}
    <link rel="stylesheet" href="{{ $css.Permalink | relURL }}">
 {{- else -}}
-    {{- $css = $css | fingerprint -}}
+    {{- $css = $css | fingerprint | resources.PostProcess -}}
    <link rel="stylesheet" href="{{ $css.Permalink }}" integrity="{{ $css.Data.Integrity }}" crossorigin="anonymous">
 {{- end -}}
 {{- if hasPrefix (lower .Site.Params.style.themeFontPath) "http" -}}
--- a/layouts/shortcodes/docs.html
+++ b/layouts/shortcodes/docs.html
@@ -9,23 +9,27 @@

 {{- $name := .Get "name" -}}
 {{- $basePath := .Site.Params.docs.basePath -}}
-{{- $file := path.Join $basePath (path.Clean (.Get "file")) -}}
-{{- $extension := path.Ext $file -}}
+{{- $file := .Get "file" }}
+{{- if hasPrefix $file "./" -}}
+    {{- $file = path.Clean $file -}}
+{{- else -}}
+    {{- $file = path.Join $basePath (path.Clean $file) -}}
+{{- end -}}
+{{- $extension := strings.TrimLeft "." (path.Ext $file)  }}
 {{- $capture_start := "" -}}
 {{- $capture_end := "" -}}

 {{- $id := printf "docs-collapse-%d" .Ordinal -}}

-{{- $supportedExtensions := slice ".scss" ".toml" -}}
+{{- $supportedExtensions := slice "js" "scss" "toml" -}}
 {{- if in $supportedExtensions $extension -}}
-    {{- if eq $extension ".toml" }}
+    {{- if eq $extension "toml" }}
        {{- $capture_start = printf "# toml-docs-start %s" $name -}}
        {{- $capture_end = printf "# toml-docs-end %s" $name -}}
    {{- else -}}
-        {{- $capture_start = printf "// scss-docs-start %s" $name -}}
-        {{- $capture_end = printf "// scss-docs-end %s" $name -}}
+        {{- $capture_start = printf "// %s-docs-start %s" $extension $name -}}
+        {{- $capture_end = printf "// %s-docs-end %s" $extension $name -}}
    {{- end -}}
-    {{- $extension = strings.TrimLeft "." $extension  }}
 {{- else -}}
    {{- errorf "File format not supported (line %s): %s" .Position $file -}}
 {{- end -}}
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.10.0-alpha2",
+  "version": "0.10.0-alpha4",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "@gethinode/hinode",
-      "version": "0.10.0-alpha2",
+      "version": "0.10.0-alpha4",
      "hasInstallScript": true,
      "license": "MIT",
      "devDependencies": {
@@ -202,15 +202,39 @@
        "postcss-selector-parser": "^6.0.10"
      }
    },
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.2.0.tgz",
+      "integrity": "sha512-gB8T4H4DEfX2IV9zGDJPOBgP1e/DbfCPDTtEqUMckpvzS1OYtva8JdFYBqMwYk7xAQ429WGF/UPqn8uQ//h2vQ==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+      }
+    },
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.0.tgz",
+      "integrity": "sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+      }
+    },
    "node_modules/@eslint/eslintrc": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.0.tgz",
-      "integrity": "sha512-fluIaaV+GyV24CCu/ggiHdV+j4RNh85yQnAYS/G2mZODZgGmmlrgCydjUcV3YvxCm9x8nMAfThsqTni4KiXT4A==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.1.tgz",
+      "integrity": "sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw==",
      "dev": true,
      "dependencies": {
        "ajv": "^6.12.4",
        "debug": "^4.3.2",
-        "espree": "^9.4.0",
+        "espree": "^9.5.0",
        "globals": "^13.19.0",
        "ignore": "^5.2.0",
        "import-fresh": "^3.2.1",
@@ -226,9 +250,9 @@
      }
    },
    "node_modules/@eslint/js": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.35.0.tgz",
-      "integrity": "sha512-JXdzbRiWclLVoD8sNUjR443VVlYqiYmDVT6rGUEIEHU5YJW0gaVZwV2xgM7D4arkvASqD0IlLUVjHiFuxaftRw==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.36.0.tgz",
+      "integrity": "sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==",
      "dev": true,
      "engines": {
        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -1791,13 +1815,15 @@
      }
    },
    "node_modules/eslint": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.35.0.tgz",
-      "integrity": "sha512-BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz",
+      "integrity": "sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==",
      "dev": true,
      "dependencies": {
-        "@eslint/eslintrc": "^2.0.0",
-        "@eslint/js": "8.35.0",
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.4.0",
+        "@eslint/eslintrc": "^2.0.1",
+        "@eslint/js": "8.36.0",
        "@humanwhocodes/config-array": "^0.11.8",
        "@humanwhocodes/module-importer": "^1.0.1",
        "@nodelib/fs.walk": "^1.2.8",
@@ -1808,9 +1834,8 @@
        "doctrine": "^3.0.0",
        "escape-string-regexp": "^4.0.0",
        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.4.0",
+        "espree": "^9.5.0",
        "esquery": "^1.4.2",
        "esutils": "^2.0.2",
        "fast-deep-equal": "^3.1.3",
@@ -1832,7 +1857,6 @@
        "minimatch": "^3.1.2",
        "natural-compare": "^1.4.0",
        "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
        "strip-ansi": "^6.0.1",
        "strip-json-comments": "^3.1.0",
        "text-table": "^0.2.0"
@@ -2108,9 +2132,9 @@
      }
    },
    "node_modules/espree": {
-      "version": "9.4.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
-      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.0.tgz",
+      "integrity": "sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw==",
      "dev": true,
      "dependencies": {
        "acorn": "^8.8.0",
@@ -6695,15 +6719,30 @@
      "dev": true,
      "requires": {}
    },
+    "@eslint-community/eslint-utils": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.2.0.tgz",
+      "integrity": "sha512-gB8T4H4DEfX2IV9zGDJPOBgP1e/DbfCPDTtEqUMckpvzS1OYtva8JdFYBqMwYk7xAQ429WGF/UPqn8uQ//h2vQ==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^3.3.0"
+      }
+    },
+    "@eslint-community/regexpp": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.0.tgz",
+      "integrity": "sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==",
+      "dev": true
+    },
    "@eslint/eslintrc": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.0.tgz",
-      "integrity": "sha512-fluIaaV+GyV24CCu/ggiHdV+j4RNh85yQnAYS/G2mZODZgGmmlrgCydjUcV3YvxCm9x8nMAfThsqTni4KiXT4A==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.1.tgz",
+      "integrity": "sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw==",
      "dev": true,
      "requires": {
        "ajv": "^6.12.4",
        "debug": "^4.3.2",
-        "espree": "^9.4.0",
+        "espree": "^9.5.0",
        "globals": "^13.19.0",
        "ignore": "^5.2.0",
        "import-fresh": "^3.2.1",
@@ -6713,9 +6752,9 @@
      }
    },
    "@eslint/js": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.35.0.tgz",
-      "integrity": "sha512-JXdzbRiWclLVoD8sNUjR443VVlYqiYmDVT6rGUEIEHU5YJW0gaVZwV2xgM7D4arkvASqD0IlLUVjHiFuxaftRw==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.36.0.tgz",
+      "integrity": "sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==",
      "dev": true
    },
    "@fortawesome/fontawesome-free": {
@@ -7834,13 +7873,15 @@
      "dev": true
    },
    "eslint": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.35.0.tgz",
-      "integrity": "sha512-BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz",
+      "integrity": "sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==",
      "dev": true,
      "requires": {
-        "@eslint/eslintrc": "^2.0.0",
-        "@eslint/js": "8.35.0",
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.4.0",
+        "@eslint/eslintrc": "^2.0.1",
+        "@eslint/js": "8.36.0",
        "@humanwhocodes/config-array": "^0.11.8",
        "@humanwhocodes/module-importer": "^1.0.1",
        "@nodelib/fs.walk": "^1.2.8",
@@ -7851,9 +7892,8 @@
        "doctrine": "^3.0.0",
        "escape-string-regexp": "^4.0.0",
        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.4.0",
+        "espree": "^9.5.0",
        "esquery": "^1.4.2",
        "esutils": "^2.0.2",
        "fast-deep-equal": "^3.1.3",
@@ -7875,7 +7915,6 @@
        "minimatch": "^3.1.2",
        "natural-compare": "^1.4.0",
        "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
        "strip-ansi": "^6.0.1",
        "strip-json-comments": "^3.1.0",
        "text-table": "^0.2.0"
@@ -8063,9 +8102,9 @@
      "dev": true
    },
    "espree": {
-      "version": "9.4.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
-      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.0.tgz",
+      "integrity": "sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw==",
      "dev": true,
      "requires": {
        "acorn": "^8.8.0",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.10.0-alpha2",
+  "version": "0.10.0-alpha4",
  "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
  "keywords": [
    "hugo",
@@ -75,6 +75,6 @@
    "stylelint-config-standard-scss": "^7.0.1"
  },
  "otherDependencies": {
-    "hugo": "0.111.2"
+    "hugo": "0.111.3"
  }
 }
Author	SHA1	Message	Date
Mark Dumay	f3225ff139	Merge pull request #177 from gethinode/sass Sass	2023-03-18 06:33:40 +01:00
mark	f0389f83b7	Add js support	2023-03-18 06:25:54 +01:00
mark	d8271aa83a	Bump release version	2023-03-18 06:24:38 +01:00
mark	c523f2b890	Bump dependencies	2023-03-18 06:22:51 +01:00
mark	6a32015d08	Support Bootstrap theme	2023-03-18 06:22:36 +01:00
mark	e576737ff1	Add PostProcess in production	2023-03-18 06:21:36 +01:00
Mark Dumay	08fa4d8c89	Merge pull request #175 from gethinode/dependabot/npm_and_yarn/eslint-8.36.0 Bump eslint from 8.35.0 to 8.36.0	2023-03-13 17:01:46 +01:00
dependabot[bot]	7086700562	Bump eslint from 8.35.0 to 8.36.0 Bumps [eslint](https://github.com/eslint/eslint) from 8.35.0 to 8.36.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.35.0...v8.36.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-03-13 14:14:57 +00:00
Mark Dumay	a8fbdad172	Merge pull request #173 from gethinode/sass Sass	2023-03-12 13:11:17 +01:00
mark	d374f50b66	Refine safelist	2023-03-12 12:52:55 +01:00
mark	f0210348c6	Bump release version	2023-03-12 12:52:44 +01:00
mark	d66b093281	Rename duplicate build tag	2023-03-12 12:50:09 +01:00