From 04ad590c243e20d43612ce0dc316494f4f672927 Mon Sep 17 00:00:00 2001 From: Lucien Cartier-Tilet Date: Sun, 28 Jan 2024 05:33:11 +0100 Subject: [PATCH] chore(deps): update Vuepress --- .gitea/workflows/deploy.yaml | 9 +++------ .gitignore | 1 + .yarnrc.yml | 3 +++ docs/.vuepress/config.ts | 8 +++++--- package.json | 12 ++++++------ 5 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 .yarnrc.yml diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 43e4305..7a7abb4 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -17,12 +17,9 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 18.x - - uses: borales/actions-yarn@v4.2.0 - with: - cmd: install --frozen-lockfile - - uses: borales/actions-yarn@v4.2.0 - with: - cmd: docs:build + - run: corepack enable + - run: yarn install --frozen-lockfile + - run: yarn build - name: "Deploy to remote server" uses: appleboy/scp-action@v0.1.4 with: diff --git a/.gitignore b/.gitignore index 78a53b8..2ad5b72 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ node_modules .cache /docs/**/*.md /docs/.vuepress/dist/ +/.yarn/ diff --git a/.yarnrc.yml b/.yarnrc.yml new file mode 100644 index 0000000..a88d909 --- /dev/null +++ b/.yarnrc.yml @@ -0,0 +1,3 @@ +enableMessageNames: false + +nodeLinker: node-modules diff --git a/docs/.vuepress/config.ts b/docs/.vuepress/config.ts index 8bc842b..07ae1a7 100644 --- a/docs/.vuepress/config.ts +++ b/docs/.vuepress/config.ts @@ -1,5 +1,7 @@ -import { defineUserConfig, defaultTheme } from 'vuepress'; -import { removeHtmlExtensionPlugin } from 'vuepress-plugin-remove-html-extension'; +import { defaultTheme } from '@vuepress/theme-default'; +import { viteBundler } from '@vuepress/bundler-vite'; +import { defineUserConfig } from 'vuepress'; + import head from './head'; interface ChildPage { @@ -109,6 +111,7 @@ export default defineUserConfig({ title: "Phundrak's Dotfiles", head: head, description: "Documentation of the GNU/Linux configuration of P'undrak", + bundler: viteBundler({}), markdown: { html: false, linkify: true, @@ -117,7 +120,6 @@ export default defineUserConfig({ level: [1, 2, 3, 4, 5], }, }, - plugins: [removeHtmlExtensionPlugin()], theme: defaultTheme({ sidebarDepth: 5, repo: 'https://labs.phundrak.com/phundrak/config.phundrak.com', diff --git a/package.json b/package.json index fd0b8f0..409388c 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "description": "", "main": "index.js", "scripts": { - "docs:dev": "vuepress dev docs", - "docs:build": "vuepress build docs" + "dev": "vuepress dev docs", + "build": "vuepress build docs" }, "repository": { "type": "git", @@ -14,9 +14,9 @@ "author": "Lucien Cartier-Tilet ", "license": "AGPL-3.0", "devDependencies": { - "vuepress": "2.0.0-beta.63" + "@vuepress/bundler-vite": "^2.0.0-rc.2", + "@vuepress/theme-default": "^2.0.0-rc.2", + "vuepress": "2.0.0-rc.2", }, - "dependencies": { - "vuepress-plugin-remove-html-extension": "^0.1.0" - } + "packageManager": "yarn@4.0.2" }