Merge branch 'master' of github.com:Ocelot-Social-Community/ocelot.social into development

This commit is contained in:
Wolfgang Huß 2024-05-21 15:02:17 +02:00
commit 533fa625ac
5 changed files with 45 additions and 64 deletions

View File

@ -4,14 +4,12 @@ import { viteBundler } from '@vuepress/bundler-vite'
import meta from './config/meta'
import theme from './config/theme'
import plugins from './config/plugins'
const __dirname = getDirname(import.meta.url)
export default defineUserConfig({
...meta,
theme,
plugins,
bundler: viteBundler(),
base: process.env.VUEPRESS_BASE ? `/${process.env.VUEPRESS_BASE}/` : '/',
alias: {

View File

@ -1,8 +0,0 @@
import { redirectPlugin } from '@vuepress/plugin-redirect'
export default [
redirectPlugin({
autoLocale: true,
})
]

View File

@ -134,6 +134,9 @@ export default hopeTheme({
sup: true,
vPre: true,
},
redirect: {
autoLocale: true,
},
searchPro: {
indexContent: true,
autoSuggestions: true,
@ -149,7 +152,8 @@ export default hopeTheme({
],
},
seo: {
fallbackImage: '/logo.svg'
fallbackImage: '/logo.svg',
hostname: 'https://ocelot.social/'
}
},
iconAssets: "fontawesome",

87
package-lock.json generated
View File

@ -11,7 +11,7 @@
"devDependencies": {
"@textlint-rule/textlint-rule-no-unmatched-pair": "^2.0.2",
"@vuepress/bundler-vite": "^2.0.0-rc.9",
"@vuepress/plugin-redirect": "^2.0.0-rc.23",
"@vuepress/plugin-redirect": "^2.0.0-rc.29",
"textlint": "^14.0.4",
"textlint-filter-rule-comments": "^1.2.2",
"textlint-rule-apostrophe": "^2.0.0",
@ -24,8 +24,8 @@
"textlint-rule-no-todo": "^2.0.1",
"textlint-rule-no-zero-width-spaces": "^1.0.1",
"vuepress": "^2.0.0-rc.9",
"vuepress-plugin-search-pro": "^2.0.0-rc.33",
"vuepress-theme-hope": "^2.0.0-rc.40"
"vuepress-plugin-search-pro": "^2.0.0-rc.43",
"vuepress-theme-hope": "^2.0.0-rc.43"
}
},
"node_modules/@aashutoshrathi/word-wrap": {
@ -2292,18 +2292,6 @@
"vuepress": "2.0.0-rc.9"
}
},
"node_modules/@vuepress/plugin-external-link-icon": {
"version": "2.0.0-rc.28",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-external-link-icon/-/plugin-external-link-icon-2.0.0-rc.28.tgz",
"integrity": "sha512-VEEQEaMZzGOh8q1oR9u18gIBK7pbkCSx02vEN0k/cvRbfKbMdayEOTk4x+5Sy/A/fUcBPRbyw8O+/nDVzLn4pg==",
"dev": true,
"dependencies": {
"vue": "^3.4.27"
},
"peerDependencies": {
"vuepress": "2.0.0-rc.9"
}
},
"node_modules/@vuepress/plugin-git": {
"version": "2.0.0-rc.22",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-git/-/plugin-git-2.0.0-rc.22.tgz",
@ -2370,9 +2358,9 @@
}
},
"node_modules/@vuepress/plugin-prismjs": {
"version": "2.0.0-rc.21",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-prismjs/-/plugin-prismjs-2.0.0-rc.21.tgz",
"integrity": "sha512-dMTCu/TZ1QCmTHXL4THVeh9gWzuqkJV8qhck5U77OP1qmgyf+r529A+MTOgp3ddcph1Yzb/FRb2orlefHk+yNQ==",
"version": "2.0.0-rc.28",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-prismjs/-/plugin-prismjs-2.0.0-rc.28.tgz",
"integrity": "sha512-CsKBmGRnY+h3iElxdi1Te4g6pzfSdBePBLWXq89IqOchFI5sOabJWKso0R5bnE1mDdT2doGjDmDvzrUZvaoK+w==",
"dev": true,
"dependencies": {
"prismjs": "^1.29.0"
@ -6952,9 +6940,9 @@
}
},
"node_modules/vuepress-plugin-components": {
"version": "2.0.0-rc.40",
"resolved": "https://registry.npmjs.org/vuepress-plugin-components/-/vuepress-plugin-components-2.0.0-rc.40.tgz",
"integrity": "sha512-FMfkQpCgzBezYFdH5Wlt3wzEEztnMYoz6UJeO4CQh9Nm3da2Qu7ov5X2338daVEIBeIsk0tpEZ7iYQa8kZShMQ==",
"version": "2.0.0-rc.43",
"resolved": "https://registry.npmjs.org/vuepress-plugin-components/-/vuepress-plugin-components-2.0.0-rc.43.tgz",
"integrity": "sha512-0bS3GewYVL0ih5jqnDhWva2dEr/+bPAnMHz5FXM+KTD1mhIFSvdJF1G4Wn4kTmEMMnDYUP+Vfrh1gyVOs4SHIA==",
"dev": true,
"dependencies": {
"@stackblitz/sdk": "^1.10.0",
@ -6965,7 +6953,7 @@
"create-codepen": "1.0.1",
"qrcode": "^1.5.3",
"vue": "^3.4.27",
"vuepress-shared": "2.0.0-rc.39"
"vuepress-shared": "2.0.0-rc.43"
},
"engines": {
"node": ">=18.19.0",
@ -7004,9 +6992,9 @@
}
},
"node_modules/vuepress-plugin-md-enhance": {
"version": "2.0.0-rc.39",
"resolved": "https://registry.npmjs.org/vuepress-plugin-md-enhance/-/vuepress-plugin-md-enhance-2.0.0-rc.39.tgz",
"integrity": "sha512-OKJcYXyZSiYBI/cZjx04TdRkKDKLqt9k+tpSNpwZLG2PI7NowOw/HQBZzTONDayRhtPhMy4519Cb0o0F8uogaw==",
"version": "2.0.0-rc.43",
"resolved": "https://registry.npmjs.org/vuepress-plugin-md-enhance/-/vuepress-plugin-md-enhance-2.0.0-rc.43.tgz",
"integrity": "sha512-VH8xB0U4u5A9uPhjDyO54iEphpPEMlRmr75k29eh9SJ/Bc7FeX36VSzZG6xGDhY2Vepb48q3kEkULv2tT6qIjw==",
"dev": true,
"dependencies": {
"@mdit/plugin-alert": "^0.10.1",
@ -7039,7 +7027,7 @@
"balloon-css": "^1.2.0",
"js-yaml": "^4.1.0",
"vue": "^3.4.27",
"vuepress-shared": "2.0.0-rc.39"
"vuepress-shared": "2.0.0-rc.43"
},
"engines": {
"node": ">=18.19.0",
@ -7142,9 +7130,9 @@
}
},
"node_modules/vuepress-plugin-search-pro": {
"version": "2.0.0-rc.39",
"resolved": "https://registry.npmjs.org/vuepress-plugin-search-pro/-/vuepress-plugin-search-pro-2.0.0-rc.39.tgz",
"integrity": "sha512-d3thn/YJNiqZm9S+Qu7KANNRgk2Wn2ZoWMk6BV+ONM6eeXimHEmeNEzBTMUDeJwZHdxewo9Szr9Dqgl4YUL4/w==",
"version": "2.0.0-rc.43",
"resolved": "https://registry.npmjs.org/vuepress-plugin-search-pro/-/vuepress-plugin-search-pro-2.0.0-rc.43.tgz",
"integrity": "sha512-ZJrhTyIRtz5Gisc9PdrjIdkUVC3EOYKpZbauPUNWceQ8JkBoRWweu90V7DNrOMfdgVNHJ8ToAuJa71udx+slIw==",
"dev": true,
"dependencies": {
"@vuepress/helper": "2.0.0-rc.28",
@ -7154,7 +7142,7 @@
"chokidar": "^3.6.0",
"slimsearch": "^2.1.1",
"vue": "^3.4.27",
"vuepress-shared": "2.0.0-rc.39"
"vuepress-shared": "2.0.0-rc.43"
},
"engines": {
"node": ">=18.19.0",
@ -7173,19 +7161,19 @@
}
},
"node_modules/vuepress-shared": {
"version": "2.0.0-rc.39",
"resolved": "https://registry.npmjs.org/vuepress-shared/-/vuepress-shared-2.0.0-rc.39.tgz",
"integrity": "sha512-F3C4cLHB8f147FwJ5HoHNjc+Tka3VHPnjUzOka/D+X13NQMpA72vsjph0q4hVVwUsq2ftQTVKxl5NSm7qgtCYg==",
"version": "2.0.0-rc.43",
"resolved": "https://registry.npmjs.org/vuepress-shared/-/vuepress-shared-2.0.0-rc.43.tgz",
"integrity": "sha512-xZlgM5UvBGhwfKPdBl+wPIox/QP0hBc+WvAb6YXAwY3SKp6+C6TvvXd1l4taCUz8XHNWNTWiKu/9kwQGjgAUAg==",
"dev": true,
"dependencies": {
"@vuepress/helper": "2.0.0-rc.28",
"@vueuse/core": "^10.9.0",
"cheerio": "1.0.0-rc.12",
"dayjs": "^1.11.11",
"execa": "^9.0.0",
"execa": "^9.0.2",
"fflate": "^0.8.2",
"gray-matter": "^4.0.3",
"semver": "^7.6.1",
"semver": "^7.6.2",
"vue": "^3.4.27"
},
"engines": {
@ -7211,9 +7199,9 @@
}
},
"node_modules/vuepress-shared/node_modules/execa": {
"version": "9.0.2",
"resolved": "https://registry.npmjs.org/execa/-/execa-9.0.2.tgz",
"integrity": "sha512-oO281GF7ksH/Ogv1xyDf1prvFta/6/XkGKxRUvA3IB2MU1rCJGlFs86HRZhdooow1ISkR0Np0rOxUCIJVw36Rg==",
"version": "9.1.0",
"resolved": "https://registry.npmjs.org/execa/-/execa-9.1.0.tgz",
"integrity": "sha512-lSgHc4Elo2m6bUDhc3Hl/VxvUDJdQWI40RZ4KMY9bKRc+hgMOT7II/JjbNDhI8VnMtrCb7U/fhpJIkLORZozWw==",
"dev": true,
"dependencies": {
"@sindresorhus/merge-streams": "^4.0.0",
@ -7322,9 +7310,9 @@
}
},
"node_modules/vuepress-theme-hope": {
"version": "2.0.0-rc.40",
"resolved": "https://registry.npmjs.org/vuepress-theme-hope/-/vuepress-theme-hope-2.0.0-rc.40.tgz",
"integrity": "sha512-u3r1QI1BvqQRWtoMn+rt3BVsC25crCsxMvRh1uuQQzUOF4E9IndADoG0KnLdL/1kTDH1bFJwfxV32sEIeu2VSg==",
"version": "2.0.0-rc.43",
"resolved": "https://registry.npmjs.org/vuepress-theme-hope/-/vuepress-theme-hope-2.0.0-rc.43.tgz",
"integrity": "sha512-9PZXFCK2XHGXytXpBchyxhxQEPNPAHgQFAwVJeI3yrPZd3zIRBAm/NAqdl0oGD9YwuIb20tI56vs6CXhOzUxKg==",
"dev": true,
"dependencies": {
"@vuepress/helper": "2.0.0-rc.28",
@ -7335,13 +7323,12 @@
"@vuepress/plugin-comment": "2.0.0-rc.28",
"@vuepress/plugin-copy-code": "2.0.0-rc.28",
"@vuepress/plugin-copyright": "2.0.0-rc.28",
"@vuepress/plugin-external-link-icon": "2.0.0-rc.28",
"@vuepress/plugin-git": "2.0.0-rc.22",
"@vuepress/plugin-links-check": "2.0.0-rc.28",
"@vuepress/plugin-notice": "2.0.0-rc.29",
"@vuepress/plugin-nprogress": "2.0.0-rc.28",
"@vuepress/plugin-photo-swipe": "2.0.0-rc.28",
"@vuepress/plugin-prismjs": "2.0.0-rc.21",
"@vuepress/plugin-prismjs": "2.0.0-rc.28",
"@vuepress/plugin-reading-time": "2.0.0-rc.28",
"@vuepress/plugin-rtl": "2.0.0-rc.28",
"@vuepress/plugin-sass-palette": "2.0.0-rc.28",
@ -7356,9 +7343,9 @@
"chokidar": "^3.6.0",
"gray-matter": "^4.0.3",
"vue": "^3.4.27",
"vuepress-plugin-components": "2.0.0-rc.40",
"vuepress-plugin-md-enhance": "2.0.0-rc.39",
"vuepress-shared": "2.0.0-rc.39"
"vuepress-plugin-components": "2.0.0-rc.43",
"vuepress-plugin-md-enhance": "2.0.0-rc.43",
"vuepress-shared": "2.0.0-rc.43"
},
"engines": {
"node": ">=18.19.0",
@ -7375,7 +7362,7 @@
"nodejs-jieba": "^0.1.2",
"sass-loader": "^14.0.0",
"vuepress": "2.0.0-rc.9",
"vuepress-plugin-search-pro": "2.0.0-rc.39"
"vuepress-plugin-search-pro": "2.0.0-rc.43"
},
"peerDependenciesMeta": {
"@vuepress/plugin-docsearch": {
@ -7685,9 +7672,9 @@
}
},
"node_modules/yoctocolors": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.0.0.tgz",
"integrity": "sha512-esbDnt0Z1zI1KgvOZU90hJbL6BkoUbrP9yy7ArNZ6TmxBxydMJTYMf9FZjmwwcA8ZgEQzriQ3hwZ0NYXhlFo8Q==",
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.0.2.tgz",
"integrity": "sha512-Ct97huExsu7cWeEjmrXlofevF8CvzUglJ4iGUet5B8xn1oumtAZBpHU4GzYuoE6PVqcZ5hghtBrSlhwHuR1Jmw==",
"dev": true,
"engines": {
"node": ">=18"

View File

@ -21,7 +21,7 @@
"devDependencies": {
"@textlint-rule/textlint-rule-no-unmatched-pair": "^2.0.2",
"@vuepress/bundler-vite": "^2.0.0-rc.9",
"@vuepress/plugin-redirect": "^2.0.0-rc.23",
"@vuepress/plugin-redirect": "^2.0.0-rc.29",
"textlint": "^14.0.4",
"textlint-filter-rule-comments": "^1.2.2",
"textlint-rule-apostrophe": "^2.0.0",
@ -34,7 +34,7 @@
"textlint-rule-no-todo": "^2.0.1",
"textlint-rule-no-zero-width-spaces": "^1.0.1",
"vuepress": "^2.0.0-rc.9",
"vuepress-plugin-search-pro": "^2.0.0-rc.33",
"vuepress-theme-hope": "^2.0.0-rc.40"
"vuepress-plugin-search-pro": "^2.0.0-rc.43",
"vuepress-theme-hope": "^2.0.0-rc.43"
}
}