diff --git a/.travis.yml b/.travis.yml index 66aaa9309ec..6fc8958921d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: node_js node_js: - - 24.15 # latest LTS version ('node' will give latest version, 'lts/*' will give LTS version ) + - 20.9 # latest LTS version ('node' will give latest version, 'lts/*' will give LTS version ) arch: amd64 # optional, this is default, routes to a full VM # arch: arm64 # this is the recommended LXD container - faster spin up but some limitations Not used as it seems very unstable. os: linux # optional, this is default diff --git a/README.md b/README.md index 32741a42544..3c6fc9dfa1c 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -# Mendix Documentation [![hugo_badge](https://img.shields.io/badge/hugo-0.156.0-green.svg)](https://gohugo.io/) [![node_badge](https://img.shields.io/badge/node-24.15.0-green.svg)](https://nodejs.org/en/) [![docsy_badge](https://img.shields.io/badge/docsy-0.15.0-green.svg)](https://www.docsy.dev/) +# Mendix Documentation [![hugo_badge](https://img.shields.io/badge/hugo-0.126.1-green.svg)](https://gohugo.io/) [![node_badge](https://img.shields.io/badge/node-20.9.0-green.svg)](https://nodejs.org/en/) [![docsy_badge](https://img.shields.io/badge/docsy-0.10.0-green.svg)](https://www.docsy.dev/) This repository contains the Mendix documentation, which is served on [https://docs.mendix.com](https://docs.mendix.com). Build status: -* production [![Build Status](https://app.travis-ci.com/mendix/docs.svg?branch=production)](https://app.travis-ci.com/github/mendix/docs) -* development [![Build Status](https://app.travis-ci.com/mendix/docs.svg?branch=development)](https://app.travis-ci.com/github/mendix/docs) +* production [![Build Status](https://secure.travis-ci.org/mendix/docs.png?branch=production)](https://app.travis-ci.com/github/mendix/docs) +* development [![Build Status](https://secure.travis-ci.org/mendix/docs.png?branch=development)](https://app.travis-ci.com/github/mendix/docs) ## Contribute diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss index 2a273670da6..0a55fb1df16 100644 --- a/assets/scss/_styles_project.scss +++ b/assets/scss/_styles_project.scss @@ -88,7 +88,7 @@ max-width: 90%; // NK - fixed width of all content to 90% p, li, td { - font-weight: $td-font-weight-body-text; + font-weight: $font-weight-body-text; } // NK - custom additions for margin styling in lists @@ -339,11 +339,6 @@ img { // Hugo's ToC is a mouthful, this can be used to style the top level h2 entries. > ul > li > ul > li > a {} - // Override Docsy 0.15+ which makes ToC bold by default - > ul > li > :not(ul) { - font-weight: $font-weight-normal; - } - a { // NK - styling for ToC color: $gray-800; @@ -351,11 +346,9 @@ img { padding-bottom: .25rem; padding-top: .25rem; - &:hover, - &:focus { + &:hover { color: $link-hover-color; text-decoration: underline; - background-color: transparent; // Override Docsy 0.15+ hover background } } @@ -416,7 +409,6 @@ img { .td-sidebar { @include media-breakpoint-up(md) { - margin-top: 0; // Olu - removed docsy margin to align sidebar to top of page padding-top: 5.25rem; // DB – aligns with .td-main main padding-top background-color: $td-sidebar-bg-color; padding-right: 1rem; diff --git a/config/_default/hugo.toml b/config/_default/hugo.toml index 6a20bfd3891..3b5d4b9f6ed 100644 --- a/config/_default/hugo.toml +++ b/config/_default/hugo.toml @@ -59,7 +59,7 @@ disableKinds = ["taxonomy", "term"] startLevel = 2 [module] -replacements = "github.com/FortAwesome/Font-Awesome -> @fortawesome/fontawesome-free, github.com/twbs/bootstrap -> bootstrap" +replacements = "github.com/FortAwesome/Font-Awesome -> ., github.com/twbs/bootstrap -> ." # Comment out if you don't want the "print entire section" link enabled. [outputs] diff --git a/layouts/docs/single.html b/layouts/docs/single.html deleted file mode 100644 index 49bb662ad0b..00000000000 --- a/layouts/docs/single.html +++ /dev/null @@ -1,3 +0,0 @@ -{{ define "main" }} -{{ .Render "content" }} -{{ end }} diff --git a/layouts/partials/feedback.html b/layouts/partials/feedback.html index a98b1a38b92..678a8617bff 100644 --- a/layouts/partials/feedback.html +++ b/layouts/partials/feedback.html @@ -45,7 +45,7 @@

Feedback

- {{ .Site.Params.ui.feedback.yes | safeHTML }} + {{ .yes | safeHTML }}

Sorry to hear that. Please tell us how we can improve. diff --git a/package-lock.json b/package-lock.json index c9e6b1a93f8..ab783541774 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,18 +13,18 @@ "bootstrap": "^5.3.3" }, "devDependencies": { - "autoprefixer": "^10.4.19", - "docsy": "github:google/docsy#semver:0.15.0", - "hugo-extended": "^0.156.0", - "postcss": "^8.5.10", + "autoprefixer": "^10.5.0", + "docsy": "github:google/docsy#semver:0.10.0", + "hugo-extended": "^0.155.0", + "postcss": "^8.5.15", "postcss-cli": "^8.3.1" } }, "node_modules/@fortawesome/fontawesome-free": { - "version": "6.7.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz", - "integrity": "sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==", - "license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.2.tgz", + "integrity": "sha512-hRILoInAx8GNT5IMkrtIt9blOdrqHOnPBH+k70aWUAqPZPgopb9G5EQJFpaBx/S8zp2fC+mPW349Bziuk1o28Q==", + "hasInstallScript": true, "engines": { "node": ">=6" } @@ -153,9 +153,9 @@ } }, "node_modules/autoprefixer": { - "version": "10.4.19", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.19.tgz", - "integrity": "sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==", + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.5.0.tgz", + "integrity": "sha512-FMhOoZV4+qR6aTUALKX2rEqGG+oyATvwBt9IIzVR5rMa2HRWPkxf+P+PAJLD1I/H5/II+HuZcBJYEFBpq39ong==", "dev": true, "funding": [ { @@ -171,12 +171,12 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { - "browserslist": "^4.23.0", - "caniuse-lite": "^1.0.30001599", - "fraction.js": "^4.3.7", - "normalize-range": "^0.1.2", - "picocolors": "^1.0.0", + "browserslist": "^4.28.2", + "caniuse-lite": "^1.0.30001787", + "fraction.js": "^5.3.4", + "picocolors": "^1.1.1", "postcss-value-parser": "^4.2.0" }, "bin": { @@ -189,6 +189,19 @@ "postcss": "^8.1.0" } }, + "node_modules/baseline-browser-mapping": { + "version": "2.10.36", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.36.tgz", + "integrity": "sha512-lVq/Df7LXlO79MVaaUHztSwWiG9oXoWHlgvNS51v8Dpd4+G4/VIy6qYePTw31nAVls33nUtnfezYeLkYAak9dg==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "baseline-browser-mapping": "dist/cli.cjs" + }, + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", @@ -199,9 +212,9 @@ } }, "node_modules/bootstrap": { - "version": "5.3.8", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.8.tgz", - "integrity": "sha512-HP1SZDqaLDPwsNiqRqi5NcP0SSXciX2s9E+RyqJIIqGo+vJeN5AJVM98CXmW/Wux0nQ5L7jeWUdplCEf0Ee+tg==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz", + "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==", "funding": [ { "type": "github", @@ -212,7 +225,6 @@ "url": "https://opencollective.com/bootstrap" } ], - "license": "MIT", "peerDependencies": { "@popperjs/core": "^2.11.8" } @@ -230,9 +242,9 @@ } }, "node_modules/browserslist": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz", - "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", + "version": "4.28.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.2.tgz", + "integrity": "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==", "dev": true, "funding": [ { @@ -248,11 +260,13 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001587", - "electron-to-chromium": "^1.4.668", - "node-releases": "^2.0.14", - "update-browserslist-db": "^1.0.13" + "baseline-browser-mapping": "^2.10.12", + "caniuse-lite": "^1.0.30001782", + "electron-to-chromium": "^1.5.328", + "node-releases": "^2.0.36", + "update-browserslist-db": "^1.2.3" }, "bin": { "browserslist": "cli.js" @@ -262,9 +276,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001625", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001625.tgz", - "integrity": "sha512-4KE9N2gcRH+HQhpeiRZXd+1niLB/XNLAhSy4z7fI8EzcbcPoAqjNInxVHTiTwWfTIV4w096XG8OtCOCQQKPv3w==", + "version": "1.0.30001799", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001799.tgz", + "integrity": "sha512-hG1bReV+OUU+MOqK4t/ZWI0tZOyz3rqS9XuhOUz1cIcbwBKjOyJEJuw9ER5JuNyqxNk8u/JUVbGibBOL1yrjFw==", "dev": true, "funding": [ { @@ -279,7 +293,8 @@ "type": "github", "url": "https://github.com/sponsors/ai" } - ] + ], + "license": "CC-BY-4.0" }, "node_modules/chokidar": { "version": "3.6.0", @@ -366,27 +381,25 @@ } }, "node_modules/docsy": { - "version": "0.15.0", - "resolved": "git+ssh://git@github.com/google/docsy.git#01c827ea890e8e498f6046a7666a3031f318cc7f", + "version": "0.10.0", + "resolved": "git+ssh://git@github.com/google/docsy.git#712aa05897c1abe239786522131e83d69e5e1b4e", "dev": true, "hasInstallScript": true, "license": "Apache-2.0", - "workspaces": [ - "docsy.dev" - ], "dependencies": { - "@fortawesome/fontawesome-free": "6.7.2", - "bootstrap": "5.3.8" + "@fortawesome/fontawesome-free": "6.5.2", + "bootstrap": "5.3.3" }, "engines": { - "node": ">=24" + "node": ">=20" } }, "node_modules/electron-to-chromium": { - "version": "1.4.670", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.670.tgz", - "integrity": "sha512-hcijYOWjOtjKrKPtNA6tuLlA/bTLO3heFG8pQA6mLpq7dRydSWicXova5lyxDzp1iVJaYhK7J2OQlGE52KYn7A==", - "dev": true + "version": "1.5.372", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.372.tgz", + "integrity": "sha512-M3yhbAlilnwqC8D21t28UCDGHyitShTmmLRU/H+b74P6Ski16Nb9HONYEaVpMj/pwC7BEo5B95FpjODLCWbtfA==", + "dev": true, + "license": "ISC" }, "node_modules/emoji-regex": { "version": "8.0.0", @@ -395,10 +408,11 @@ "dev": true }, "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -441,15 +455,16 @@ } }, "node_modules/fraction.js": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz", - "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==", + "version": "5.3.4", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-5.3.4.tgz", + "integrity": "sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==", "dev": true, + "license": "MIT", "engines": { "node": "*" }, "funding": { - "type": "patreon", + "type": "github", "url": "https://github.com/sponsors/rawify" } }, @@ -527,15 +542,15 @@ "dev": true }, "node_modules/hugo-extended": { - "version": "0.156.0", - "resolved": "https://registry.npmjs.org/hugo-extended/-/hugo-extended-0.156.0.tgz", - "integrity": "sha512-65/OU9W2PVzn1pWaxF8tu/3rTnglHn6hr4dBjABDo4DIOLjb9qpp+9wwh9PGkDTvhwyxk4pkHieWORn0MgDXqA==", + "version": "0.155.0", + "resolved": "https://registry.npmjs.org/hugo-extended/-/hugo-extended-0.155.0.tgz", + "integrity": "sha512-bazl6Evog/dHUCNrF7tqgYjqgv70fJO1jTT7BFodgb0NIr5mbKQt1+N7uNwQIK70f1qMGQEUZpt9qiHpfTDwLA==", "dev": true, "hasInstallScript": true, "license": "MIT", "dependencies": { "adm-zip": "^0.5.16", - "tar": "^7.5.9" + "tar": "^7.5.7" }, "bin": { "hugo": "dist/cli.mjs", @@ -672,9 +687,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.11", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", - "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", + "version": "3.3.12", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.12.tgz", + "integrity": "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==", "dev": true, "funding": [ { @@ -691,10 +706,14 @@ } }, "node_modules/node-releases": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", - "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", - "dev": true + "version": "2.0.47", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.47.tgz", + "integrity": "sha512-Uzmd6LXpouKo8EUK68IjH4+E01w/hXyV3R3g/geCJo+rXLNfh1xucB+LOzYEOQPSiUK3h/xZf0cQGcSsmyL2Og==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + } }, "node_modules/normalize-path": { "version": "3.0.0", @@ -705,15 +724,6 @@ "node": ">=0.10.0" } }, - "node_modules/normalize-range": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", - "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", @@ -753,9 +763,9 @@ } }, "node_modules/postcss": { - "version": "8.5.10", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.10.tgz", - "integrity": "sha512-pMMHxBOZKFU6HgAZ4eyGnwXF/EvPGGqUr0MnZ5+99485wwW41kW91A4LOGxSHhgugZmSChL5AlElNdwlNgcnLQ==", + "version": "8.5.15", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.15.tgz", + "integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==", "dev": true, "funding": [ { @@ -773,7 +783,7 @@ ], "license": "MIT", "dependencies": { - "nanoid": "^3.3.11", + "nanoid": "^3.3.12", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" }, @@ -786,6 +796,7 @@ "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-8.3.1.tgz", "integrity": "sha512-leHXsQRq89S3JC9zw/tKyiVV2jAhnfQe0J8VI4eQQbUjwIe0XxVqLrR+7UsahF1s9wi4GlqP6SJ8ydf44cgF2Q==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^4.0.0", "chokidar": "^3.3.0", @@ -1061,9 +1072,9 @@ } }, "node_modules/tar": { - "version": "7.5.15", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.15.tgz", - "integrity": "sha512-dzGK0boVlC4W5QFuQN1EFSl3bIDYsk7Tj40U6eIBnK2k/8ml7TZ5agbI5j5+qnoVcAA+rNtBml8SEiLxZpNqRQ==", + "version": "7.5.16", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.16.tgz", + "integrity": "sha512-56adEpPMouktRlBLXiaYFFzZ/3+JXa8P9n7WbR+ibIjtviN55mEaOkiysCnPnWm+7kkui1Dn8J9l+g6zV8731w==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -1105,9 +1116,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", - "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz", + "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==", "dev": true, "funding": [ { @@ -1123,9 +1134,10 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" + "escalade": "^3.2.0", + "picocolors": "^1.1.1" }, "bin": { "update-browserslist-db": "cli.js" diff --git a/package.json b/package.json index 3e386957570..c1fc97e142b 100644 --- a/package.json +++ b/package.json @@ -22,10 +22,10 @@ }, "homepage": "https://github.com/mendix/docs#readme", "devDependencies": { - "autoprefixer": "^10.4.19", - "docsy": "github:google/docsy#semver:0.15.0", - "hugo-extended": "^0.156.0", - "postcss": "^8.5.10", + "autoprefixer": "^10.5.0", + "docsy": "github:google/docsy#semver:0.10.0", + "hugo-extended": "^0.155.0", + "postcss": "^8.5.15", "postcss-cli": "^8.3.1" }, "dependencies": {