mirrors/elk
1
0
Fork 0
mirror of https://github.com/elk-zone/elk.git synced 2024-12-18 09:01:46 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into userquin/fix-patch-pwa-plugin

Browse source 
# Conflicts:
#	pnpm-lock.yaml
This commit is contained in:
userquin 2023-05-02 11:49:09 +02:00
commit 5b09cc3c78
5 changed files with 1419 additions and 1411 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
docs/nuxt.config.ts
View file

@ -2,5 +2,16 @@ export default defineNuxtConfig({
app: { app: {
baseURL: '/docs', baseURL: '/docs',
}, },
experimental: {
/**
* TODO: investigate upstream the following error:
* ```
* [error] Unexpected token (Note that you need plugins to import files that are not JavaScript)
* file: /opt/build/repo/docs/components/global/Logo.vue?vue&type=style&index=0&scoped=1f94f36b&lang.ts?inline&used:1:0
* 1: .logo{display:flex;flex-direction:row;align-items:center;gap:0.5rem;font-size:1.5rem;}img{flex-shrink:0;aspect-ratio:...
* ```
*/
inlineSSRStyles: false,
},
extends: '@nuxt-themes/docus', extends: '@nuxt-themes/docus',
}) })

4
docs/package.json
View file

@ -12,7 +12,7 @@
"theme-colors": "^0.0.5" "theme-colors": "^0.0.5"
}, },
"devDependencies": { "devDependencies": {
"@nuxt-themes/docus": "^1.10.1", "@nuxt-themes/docus": "^1.11.0",
"nuxt": "^3.4.2" "nuxt": "^3.4.3"
} }
} }

2
nuxt.config.ts
View file

@ -262,7 +262,7 @@ declare global {
} }
} }
declare module 'nuxt/dist/app' { declare module '#app' {
interface RuntimeNuxtHooks { interface RuntimeNuxtHooks {
'elk-logo:click': () => void 'elk-logo:click': () => void
} }

15
package.json
View file

@ -34,10 +34,10 @@
"@iconify-emoji/twemoji": "^1.0.2", "@iconify-emoji/twemoji": "^1.0.2",
"@iconify/json": "^2.2.49", "@iconify/json": "^2.2.49",
"@iconify/utils": "^2.1.5", "@iconify/utils": "^2.1.5",
"@nuxt/devtools": "^0.4.0", "@nuxt/devtools": "^0.4.5",
"@nuxtjs/color-mode": "^3.2.0", "@nuxtjs/color-mode": "^3.2.0",
"@nuxtjs/i18n": "8.0.0-beta.10", "@nuxtjs/i18n": "8.0.0-beta.10",
"@pinia/nuxt": "^0.4.8", "@pinia/nuxt": "^0.4.9",
"@tiptap/extension-character-count": "2.0.3", "@tiptap/extension-character-count": "2.0.3",
"@tiptap/extension-code-block": "2.0.3", "@tiptap/extension-code-block": "2.0.3",
"@tiptap/extension-history": "2.0.3", "@tiptap/extension-history": "2.0.3",
@ -49,8 +49,8 @@
"@tiptap/starter-kit": "2.0.3", "@tiptap/starter-kit": "2.0.3",
"@tiptap/suggestion": "2.0.3", "@tiptap/suggestion": "2.0.3",
"@tiptap/vue-3": "2.0.3", "@tiptap/vue-3": "2.0.3",
"@unocss/nuxt": "^0.51.4", "@unocss/nuxt": "^0.51.8",
"@vue-macros/nuxt": "^1.2.8", "@vue-macros/nuxt": "^1.3.4",
"@vueuse/core": "^10.1.0", "@vueuse/core": "^10.1.0",
"@vueuse/gesture": "2.0.0-beta.1", "@vueuse/gesture": "2.0.0-beta.1",
"@vueuse/integrations": "^10.1.0", "@vueuse/integrations": "^10.1.0",
@ -76,7 +76,7 @@
"nuxt-security": "^0.13.0", "nuxt-security": "^0.13.0",
"nuxt-vitest": "^0.6.10", "nuxt-vitest": "^0.6.10",
"page-lifecycle": "^0.1.2", "page-lifecycle": "^0.1.2",
"pinia": "^2.0.34", "pinia": "^2.0.35",
"postcss-nested": "^6.0.1", "postcss-nested": "^6.0.1",
"rollup-plugin-node-polyfills": "^0.2.1", "rollup-plugin-node-polyfills": "^0.2.1",
"shiki": "^0.14.1", "shiki": "^0.14.1",
@ -94,7 +94,6 @@
"ufo": "^1.1.1", "ufo": "^1.1.1",
"ultrahtml": "^1.2.0", "ultrahtml": "^1.2.0",
"unimport": "^3.0.6", "unimport": "^3.0.6",
"unplugin-auto-import": "^0.15.2",
"vite-plugin-pwa": "^0.14.7", "vite-plugin-pwa": "^0.14.7",
"vue-advanced-cropper": "^2.8.8", "vue-advanced-cropper": "^2.8.8",
"vue-virtual-scroller": "2.0.0-beta.8", "vue-virtual-scroller": "2.0.0-beta.8",
@ -114,12 +113,12 @@
"@types/wicg-file-system-access": "^2020.9.6", "@types/wicg-file-system-access": "^2020.9.6",
"@unlazy/nuxt": "^0.8.8", "@unlazy/nuxt": "^0.8.8",
"bumpp": "^9.1.0", "bumpp": "^9.1.0",
"consola": "^3.0.1", "consola": "^3.1.0",
"eslint": "^8.38.0", "eslint": "^8.38.0",
"flat": "^5.0.2", "flat": "^5.0.2",
"fs-extra": "^11.1.1", "fs-extra": "^11.1.1",
"lint-staged": "^13.2.1", "lint-staged": "^13.2.1",
"nuxt": "3.4.2", "nuxt": "3.4.3",
"prettier": "^2.8.7", "prettier": "^2.8.7",
"simple-git-hooks": "^2.8.1", "simple-git-hooks": "^2.8.1",
"tsx": "^3.12.6", "tsx": "^3.12.6",

2798
pnpm-lock.yaml
View file

File diff suppressed because it is too large Load diff