diff --git a/ux/package.json b/ux/package.json index 37f087f6..f183fb79 100644 --- a/ux/package.json +++ b/ux/package.json @@ -68,7 +68,7 @@ "markdown-it-footnote": "4.0.0", "markdown-it-imsize": "2.0.1", "markdown-it-mark": "4.0.0", - "markdown-it-mdc": "0.2.1", + "markdown-it-mdc": "0.2.2", "markdown-it-multimd-table": "4.2.3", "markdown-it-sub": "2.0.0", "markdown-it-sup": "2.0.0", diff --git a/ux/pnpm-lock.yaml b/ux/pnpm-lock.yaml index 19533b7d..9a504bd6 100644 --- a/ux/pnpm-lock.yaml +++ b/ux/pnpm-lock.yaml @@ -180,8 +180,8 @@ dependencies: specifier: 4.0.0 version: 4.0.0 markdown-it-mdc: - specifier: 0.2.1 - version: 0.2.1(@types/markdown-it@13.0.7)(markdown-it@14.0.0) + specifier: 0.2.2 + version: 0.2.2(@types/markdown-it@13.0.7)(markdown-it@14.0.0) markdown-it-multimd-table: specifier: 4.2.3 version: 4.2.3 @@ -3899,8 +3899,8 @@ packages: resolution: {integrity: sha512-YLhzaOsU9THO/cal0lUjfMjrqSMPjjyjChYM7oyj4DnyaXEzA8gnW6cVJeyCrCVeyesrY2PlEdUYJSPFYL4Nkg==} dev: false - /markdown-it-mdc@0.2.1(@types/markdown-it@13.0.7)(markdown-it@14.0.0): - resolution: {integrity: sha512-yUQKSlXXqS94VamsBPdmxAt5nXqSQ062NV9KTSXVR3RD9u+yFP/e+N13L7ebfRJRYRCXhANQF5z6N4/nIZ757g==} + /markdown-it-mdc@0.2.2(@types/markdown-it@13.0.7)(markdown-it@14.0.0): + resolution: {integrity: sha512-80JZ1L6OsA+2uYnVvLW2sCoFx9htY07QSQJsb6PND8oqXrQk/LS4rRIrtY2MmuktNDXBDJr9os+B5dCFLZR6Zw==} peerDependencies: '@types/markdown-it': '*' markdown-it: ^14.0.0 diff --git a/ux/quasar.config.js b/ux/quasar.config.js index 83092da9..1bdaf297 100644 --- a/ux/quasar.config.js +++ b/ux/quasar.config.js @@ -109,10 +109,6 @@ module.exports = configure(function (ctx) { } } viteConf.build.chunkSizeWarningLimit = 5000 - viteConf.build.dynamicImportVarsOptions = { - warnOnError: true, - include: ['!/_blocks/**'] - } viteConf.optimizeDeps.include = [ 'prosemirror-state', 'prosemirror-transform', @@ -120,6 +116,10 @@ module.exports = configure(function (ctx) { 'prosemirror-view' ] } + viteConf.build.dynamicImportVarsOptions = { + warnOnError: true, + include: ['!/_blocks/**'] + } }, // viteVuePluginOptions: {}, diff --git a/ux/src/components/WelcomeOverlay.vue b/ux/src/components/WelcomeOverlay.vue index 52b947de..9463db63 100644 --- a/ux/src/components/WelcomeOverlay.vue +++ b/ux/src/components/WelcomeOverlay.vue @@ -4,8 +4,8 @@ .welcome-content .welcome-logo img(src='/_assets/logo-wikijs.svg') - .welcome-title {{t('welcome.title')}} - .welcome-subtitle {{t('welcome.subtitle')}} + .welcome-title {{ t('welcome.title') }} + .welcome-subtitle {{ t('welcome.subtitle') }} .welcome-actions q-btn( push @@ -23,7 +23,7 @@ q-item( clickable @click='createHomePage(`wysiwyg`)' - v-if='siteStore.editors.wysiwyg' + v-if='flagsStore.experimental && siteStore.editors.wysiwyg' ) blueprint-icon(icon='google-presentation') q-item-section.q-pr-sm Using the Visual Editor @@ -39,7 +39,7 @@ q-item( clickable @click='createHomePage(`asciidoc`)' - v-if='siteStore.editors.asciidoc' + v-if='flagsStore.experimental && siteStore.editors.asciidoc' ) blueprint-icon(icon='asciidoc') q-item-section.q-pr-sm Using the AsciiDoc Editor @@ -60,8 +60,9 @@ import { useI18n } from 'vue-i18n' import { useRouter } from 'vue-router' import { useMeta, useQuasar } from 'quasar' -import { useSiteStore } from 'src/stores/site' +import { useFlagsStore } from 'src/stores/flags' import { usePageStore } from 'src/stores/page' +import { useSiteStore } from 'src/stores/site' // QUASAR @@ -69,6 +70,7 @@ const $q = useQuasar() // STORES +const flagsStore = useFlagsStore() const pageStore = usePageStore() const siteStore = useSiteStore()