From 74f48cd7869f8cd141122b4b2aa75aa45d4ae811 Mon Sep 17 00:00:00 2001 From: Mike Pirog Date: Fri, 2 Feb 2024 10:48:05 -0500 Subject: [PATCH] update vitepress and sponsorz --- CHANGELOG.md | 5 ++ config/landov3.js | 5 +- config/landov4.js | 6 +- docs/.vitepress/config.js | 1 + package-lock.json | 117 +++++++++++++++++++++++++++---------- package.json | 2 +- sponsors.yaml | 119 ++++++++++++++++++++++++++++++++++++++ sponsors.yml | 5 -- 8 files changed, 221 insertions(+), 39 deletions(-) create mode 100644 sponsors.yaml delete mode 100644 sponsors.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 0102ae97..c390820d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## v1.0.0-beta.24 - [February 2, 2024](https://github.com/lando/vitepress-theme-default-plus/releases/tag/v1.0.0-beta.24) + +* Updated to `vitepress@1.0.0-rc.41` +* Updated `sponsors.yaml` + ## v1.0.0-beta.23 - [February 1, 2024](https://github.com/lando/vitepress-theme-default-plus/releases/tag/v1.0.0-beta.23) * Fixed collection `WSOD` in some `undefined` id situations diff --git a/config/landov3.js b/config/landov3.js index 617759d8..11698a30 100644 --- a/config/landov3.js +++ b/config/landov3.js @@ -4,6 +4,8 @@ import {fileURLToPath} from 'node:url'; import yaml from 'js-yaml'; const __dirname = dirname(fileURLToPath(import.meta.url)); +const sponsors = yaml.load(readFileSync(resolve(__dirname, '..', 'sponsors.yaml'), 'utf8')); +const patriots = sponsors.filter(sponsor => sponsor.tier === 'patriot'); export default function({landoPlugin, version}) { const baseUrl = landoPlugin ? `https://docs.lando.dev/${landoPlugin}` : 'https://docs.lando.dev'; @@ -203,7 +205,8 @@ export default function({landoPlugin, version}) { sponsors: { text: 'your logo?', link: 'https://lando.dev/sponsor', - data: yaml.load(readFileSync(resolve(__dirname, '..', 'sponsors.yml'), 'utf8')), + data: patriots, + all: sponsors, }, team: [], }, diff --git a/config/landov4.js b/config/landov4.js index dc15b11c..7cd38d03 100644 --- a/config/landov4.js +++ b/config/landov4.js @@ -4,6 +4,8 @@ import {fileURLToPath} from 'node:url'; import yaml from 'js-yaml'; const __dirname = dirname(fileURLToPath(import.meta.url)); +const sponsors = yaml.load(readFileSync(resolve(__dirname, '..', 'sponsors.yaml'), 'utf8')); +const patriots = sponsors.filter(sponsor => sponsor.tier === 'patriot'); export default function({landoPlugin, version}) { const baseUrl = landoPlugin ? `https://docs.lando.dev/${landoPlugin}` : 'https://docs.lando.dev'; @@ -18,7 +20,6 @@ export default function({landoPlugin, version}) { ], } : false; - return { base, collections: {}, @@ -204,7 +205,8 @@ export default function({landoPlugin, version}) { sponsors: { text: 'your logo?', link: 'https://lando.dev/sponsor', - data: yaml.load(readFileSync(resolve(__dirname, '..', 'sponsors.yml'), 'utf8')), + data: patriots, + all: sponsors, }, team: [], }, diff --git a/docs/.vitepress/config.js b/docs/.vitepress/config.js index 5ed49f92..03d5dca0 100644 --- a/docs/.vitepress/config.js +++ b/docs/.vitepress/config.js @@ -14,6 +14,7 @@ export default defineConfig({ description: 'The VitePress default theme with some MOARPOWAH!', base: '/', lang: 'en-US', + landoDocs: 3, head: [ ['link', {rel: 'icon', type: 'image/png', href: '/images/vitepress-lando-logo-mini.png'}], ['meta', {name: 'og:type', content: 'website'}], diff --git a/package-lock.json b/package-lock.json index d5cb5ec5..13555a01 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "@lando/vitepress-theme-default-plus", - "version": "1.0.0-beta.15", + "version": "1.0.0-beta.23", "license": "GPL-3.0", "dependencies": { "debug": "^4.3.2", @@ -21,7 +21,6 @@ "node-html-parser": "^6.1.12", "sass": "^1.69.7", "timeago.js": "^4.0.2", - "vitepress": "^1.0.0-rc.40", "vitepress-plugin-tabs": "^0.5.0", "vue": "^3.3.12" }, @@ -31,6 +30,7 @@ "eslint": "^7.32.0", "eslint-config-google": "^0.9.1", "eslint-plugin-vue": "^8.0.3", + "vitepress": "^1.0.0-rc.41", "vue-eslint-parser": "^9.3.2" }, "engines": { @@ -1249,6 +1249,19 @@ "win32" ] }, + "node_modules/@shikijs/core": { + "version": "1.0.0-beta.3", + "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.0.0-beta.3.tgz", + "integrity": "sha512-SCwPom2Wn8XxNlEeqdzycU93SKgzYeVsedjqDsgZaz4XiiPpZUzlHt2NAEQTwTnPcHNZapZ6vbkwJ8P11ggL3Q==" + }, + "node_modules/@shikijs/transformers": { + "version": "1.0.0-beta.3", + "resolved": "https://registry.npmjs.org/@shikijs/transformers/-/transformers-1.0.0-beta.3.tgz", + "integrity": "sha512-ASQQQqxW4dANxMGw4yGkTjtMSsUaRhImv/lzJEdfJ3/eP8TVlVYnohOFQVgpLjBBYGy9P0l0oKrlbjiGosTJ/Q==", + "dependencies": { + "shiki": "1.0.0-beta.3" + } + }, "node_modules/@types/estree": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", @@ -1352,9 +1365,38 @@ } }, "node_modules/@vue/devtools-api": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.5.1.tgz", - "integrity": "sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA==" + "version": "7.0.14", + "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.0.14.tgz", + "integrity": "sha512-TluWR9qZ6aO11bwtYK8+fzXxBqLfsE0mWZz1q/EQBmO9k82Cm6deieLwNNXjNFJz7xutazoia5Qa+zTYkPPOfw==", + "dependencies": { + "@vue/devtools-kit": "^7.0.14" + } + }, + "node_modules/@vue/devtools-kit": { + "version": "7.0.14", + "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.0.14.tgz", + "integrity": "sha512-wAAJazr4hI0aVRpgWOCVPw+NzMQdthhnprHHIg4njp1MkKrpCNGQ7MtQbZF1AltAA7xpMCGyyt+0kYH0FqTiPg==", + "dependencies": { + "@vue/devtools-schema": "^7.0.14", + "@vue/devtools-shared": "^7.0.14", + "hookable": "^5.5.3", + "mitt": "^3.0.1", + "perfect-debounce": "^1.0.0", + "speakingurl": "^14.0.1" + } + }, + "node_modules/@vue/devtools-schema": { + "version": "7.0.14", + "resolved": "https://registry.npmjs.org/@vue/devtools-schema/-/devtools-schema-7.0.14.tgz", + "integrity": "sha512-tpUeCLVrdHX+KzWMLTAwx/vAPFbo6jAUi7sr6Q+0mBIqIVSSIxNr5wEhegiFvYva+OtDeM2OrT+f7/X/5bvZNg==" + }, + "node_modules/@vue/devtools-shared": { + "version": "7.0.14", + "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.0.14.tgz", + "integrity": "sha512-79RP1NDakBVWou9rDpVnT1WMjTbL1lJKm6YEOodjQ0dq5ehf0wsRbeYDhgAlnjehWRzTq5GAYFBFUPYBs0/QpA==", + "dependencies": { + "rfdc": "^1.3.1" + } }, "node_modules/@vue/reactivity": { "version": "3.4.15", @@ -3061,6 +3103,11 @@ "he": "bin/he" } }, + "node_modules/hookable": { + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz", + "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==" + }, "node_modules/hosted-git-info": { "version": "2.8.9", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", @@ -3516,6 +3563,11 @@ "resolved": "https://registry.npmjs.org/minisearch/-/minisearch-6.3.0.tgz", "integrity": "sha512-ihFnidEeU8iXzcVHy74dhkxh/dn8Dc08ERl0xwoMMGqp4+LvRSCgicb+zGqWthVokQKvCSxITlh3P08OzdTYCQ==" }, + "node_modules/mitt": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz", + "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==" + }, "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -3724,6 +3776,11 @@ "node": ">=8" } }, + "node_modules/perfect-debounce": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz", + "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==" + }, "node_modules/picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", @@ -3983,6 +4040,11 @@ "node": ">=0.10.0" } }, + "node_modules/rfdc": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz", + "integrity": "sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==" + }, "node_modules/rimraf": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", @@ -4108,25 +4170,12 @@ "node": ">=8" } }, - "node_modules/shikiji": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/shikiji/-/shikiji-0.10.0.tgz", - "integrity": "sha512-1dAzIOWbtM7B4Sem5BvE+CEdsebDsRA34SfCxM4qJ4PLgR73ZD92VEtNfbcoZ3xOLSqvtV0J9i4WpCgVsmQteg==", + "node_modules/shiki": { + "version": "1.0.0-beta.3", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-1.0.0-beta.3.tgz", + "integrity": "sha512-z7cHTNSSvwGx2DfeLwjSNLo+HcVxifgNIzLm6Ye52eXcIwNHXT0wHbhy7FDOKSKveuEHBwt9opfj3Hoc8LE1Yg==", "dependencies": { - "shikiji-core": "0.10.0" - } - }, - "node_modules/shikiji-core": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/shikiji-core/-/shikiji-core-0.10.0.tgz", - "integrity": "sha512-imG+bvRkuNlZUi2q9tMVfegRRouTpDxMFejpfF/6J+bFX3NDKtlW9T9iIAkBYnw4pcCtSwirW0AvkwlQR4wyxg==" - }, - "node_modules/shikiji-transformers": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/shikiji-transformers/-/shikiji-transformers-0.10.0.tgz", - "integrity": "sha512-x9oYybeF/XOrIc6Mm8G1gU5ezunMxdgD4WwBTKrZ5tAmFFaNIWCjwZENgRt1uR4iMi0+pGH0g9bmrbraSC41nA==", - "dependencies": { - "shikiji": "0.10.0" + "@shikijs/core": "1.0.0-beta.3" } }, "node_modules/slice-ansi": { @@ -4215,6 +4264,14 @@ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz", "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==" }, + "node_modules/speakingurl": { + "version": "14.0.1", + "resolved": "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz", + "integrity": "sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", @@ -4521,23 +4578,23 @@ } }, "node_modules/vitepress": { - "version": "1.0.0-rc.40", - "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-1.0.0-rc.40.tgz", - "integrity": "sha512-1x9PCrcsJwqhpccyTR93uD6jpiPDeRC98CBCAQLLBb44a3VSXYBPzhCahi+2kwAYylu49p0XhseMPVM4IVcWcw==", + "version": "1.0.0-rc.41", + "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-1.0.0-rc.41.tgz", + "integrity": "sha512-PAEoIIc9J//k/Wg39C6k86hZpXPmLZjRiTBwieDNeYGdevD7xr5Ve8o1W/w+e9dtyQMkuvzgianEamXDX3aj7g==", "dependencies": { "@docsearch/css": "^3.5.2", "@docsearch/js": "^3.5.2", + "@shikijs/core": "^1.0.0-beta.3", + "@shikijs/transformers": "^1.0.0-beta.3", "@types/markdown-it": "^13.0.7", "@vitejs/plugin-vue": "^5.0.3", - "@vue/devtools-api": "^6.5.1", + "@vue/devtools-api": "^7.0.14", "@vueuse/core": "^10.7.2", "@vueuse/integrations": "^10.7.2", "focus-trap": "^7.5.4", "mark.js": "8.11.1", "minisearch": "^6.3.0", - "shikiji": "^0.10.0", - "shikiji-core": "^0.10.0", - "shikiji-transformers": "^0.10.0", + "shiki": "^1.0.0-beta.3", "vite": "^5.0.12", "vue": "^3.4.15" }, diff --git a/package.json b/package.json index f0afd24f..d4e772a7 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,6 @@ "node-html-parser": "^6.1.12", "sass": "^1.69.7", "timeago.js": "^4.0.2", - "vitepress": "^1.0.0-rc.40", "vitepress-plugin-tabs": "^0.5.0", "vue": "^3.3.12" }, @@ -54,6 +53,7 @@ "eslint": "^7.32.0", "eslint-config-google": "^0.9.1", "eslint-plugin-vue": "^8.0.3", + "vitepress": "^1.0.0-rc.41", "vue-eslint-parser": "^9.3.2" } } diff --git a/sponsors.yaml b/sponsors.yaml new file mode 100644 index 00000000..234ac8f4 --- /dev/null +++ b/sponsors.yaml @@ -0,0 +1,119 @@ +- name: lagoon.sh + url: https://lagoon.sh/ + logo: https://docs.lagoon.sh/lagoon-logo.png + tier: patriot + type: full + +- name: Acro Media + tier: ally + url: https://www.acromedia.com + logo: https://lando.dev/images/acromedia_logo.png +- name: BairesDev + tier: ally + url: https://www.bairesdev.com/sponsoring-open-source-projects + logo: https://lando.dev/images/bairesdev_logo.png +- name: Capellic + tier: ally + url: http://capellic.com/ + logo: https://lando.dev/images/capellic_logo.png +- name: OpenUp Media + tier: ally + url: https://www.openup.media/ + logo: https://images.opencollective.com/openupmedia/15a7c4b/logo/256.png?height=256 +- name: Principal Financial Group + tier: ally + url: https://www.principal.com/ + logo: https://images.opencollective.com/principal/431e690/logo/256.png?height=256 +- name: Sagetree + tier: ally + url: https://www.sagetree.com + logo: https://lando.dev/images/sagetree_logo.png +- name: Sitecrafting + tier: ally + url: https://www.sitecrafting.com + logo: https://lando.dev/images/sitecrafting_logo.png + +- name: AaronFeledy + tier: herald +- name: JDSaward + tier: herald +- name: KurtTrowbridge + tier: herald +- name: RyanBaron + tier: herald +- name: SSXD + tier: herald +- name: WiseArts + tier: herald +- name: alisqi + tier: herald +- name: almunnings + tier: herald +- name: alphex + tier: herald +- name: backlineint + tier: herald +- name: benjifisher + tier: herald +- name: daggerhart + tier: herald +- name: dimitridarras + tier: herald +- name: dougvann + tier: herald +- name: ethancodes + tier: herald +- name: fmitchell + tier: herald +- name: jonathanjfshaw + tier: herald +- name: keiserjb + tier: herald +- name: labboy0276 + tier: herald +- name: leoloso + tier: herald +- name: mchelen + tier: herald +- name: michaelprflores + tier: herald +- name: mikeethedude + tier: herald +- name: mourogers + tier: herald +- name: noahott + tier: herald +- name: nuklive + tier: herald +- name: pirog + tier: herald +- name: polylang + tier: herald +- name: pvanhemmen + tier: herald +- name: radimklaska + tier: herald +- name: reynoldsalec + tier: herald +- name: robclancy + tier: herald +- name: robert-t-taylor + tier: herald +- name: roberttolton + tier: herald +- name: ronaldmulero + tier: herald +- name: smutlord + tier: herald +- name: smwoll + tier: herald +- name: stiknoltz + tier: herald +- name: vrwired + tier: herald +- name: xaqrox + tier: herald +- name: xurizaemon + tier: herald +- name: yobottehg + tier: herald diff --git a/sponsors.yml b/sponsors.yml deleted file mode 100644 index 2f3c4f47..00000000 --- a/sponsors.yml +++ /dev/null @@ -1,5 +0,0 @@ -- name: amazee.io - id: amazeeio - url: https://www.amazee.io/ - logo: https://docs.lagoon.sh/lagoon-logo.png - type: full