From c9a75cceacdfdc5e8c3359dbd5fe9f1b4decbc2c Mon Sep 17 00:00:00 2001 From: Manuel Leduc Date: Wed, 5 Feb 2025 13:34:51 +0100 Subject: [PATCH 01/18] CRISTAL-463: Improve Cristal bundled size - load the editor code lazily - bundle wikimodel in a separate chunk - replace vuetify large font file for icons with svg elements loaded from javascript --- api/src/api/cristalApp.ts | 11 ++- .../extra-tabs-default/package.json | 4 +- .../src/DefaultExtraTabsService.ts | 2 +- .../info-actions-default/package.json | 4 +- .../src/DefaultInfoActionsService.ts | 2 +- .../model-reference-xwiki/package.json | 4 +- .../src/xWikiModelReferenceParser.ts | 2 +- .../page-actions-default/package.json | 4 +- .../src/DefaultPageActionCategoryService.ts | 2 +- .../src/DefaultPageActionService.ts | 2 +- .../tiptap-extension-image/package.json | 4 +- .../src/vue/ImageInsertView.vue | 2 +- .../uiextension-default/package.json | 4 +- .../src/DefaultUIExtensionsManager.ts | 2 +- .../components/vuetifyDesignSystemLoader.ts | 3 +- editors/tiptap/package.json | 4 +- .../src/components/uixTiptapEditorProvider.ts | 8 +- editors/tiptap/src/vue/c-edit-tiptap.vue | 2 +- editors/tiptap/src/vue/c-tiptap-link-edit.vue | 2 +- editors/tiptap/tsconfig.json | 2 +- electron/renderer/src/index.ts | 5 +- .../src/components/uixMenuTemplateProvider.ts | 2 +- .../components/uixMenuTemplateProvider2.ts | 2 +- lib/package.json | 1 - lib/src/components/DefaultCristalApp.ts | 11 ++- lib/src/components/cristalAppLoader.ts | 47 ++++++---- .../{ => default}/defaultComponentsList.ts | 58 ++++++------ lib/src/default/nextcloud.ts | 34 +++++++ lib/src/default/offline.ts | 28 ++++++ lib/src/default/shoelace.ts | 26 ++++++ lib/src/default/vuetify.ts | 26 ++++++ lib/src/default/xwiki.ts | 36 ++++++++ lib/src/index.ts | 2 +- lib/src/staticBuild.ts | 13 ++- macros/src/components/alertMacro.ts | 2 +- macros/src/components/errorMacro.ts | 2 +- macros/src/components/infoMacro.ts | 2 +- macros/src/components/successMacro.ts | 2 +- macros/src/components/warningMacro.ts | 2 +- pnpm-lock.yaml | 88 +++++++++---------- .../impl/src/components/workerCristalApp.ts | 2 +- skin/src/api/vueTemplateProvider.ts | 2 +- .../components/defaultVueTemplateProvider.ts | 2 +- .../components/templateTemplateProvider.ts | 2 +- .../components/uixLoginTemplateProvider.ts | 2 +- .../components/uixSearchTemplateProvider.ts | 2 +- skin/src/components/uixVueTemplateProvider.ts | 2 +- skin/src/vue/c-edit.vue | 4 +- skin/src/vue/c-main.vue | 4 +- skin/src/vue/c-uix.vue | 2 +- skin/src/vue/contentTools.ts | 6 +- web/package.json | 1 + web/src/index.ts | 8 +- web/vite.config.ts | 36 ++++---- .../uixRemoteXWikiEditorProvider.ts | 2 +- 55 files changed, 354 insertions(+), 182 deletions(-) rename lib/src/{ => default}/defaultComponentsList.ts (69%) create mode 100644 lib/src/default/nextcloud.ts create mode 100644 lib/src/default/offline.ts create mode 100644 lib/src/default/shoelace.ts create mode 100644 lib/src/default/vuetify.ts create mode 100644 lib/src/default/xwiki.ts diff --git a/api/src/api/cristalApp.ts b/api/src/api/cristalApp.ts index a956af231..914e5b6d3 100644 --- a/api/src/api/cristalApp.ts +++ b/api/src/api/cristalApp.ts @@ -51,7 +51,16 @@ export interface CristalApp { run(): Promise; - getUIXTemplates(extensionPoint: string): Array; + /** + * The method existed before 0.15, but wasn't allowing for components to be + * resolved asynchronously. + * This is useful to avoid loading all the components of a UIX during the first page load, and instead wait for the + * extension point to be actually required first. + * + * @param extensionPoint - id of the extension point to resolve + * @since 0.15 + */ + getUIXTemplates(extensionPoint: string): Promise>; getMenuEntries(): Array; diff --git a/core/extra-tabs/extra-tabs-default/package.json b/core/extra-tabs/extra-tabs-default/package.json index 314a937d6..1cba4eb42 100644 --- a/core/extra-tabs/extra-tabs-default/package.json +++ b/core/extra-tabs/extra-tabs-default/package.json @@ -25,13 +25,13 @@ "dependencies": { "@xwiki/cristal-extra-tabs-api": "workspace:*", "inversify": "6.2.2", - "lodash": "4.17.21" + "lodash-es": "4.17.21" }, "peerDependencies": { "reflect-metadata": "0.2.2" }, "devDependencies": { - "@types/lodash": "4.17.15", + "@types/lodash-es": "4.17.12", "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", diff --git a/core/extra-tabs/extra-tabs-default/src/DefaultExtraTabsService.ts b/core/extra-tabs/extra-tabs-default/src/DefaultExtraTabsService.ts index 3d9ae8cca..49b41b196 100644 --- a/core/extra-tabs/extra-tabs-default/src/DefaultExtraTabsService.ts +++ b/core/extra-tabs/extra-tabs-default/src/DefaultExtraTabsService.ts @@ -21,7 +21,7 @@ import { ExtraTab, ExtraTabsService } from "@xwiki/cristal-extra-tabs-api"; import { injectable, multiInject } from "inversify"; -import { sortBy } from "lodash"; +import { sortBy } from "lodash-es"; /** * @since 0.9 diff --git a/core/info-actions/info-actions-default/package.json b/core/info-actions/info-actions-default/package.json index bb8462c1a..0f651009b 100644 --- a/core/info-actions/info-actions-default/package.json +++ b/core/info-actions/info-actions-default/package.json @@ -26,13 +26,13 @@ "dependencies": { "@xwiki/cristal-info-actions-api": "workspace:*", "inversify": "6.2.2", - "lodash": "4.17.21" + "lodash-es": "4.17.21" }, "peerDependencies": { "reflect-metadata": "0.2.2" }, "devDependencies": { - "@types/lodash": "4.17.15", + "@types/lodash-es": "4.17.12", "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", diff --git a/core/info-actions/info-actions-default/src/DefaultInfoActionsService.ts b/core/info-actions/info-actions-default/src/DefaultInfoActionsService.ts index 6b8c68711..57696669a 100644 --- a/core/info-actions/info-actions-default/src/DefaultInfoActionsService.ts +++ b/core/info-actions/info-actions-default/src/DefaultInfoActionsService.ts @@ -23,7 +23,7 @@ import { InfoActionsService, } from "@xwiki/cristal-info-actions-api"; import { injectable, multiInject } from "inversify"; -import { sortBy } from "lodash"; +import { sortBy } from "lodash-es"; /** * Default implementation of InfoActionsService. Returns the list of enabled diff --git a/core/model/model-reference/model-reference-xwiki/package.json b/core/model/model-reference/model-reference-xwiki/package.json index fdeeb97fb..f93737a8f 100644 --- a/core/model/model-reference/model-reference-xwiki/package.json +++ b/core/model/model-reference/model-reference-xwiki/package.json @@ -28,10 +28,10 @@ "@xwiki/cristal-model-api": "workspace:*", "@xwiki/cristal-model-reference-api": "workspace:*", "inversify": "6.2.2", - "lodash": "4.17.21" + "lodash-es": "4.17.21" }, "devDependencies": { - "@types/lodash": "4.17.15", + "@types/lodash-es": "4.17.12", "reflect-metadata": "0.2.2", "typescript": "5.7.3", "vite": "6.0.11", diff --git a/core/model/model-reference/model-reference-xwiki/src/xWikiModelReferenceParser.ts b/core/model/model-reference/model-reference-xwiki/src/xWikiModelReferenceParser.ts index c68a6513b..863f61ae9 100644 --- a/core/model/model-reference/model-reference-xwiki/src/xWikiModelReferenceParser.ts +++ b/core/model/model-reference/model-reference-xwiki/src/xWikiModelReferenceParser.ts @@ -28,7 +28,7 @@ import { import { ModelReferenceParser } from "@xwiki/cristal-model-reference-api"; import { inject, injectable } from "inversify"; -import { isEqual } from "lodash"; +import { isEqual } from "lodash-es"; import type { DocumentService } from "@xwiki/cristal-document-api"; @injectable() diff --git a/core/page-actions/page-actions-default/package.json b/core/page-actions/page-actions-default/package.json index b9046e2ae..d88b4e9fa 100644 --- a/core/page-actions/page-actions-default/package.json +++ b/core/page-actions/page-actions-default/package.json @@ -25,13 +25,13 @@ "dependencies": { "@xwiki/cristal-page-actions-api": "workspace:*", "inversify": "6.2.2", - "lodash": "4.17.21" + "lodash-es": "4.17.21" }, "peerDependencies": { "reflect-metadata": "0.2.2" }, "devDependencies": { - "@types/lodash": "4.17.15", + "@types/lodash-es": "4.17.12", "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", diff --git a/core/page-actions/page-actions-default/src/DefaultPageActionCategoryService.ts b/core/page-actions/page-actions-default/src/DefaultPageActionCategoryService.ts index 09b5caf40..32c2511fc 100644 --- a/core/page-actions/page-actions-default/src/DefaultPageActionCategoryService.ts +++ b/core/page-actions/page-actions-default/src/DefaultPageActionCategoryService.ts @@ -24,7 +24,7 @@ import { } from "@xwiki/cristal-page-actions-api"; import { injectable, multiInject } from "inversify"; -import { sortBy } from "lodash"; +import { sortBy } from "lodash-es"; /** * @since 0.11 diff --git a/core/page-actions/page-actions-default/src/DefaultPageActionService.ts b/core/page-actions/page-actions-default/src/DefaultPageActionService.ts index b60da48ee..3e1479c57 100644 --- a/core/page-actions/page-actions-default/src/DefaultPageActionService.ts +++ b/core/page-actions/page-actions-default/src/DefaultPageActionService.ts @@ -21,7 +21,7 @@ import { PageAction, PageActionService } from "@xwiki/cristal-page-actions-api"; import { injectable, multiInject } from "inversify"; -import { sortBy } from "lodash"; +import { sortBy } from "lodash-es"; /** * @since 0.11 diff --git a/core/tiptap-extensions/tiptap-extension-image/package.json b/core/tiptap-extensions/tiptap-extension-image/package.json index f88ee6eaa..0fc530b7f 100644 --- a/core/tiptap-extensions/tiptap-extension-image/package.json +++ b/core/tiptap-extensions/tiptap-extension-image/package.json @@ -34,7 +34,7 @@ "@xwiki/cristal-model-reference-api": "workspace:*", "@xwiki/cristal-model-remote-url-api": "workspace:*", "@xwiki/cristal-tiptap-link-suggest-ui": "workspace:*", - "lodash": "4.17.21", + "lodash-es": "4.17.21", "prosemirror-markdown": "1.13.1", "vue-i18n": "11.1.0", "vue-tippy": "6.6.0", @@ -47,7 +47,7 @@ }, "devDependencies": { "@tiptap/core": "2.11.4", - "@types/lodash": "4.17.15", + "@types/lodash-es": "4.17.12", "@xwiki/cristal-dev-config": "workspace:*", "@xwiki/cristal-dsapi": "workspace:*", "vue": "3.5.13", diff --git a/core/tiptap-extensions/tiptap-extension-image/src/vue/ImageInsertView.vue b/core/tiptap-extensions/tiptap-extension-image/src/vue/ImageInsertView.vue index b9e4abe59..9776df45c 100644 --- a/core/tiptap-extensions/tiptap-extension-image/src/vue/ImageInsertView.vue +++ b/core/tiptap-extensions/tiptap-extension-image/src/vue/ImageInsertView.vue @@ -16,7 +16,7 @@ import { import { ModelReferenceParserProvider } from "@xwiki/cristal-model-reference-api"; import { RemoteURLSerializerProvider } from "@xwiki/cristal-model-remote-url-api"; import { LinkSuggestItem } from "@xwiki/cristal-tiptap-link-suggest-ui"; -import { debounce } from "lodash"; +import { debounce } from "lodash-es"; import { Ref, inject, ref, useTemplateRef, watch } from "vue"; import { useI18n } from "vue-i18n"; import { Tippy } from "vue-tippy"; diff --git a/core/uiextension/uiextension-default/package.json b/core/uiextension/uiextension-default/package.json index fde518113..8def7396d 100644 --- a/core/uiextension/uiextension-default/package.json +++ b/core/uiextension/uiextension-default/package.json @@ -26,13 +26,13 @@ "dependencies": { "@xwiki/cristal-uiextension-api": "workspace:*", "inversify": "6.2.2", - "lodash": "4.17.21" + "lodash-es": "4.17.21" }, "peerDependencies": { "reflect-metadata": "0.2.2" }, "devDependencies": { - "@types/lodash": "4.17.15", + "@types/lodash-es": "4.17.12", "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", diff --git a/core/uiextension/uiextension-default/src/DefaultUIExtensionsManager.ts b/core/uiextension/uiextension-default/src/DefaultUIExtensionsManager.ts index 47987ead1..b2d89c1f2 100644 --- a/core/uiextension/uiextension-default/src/DefaultUIExtensionsManager.ts +++ b/core/uiextension/uiextension-default/src/DefaultUIExtensionsManager.ts @@ -23,7 +23,7 @@ import { UIExtensionsManager, } from "@xwiki/cristal-uiextension-api"; import { injectable, multiInject } from "inversify"; -import { sortBy } from "lodash"; +import { sortBy } from "lodash-es"; @injectable() export class DefaultUIExtensionsManager implements UIExtensionsManager { diff --git a/ds/vuetify/src/components/vuetifyDesignSystemLoader.ts b/ds/vuetify/src/components/vuetifyDesignSystemLoader.ts index 0043d5397..11692f747 100644 --- a/ds/vuetify/src/components/vuetifyDesignSystemLoader.ts +++ b/ds/vuetify/src/components/vuetifyDesignSystemLoader.ts @@ -26,7 +26,7 @@ import * as components from "vuetify/components"; import { VCol, VContainer, VRow, VTextField } from "vuetify/components"; import * as directives from "vuetify/directives"; -import { mdi } from "vuetify/iconsets/mdi"; +import { aliases, mdi } from "vuetify/iconsets/mdi-svg"; import { blue, blueGrey } from "vuetify/util/colors"; import type { DesignSystemLoader } from "@xwiki/cristal-api"; import type { App } from "vue"; @@ -56,6 +56,7 @@ export class VuetifyDesignSystemLoader implements DesignSystemLoader { directives, icons: { defaultSet: "mdi", + aliases, sets: { mdi, }, diff --git a/editors/tiptap/package.json b/editors/tiptap/package.json index 46a63c08c..7ff5c3e81 100644 --- a/editors/tiptap/package.json +++ b/editors/tiptap/package.json @@ -60,7 +60,7 @@ "@xwiki/cristal-tiptap-link-suggest-ui": "workspace:*", "eventemitter3": "5.0.1", "inversify": "6.2.2", - "lodash": "4.17.21", + "lodash-es": "4.17.21", "markdown-it": "14.1.0", "pinia": "2.3.1", "tippy.js": "6.3.7", @@ -76,7 +76,7 @@ "reflect-metadata": "0.2.2" }, "devDependencies": { - "@types/lodash": "4.17.15", + "@types/lodash-es": "4.17.12", "@types/markdown-it": "14.1.2", "@xwiki/cristal-dev-config": "workspace:*", "@xwiki/cristal-dsapi": "workspace:*", diff --git a/editors/tiptap/src/components/uixTiptapEditorProvider.ts b/editors/tiptap/src/components/uixTiptapEditorProvider.ts index a77327dc3..99ac8d7a2 100644 --- a/editors/tiptap/src/components/uixTiptapEditorProvider.ts +++ b/editors/tiptap/src/components/uixTiptapEditorProvider.ts @@ -18,7 +18,6 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -import TiptapEditor from "../vue/c-edit-tiptap.vue"; import { CristalApp } from "@xwiki/cristal-api"; import { DefaultVueTemplateProvider } from "@xwiki/cristal-skin"; import { injectable } from "inversify"; @@ -34,9 +33,10 @@ export class UixTiptapEditorProvider extends DefaultVueTemplateProvider { registered = false; - override getVueComponent(): Component { - TiptapEditor.editorname = "tiptap"; - return TiptapEditor; + override async getVueComponent(): Promise { + const component = (await import("../vue/c-edit-tiptap.vue")).default; + component.editorname = "tiptap"; + return component; } override getVueName(): string { return "TiptapEditor"; diff --git a/editors/tiptap/src/vue/c-edit-tiptap.vue b/editors/tiptap/src/vue/c-edit-tiptap.vue index bc6b7ed4a..06e3b1b3f 100644 --- a/editors/tiptap/src/vue/c-edit-tiptap.vue +++ b/editors/tiptap/src/vue/c-edit-tiptap.vue @@ -57,7 +57,7 @@ import { initTiptapImage, } from "@xwiki/cristal-tiptap-extension-image"; import { Container } from "inversify"; -import { debounce } from "lodash"; +import { debounce } from "lodash-es"; import GlobalDragHandle from "tiptap-extension-global-drag-handle"; import { inject, ref, watch } from "vue"; import { useI18n } from "vue-i18n"; diff --git a/editors/tiptap/src/vue/c-tiptap-link-edit.vue b/editors/tiptap/src/vue/c-tiptap-link-edit.vue index 9d9b21edd..d30cfe3d4 100644 --- a/editors/tiptap/src/vue/c-tiptap-link-edit.vue +++ b/editors/tiptap/src/vue/c-tiptap-link-edit.vue @@ -33,7 +33,7 @@ import { ModelReferenceSerializerProvider, } from "@xwiki/cristal-model-reference-api"; import { ContentTools } from "@xwiki/cristal-skin"; -import { debounce } from "lodash"; +import { debounce } from "lodash-es"; import { Ref, inject, onMounted, onUpdated, ref, toRefs, watch } from "vue"; import type { BubbleMenuAction } from "../components/extensions/bubble-menu/BubbleMenuAction"; import type { Editor } from "@tiptap/core"; diff --git a/editors/tiptap/tsconfig.json b/editors/tiptap/tsconfig.json index 65eaa53c2..8d1e520b4 100644 --- a/editors/tiptap/tsconfig.json +++ b/editors/tiptap/tsconfig.json @@ -7,7 +7,7 @@ ], "isolatedDeclarations": false, "types": [ - "@types/lodash", + "@types/lodash-es", "@types/markdown-it", "@xwiki/cristal-dsapi" ] diff --git a/electron/renderer/src/index.ts b/electron/renderer/src/index.ts index 5777b60dc..5fbbf6b70 100644 --- a/electron/renderer/src/index.ts +++ b/electron/renderer/src/index.ts @@ -30,7 +30,6 @@ import { ComponentInit as ModelReferenceFilesystemComponentInit } from "@xwiki/c import { ComponentInit as ModelRemoteURLFilesystemComponentInit } from "@xwiki/cristal-model-remote-url-filesystem-default"; import { ComponentInit as FileSystemNavigationTreeComponentInit } from "@xwiki/cristal-navigation-tree-filesystem"; import { ComponentInit as FileSystemRenameComponentInit } from "@xwiki/cristal-rename-filesystem"; -import { Container } from "inversify"; CristalAppLoader.init( [ @@ -47,8 +46,8 @@ CristalAppLoader.init( true, true, "FileSystemSL", - (container: Container) => { - defaultComponentsList(container); + async (container, configuration) => { + await defaultComponentsList(container, configuration); new ElectronStorageComponentInit(container); new BrowserComponentInit(container); new FileSystemPageHierarchyComponentInit(container); diff --git a/extensions/menubuttons/src/components/uixMenuTemplateProvider.ts b/extensions/menubuttons/src/components/uixMenuTemplateProvider.ts index 5bad28111..7b389e92d 100644 --- a/extensions/menubuttons/src/components/uixMenuTemplateProvider.ts +++ b/extensions/menubuttons/src/components/uixMenuTemplateProvider.ts @@ -36,7 +36,7 @@ export class UIXMenuTemplateProvider extends DefaultUIXTemplateProvider { super(); } - override getVueComponent(): Component { + override async getVueComponent(): Promise { return Menu; } diff --git a/extensions/menubuttons/src/components/uixMenuTemplateProvider2.ts b/extensions/menubuttons/src/components/uixMenuTemplateProvider2.ts index 1f05058f4..19a1a7729 100644 --- a/extensions/menubuttons/src/components/uixMenuTemplateProvider2.ts +++ b/extensions/menubuttons/src/components/uixMenuTemplateProvider2.ts @@ -36,7 +36,7 @@ export class UIXMenuTemplateProvider2 extends DefaultUIXTemplateProvider { super(); } - override getVueComponent(): Component { + override async getVueComponent(): Promise { return Menu; } diff --git a/lib/package.json b/lib/package.json index d1cfc879e..3574d1094 100644 --- a/lib/package.json +++ b/lib/package.json @@ -26,7 +26,6 @@ }, "types": "dist/index.d.ts", "dependencies": { - "@mdi/font": "7.4.47", "@xwiki/cristal-alerts-default": "workspace:*", "@xwiki/cristal-api": "workspace:*", "@xwiki/cristal-attachments-default": "workspace:*", diff --git a/lib/src/components/DefaultCristalApp.ts b/lib/src/components/DefaultCristalApp.ts index 8e8785b22..5124c3a75 100644 --- a/lib/src/components/DefaultCristalApp.ts +++ b/lib/src/components/DefaultCristalApp.ts @@ -45,7 +45,6 @@ import type { } from "@xwiki/cristal-api"; import type { BrowserApi } from "@xwiki/cristal-browser-api"; import type { DocumentService } from "@xwiki/cristal-document-api"; -import "@mdi/font/css/materialdesignicons.css"; import type { ExtensionManager } from "@xwiki/cristal-extension-manager"; import type { MenuEntry } from "@xwiki/cristal-extension-menubuttons"; import type { Renderer } from "@xwiki/cristal-rendering"; @@ -462,9 +461,9 @@ export class DefaultCristalApp implements CristalApp { vueComponent, ); if (vueComponent.isGlobal()) { - this.logger?.debug("Vue component is ", vueComponent.getVueComponent()); - const vueComp = vueComponent.getVueComponent(); - this.app.component(vueComponent.getVueName(), vueComp); + const vueCompInstance = await vueComponent.getVueComponent(); + this.logger?.debug("Vue component is ", vueCompInstance); + this.app.component(vueComponent.getVueName(), vueCompInstance); } // registering additional components this.logger?.debug( @@ -528,7 +527,7 @@ export class DefaultCristalApp implements CristalApp { return menuEntriesElements; } - getUIXTemplates(extensionPoint: string): Array { + async getUIXTemplates(extensionPoint: string): Promise> { const uixTemplates = new Array(); try { this.logger?.debug( @@ -546,7 +545,7 @@ export class DefaultCristalApp implements CristalApp { uixComponents, ); for (const i in uixComponents) { - uixTemplates.push(uixComponents[i].getVueComponent()); + uixTemplates.push(await uixComponents[i].getVueComponent()); } } catch (e) { if ( diff --git a/lib/src/components/cristalAppLoader.ts b/lib/src/components/cristalAppLoader.ts index e82760e00..f276e9dfe 100644 --- a/lib/src/components/cristalAppLoader.ts +++ b/lib/src/components/cristalAppLoader.ts @@ -24,6 +24,7 @@ import { Container } from "inversify"; import type { CristalApp } from "@xwiki/cristal-api"; import type { AuthenticationManagerProvider } from "@xwiki/cristal-authentication-api"; import type { + Configuration, ConfigurationLoader, Configurations, } from "@xwiki/cristal-configuration-api"; @@ -61,20 +62,7 @@ class CristalAppLoader extends CristalLoader { this.cristal.setAvailableConfigurations(config); await handleCallback(this.cristal.getContainer()); - - if (isElectron) { - const localConfigName = window.localStorage.getItem("currentApp"); - if ( - localConfigName != null && - this.cristal.getAvailableConfigurations().has(localConfigName) - ) { - configName = localConfigName; - } else { - configName = "FileSystemSL"; - } - } else { - configName = this.getConfigFromPathName(window.location.pathname); - } + configName = this.resolveCurrentConfiguration(isElectron); let wikiConfig = this.cristal.getAvailableConfigurations().get(configName); if (wikiConfig == null) { @@ -114,16 +102,21 @@ class CristalAppLoader extends CristalLoader { loadConfig: ConfigurationLoader, isElectron: boolean, configName: string, - additionalComponents: (container: Container) => void, + additionalComponents: ( + container: Container, + config: Configuration, + ) => Promise, ): Promise { let staticMode = forceStaticMode; + const config = await loadConfig(); if (import.meta.env.MODE == "development" || staticMode) { staticMode = true; const StaticBuild = await import("../staticBuild"); - StaticBuild.StaticBuild.init( + await StaticBuild.StaticBuild.init( this.container, staticMode, additionalComponents, + config[this.resolveCurrentConfiguration(isElectron)], ); } @@ -138,7 +131,6 @@ class CristalAppLoader extends CristalLoader { this.cristal.isElectron = isElectron; this.cristal.setContainer(this.container); - const config = await loadConfig(); await this.loadApp(config, isElectron, configName); } @@ -148,7 +140,10 @@ class CristalAppLoader extends CristalLoader { staticBuild: boolean, isElectron: boolean, configName: string, - additionalComponents: (container: Container) => void, + additionalComponents: ( + container: Container, + configuration: Configuration, + ) => Promise, ): void { const cristalLoader = new CristalAppLoader(extensionList); cristalLoader.initializeContainer(); @@ -160,6 +155,22 @@ class CristalAppLoader extends CristalLoader { additionalComponents, ); } + + private resolveCurrentConfiguration(isElectron: boolean) { + if (isElectron) { + const localConfigName = window.localStorage.getItem("currentApp"); + if ( + localConfigName != null && + this.cristal.getAvailableConfigurations().has(localConfigName) + ) { + return localConfigName; + } else { + return "FileSystemSL"; + } + } else { + return this.getConfigFromPathName(window.location.pathname); + } + } } export { CristalAppLoader }; diff --git a/lib/src/defaultComponentsList.ts b/lib/src/default/defaultComponentsList.ts similarity index 69% rename from lib/src/defaultComponentsList.ts rename to lib/src/default/defaultComponentsList.ts index 5e0673e57..3e85fe4f6 100644 --- a/lib/src/defaultComponentsList.ts +++ b/lib/src/default/defaultComponentsList.ts @@ -24,43 +24,29 @@ import { ComponentInit as AttachmentsUIComponentInit } from "@xwiki/cristal-atta import { ComponentInit as AuthenticationDefaultComponentInit } from "@xwiki/cristal-authentication-default"; import { ComponentInit as AuthenticationUIComponentInit } from "@xwiki/cristal-authentication-ui"; import { ComponentInit as BackendAPIComponentInit } from "@xwiki/cristal-backend-api"; -import { ComponentInit as DexieBackendComponentInit } from "@xwiki/cristal-backend-dexie"; import { ComponentInit as NextcloudBackendComponentInit } from "@xwiki/cristal-backend-nextcloud"; import { ComponentInit as XWikiBackendComponentInit } from "@xwiki/cristal-backend-xwiki"; +import { Configuration } from "@xwiki/cristal-configuration-api"; import { ComponentInit as DateAPIComponentInit } from "@xwiki/cristal-date-api"; import { ComponentInit as DocumentComponentInit } from "@xwiki/cristal-document-default"; -import { ComponentInit as ShoelaceComponentInit } from "@xwiki/cristal-dsshoelace"; -import { ComponentInit as VueDSComponentInit } from "@xwiki/cristal-dsvuetify"; import { ComponentInit as EditorTiptapComponentInit } from "@xwiki/cristal-editors-tiptap"; import { ComponentInit as MenuButtonsComponentInit } from "@xwiki/cristal-extension-menubuttons"; import { ComponentInit as ExtraTabsComponentInit } from "@xwiki/cristal-extra-tabs-default"; import { ComponentInit as DefaultPageHierarchyComponentInit } from "@xwiki/cristal-hierarchy-default"; -import { ComponentInit as NextcloudPageHierarchyComponentInit } from "@xwiki/cristal-hierarchy-nextcloud"; -import { ComponentInit as XWikiPageHierarchyComponentInit } from "@xwiki/cristal-hierarchy-xwiki"; import { ComponentInit as DefaultPageHistoryComponentInit } from "@xwiki/cristal-history-default"; import { ComponentInit as HistoryUIComponentInit } from "@xwiki/cristal-history-ui"; -import { ComponentInit as XWikiPageHistoryComponentInit } from "@xwiki/cristal-history-xwiki"; import { ComponentInit as InfoActionsComponentInit } from "@xwiki/cristal-info-actions-default"; import { ComponentInit as LinkSuggestComponentInit } from "@xwiki/cristal-link-suggest-api"; -import { ComponentInit as NextcloudLinkSuggestComponentInit } from "@xwiki/cristal-link-suggest-nextcloud"; -import { ComponentInit as XWikiLinkSuggestComponentInit } from "@xwiki/cristal-link-suggest-xwiki"; import { ComponentInit as MacrosComponentInit } from "@xwiki/cristal-macros"; import { ComponentInit as MarkdownDefaultComponentInit } from "@xwiki/cristal-markdown-default"; import { ComponentInit as ClickListenerComponentInit } from "@xwiki/cristal-model-click-listener"; import { ComponentInit as ModelReferenceAPIComponentInit } from "@xwiki/cristal-model-reference-api"; -import { ComponentInit as ModelReferenceNextcloudComponentInit } from "@xwiki/cristal-model-reference-nextcloud"; -import { ComponentInit as ModelReferenceXWikiComponentInit } from "@xwiki/cristal-model-reference-xwiki"; import { ComponentInit as ModelRemoteURLAPIComponentInit } from "@xwiki/cristal-model-remote-url-api"; -import { ComponentInit as ModelRemoteURLNextcloudComponentInit } from "@xwiki/cristal-model-remote-url-nextcloud"; -import { ComponentInit as ModelRemoteURLXWikiComponentInit } from "@xwiki/cristal-model-remote-url-xwiki"; import { ComponentInit as DefaultNavigationTreeComponentInit } from "@xwiki/cristal-navigation-tree-default"; -import { ComponentInit as NextcloudNavigationTreeComponentInit } from "@xwiki/cristal-navigation-tree-nextcloud"; -import { ComponentInit as XWikiNavigationTreeComponentInit } from "@xwiki/cristal-navigation-tree-xwiki"; import { ComponentInit as ActionsPagesComponentInit } from "@xwiki/cristal-page-actions-default"; import { ComponentInit as ActionsPagesUIComponentInit } from "@xwiki/cristal-page-actions-ui"; import { ComponentInit as RenameComponentInit } from "@xwiki/cristal-rename-default"; import { ComponentInit as RenderingComponentInit } from "@xwiki/cristal-rendering"; -import { ComponentInit as QueueWorkerComponentInit } from "@xwiki/cristal-sharedworker-impl"; import { ComponentInit as SkinComponentInit } from "@xwiki/cristal-skin"; import { ComponentInit as UIExtensionDefaultComponentInit } from "@xwiki/cristal-uiextension-default"; import type { Container } from "inversify"; @@ -69,20 +55,37 @@ import type { Container } from "inversify"; * Loads all the components of the default distribution. * * @param container - the container the load the components in + * @param configuration - the current configuration, some component are only loaded if they match a given configuration + * value * @since 0.14 */ // eslint-disable-next-line max-statements -export function defaultComponentsList(container: Container): void { +export async function defaultComponentsList( + container: Container, + configuration: Configuration, +): Promise { new SkinComponentInit(container); new MacrosComponentInit(container); - new VueDSComponentInit(container); - new ShoelaceComponentInit(container); - new DexieBackendComponentInit(container); - new NextcloudBackendComponentInit(container); new XWikiBackendComponentInit(container); - new MenuButtonsComponentInit(container); - new QueueWorkerComponentInit(container); + new NextcloudBackendComponentInit(container); + + // Load only components that are required by the current configuration. + if (configuration.designSystem == "vuetify") { + (await import("./vuetify")).load(container); + } else if (configuration.designSystem == "shoelace") { + (await import("./shoelace")).load(container); + } + if (configuration.offline) { + (await import("./offline")).load(container); + } + if (configuration.configType == "Nextcloud") { + (await import("./nextcloud")).load(container); + } else if (configuration.configType == "XWiki") { + (await import("./xwiki")).load(container); + } + new RenderingComponentInit(container); + new MenuButtonsComponentInit(container); new EditorTiptapComponentInit(container); new ExtraTabsComponentInit(container); new InfoActionsComponentInit(container); @@ -93,28 +96,17 @@ export function defaultComponentsList(container: Container): void { new BackendAPIComponentInit(container); new AuthenticationDefaultComponentInit(container); new LinkSuggestComponentInit(container); - new XWikiLinkSuggestComponentInit(container); - new NextcloudLinkSuggestComponentInit(container); new DocumentComponentInit(container); new AlertsDefaultComponentInit(container); new ActionsPagesComponentInit(container); new ActionsPagesUIComponentInit(container); new DefaultPageHierarchyComponentInit(container); - new NextcloudPageHierarchyComponentInit(container); - new XWikiPageHierarchyComponentInit(container); new DefaultNavigationTreeComponentInit(container); - new NextcloudNavigationTreeComponentInit(container); - new XWikiNavigationTreeComponentInit(container); new DefaultPageHistoryComponentInit(container); - new XWikiPageHistoryComponentInit(container); new HistoryUIComponentInit(container); new ClickListenerComponentInit(container); new ModelRemoteURLAPIComponentInit(container); - new ModelRemoteURLNextcloudComponentInit(container); - new ModelRemoteURLXWikiComponentInit(container); new ModelReferenceAPIComponentInit(container); - new ModelReferenceNextcloudComponentInit(container); - new ModelReferenceXWikiComponentInit(container); new DateAPIComponentInit(container); new MarkdownDefaultComponentInit(container); new RenameComponentInit(container); diff --git a/lib/src/default/nextcloud.ts b/lib/src/default/nextcloud.ts new file mode 100644 index 000000000..992774b8b --- /dev/null +++ b/lib/src/default/nextcloud.ts @@ -0,0 +1,34 @@ +/* + * See the LICENSE file distributed with this work for additional + * information regarding copyright ownership. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +import { ComponentInit as NextcloudPageHierarchyComponentInit } from "@xwiki/cristal-hierarchy-nextcloud"; +import { ComponentInit as NextcloudLinkSuggestComponentInit } from "@xwiki/cristal-link-suggest-nextcloud"; +import { ComponentInit as ModelReferenceNextcloudComponentInit } from "@xwiki/cristal-model-reference-nextcloud"; +import { ComponentInit as ModelRemoteURLNextcloudComponentInit } from "@xwiki/cristal-model-remote-url-nextcloud"; +import { ComponentInit as NextcloudNavigationTreeComponentInit } from "@xwiki/cristal-navigation-tree-nextcloud"; +import type { Container } from "inversify"; + +export function load(container: Container) { + new NextcloudLinkSuggestComponentInit(container); + new NextcloudPageHierarchyComponentInit(container); + new NextcloudNavigationTreeComponentInit(container); + new ModelRemoteURLNextcloudComponentInit(container); + new ModelReferenceNextcloudComponentInit(container); +} diff --git a/lib/src/default/offline.ts b/lib/src/default/offline.ts new file mode 100644 index 000000000..7a7217dec --- /dev/null +++ b/lib/src/default/offline.ts @@ -0,0 +1,28 @@ +/* + * See the LICENSE file distributed with this work for additional + * information regarding copyright ownership. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +import { ComponentInit as DexieBackendComponentInit } from "@xwiki/cristal-backend-dexie"; +import { ComponentInit as QueueWorkerComponentInit } from "@xwiki/cristal-sharedworker-impl"; +import type { Container } from "inversify"; + +export function load(container: Container) { + new DexieBackendComponentInit(container); + new QueueWorkerComponentInit(container); +} diff --git a/lib/src/default/shoelace.ts b/lib/src/default/shoelace.ts new file mode 100644 index 000000000..06bba8e67 --- /dev/null +++ b/lib/src/default/shoelace.ts @@ -0,0 +1,26 @@ +/* + * See the LICENSE file distributed with this work for additional + * information regarding copyright ownership. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +import { ComponentInit as ShoelaceComponentInit } from "@xwiki/cristal-dsshoelace"; +import type { Container } from "inversify"; + +export function load(container: Container) { + new ShoelaceComponentInit(container); +} diff --git a/lib/src/default/vuetify.ts b/lib/src/default/vuetify.ts new file mode 100644 index 000000000..6154dc08f --- /dev/null +++ b/lib/src/default/vuetify.ts @@ -0,0 +1,26 @@ +/* + * See the LICENSE file distributed with this work for additional + * information regarding copyright ownership. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +import { ComponentInit as VueDSComponentInit } from "@xwiki/cristal-dsvuetify"; +import type { Container } from "inversify"; + +export function load(container: Container) { + new VueDSComponentInit(container); +} diff --git a/lib/src/default/xwiki.ts b/lib/src/default/xwiki.ts new file mode 100644 index 000000000..74d718a43 --- /dev/null +++ b/lib/src/default/xwiki.ts @@ -0,0 +1,36 @@ +/* + * See the LICENSE file distributed with this work for additional + * information regarding copyright ownership. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +import { ComponentInit as XWikiPageHierarchyComponentInit } from "@xwiki/cristal-hierarchy-xwiki"; +import { ComponentInit as XWikiPageHistoryComponentInit } from "@xwiki/cristal-history-xwiki"; +import { ComponentInit as XWikiLinkSuggestComponentInit } from "@xwiki/cristal-link-suggest-xwiki"; +import { ComponentInit as ModelReferenceXWikiComponentInit } from "@xwiki/cristal-model-reference-xwiki"; +import { ComponentInit as ModelRemoteURLXWikiComponentInit } from "@xwiki/cristal-model-remote-url-xwiki"; +import { ComponentInit as XWikiNavigationTreeComponentInit } from "@xwiki/cristal-navigation-tree-xwiki"; +import type { Container } from "inversify"; + +export function load(container: Container) { + new XWikiLinkSuggestComponentInit(container); + new XWikiPageHierarchyComponentInit(container); + new XWikiNavigationTreeComponentInit(container); + new XWikiPageHistoryComponentInit(container); + new ModelRemoteURLXWikiComponentInit(container); + new ModelReferenceXWikiComponentInit(container); +} diff --git a/lib/src/index.ts b/lib/src/index.ts index f0ac651c3..6c9b6fe33 100644 --- a/lib/src/index.ts +++ b/lib/src/index.ts @@ -20,6 +20,6 @@ import { DefaultCristalApp } from "./components/DefaultCristalApp"; import { CristalAppLoader } from "./components/cristalAppLoader"; -import { defaultComponentsList } from "./defaultComponentsList"; +import { defaultComponentsList } from "./default/defaultComponentsList"; export { CristalAppLoader, DefaultCristalApp, defaultComponentsList }; diff --git a/lib/src/staticBuild.ts b/lib/src/staticBuild.ts index 575cf5bad..dc234672c 100644 --- a/lib/src/staticBuild.ts +++ b/lib/src/staticBuild.ts @@ -18,21 +18,26 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ +import type { Configuration } from "@xwiki/cristal-configuration-api"; import type { Container } from "inversify"; export class StaticBuild { // TODO: reduce the number of statements in the following method and reactivate the disabled eslint rule. - public static init( + public static async init( container: Container, forceStaticBuild: boolean, - additionalComponents: (container: Container) => void, - ): void { + additionalComponents: ( + container: Container, + configuration: Configuration, + ) => Promise, + configuration: Configuration, + ): Promise { if ( (import.meta.env && import.meta.env.MODE == "development") || forceStaticBuild ) { - additionalComponents(container); + await additionalComponents(container, configuration); } } } diff --git a/macros/src/components/alertMacro.ts b/macros/src/components/alertMacro.ts index 8e4b5eb9d..5224ce615 100644 --- a/macros/src/components/alertMacro.ts +++ b/macros/src/components/alertMacro.ts @@ -38,7 +38,7 @@ export class AlertMacro extends DefaultMacroProvider { return AlertMacro.macroName; } - override getVueComponent(): Component { + override async getVueComponent(): Promise { return Warning; } diff --git a/macros/src/components/errorMacro.ts b/macros/src/components/errorMacro.ts index 522187b1d..17f66d101 100644 --- a/macros/src/components/errorMacro.ts +++ b/macros/src/components/errorMacro.ts @@ -34,7 +34,7 @@ export class ErrorMacro extends AlertMacro { return ErrorMacro.macroName; } - override getVueComponent(): Component { + override async getVueComponent(): Promise { return Error; } } diff --git a/macros/src/components/infoMacro.ts b/macros/src/components/infoMacro.ts index f557f57d1..9ae9fb733 100644 --- a/macros/src/components/infoMacro.ts +++ b/macros/src/components/infoMacro.ts @@ -34,7 +34,7 @@ export class InfoMacro extends AlertMacro { return InfoMacro.macroName; } - override getVueComponent(): Component { + override async getVueComponent(): Promise { return Info; } } diff --git a/macros/src/components/successMacro.ts b/macros/src/components/successMacro.ts index 139ca3c52..1c8995945 100644 --- a/macros/src/components/successMacro.ts +++ b/macros/src/components/successMacro.ts @@ -34,7 +34,7 @@ export class SuccessMacro extends AlertMacro { return SuccessMacro.macroName; } - override getVueComponent(): Component { + override async getVueComponent(): Promise { return Success; } } diff --git a/macros/src/components/warningMacro.ts b/macros/src/components/warningMacro.ts index 9953dab57..bd5405a44 100644 --- a/macros/src/components/warningMacro.ts +++ b/macros/src/components/warningMacro.ts @@ -34,7 +34,7 @@ export class WarningMacro extends AlertMacro { return WarningMacro.macroName; } - override getVueComponent(): Component { + override async getVueComponent(): Promise { return Warning; } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 437bca3b8..f96871d5b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -869,13 +869,13 @@ importers: inversify: specifier: 6.2.2 version: 6.2.2(reflect-metadata@0.2.2) - lodash: + lodash-es: specifier: 4.17.21 version: 4.17.21 devDependencies: - '@types/lodash': - specifier: 4.17.15 - version: 4.17.15 + '@types/lodash-es': + specifier: 4.17.12 + version: 4.17.12 '@xwiki/cristal-dev-config': specifier: workspace:* version: link:../../../dev/config @@ -1314,13 +1314,13 @@ importers: inversify: specifier: 6.2.2 version: 6.2.2(reflect-metadata@0.2.2) - lodash: + lodash-es: specifier: 4.17.21 version: 4.17.21 devDependencies: - '@types/lodash': - specifier: 4.17.15 - version: 4.17.15 + '@types/lodash-es': + specifier: 4.17.12 + version: 4.17.12 '@xwiki/cristal-dev-config': specifier: workspace:* version: link:../../../dev/config @@ -1677,13 +1677,13 @@ importers: inversify: specifier: 6.2.2 version: 6.2.2(reflect-metadata@0.2.2) - lodash: + lodash-es: specifier: 4.17.21 version: 4.17.21 devDependencies: - '@types/lodash': - specifier: 4.17.15 - version: 4.17.15 + '@types/lodash-es': + specifier: 4.17.12 + version: 4.17.12 reflect-metadata: specifier: 0.2.2 version: 0.2.2 @@ -2040,13 +2040,13 @@ importers: inversify: specifier: 6.2.2 version: 6.2.2(reflect-metadata@0.2.2) - lodash: + lodash-es: specifier: 4.17.21 version: 4.17.21 devDependencies: - '@types/lodash': - specifier: 4.17.15 - version: 4.17.15 + '@types/lodash-es': + specifier: 4.17.12 + version: 4.17.12 '@xwiki/cristal-dev-config': specifier: workspace:* version: link:../../../dev/config @@ -2228,7 +2228,7 @@ importers: '@xwiki/cristal-tiptap-link-suggest-ui': specifier: workspace:* version: link:../tiptap-link-suggest-ui - lodash: + lodash-es: specifier: 4.17.21 version: 4.17.21 prosemirror-markdown: @@ -2250,9 +2250,9 @@ importers: '@tiptap/core': specifier: 2.11.4 version: 2.11.4(@tiptap/pm@2.11.4) - '@types/lodash': - specifier: 4.17.15 - version: 4.17.15 + '@types/lodash-es': + specifier: 4.17.12 + version: 4.17.12 '@xwiki/cristal-dev-config': specifier: workspace:* version: link:../../../dev/config @@ -2318,13 +2318,13 @@ importers: inversify: specifier: 6.2.2 version: 6.2.2(reflect-metadata@0.2.2) - lodash: + lodash-es: specifier: 4.17.21 version: 4.17.21 devDependencies: - '@types/lodash': - specifier: 4.17.15 - version: 4.17.15 + '@types/lodash-es': + specifier: 4.17.12 + version: 4.17.12 '@xwiki/cristal-dev-config': specifier: workspace:* version: link:../../../dev/config @@ -2692,7 +2692,7 @@ importers: inversify: specifier: 6.2.2 version: 6.2.2(reflect-metadata@0.2.2) - lodash: + lodash-es: specifier: 4.17.21 version: 4.17.21 markdown-it: @@ -2726,9 +2726,9 @@ importers: specifier: 13.6.23 version: 13.6.23 devDependencies: - '@types/lodash': - specifier: 4.17.15 - version: 4.17.15 + '@types/lodash-es': + specifier: 4.17.12 + version: 4.17.12 '@types/markdown-it': specifier: 14.1.2 version: 14.1.2 @@ -3170,9 +3170,6 @@ importers: lib: dependencies: - '@mdi/font': - specifier: 7.4.47 - version: 7.4.47 '@xwiki/cristal-alerts-default': specifier: workspace:* version: link:../core/alerts/alerts-default @@ -3724,6 +3721,9 @@ importers: '@xwiki/cristal-browser-default': specifier: workspace:* version: link:../core/browser/browser-default + '@xwiki/cristal-configuration-api': + specifier: workspace:* + version: link:../core/configuration/configuration-api '@xwiki/cristal-configuration-web': specifier: workspace:* version: link:../core/configuration/configuration-web @@ -4459,9 +4459,6 @@ packages: '@manypkg/get-packages@1.1.3': resolution: {integrity: sha512-fo+QhuU3qE/2TQMQmbVMqaQ6EWbMhi4ABWP+O4AM1NqPBuy0OrApV5LO6BrrgnhtAHS2NH6RrVk9OL181tTi8A==} - '@mdi/font@7.4.47': - resolution: {integrity: sha512-43MtGpd585SNzHZPcYowu/84Vz2a2g31TvPMTm9uTiCSWzaheQySUcSyUH/46fPnuPQWof2yd0pGBtzee/IQWw==} - '@microsoft/api-extractor-model@7.30.2': resolution: {integrity: sha512-3/t2F+WhkJgBzSNwlkTIL0tBgUoBqDqL66pT+nh2mPbM0NIDGVGtpqbGWPgHIzn/mn7kGS/Ep8D8po58e8UUIw==} @@ -5003,6 +5000,9 @@ packages: '@types/linkify-it@5.0.0': resolution: {integrity: sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==} + '@types/lodash-es@4.17.12': + resolution: {integrity: sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==} + '@types/lodash@4.17.15': resolution: {integrity: sha512-w/P33JFeySuhN6JLkysYUK2gEmy9kHHFN7E8ro0tkfmlDOgxBDzWEZ/J8cWA+fHqFevpswDTFZnDx+R9lbL6xw==} @@ -6456,9 +6456,6 @@ packages: get-tsconfig@4.10.0: resolution: {integrity: sha512-kGzZ3LWWQcGIAmg6iWvXn0ei6WDtV26wzHRMwDSzmAbcXrTEXxHy6IehI6/4eT6VRKyMP1eF1VqwrVUmE/LR7A==} - get-tsconfig@4.8.1: - resolution: {integrity: sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg==} - glob-parent@5.1.2: resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} engines: {node: '>= 6'} @@ -6994,6 +6991,9 @@ packages: resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} engines: {node: '>=10'} + lodash-es@4.17.21: + resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==} + lodash.defaults@4.2.0: resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==} @@ -9369,8 +9369,6 @@ snapshots: globby: 11.1.0 read-yaml-file: 1.1.0 - '@mdi/font@7.4.47': {} - '@microsoft/api-extractor-model@7.30.2(@types/node@22.13.1)': dependencies: '@microsoft/tsdoc': 0.15.1 @@ -9895,6 +9893,10 @@ snapshots: '@types/linkify-it@5.0.0': {} + '@types/lodash-es@4.17.12': + dependencies: + '@types/lodash': 4.17.15 + '@types/lodash@4.17.15': {} '@types/markdown-it@13.0.8': @@ -11828,10 +11830,6 @@ snapshots: dependencies: resolve-pkg-maps: 1.0.0 - get-tsconfig@4.8.1: - dependencies: - resolve-pkg-maps: 1.0.0 - glob-parent@5.1.2: dependencies: is-glob: 4.0.3 @@ -12395,6 +12393,8 @@ snapshots: dependencies: p-locate: 5.0.0 + lodash-es@4.17.21: {} + lodash.defaults@4.2.0: {} lodash.difference@4.5.0: {} @@ -13742,7 +13742,7 @@ snapshots: tsx@4.19.2: dependencies: esbuild: 0.23.1 - get-tsconfig: 4.8.1 + get-tsconfig: 4.10.0 optionalDependencies: fsevents: 2.3.3 diff --git a/sharedworker/impl/src/components/workerCristalApp.ts b/sharedworker/impl/src/components/workerCristalApp.ts index f0e7a9866..61103bd23 100644 --- a/sharedworker/impl/src/components/workerCristalApp.ts +++ b/sharedworker/impl/src/components/workerCristalApp.ts @@ -100,7 +100,7 @@ export class WorkerCristalApp implements CristalApp { throw new Error("Method not implemented."); } - getUIXTemplates(): Component[] { + getUIXTemplates(): Promise { throw new Error("Method not implemented."); } diff --git a/skin/src/api/vueTemplateProvider.ts b/skin/src/api/vueTemplateProvider.ts index 34b9aa56d..66e866e7c 100644 --- a/skin/src/api/vueTemplateProvider.ts +++ b/skin/src/api/vueTemplateProvider.ts @@ -21,7 +21,7 @@ import type { App, Component } from "vue"; export interface VueTemplateProvider { - getVueComponent(): Component; + getVueComponent(): Promise; getVueName(): string; diff --git a/skin/src/components/defaultVueTemplateProvider.ts b/skin/src/components/defaultVueTemplateProvider.ts index f844d9990..7a77918b8 100644 --- a/skin/src/components/defaultVueTemplateProvider.ts +++ b/skin/src/components/defaultVueTemplateProvider.ts @@ -30,7 +30,7 @@ export default class DefaultVueTemplateProvider implements VueTemplateProvider { public static priority = 1000; public static singleton = true; - getVueComponent(): Component { + getVueComponent(): Promise { throw new Error("Method not implemented."); } diff --git a/skin/src/components/templateTemplateProvider.ts b/skin/src/components/templateTemplateProvider.ts index 222701c0b..1b7d27b89 100644 --- a/skin/src/components/templateTemplateProvider.ts +++ b/skin/src/components/templateTemplateProvider.ts @@ -37,7 +37,7 @@ export class TemplateComponent extends DefaultVueTemplateProvider { super(); } - override getVueComponent(): Component { + override async getVueComponent(): Promise { return Template; } diff --git a/skin/src/components/uixLoginTemplateProvider.ts b/skin/src/components/uixLoginTemplateProvider.ts index d724402bf..9ac8a9540 100644 --- a/skin/src/components/uixLoginTemplateProvider.ts +++ b/skin/src/components/uixLoginTemplateProvider.ts @@ -33,7 +33,7 @@ export class UIXLoginTemplateProvider extends DefaultVueTemplateProvider { registered = false; - override getVueComponent(): Component { + override async getVueComponent(): Promise { return Login; } override getVueName(): string { diff --git a/skin/src/components/uixSearchTemplateProvider.ts b/skin/src/components/uixSearchTemplateProvider.ts index 86beb8900..ff105dea9 100644 --- a/skin/src/components/uixSearchTemplateProvider.ts +++ b/skin/src/components/uixSearchTemplateProvider.ts @@ -33,7 +33,7 @@ export class UIXSearchTemplateProvider extends DefaultVueTemplateProvider { registered = false; - override getVueComponent(): Component { + override async getVueComponent(): Promise { return Search; } override getVueName(): string { diff --git a/skin/src/components/uixVueTemplateProvider.ts b/skin/src/components/uixVueTemplateProvider.ts index b60c1b8e9..abea1469c 100644 --- a/skin/src/components/uixVueTemplateProvider.ts +++ b/skin/src/components/uixVueTemplateProvider.ts @@ -37,7 +37,7 @@ export class UIXVueTemplateProvider extends DefaultVueTemplateProvider { super(); } - override getVueComponent(): Component { + override async getVueComponent(): Promise { return UIX; } diff --git a/skin/src/vue/c-edit.vue b/skin/src/vue/c-edit.vue index 6ddf6e67b..2b5710798 100644 --- a/skin/src/vue/c-edit.vue +++ b/skin/src/vue/c-edit.vue @@ -26,10 +26,10 @@ let comps: Array; let logger: Logger; export default { - setup() { + async setup() { let cristal = inject("cristal"); if (cristal) { - comps = cristal.getUIXTemplates("editor"); + comps = await cristal.getUIXTemplates("editor"); logger = cristal.getLogger("skin.vue.editor"); } }, diff --git a/skin/src/vue/c-main.vue b/skin/src/vue/c-main.vue index f11ae4838..990167201 100644 --- a/skin/src/vue/c-main.vue +++ b/skin/src/vue/c-main.vue @@ -21,7 +21,9 @@ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA diff --git a/skin/src/vue/c-uix.vue b/skin/src/vue/c-uix.vue index 036cd66a4..5d044e0aa 100644 --- a/skin/src/vue/c-uix.vue +++ b/skin/src/vue/c-uix.vue @@ -28,7 +28,7 @@ let logger: Logger | undefined = undefined; const props = defineProps<{ uixname: string }>(); const cristal = inject("cristal"); if (cristal) { - components = cristal.getUIXTemplates(props.uixname); + components = await cristal.getUIXTemplates(props.uixname); logger = cristal.getLogger("skin.vue.template"); } diff --git a/skin/src/vue/contentTools.ts b/skin/src/vue/contentTools.ts index ea29ba42f..193f8cd27 100644 --- a/skin/src/vue/contentTools.ts +++ b/skin/src/vue/contentTools.ts @@ -265,10 +265,10 @@ export class ContentTools { */ // TODO: reduce the number of statements in the following method and reactivate the disabled eslint rule. // eslint-disable-next-line max-statements - public static transformMacros( + public static async transformMacros( element: HTMLElement, cristal: CristalApp, - ): void { + ): Promise { const macroTagList = element.getElementsByTagName("pre"); for (let i = 0; i < macroTagList.length; i++) { const macroTag = macroTagList[i]; @@ -280,7 +280,7 @@ export class ContentTools { const macroProvider = cristal ?.getContainer() .getNamed("MacroProvider", macroName); - const vueComponent = macroProvider?.getVueComponent(); + const vueComponent = await macroProvider?.getVueComponent(); if (vueComponent && cristal?.getApp()) { macroTag.id = "wikimodel-macro-" + macroName + "-1"; const macroData = macroProvider.parseParameters(macroTag); diff --git a/web/package.json b/web/package.json index ad7e048a0..ba45defb6 100644 --- a/web/package.json +++ b/web/package.json @@ -32,6 +32,7 @@ "dependencies": { "@xwiki/cristal-authentication-xwiki": "workspace:*", "@xwiki/cristal-browser-default": "workspace:*", + "@xwiki/cristal-configuration-api": "workspace:*", "@xwiki/cristal-configuration-web": "workspace:*", "@xwiki/cristal-lib": "workspace:*", "@xwiki/cristal-navigation-tree-default": "workspace:*", diff --git a/web/src/index.ts b/web/src/index.ts index 3ce27421e..ef640d97b 100644 --- a/web/src/index.ts +++ b/web/src/index.ts @@ -18,12 +18,10 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -import { CristalAppLoader } from "@xwiki/cristal-lib"; +import { CristalAppLoader, defaultComponentsList } from "@xwiki/cristal-lib"; import { ComponentInit as AuthenticationXWikiComponentInit } from "@xwiki/cristal-authentication-xwiki"; import { ComponentInit as BrowserComponentInit } from "@xwiki/cristal-browser-default"; -import { Container } from "inversify"; import { loadConfig } from "@xwiki/cristal-configuration-web"; -import { defaultComponentsList } from "@xwiki/cristal-lib"; CristalAppLoader.init( [ @@ -40,8 +38,8 @@ CristalAppLoader.init( true, false, "XWiki", - (container: Container) => { - defaultComponentsList(container); + async (container, configuration) => { + await defaultComponentsList(container, configuration); new BrowserComponentInit(container); new AuthenticationXWikiComponentInit(container); }, diff --git a/web/vite.config.ts b/web/vite.config.ts index 5193ae4e1..409f99eeb 100644 --- a/web/vite.config.ts +++ b/web/vite.config.ts @@ -21,7 +21,6 @@ import { defineConfig } from "vite"; import Vue from "@vitejs/plugin-vue"; import dts from "vite-plugin-dts"; -import vuetify from "vite-plugin-vuetify"; import { resolve } from "path"; @@ -29,8 +28,19 @@ export default defineConfig({ build: { sourcemap: true, input: { - main: resolve(__dirname, "index.html"), + main: resolve(__dirname, "index.html") }, + rollupOptions: { + output: { + manualChunks(id) { + // For the wikimodel (very) large javascript file to be chuncked separately. + if (id.includes("components/wikimodel-teavm.ts")) { + return "wikimodel"; + } + return null; + } + } + } }, plugins: [ Vue({ @@ -38,26 +48,22 @@ export default defineConfig({ template: { compilerOptions: { isCustomElement: (tag) => - tag.startsWith("sl-") || tag.startsWith("solid-"), - }, - }, - }), - vuetify(), - dts({ - insertTypesEntry: true, + tag.startsWith("sl-") || tag.startsWith("solid-") + } + } }) ], worker: { - format: "es", + format: "es" }, optimizeDeps: { esbuildOptions: { tsconfigRaw: { compilerOptions: { // Workaround for a vite bug (see https://github.com/vitejs/vite/issues/13736) - experimentalDecorators: true, - }, - }, - }, - }, + experimentalDecorators: true + } + } + } + } }); diff --git a/xwiki/remoteinlineeditor/src/components/uixRemoteXWikiEditorProvider.ts b/xwiki/remoteinlineeditor/src/components/uixRemoteXWikiEditorProvider.ts index c20bc0811..04a0affdc 100644 --- a/xwiki/remoteinlineeditor/src/components/uixRemoteXWikiEditorProvider.ts +++ b/xwiki/remoteinlineeditor/src/components/uixRemoteXWikiEditorProvider.ts @@ -34,7 +34,7 @@ export class UIXRemoteXWikiEditorProvider extends DefaultVueTemplateProvider { registered = false; - override getVueComponent(): Component { + override async getVueComponent(): Promise { return TextEditor; } override getVueName(): string { From 5061ab400ef3b1da1f3d0a91ff5e2e637ba17200 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 7 Feb 2025 09:28:36 +0100 Subject: [PATCH 02/18] [Misc] Update pnpm to v10.2.1 (#655) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1d901b0e8..117068d37 100644 --- a/package.json +++ b/package.json @@ -57,5 +57,5 @@ "engines": { "node": "22.13.1" }, - "packageManager": "pnpm@10.2.0" + "packageManager": "pnpm@10.2.1" } From 2859c5bba0aba58be0a53720b27a8d6812a54d79 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 7 Feb 2025 09:35:22 +0100 Subject: [PATCH 03/18] [Misc] Update dependency nx to v20.4.1 (#654) --- package.json | 2 +- pnpm-lock.yaml | 90 +++++++++++++++++++++++++------------------------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/package.json b/package.json index 117068d37..c5845fdb9 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "eslint-plugin-tsdoc": "0.4.0", "eslint-plugin-vue": "9.32.0", "happy-dom": "16.8.1", - "nx": "20.4.0", + "nx": "20.4.1", "prettier": "3.4.2", "rimraf": "6.0.1", "typescript": "5.7.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f96871d5b..9c3a7353a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -63,8 +63,8 @@ importers: specifier: 16.8.1 version: 16.8.1 nx: - specifier: 20.4.0 - version: 20.4.0 + specifier: 20.4.1 + version: 20.4.1 prettier: specifier: 3.4.2 version: 3.4.2 @@ -4500,62 +4500,62 @@ packages: engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} deprecated: This functionality has been moved to @npmcli/fs - '@nx/nx-darwin-arm64@20.4.0': - resolution: {integrity: sha512-w07StYKNUIiH1koqBZY9Ew57d0wACyNdKpX96og4oiuSFYTTb+QhL4+vX2GOIYyEDfX7A97mA4lXcYUvN6R4zQ==} + '@nx/nx-darwin-arm64@20.4.1': + resolution: {integrity: sha512-hXp4w7YvwRA6TZsU6srVCe6ziNvIcXAhg/piZ0PvSDRgKLUqPc/Gd2Ry6Iga7ORYSRFhxHQHR7ZlPk/OJi3RvQ==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] - '@nx/nx-darwin-x64@20.4.0': - resolution: {integrity: sha512-HS9SfQs9BKZm3mXnOggmDrsVPTdJOr4RYa0k8zhXd0GKOdAOmgvWYsCAFxHB1BV4FGq7wfc4YskXRYHra4Ornw==} + '@nx/nx-darwin-x64@20.4.1': + resolution: {integrity: sha512-0wFsyZSrdbyqfXIqi+mID7sY5ARxuaIQ/B3jinCEMc4CDYf6sYajreXH9ZEsm8/CEBCfZZKIVkOXRz8OuxHX0A==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] - '@nx/nx-freebsd-x64@20.4.0': - resolution: {integrity: sha512-5Ex4dV9YKbmO+4ZNI7qXOPvVD7A0t/guPUMcye/Rk/vJVx3Ixr/PZlc2SpBDXDLXye4quiTqICV92VrOrVBj8Q==} + '@nx/nx-freebsd-x64@20.4.1': + resolution: {integrity: sha512-Fp6igKyg3HLGXXc3k2E3d8cK+vCGQWJRS7FTshIHXo5ztBn1l9feXJYOooCtHkhgIV6Vxzup0YAFsM17p0bQYg==} engines: {node: '>= 10'} cpu: [x64] os: [freebsd] - '@nx/nx-linux-arm-gnueabihf@20.4.0': - resolution: {integrity: sha512-mWu0QPZ4WQS39NuFOhbKy6Dwiytgn4SCzadZs/raXs/Sl9A1JtXIojMe5vy49rZocjhbpDuXCuKzHeFOi24TpA==} + '@nx/nx-linux-arm-gnueabihf@20.4.1': + resolution: {integrity: sha512-n0cQI3icbRAdPLzdf4t8UOxzeV6+eKZV6TD7BzJXn/yJHu195QzsIYx6IeJj1TCEjh9J5Z21boLhRQ6EJBL3NQ==} engines: {node: '>= 10'} cpu: [arm] os: [linux] - '@nx/nx-linux-arm64-gnu@20.4.0': - resolution: {integrity: sha512-5ZOMKtEPoAQfSXgWYgQvMt+8JreWfnHC1rHBhQznb/66DyimKlPFv5TprzKCTqg2ElrYMe5NT5usU5fO94NDnA==} + '@nx/nx-linux-arm64-gnu@20.4.1': + resolution: {integrity: sha512-4X2k+K169gvtqmNqtQVAZQFQxBfnnxJfJcM/UbgejmGZlvL9psCm7pG0wLR187FfB2lCiUKeTdw3w2nkvJ3I7w==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@nx/nx-linux-arm64-musl@20.4.0': - resolution: {integrity: sha512-RBF3KoBYEs0q9YZ1yBidKhcszI8x4znAfcZI+RQ1zWa/kT/GlnQKamdxinri4ov8/bEo9E4YTx4ITLg4RuVHLg==} + '@nx/nx-linux-arm64-musl@20.4.1': + resolution: {integrity: sha512-cMq2NBgwjKlvZmE0r4rU2P4WPeMF7EA6ktavhefjInDQU6OqSz/kI6C0xAHt4RJFm7S9z9mmYP8fK7oSYWgNhA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@nx/nx-linux-x64-gnu@20.4.0': - resolution: {integrity: sha512-RSYAfAmulCatDIKXXbWDhLU/fm03YrAMTD5FtS5IeEvMGEHkQ3scmXEXTxkOF4q5LuqSrutjdb3s8wHkbFRVqw==} + '@nx/nx-linux-x64-gnu@20.4.1': + resolution: {integrity: sha512-m1O2twC6o43tDnlSNQnN+iCSaaVNVOHmCA3WYjVLCQWnkGmzhWEuKZ0xKIgjnzRUqTm7UYIluZVzYm8PCMkPDw==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@nx/nx-linux-x64-musl@20.4.0': - resolution: {integrity: sha512-0eup79jxSzHoYEGl6OU3wb02wWQbEt4ZfOA58fiZ7c5mvCpKXQV9kg7Tu38zIA8nkcEXGb8JaR1R9TgMiAIZsw==} + '@nx/nx-linux-x64-musl@20.4.1': + resolution: {integrity: sha512-Se9Aqqosyd1y2OixrOwvIlB3rmCerhu977sUYv8kf/ALfYUvENwr6arXO5M+22E3XVmclMAQjwoF5fUQHlhmTQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@nx/nx-win32-arm64-msvc@20.4.0': - resolution: {integrity: sha512-EeHJL9YPVqi3ad9hXVCr1xDM2/PNgZIJvOlJ/ND6r9dVZ+UWw2Kk7G2r13zz4j4QAhrhQJ+kzrvXYkQlhiSH6g==} + '@nx/nx-win32-arm64-msvc@20.4.1': + resolution: {integrity: sha512-AHc8zYzrdIcpGkxZvv/Xtu4b0L0S0yTB+IeFfvH/+tOcysRr2OuVwlzI+VAVeq+JE4rhscOGxwXaqOVZi0EiNA==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] - '@nx/nx-win32-x64-msvc@20.4.0': - resolution: {integrity: sha512-IUeCeLdehVocLML6Wub7OZVM96Sk97AshiWmeNnozI6/OYdS34hQ2+thH7ETUZas9nkC2nNkJ5jLwuAHm+5/vw==} + '@nx/nx-win32-x64-msvc@20.4.1': + resolution: {integrity: sha512-3/zoQCtmIUpOZmpKuiAIy2Vo9fMPJOhlD64292h9yEzfEQf/v4ykHGNbHIx34dMzlkN10FOFMGV6J5ZImK36xw==} engines: {node: '>= 10'} cpu: [x64] os: [win32] @@ -7312,8 +7312,8 @@ packages: nth-check@2.1.1: resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==} - nx@20.4.0: - resolution: {integrity: sha512-barpwhq8noc30U0d5j2bSp9x/HDL33TCYsP2fl6FvpssbL64PwLOSBqIdZ9ATxVxAE/xAc/s+z72cYDkaYouPA==} + nx@20.4.1: + resolution: {integrity: sha512-8E2L3qhmVOC6Qp4x3eaAokK/NfWTqZWg/Xv0gbrcTlVIRvSgnmM0UIOI3utRfYO6jGuAw5h5BmR9Zb9pGxIvHw==} hasBin: true peerDependencies: '@swc-node/register': ^1.8.0 @@ -9434,34 +9434,34 @@ snapshots: mkdirp: 1.0.4 rimraf: 3.0.2 - '@nx/nx-darwin-arm64@20.4.0': + '@nx/nx-darwin-arm64@20.4.1': optional: true - '@nx/nx-darwin-x64@20.4.0': + '@nx/nx-darwin-x64@20.4.1': optional: true - '@nx/nx-freebsd-x64@20.4.0': + '@nx/nx-freebsd-x64@20.4.1': optional: true - '@nx/nx-linux-arm-gnueabihf@20.4.0': + '@nx/nx-linux-arm-gnueabihf@20.4.1': optional: true - '@nx/nx-linux-arm64-gnu@20.4.0': + '@nx/nx-linux-arm64-gnu@20.4.1': optional: true - '@nx/nx-linux-arm64-musl@20.4.0': + '@nx/nx-linux-arm64-musl@20.4.1': optional: true - '@nx/nx-linux-x64-gnu@20.4.0': + '@nx/nx-linux-x64-gnu@20.4.1': optional: true - '@nx/nx-linux-x64-musl@20.4.0': + '@nx/nx-linux-x64-musl@20.4.1': optional: true - '@nx/nx-win32-arm64-msvc@20.4.0': + '@nx/nx-win32-arm64-msvc@20.4.1': optional: true - '@nx/nx-win32-x64-msvc@20.4.0': + '@nx/nx-win32-x64-msvc@20.4.1': optional: true '@one-ini/wasm@0.1.1': {} @@ -12699,7 +12699,7 @@ snapshots: dependencies: boolbase: 1.0.0 - nx@20.4.0: + nx@20.4.1: dependencies: '@napi-rs/wasm-runtime': 0.2.4 '@yarnpkg/lockfile': 1.1.0 @@ -12736,16 +12736,16 @@ snapshots: yargs: 17.7.2 yargs-parser: 21.1.1 optionalDependencies: - '@nx/nx-darwin-arm64': 20.4.0 - '@nx/nx-darwin-x64': 20.4.0 - '@nx/nx-freebsd-x64': 20.4.0 - '@nx/nx-linux-arm-gnueabihf': 20.4.0 - '@nx/nx-linux-arm64-gnu': 20.4.0 - '@nx/nx-linux-arm64-musl': 20.4.0 - '@nx/nx-linux-x64-gnu': 20.4.0 - '@nx/nx-linux-x64-musl': 20.4.0 - '@nx/nx-win32-arm64-msvc': 20.4.0 - '@nx/nx-win32-x64-msvc': 20.4.0 + '@nx/nx-darwin-arm64': 20.4.1 + '@nx/nx-darwin-x64': 20.4.1 + '@nx/nx-freebsd-x64': 20.4.1 + '@nx/nx-linux-arm-gnueabihf': 20.4.1 + '@nx/nx-linux-arm64-gnu': 20.4.1 + '@nx/nx-linux-arm64-musl': 20.4.1 + '@nx/nx-linux-x64-gnu': 20.4.1 + '@nx/nx-linux-x64-musl': 20.4.1 + '@nx/nx-win32-arm64-msvc': 20.4.1 + '@nx/nx-win32-x64-msvc': 20.4.1 transitivePeerDependencies: - debug From 46925de40485af724d3c1542ed6f0157564f5a1d Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 7 Feb 2025 09:35:41 +0100 Subject: [PATCH 04/18] [Misc] Update dependency vite to v6.1.0 (#657) --- api/package.json | 2 +- core/alerts/alerts-api/package.json | 2 +- core/alerts/alerts-default/package.json | 2 +- core/alerts/alerts-ui/package.json | 2 +- core/attachments/attachments-api/package.json | 2 +- .../attachments-default/package.json | 2 +- core/attachments/attachments-ui/package.json | 2 +- .../authentication-api/package.json | 2 +- .../authentication-default/package.json | 2 +- .../authentication-nextcloud/package.json | 2 +- .../authentication-ui/package.json | 2 +- .../authentication-xwiki/package.json | 2 +- core/backends/backend-api/package.json | 2 +- core/backends/backend-dexie/package.json | 2 +- core/backends/backend-github/package.json | 2 +- core/backends/backend-nextcloud/package.json | 2 +- core/backends/backend-xwiki/package.json | 2 +- core/browser/browser-api/package.json | 2 +- core/browser/browser-default/package.json | 2 +- .../configuration-api/package.json | 2 +- .../configuration-web/package.json | 2 +- core/date/date-api/package.json | 2 +- core/date/date-ui/package.json | 2 +- core/document/document-api/package.json | 2 +- core/document/document-default/package.json | 2 +- core/extra-tabs/extra-tabs-api/package.json | 2 +- .../extra-tabs-default/package.json | 2 +- core/extra-tabs/extra-tabs-ui/package.json | 2 +- .../file-preview/file-preview-ui/package.json | 2 +- core/hierarchy/hierarchy-api/package.json | 2 +- core/hierarchy/hierarchy-default/package.json | 2 +- .../hierarchy-filesystem/package.json | 2 +- core/hierarchy/hierarchy-github/package.json | 2 +- .../hierarchy-nextcloud/package.json | 2 +- core/hierarchy/hierarchy-xwiki/package.json | 2 +- core/history/history-api/package.json | 2 +- core/history/history-default/package.json | 2 +- core/history/history-github/package.json | 2 +- core/history/history-ui/package.json | 2 +- core/history/history-xwiki/package.json | 2 +- core/icons/package.json | 2 +- .../info-actions-api/package.json | 2 +- .../info-actions-default/package.json | 2 +- .../info-actions/info-actions-ui/package.json | 2 +- .../link-suggest-api/package.json | 2 +- .../link-suggest-nextcloud/package.json | 2 +- .../link-suggest-xwiki/package.json | 2 +- core/markdown/markdown-api/package.json | 2 +- core/markdown/markdown-default/package.json | 2 +- core/model/model-api/package.json | 2 +- core/model/model-click-listener/package.json | 2 +- core/model/model-local-url/package.json | 2 +- .../model-reference-api/package.json | 2 +- .../model-reference-filesystem/package.json | 2 +- .../model-reference-nextcloud/package.json | 2 +- .../model-reference-xwiki/package.json | 2 +- .../model-remote-url-api/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../model-remote-url-nextcloud/package.json | 2 +- .../model-remote-url-xwiki/package.json | 2 +- .../navigation-tree-api/package.json | 2 +- .../navigation-tree-default/package.json | 2 +- .../navigation-tree-filesystem/package.json | 2 +- .../navigation-tree-github/package.json | 2 +- .../navigation-tree-nextcloud/package.json | 2 +- .../navigation-tree-xwiki/package.json | 2 +- .../page-actions-api/package.json | 2 +- .../page-actions-default/package.json | 2 +- .../page-actions/page-actions-ui/package.json | 2 +- core/rename/rename-api/package.json | 2 +- core/rename/rename-default/package.json | 2 +- core/rename/rename-filesystem/package.json | 2 +- core/uiextension/uiextension-api/package.json | 2 +- .../uiextension-default/package.json | 2 +- core/uiextension/uiextension-ui/package.json | 2 +- core/user/user-ui/package.json | 2 +- core/xwiki/xwiki-utils/package.json | 2 +- dev/config/package.json | 2 +- dev/test-utils/package.json | 2 +- ds/api/package.json | 2 +- ds/dsfr/package.json | 2 +- ds/shoelace/package.json | 2 +- ds/vuetify/package.json | 2 +- editors/tiptap/package.json | 2 +- .../authentication-xwiki-main/package.json | 2 +- .../authentication-xwiki-preload/package.json | 2 +- .../package.json | 2 +- electron/browser/package.json | 2 +- .../configuration-electron-main/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../link-suggest-filesystem/package.json | 2 +- electron/main/package.json | 2 +- electron/package.json | 2 +- electron/preload/package.json | 2 +- electron/renderer/package.json | 2 +- electron/storage/package.json | 2 +- extension-manager/package.json | 2 +- extensions/menubuttons/package.json | 2 +- lib/package.json | 2 +- macros/package.json | 2 +- package.json | 2 +- pnpm-lock.yaml | 508 +++++++++--------- realtime/package.json | 2 +- rendering/rendering/package.json | 2 +- rendering/wikimodel/package.json | 2 +- sharedworker/api/package.json | 2 +- sharedworker/impl/package.json | 2 +- skin/package.json | 2 +- sources/xwiki/mock-server/package.json | 2 +- web/package.json | 2 +- xwiki/remoteinlineeditor/package.json | 2 +- 113 files changed, 366 insertions(+), 366 deletions(-) diff --git a/api/package.json b/api/package.json index e7e0a2e5b..f3b27c0df 100644 --- a/api/package.json +++ b/api/package.json @@ -36,7 +36,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vue-tsc": "2.2.0" }, "publishConfig": { diff --git a/core/alerts/alerts-api/package.json b/core/alerts/alerts-api/package.json index cf6387e39..6c0fe387e 100644 --- a/core/alerts/alerts-api/package.json +++ b/core/alerts/alerts-api/package.json @@ -29,7 +29,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "@xwiki/cristal-dsapi": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/alerts/alerts-default/package.json b/core/alerts/alerts-default/package.json index 230f4a609..8e8d6a610 100644 --- a/core/alerts/alerts-default/package.json +++ b/core/alerts/alerts-default/package.json @@ -36,7 +36,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/alerts/alerts-ui/package.json b/core/alerts/alerts-ui/package.json index 7211d316c..80154537d 100644 --- a/core/alerts/alerts-ui/package.json +++ b/core/alerts/alerts-ui/package.json @@ -37,7 +37,7 @@ "@xwiki/cristal-dsapi": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vue-tsc": "2.2.0" }, "publishConfig": { diff --git a/core/attachments/attachments-api/package.json b/core/attachments/attachments-api/package.json index bed4efa93..632cd36ac 100644 --- a/core/attachments/attachments-api/package.json +++ b/core/attachments/attachments-api/package.json @@ -30,7 +30,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/attachments/attachments-default/package.json b/core/attachments/attachments-default/package.json index a413387c0..103c23462 100644 --- a/core/attachments/attachments-default/package.json +++ b/core/attachments/attachments-default/package.json @@ -40,7 +40,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/attachments/attachments-ui/package.json b/core/attachments/attachments-ui/package.json index 506f4b8d4..8883f6b8d 100644 --- a/core/attachments/attachments-ui/package.json +++ b/core/attachments/attachments-ui/package.json @@ -51,7 +51,7 @@ "@xwiki/cristal-dsapi": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vitest": "3.0.5", "vitest-mock-extended": "2.0.2", "vue-tsc": "2.2.0" diff --git a/core/authentication/authentication-api/package.json b/core/authentication/authentication-api/package.json index 256aed5a2..6de112432 100644 --- a/core/authentication/authentication-api/package.json +++ b/core/authentication/authentication-api/package.json @@ -30,7 +30,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/authentication/authentication-default/package.json b/core/authentication/authentication-default/package.json index cbc5904bc..062344f4d 100644 --- a/core/authentication/authentication-default/package.json +++ b/core/authentication/authentication-default/package.json @@ -35,7 +35,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/authentication/authentication-nextcloud/package.json b/core/authentication/authentication-nextcloud/package.json index a1370c61c..4ae7b9350 100644 --- a/core/authentication/authentication-nextcloud/package.json +++ b/core/authentication/authentication-nextcloud/package.json @@ -26,7 +26,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/authentication/authentication-ui/package.json b/core/authentication/authentication-ui/package.json index 0d0915a34..75aa6e031 100644 --- a/core/authentication/authentication-ui/package.json +++ b/core/authentication/authentication-ui/package.json @@ -40,7 +40,7 @@ "@xwiki/cristal-dsapi": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vitest": "3.0.5", "vue-tsc": "2.2.0" }, diff --git a/core/authentication/authentication-xwiki/package.json b/core/authentication/authentication-xwiki/package.json index 3fcdea178..f0d1c8ecd 100644 --- a/core/authentication/authentication-xwiki/package.json +++ b/core/authentication/authentication-xwiki/package.json @@ -38,7 +38,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/backends/backend-api/package.json b/core/backends/backend-api/package.json index 0269c9e75..e0b105e52 100644 --- a/core/backends/backend-api/package.json +++ b/core/backends/backend-api/package.json @@ -33,7 +33,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/backends/backend-dexie/package.json b/core/backends/backend-dexie/package.json index 95eaadd56..6f10fddd4 100644 --- a/core/backends/backend-dexie/package.json +++ b/core/backends/backend-dexie/package.json @@ -36,7 +36,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/backends/backend-github/package.json b/core/backends/backend-github/package.json index 12b6cb359..a0f4ff81c 100644 --- a/core/backends/backend-github/package.json +++ b/core/backends/backend-github/package.json @@ -34,7 +34,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/backends/backend-nextcloud/package.json b/core/backends/backend-nextcloud/package.json index 9ae0513b2..8ab292634 100644 --- a/core/backends/backend-nextcloud/package.json +++ b/core/backends/backend-nextcloud/package.json @@ -36,7 +36,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/backends/backend-xwiki/package.json b/core/backends/backend-xwiki/package.json index 584f3b291..5861d54d8 100644 --- a/core/backends/backend-xwiki/package.json +++ b/core/backends/backend-xwiki/package.json @@ -34,7 +34,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vitest-mock-extended": "2.0.2" }, "publishConfig": { diff --git a/core/browser/browser-api/package.json b/core/browser/browser-api/package.json index bc4a7993e..c44e476d4 100644 --- a/core/browser/browser-api/package.json +++ b/core/browser/browser-api/package.json @@ -28,7 +28,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/browser/browser-default/package.json b/core/browser/browser-default/package.json index fc2bfdf6b..4fe66f09f 100644 --- a/core/browser/browser-default/package.json +++ b/core/browser/browser-default/package.json @@ -35,7 +35,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/configuration/configuration-api/package.json b/core/configuration/configuration-api/package.json index 5c6fb8e97..a35986a88 100644 --- a/core/configuration/configuration-api/package.json +++ b/core/configuration/configuration-api/package.json @@ -28,7 +28,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/configuration/configuration-web/package.json b/core/configuration/configuration-web/package.json index 27e5c8126..e89998cb9 100644 --- a/core/configuration/configuration-web/package.json +++ b/core/configuration/configuration-web/package.json @@ -28,7 +28,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/date/date-api/package.json b/core/date/date-api/package.json index 84293daa7..16438a84e 100644 --- a/core/date/date-api/package.json +++ b/core/date/date-api/package.json @@ -33,7 +33,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/date/date-ui/package.json b/core/date/date-ui/package.json index 3ff8503e6..238546629 100644 --- a/core/date/date-ui/package.json +++ b/core/date/date-ui/package.json @@ -30,7 +30,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vue-tsc": "2.2.0" }, "publishConfig": { diff --git a/core/document/document-api/package.json b/core/document/document-api/package.json index 55e3b545d..7ddff46e0 100644 --- a/core/document/document-api/package.json +++ b/core/document/document-api/package.json @@ -30,7 +30,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/document/document-default/package.json b/core/document/document-default/package.json index a25d4eb5a..47aa3c87b 100644 --- a/core/document/document-default/package.json +++ b/core/document/document-default/package.json @@ -39,7 +39,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vitest-mock-extended": "2.0.2" }, "publishConfig": { diff --git a/core/extra-tabs/extra-tabs-api/package.json b/core/extra-tabs/extra-tabs-api/package.json index ca3ece765..c3a47bfa3 100644 --- a/core/extra-tabs/extra-tabs-api/package.json +++ b/core/extra-tabs/extra-tabs-api/package.json @@ -34,7 +34,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/extra-tabs/extra-tabs-default/package.json b/core/extra-tabs/extra-tabs-default/package.json index 1cba4eb42..d109d7d73 100644 --- a/core/extra-tabs/extra-tabs-default/package.json +++ b/core/extra-tabs/extra-tabs-default/package.json @@ -35,7 +35,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/extra-tabs/extra-tabs-ui/package.json b/core/extra-tabs/extra-tabs-ui/package.json index a4fa04ea9..94e906ee4 100644 --- a/core/extra-tabs/extra-tabs-ui/package.json +++ b/core/extra-tabs/extra-tabs-ui/package.json @@ -31,7 +31,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "@xwiki/cristal-dsapi": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vue-tsc": "2.2.0" }, "publishConfig": { diff --git a/core/file-preview/file-preview-ui/package.json b/core/file-preview/file-preview-ui/package.json index 660b06ac6..0ad91543a 100644 --- a/core/file-preview/file-preview-ui/package.json +++ b/core/file-preview/file-preview-ui/package.json @@ -31,7 +31,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vue-tsc": "2.2.0" }, "publishConfig": { diff --git a/core/hierarchy/hierarchy-api/package.json b/core/hierarchy/hierarchy-api/package.json index 81fec6065..66d9ae7c4 100644 --- a/core/hierarchy/hierarchy-api/package.json +++ b/core/hierarchy/hierarchy-api/package.json @@ -28,7 +28,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/hierarchy/hierarchy-default/package.json b/core/hierarchy/hierarchy-default/package.json index 777e9bec4..efedb4c03 100644 --- a/core/hierarchy/hierarchy-default/package.json +++ b/core/hierarchy/hierarchy-default/package.json @@ -34,7 +34,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/hierarchy/hierarchy-filesystem/package.json b/core/hierarchy/hierarchy-filesystem/package.json index 5a777d539..81cf0ae10 100644 --- a/core/hierarchy/hierarchy-filesystem/package.json +++ b/core/hierarchy/hierarchy-filesystem/package.json @@ -35,7 +35,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/hierarchy/hierarchy-github/package.json b/core/hierarchy/hierarchy-github/package.json index cd9c45729..581e9b581 100644 --- a/core/hierarchy/hierarchy-github/package.json +++ b/core/hierarchy/hierarchy-github/package.json @@ -34,7 +34,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/hierarchy/hierarchy-nextcloud/package.json b/core/hierarchy/hierarchy-nextcloud/package.json index 2c7ddc8d7..a3a4c5593 100644 --- a/core/hierarchy/hierarchy-nextcloud/package.json +++ b/core/hierarchy/hierarchy-nextcloud/package.json @@ -35,7 +35,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/hierarchy/hierarchy-xwiki/package.json b/core/hierarchy/hierarchy-xwiki/package.json index 000ea732c..a86dd7e3e 100644 --- a/core/hierarchy/hierarchy-xwiki/package.json +++ b/core/hierarchy/hierarchy-xwiki/package.json @@ -41,7 +41,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/history/history-api/package.json b/core/history/history-api/package.json index 11996a2bf..6ef0f6b1a 100644 --- a/core/history/history-api/package.json +++ b/core/history/history-api/package.json @@ -30,7 +30,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/history/history-default/package.json b/core/history/history-default/package.json index d75565d01..c3489ada3 100644 --- a/core/history/history-default/package.json +++ b/core/history/history-default/package.json @@ -35,7 +35,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/history/history-github/package.json b/core/history/history-github/package.json index 1ba52259b..d7f8257bf 100644 --- a/core/history/history-github/package.json +++ b/core/history/history-github/package.json @@ -36,7 +36,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/history/history-ui/package.json b/core/history/history-ui/package.json index cbd57da37..1274b3387 100644 --- a/core/history/history-ui/package.json +++ b/core/history/history-ui/package.json @@ -42,7 +42,7 @@ "@xwiki/cristal-dsapi": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vue-tsc": "2.2.0" }, "publishConfig": { diff --git a/core/history/history-xwiki/package.json b/core/history/history-xwiki/package.json index e460c550c..00ab5be9a 100644 --- a/core/history/history-xwiki/package.json +++ b/core/history/history-xwiki/package.json @@ -38,7 +38,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/icons/package.json b/core/icons/package.json index b2a772c5c..05fef8463 100644 --- a/core/icons/package.json +++ b/core/icons/package.json @@ -32,7 +32,7 @@ "@vue/test-utils": "2.4.6", "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vue-tsc": "2.2.0" }, "keywords": [ diff --git a/core/info-actions/info-actions-api/package.json b/core/info-actions/info-actions-api/package.json index f46f1465b..fa19cb23b 100644 --- a/core/info-actions/info-actions-api/package.json +++ b/core/info-actions/info-actions-api/package.json @@ -29,7 +29,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/info-actions/info-actions-default/package.json b/core/info-actions/info-actions-default/package.json index 0f651009b..f99d62257 100644 --- a/core/info-actions/info-actions-default/package.json +++ b/core/info-actions/info-actions-default/package.json @@ -36,7 +36,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/info-actions/info-actions-ui/package.json b/core/info-actions/info-actions-ui/package.json index 231127f7c..780234351 100644 --- a/core/info-actions/info-actions-ui/package.json +++ b/core/info-actions/info-actions-ui/package.json @@ -35,7 +35,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "@xwiki/cristal-dev-test-utils": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vue-tsc": "2.2.0" }, "publishConfig": { diff --git a/core/link-suggest/link-suggest-api/package.json b/core/link-suggest/link-suggest-api/package.json index 9210d33d6..b456ca36b 100644 --- a/core/link-suggest/link-suggest-api/package.json +++ b/core/link-suggest/link-suggest-api/package.json @@ -34,7 +34,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/link-suggest/link-suggest-nextcloud/package.json b/core/link-suggest/link-suggest-nextcloud/package.json index 2d0088b7e..b331d0fa3 100644 --- a/core/link-suggest/link-suggest-nextcloud/package.json +++ b/core/link-suggest/link-suggest-nextcloud/package.json @@ -38,7 +38,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/link-suggest/link-suggest-xwiki/package.json b/core/link-suggest/link-suggest-xwiki/package.json index ba0bac50e..f1c43c760 100644 --- a/core/link-suggest/link-suggest-xwiki/package.json +++ b/core/link-suggest/link-suggest-xwiki/package.json @@ -38,7 +38,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/markdown/markdown-api/package.json b/core/markdown/markdown-api/package.json index 0f6134f77..4245c17b1 100644 --- a/core/markdown/markdown-api/package.json +++ b/core/markdown/markdown-api/package.json @@ -29,7 +29,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/markdown/markdown-default/package.json b/core/markdown/markdown-default/package.json index 363689dad..a3377c9d7 100644 --- a/core/markdown/markdown-default/package.json +++ b/core/markdown/markdown-default/package.json @@ -39,7 +39,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vitest-mock-extended": "2.0.2" }, "publishConfig": { diff --git a/core/model/model-api/package.json b/core/model/model-api/package.json index 23e04212f..e0eead2cb 100644 --- a/core/model/model-api/package.json +++ b/core/model/model-api/package.json @@ -26,7 +26,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/model/model-click-listener/package.json b/core/model/model-click-listener/package.json index 9a3045948..1ccda3074 100644 --- a/core/model/model-click-listener/package.json +++ b/core/model/model-click-listener/package.json @@ -38,7 +38,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/model/model-local-url/package.json b/core/model/model-local-url/package.json index fdb1d4168..165166c7d 100644 --- a/core/model/model-local-url/package.json +++ b/core/model/model-local-url/package.json @@ -34,7 +34,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vitest": "3.0.5" }, "publishConfig": { diff --git a/core/model/model-reference/model-reference-api/package.json b/core/model/model-reference/model-reference-api/package.json index 661027f4b..5d59c1e28 100644 --- a/core/model/model-reference/model-reference-api/package.json +++ b/core/model/model-reference/model-reference-api/package.json @@ -35,7 +35,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/model/model-reference/model-reference-filesystem/package.json b/core/model/model-reference/model-reference-filesystem/package.json index 8fec70130..0c5ba42fd 100644 --- a/core/model/model-reference/model-reference-filesystem/package.json +++ b/core/model/model-reference/model-reference-filesystem/package.json @@ -35,7 +35,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/model/model-reference/model-reference-nextcloud/package.json b/core/model/model-reference/model-reference-nextcloud/package.json index 20fb06970..b7f73b1f6 100644 --- a/core/model/model-reference/model-reference-nextcloud/package.json +++ b/core/model/model-reference/model-reference-nextcloud/package.json @@ -35,7 +35,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/model/model-reference/model-reference-xwiki/package.json b/core/model/model-reference/model-reference-xwiki/package.json index f93737a8f..3997f9383 100644 --- a/core/model/model-reference/model-reference-xwiki/package.json +++ b/core/model/model-reference/model-reference-xwiki/package.json @@ -34,7 +34,7 @@ "@types/lodash-es": "4.17.12", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vitest": "3.0.5", "vitest-mock-extended": "2.0.2", "vue": "3.5.13" diff --git a/core/model/model-remote-url/model-remote-url-api/package.json b/core/model/model-remote-url/model-remote-url-api/package.json index e1e94e03b..1f3504dde 100644 --- a/core/model/model-remote-url/model-remote-url-api/package.json +++ b/core/model/model-remote-url/model-remote-url-api/package.json @@ -35,7 +35,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/model/model-remote-url/model-remote-url-filesystem/model-remote-url-filesystem-api/package.json b/core/model/model-remote-url/model-remote-url-filesystem/model-remote-url-filesystem-api/package.json index ddaa135ba..e209d29aa 100644 --- a/core/model/model-remote-url/model-remote-url-filesystem/model-remote-url-filesystem-api/package.json +++ b/core/model/model-remote-url/model-remote-url-filesystem/model-remote-url-filesystem-api/package.json @@ -26,7 +26,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/model/model-remote-url/model-remote-url-filesystem/model-remote-url-filesystem-default/package.json b/core/model/model-remote-url/model-remote-url-filesystem/model-remote-url-filesystem-default/package.json index 721aca0da..8701adb61 100644 --- a/core/model/model-remote-url/model-remote-url-filesystem/model-remote-url-filesystem-default/package.json +++ b/core/model/model-remote-url/model-remote-url-filesystem/model-remote-url-filesystem-default/package.json @@ -36,7 +36,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/model/model-remote-url/model-remote-url-nextcloud/package.json b/core/model/model-remote-url/model-remote-url-nextcloud/package.json index 59a0d90a8..7c980c788 100644 --- a/core/model/model-remote-url/model-remote-url-nextcloud/package.json +++ b/core/model/model-remote-url/model-remote-url-nextcloud/package.json @@ -37,7 +37,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/model/model-remote-url/model-remote-url-xwiki/package.json b/core/model/model-remote-url/model-remote-url-xwiki/package.json index b109f365e..6ff639d21 100644 --- a/core/model/model-remote-url/model-remote-url-xwiki/package.json +++ b/core/model/model-remote-url/model-remote-url-xwiki/package.json @@ -36,7 +36,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/navigation-tree/navigation-tree-api/package.json b/core/navigation-tree/navigation-tree-api/package.json index d66c6d652..9fef501ec 100644 --- a/core/navigation-tree/navigation-tree-api/package.json +++ b/core/navigation-tree/navigation-tree-api/package.json @@ -30,7 +30,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/navigation-tree/navigation-tree-default/package.json b/core/navigation-tree/navigation-tree-default/package.json index 56753a02f..175a55ce6 100644 --- a/core/navigation-tree/navigation-tree-default/package.json +++ b/core/navigation-tree/navigation-tree-default/package.json @@ -35,7 +35,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/navigation-tree/navigation-tree-filesystem/package.json b/core/navigation-tree/navigation-tree-filesystem/package.json index e8bc46c53..ca3b6a24e 100644 --- a/core/navigation-tree/navigation-tree-filesystem/package.json +++ b/core/navigation-tree/navigation-tree-filesystem/package.json @@ -38,7 +38,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/navigation-tree/navigation-tree-github/package.json b/core/navigation-tree/navigation-tree-github/package.json index ce3f55740..984af9106 100644 --- a/core/navigation-tree/navigation-tree-github/package.json +++ b/core/navigation-tree/navigation-tree-github/package.json @@ -37,7 +37,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/navigation-tree/navigation-tree-nextcloud/package.json b/core/navigation-tree/navigation-tree-nextcloud/package.json index 8a88c1b44..20bff9a96 100644 --- a/core/navigation-tree/navigation-tree-nextcloud/package.json +++ b/core/navigation-tree/navigation-tree-nextcloud/package.json @@ -38,7 +38,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/navigation-tree/navigation-tree-xwiki/package.json b/core/navigation-tree/navigation-tree-xwiki/package.json index 9bd8a5004..e417f0c41 100644 --- a/core/navigation-tree/navigation-tree-xwiki/package.json +++ b/core/navigation-tree/navigation-tree-xwiki/package.json @@ -39,7 +39,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/page-actions/page-actions-api/package.json b/core/page-actions/page-actions-api/package.json index 8ad71b400..ae941b7e9 100644 --- a/core/page-actions/page-actions-api/package.json +++ b/core/page-actions/page-actions-api/package.json @@ -34,7 +34,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/page-actions/page-actions-default/package.json b/core/page-actions/page-actions-default/package.json index d88b4e9fa..540cd177e 100644 --- a/core/page-actions/page-actions-default/package.json +++ b/core/page-actions/page-actions-default/package.json @@ -35,7 +35,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/page-actions/page-actions-ui/package.json b/core/page-actions/page-actions-ui/package.json index 962fa5a9c..2876ddbb0 100644 --- a/core/page-actions/page-actions-ui/package.json +++ b/core/page-actions/page-actions-ui/package.json @@ -46,7 +46,7 @@ "@xwiki/cristal-dsapi": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vue-tsc": "2.2.0" }, "publishConfig": { diff --git a/core/rename/rename-api/package.json b/core/rename/rename-api/package.json index 69334f15b..71b6b0d93 100644 --- a/core/rename/rename-api/package.json +++ b/core/rename/rename-api/package.json @@ -28,7 +28,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/rename/rename-default/package.json b/core/rename/rename-default/package.json index ed2b0f2e0..22159763d 100644 --- a/core/rename/rename-default/package.json +++ b/core/rename/rename-default/package.json @@ -34,7 +34,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/rename/rename-filesystem/package.json b/core/rename/rename-filesystem/package.json index b1e420e3f..66095e156 100644 --- a/core/rename/rename-filesystem/package.json +++ b/core/rename/rename-filesystem/package.json @@ -35,7 +35,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/uiextension/uiextension-api/package.json b/core/uiextension/uiextension-api/package.json index 4fa3a6adf..db6793c9f 100644 --- a/core/uiextension/uiextension-api/package.json +++ b/core/uiextension/uiextension-api/package.json @@ -29,7 +29,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/uiextension/uiextension-default/package.json b/core/uiextension/uiextension-default/package.json index 8def7396d..7576af2f8 100644 --- a/core/uiextension/uiextension-default/package.json +++ b/core/uiextension/uiextension-default/package.json @@ -36,7 +36,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/core/uiextension/uiextension-ui/package.json b/core/uiextension/uiextension-ui/package.json index 3a1ab2fb4..4a46fa9c9 100644 --- a/core/uiextension/uiextension-ui/package.json +++ b/core/uiextension/uiextension-ui/package.json @@ -31,7 +31,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vue-tsc": "2.2.0" }, "publishConfig": { diff --git a/core/user/user-ui/package.json b/core/user/user-ui/package.json index 7c9fc5fe0..010c2f103 100644 --- a/core/user/user-ui/package.json +++ b/core/user/user-ui/package.json @@ -30,7 +30,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vue-tsc": "2.2.0" }, "publishConfig": { diff --git a/core/xwiki/xwiki-utils/package.json b/core/xwiki/xwiki-utils/package.json index 5cc82d835..52f5f68d2 100644 --- a/core/xwiki/xwiki-utils/package.json +++ b/core/xwiki/xwiki-utils/package.json @@ -27,7 +27,7 @@ "@xwiki/cristal-api": "workspace:*", "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/dev/config/package.json b/dev/config/package.json index ed434cfb7..7b0621a32 100644 --- a/dev/config/package.json +++ b/dev/config/package.json @@ -16,6 +16,6 @@ "type": "module", "devDependencies": { "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" } } diff --git a/dev/test-utils/package.json b/dev/test-utils/package.json index 71111564d..6073dfde8 100644 --- a/dev/test-utils/package.json +++ b/dev/test-utils/package.json @@ -31,6 +31,6 @@ "devDependencies": { "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" } } diff --git a/ds/api/package.json b/ds/api/package.json index a9471e74d..3870691f6 100644 --- a/ds/api/package.json +++ b/ds/api/package.json @@ -31,7 +31,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/ds/dsfr/package.json b/ds/dsfr/package.json index 3d175f1bd..94c6e1122 100644 --- a/ds/dsfr/package.json +++ b/ds/dsfr/package.json @@ -42,7 +42,7 @@ "@xwiki/cristal-dsapi": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vue-tsc": "2.2.0" }, "publishConfig": { diff --git a/ds/shoelace/package.json b/ds/shoelace/package.json index 41119252a..6945afc9d 100644 --- a/ds/shoelace/package.json +++ b/ds/shoelace/package.json @@ -44,7 +44,7 @@ "@xwiki/cristal-dsapi": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vue-tsc": "2.2.0" }, "publishConfig": { diff --git a/ds/vuetify/package.json b/ds/vuetify/package.json index d497c89a0..c1e47a398 100644 --- a/ds/vuetify/package.json +++ b/ds/vuetify/package.json @@ -44,7 +44,7 @@ "@xwiki/cristal-dsapi": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vue-tsc": "2.2.0" }, "publishConfig": { diff --git a/editors/tiptap/package.json b/editors/tiptap/package.json index 7ff5c3e81..5196c0038 100644 --- a/editors/tiptap/package.json +++ b/editors/tiptap/package.json @@ -82,7 +82,7 @@ "@xwiki/cristal-dsapi": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vue-tsc": "2.2.0" }, "publishConfig": { diff --git a/electron/authentication/authentication-xwiki/authentication-xwiki-main/package.json b/electron/authentication/authentication-xwiki/authentication-xwiki-main/package.json index 460c372cb..1d95df309 100644 --- a/electron/authentication/authentication-xwiki/authentication-xwiki-main/package.json +++ b/electron/authentication/authentication-xwiki/authentication-xwiki-main/package.json @@ -34,7 +34,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/electron/authentication/authentication-xwiki/authentication-xwiki-preload/package.json b/electron/authentication/authentication-xwiki/authentication-xwiki-preload/package.json index 475707fc2..f99b8cf06 100644 --- a/electron/authentication/authentication-xwiki/authentication-xwiki-preload/package.json +++ b/electron/authentication/authentication-xwiki/authentication-xwiki-preload/package.json @@ -32,7 +32,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/electron/authentication/authentication-xwiki/authentication-xwiki-renderer/package.json b/electron/authentication/authentication-xwiki/authentication-xwiki-renderer/package.json index 3b061961b..3f35f3903 100644 --- a/electron/authentication/authentication-xwiki/authentication-xwiki-renderer/package.json +++ b/electron/authentication/authentication-xwiki/authentication-xwiki-renderer/package.json @@ -35,7 +35,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/electron/browser/package.json b/electron/browser/package.json index 811fa59e5..d4b844796 100644 --- a/electron/browser/package.json +++ b/electron/browser/package.json @@ -38,7 +38,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/electron/configuration/configuration-electron/configuration-electron-main/package.json b/electron/configuration/configuration-electron/configuration-electron-main/package.json index 77dd96a67..76cb5aef0 100644 --- a/electron/configuration/configuration-electron/configuration-electron-main/package.json +++ b/electron/configuration/configuration-electron/configuration-electron-main/package.json @@ -33,7 +33,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/electron/configuration/configuration-electron/configuration-electron-preload/package.json b/electron/configuration/configuration-electron/configuration-electron-preload/package.json index 602f1a779..055a6b878 100644 --- a/electron/configuration/configuration-electron/configuration-electron-preload/package.json +++ b/electron/configuration/configuration-electron/configuration-electron-preload/package.json @@ -32,7 +32,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/electron/configuration/configuration-electron/configuration-electron-renderer/package.json b/electron/configuration/configuration-electron/configuration-electron-renderer/package.json index a0be0751e..5cb3a09f1 100644 --- a/electron/configuration/configuration-electron/configuration-electron-renderer/package.json +++ b/electron/configuration/configuration-electron/configuration-electron-renderer/package.json @@ -29,7 +29,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/electron/link-suggest/link-suggest-filesystem/package.json b/electron/link-suggest/link-suggest-filesystem/package.json index 12f1875b0..ad0dc7418 100644 --- a/electron/link-suggest/link-suggest-filesystem/package.json +++ b/electron/link-suggest/link-suggest-filesystem/package.json @@ -38,7 +38,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/electron/main/package.json b/electron/main/package.json index 167a1ddf7..324902e52 100644 --- a/electron/main/package.json +++ b/electron/main/package.json @@ -27,6 +27,6 @@ "devDependencies": { "@types/node": "22.13.1", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" } } diff --git a/electron/package.json b/electron/package.json index e200a1cfb..e44e8876e 100644 --- a/electron/package.json +++ b/electron/package.json @@ -30,6 +30,6 @@ "electron": "34.0.2", "electron-builder": "25.1.8", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" } } diff --git a/electron/preload/package.json b/electron/preload/package.json index 3092e1d1c..d26d39380 100644 --- a/electron/preload/package.json +++ b/electron/preload/package.json @@ -26,6 +26,6 @@ "@xwiki/cristal-browser-electron": "workspace:*", "@xwiki/cristal-electron-storage": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" } } diff --git a/electron/renderer/package.json b/electron/renderer/package.json index a50a26b21..ef0287906 100644 --- a/electron/renderer/package.json +++ b/electron/renderer/package.json @@ -37,6 +37,6 @@ "devDependencies": { "@types/node": "22.13.1", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" } } diff --git a/electron/storage/package.json b/electron/storage/package.json index c16d7f0e9..89e757074 100644 --- a/electron/storage/package.json +++ b/electron/storage/package.json @@ -45,7 +45,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vite-plugin-node": "4.0.0" }, "publishConfig": { diff --git a/extension-manager/package.json b/extension-manager/package.json index e2b4406ca..571f58986 100644 --- a/extension-manager/package.json +++ b/extension-manager/package.json @@ -33,7 +33,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" }, "publishConfig": { "exports": { diff --git a/extensions/menubuttons/package.json b/extensions/menubuttons/package.json index debcf9296..5c3d38a97 100644 --- a/extensions/menubuttons/package.json +++ b/extensions/menubuttons/package.json @@ -36,7 +36,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vue-tsc": "2.2.0" }, "publishConfig": { diff --git a/lib/package.json b/lib/package.json index 3574d1094..94ebe2b41 100644 --- a/lib/package.json +++ b/lib/package.json @@ -89,7 +89,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "@xwiki/cristal-dsapi": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vue-tsc": "2.2.0" }, "publishConfig": { diff --git a/macros/package.json b/macros/package.json index 85bcb9b8b..fed74f4f2 100644 --- a/macros/package.json +++ b/macros/package.json @@ -40,7 +40,7 @@ "@xwiki/cristal-dsapi": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vue-tsc": "2.2.0" }, "publishConfig": { diff --git a/package.json b/package.json index c5845fdb9..760ebfc18 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "prettier": "3.4.2", "rimraf": "6.0.1", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vite-plugin-css-injected-by-js": "3.5.2", "vite-plugin-dts": "4.5.0", "vitest": "3.0.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9c3a7353a..a441e71ec 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -31,7 +31,7 @@ importers: version: 8.23.0(eslint@9.19.0)(typescript@5.7.3) '@vitejs/plugin-vue': specifier: 5.2.1 - version: 5.2.1(vite@6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.3)) + version: 5.2.1(vite@6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.3)) '@vitest/coverage-v8': specifier: 3.0.5 version: 3.0.5(vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0)) @@ -75,14 +75,14 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-css-injected-by-js: specifier: 3.5.2 - version: 3.5.2(vite@6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)) + version: 3.5.2(vite@6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)) vite-plugin-dts: specifier: 4.5.0 - version: 4.5.0(@types/node@22.13.1)(rollup@4.32.1)(typescript@5.7.3)(vite@6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.1)(rollup@4.32.1)(typescript@5.7.3)(vite@6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)) vitest: specifier: 3.0.5 version: 3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0) @@ -118,8 +118,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -140,8 +140,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/alerts/alerts-default: dependencies: @@ -171,8 +171,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/alerts/alerts-ui: dependencies: @@ -205,8 +205,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -230,8 +230,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/attachments/attachments-default: dependencies: @@ -273,8 +273,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/attachments/attachments-ui: dependencies: @@ -349,8 +349,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vitest: specifier: 3.0.5 version: 3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0) @@ -373,8 +373,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/authentication/authentication-default: dependencies: @@ -398,8 +398,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/authentication/authentication-nextcloud: devDependencies: @@ -410,8 +410,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/authentication/authentication-ui: dependencies: @@ -459,8 +459,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vitest: specifier: 3.0.5 version: 3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0) @@ -499,8 +499,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/backends/backend-api: dependencies: @@ -521,8 +521,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/backends/backend-dexie: dependencies: @@ -552,8 +552,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/backends/backend-github: dependencies: @@ -577,8 +577,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/backends/backend-nextcloud: dependencies: @@ -608,8 +608,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/backends/backend-xwiki: dependencies: @@ -642,8 +642,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vitest-mock-extended: specifier: 2.0.2 version: 2.0.2(typescript@5.7.3)(vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0)) @@ -661,8 +661,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/browser/browser-default: dependencies: @@ -689,8 +689,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/configuration/configuration-api: dependencies: @@ -705,8 +705,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/configuration/configuration-web: dependencies: @@ -721,8 +721,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/date/date-api: dependencies: @@ -743,8 +743,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/date/date-ui: dependencies: @@ -765,8 +765,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -790,8 +790,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/document/document-default: dependencies: @@ -830,8 +830,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vitest-mock-extended: specifier: 2.0.2 version: 2.0.2(typescript@5.7.3)(vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0)) @@ -858,8 +858,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/extra-tabs/extra-tabs-default: dependencies: @@ -886,8 +886,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/extra-tabs/extra-tabs-ui: dependencies: @@ -911,8 +911,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -939,8 +939,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -958,8 +958,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/hierarchy/hierarchy-default: dependencies: @@ -983,8 +983,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/hierarchy/hierarchy-filesystem: dependencies: @@ -1011,8 +1011,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/hierarchy/hierarchy-github: dependencies: @@ -1036,8 +1036,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/hierarchy/hierarchy-nextcloud: dependencies: @@ -1064,8 +1064,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/hierarchy/hierarchy-xwiki: dependencies: @@ -1107,8 +1107,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/history/history-api: dependencies: @@ -1126,8 +1126,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/history/history-default: dependencies: @@ -1151,8 +1151,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/history/history-github: dependencies: @@ -1179,8 +1179,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/history/history-ui: dependencies: @@ -1225,8 +1225,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -1262,8 +1262,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/icons: dependencies: @@ -1284,8 +1284,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -1303,8 +1303,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/info-actions/info-actions-default: dependencies: @@ -1331,8 +1331,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/info-actions/info-actions-ui: dependencies: @@ -1365,8 +1365,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -1390,8 +1390,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/link-suggest/link-suggest-nextcloud: dependencies: @@ -1424,8 +1424,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/link-suggest/link-suggest-xwiki: dependencies: @@ -1458,8 +1458,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/markdown/markdown-api: dependencies: @@ -1474,8 +1474,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/markdown/markdown-default: dependencies: @@ -1511,8 +1511,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vitest-mock-extended: specifier: 2.0.2 version: 2.0.2(typescript@5.7.3)(vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0)) @@ -1526,8 +1526,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/model/model-click-listener: dependencies: @@ -1560,8 +1560,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/model/model-local-url: dependencies: @@ -1582,8 +1582,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vitest: specifier: 3.0.5 version: 3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0) @@ -1610,8 +1610,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/model/model-reference/model-reference-filesystem: dependencies: @@ -1635,8 +1635,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/model/model-reference/model-reference-nextcloud: dependencies: @@ -1660,8 +1660,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/model/model-reference/model-reference-xwiki: dependencies: @@ -1691,8 +1691,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vitest: specifier: 3.0.5 version: 3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0) @@ -1725,8 +1725,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/model/model-remote-url/model-remote-url-filesystem/model-remote-url-filesystem-api: devDependencies: @@ -1737,8 +1737,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/model/model-remote-url/model-remote-url-filesystem/model-remote-url-filesystem-default: dependencies: @@ -1765,8 +1765,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/model/model-remote-url/model-remote-url-nextcloud: dependencies: @@ -1796,8 +1796,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/model/model-remote-url/model-remote-url-xwiki: dependencies: @@ -1824,8 +1824,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/navigation-tree/navigation-tree-api: dependencies: @@ -1843,8 +1843,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/navigation-tree/navigation-tree-default: dependencies: @@ -1868,8 +1868,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/navigation-tree/navigation-tree-filesystem: dependencies: @@ -1902,8 +1902,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/navigation-tree/navigation-tree-github: dependencies: @@ -1933,8 +1933,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/navigation-tree/navigation-tree-nextcloud: dependencies: @@ -1967,8 +1967,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/navigation-tree/navigation-tree-xwiki: dependencies: @@ -2004,8 +2004,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/page-actions/page-actions-api: dependencies: @@ -2029,8 +2029,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/page-actions/page-actions-default: dependencies: @@ -2057,8 +2057,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/page-actions/page-actions-ui: dependencies: @@ -2118,8 +2118,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -2137,8 +2137,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/rename/rename-default: dependencies: @@ -2162,8 +2162,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/rename/rename-filesystem: dependencies: @@ -2190,8 +2190,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/tiptap-extensions/tiptap-extension-image: dependencies: @@ -2307,8 +2307,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/uiextension/uiextension-default: dependencies: @@ -2335,8 +2335,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) core/uiextension/uiextension-ui: dependencies: @@ -2357,8 +2357,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -2379,8 +2379,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -2397,8 +2397,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) dev/config: devDependencies: @@ -2406,8 +2406,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) dev/test-utils: dependencies: @@ -2428,8 +2428,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) ds/api: dependencies: @@ -2450,8 +2450,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) ds/dsfr: dependencies: @@ -2487,8 +2487,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -2536,8 +2536,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -2585,8 +2585,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -2742,8 +2742,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -2770,8 +2770,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) electron/authentication/authentication-xwiki/authentication-xwiki-main: dependencies: @@ -2795,8 +2795,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) electron/authentication/authentication-xwiki/authentication-xwiki-preload: dependencies: @@ -2814,8 +2814,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) electron/authentication/authentication-xwiki/authentication-xwiki-renderer: dependencies: @@ -2839,8 +2839,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) electron/browser: dependencies: @@ -2867,8 +2867,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) electron/configuration/configuration-electron/configuration-electron-main: dependencies: @@ -2889,8 +2889,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) electron/configuration/configuration-electron/configuration-electron-preload: dependencies: @@ -2908,8 +2908,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) electron/configuration/configuration-electron/configuration-electron-renderer: dependencies: @@ -2924,8 +2924,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) electron/link-suggest/link-suggest-filesystem: dependencies: @@ -2958,8 +2958,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) electron/main: dependencies: @@ -2986,8 +2986,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) electron/preload: dependencies: @@ -3011,8 +3011,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) electron/renderer: dependencies: @@ -3066,8 +3066,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) electron/storage: dependencies: @@ -3109,11 +3109,11 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-node: specifier: 4.0.0 - version: 4.0.0(vite@6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.0.0(vite@6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)) extension-manager: dependencies: @@ -3134,8 +3134,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) extensions/menubuttons: dependencies: @@ -3162,8 +3162,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -3355,8 +3355,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -3389,8 +3389,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -3423,8 +3423,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) rendering/rendering: dependencies: @@ -3460,8 +3460,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -3475,8 +3475,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -3497,11 +3497,11 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-comlink: specifier: 5.1.0 - version: 5.1.0(comlink@4.4.2)(vite@6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.0(comlink@4.4.2)(vite@6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -3567,11 +3567,11 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-comlink: specifier: 5.1.0 - version: 5.1.0(comlink@4.4.2)(vite@6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.0(comlink@4.4.2)(vite@6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -3676,8 +3676,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vitest: specifier: 3.0.5 version: 3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0) @@ -3710,8 +3710,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) web: dependencies: @@ -3763,7 +3763,7 @@ importers: version: 22.13.1 '@vitejs/plugin-vue': specifier: 5.2.1 - version: 5.2.1(vite@6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.3)) + version: 5.2.1(vite@6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.3)) globals: specifier: 15.14.0 version: 15.14.0 @@ -3777,14 +3777,14 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: 4.5.0 - version: 4.5.0(@types/node@22.13.1)(rollup@4.32.1)(typescript@5.7.3)(vite@6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.1)(rollup@4.32.1)(typescript@5.7.3)(vite@6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)) vite-plugin-vuetify: specifier: 2.1.0 - version: 2.1.0(vite@6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.3))(vuetify@3.7.11) + version: 2.1.0(vite@6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.3))(vuetify@3.7.11) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -3814,8 +3814,8 @@ importers: specifier: 5.7.3 version: 5.7.3 vite: - specifier: 6.0.11 - version: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -8390,8 +8390,8 @@ packages: vue: ^3.0.0 vuetify: ^3.0.0 - vite@6.0.11: - resolution: {integrity: sha512-4VL9mQPKoHy4+FE0NnRE/kbY51TOfaknxAjt3fJbGJxhIpBZiqVzlZDEesWWsuREXHwNdAoOFZ9MkPEVXczHwg==} + vite@6.1.0: + resolution: {integrity: sha512-RjjMipCKVoR4hVfPY6GQTgveinjNuyLw+qruksLDvA5ktI1150VmcMBKmQaEWJhg/j6Uaf6dNCNA0AfdzUb/hQ==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: @@ -10057,9 +10057,9 @@ snapshots: '@typescript-eslint/types': 8.23.0 eslint-visitor-keys: 4.2.0 - '@vitejs/plugin-vue@5.2.1(vite@6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.3))': + '@vitejs/plugin-vue@5.2.1(vite@6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.3))': dependencies: - vite: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue: 3.5.13(typescript@5.7.3) '@vitest/coverage-v8@3.0.5(vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0))': @@ -10087,13 +10087,13 @@ snapshots: chai: 5.1.2 tinyrainbow: 2.0.0 - '@vitest/mocker@3.0.5(vite@6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0))': + '@vitest/mocker@3.0.5(vite@6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0))': dependencies: '@vitest/spy': 3.0.5 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: - vite: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) '@vitest/pretty-format@3.0.5': dependencies: @@ -13865,7 +13865,7 @@ snapshots: debug: 4.4.0 es-module-lexer: 1.6.0 pathe: 2.0.2 - vite: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) transitivePeerDependencies: - '@types/node' - jiti @@ -13880,19 +13880,19 @@ snapshots: - tsx - yaml - vite-plugin-comlink@5.1.0(comlink@4.4.2)(vite@6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)): + vite-plugin-comlink@5.1.0(comlink@4.4.2)(vite@6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)): dependencies: comlink: 4.4.2 json5: 2.2.3 magic-string: 0.30.12 source-map: 0.7.4 - vite: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) - vite-plugin-css-injected-by-js@3.5.2(vite@6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)): + vite-plugin-css-injected-by-js@3.5.2(vite@6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)): dependencies: - vite: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) - vite-plugin-dts@4.5.0(@types/node@22.13.1)(rollup@4.32.1)(typescript@5.7.3)(vite@6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)): + vite-plugin-dts@4.5.0(@types/node@22.13.1)(rollup@4.32.1)(typescript@5.7.3)(vite@6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)): dependencies: '@microsoft/api-extractor': 7.49.1(@types/node@22.13.1) '@rollup/pluginutils': 5.1.4(rollup@4.32.1) @@ -13905,33 +13905,33 @@ snapshots: magic-string: 0.30.17 typescript: 5.7.3 optionalDependencies: - vite: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) transitivePeerDependencies: - '@types/node' - rollup - supports-color - vite-plugin-node@4.0.0(vite@6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)): + vite-plugin-node@4.0.0(vite@6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)): dependencies: '@rollup/pluginutils': 4.2.1 chalk: 4.1.2 debug: 4.3.7(supports-color@5.5.0) - vite: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) transitivePeerDependencies: - supports-color - vite-plugin-vuetify@2.1.0(vite@6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.3))(vuetify@3.7.11): + vite-plugin-vuetify@2.1.0(vite@6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.3))(vuetify@3.7.11): dependencies: '@vuetify/loader-shared': 2.1.0(vue@3.5.13(typescript@5.7.3))(vuetify@3.7.11) debug: 4.4.0 upath: 2.0.1 - vite: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue: 3.5.13(typescript@5.7.3) vuetify: 3.7.11(typescript@5.7.3)(vite-plugin-vuetify@2.1.0)(vue@3.5.13(typescript@5.7.3)) transitivePeerDependencies: - supports-color - vite@6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0): + vite@6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0): dependencies: esbuild: 0.24.2 postcss: 8.5.1 @@ -13951,7 +13951,7 @@ snapshots: vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0): dependencies: '@vitest/expect': 3.0.5 - '@vitest/mocker': 3.0.5(vite@6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)) + '@vitest/mocker': 3.0.5(vite@6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)) '@vitest/pretty-format': 3.0.5 '@vitest/runner': 3.0.5 '@vitest/snapshot': 3.0.5 @@ -13967,7 +13967,7 @@ snapshots: tinyexec: 0.3.2 tinypool: 1.0.2 tinyrainbow: 2.0.0 - vite: 6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vite-node: 3.0.5(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) why-is-node-running: 2.3.0 optionalDependencies: @@ -14053,7 +14053,7 @@ snapshots: vue: 3.5.13(typescript@5.7.3) optionalDependencies: typescript: 5.7.3 - vite-plugin-vuetify: 2.1.0(vite@6.0.11(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.3))(vuetify@3.7.11) + vite-plugin-vuetify: 2.1.0(vite@6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.3))(vuetify@3.7.11) w3c-keyname@2.2.8: {} diff --git a/realtime/package.json b/realtime/package.json index f266de2cf..cf56ff3ea 100644 --- a/realtime/package.json +++ b/realtime/package.json @@ -30,6 +30,6 @@ "esbuild": "0.24.2", "tsx": "4.19.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" } } diff --git a/rendering/rendering/package.json b/rendering/rendering/package.json index 69dbf9d0b..dcd5c0b29 100644 --- a/rendering/rendering/package.json +++ b/rendering/rendering/package.json @@ -42,7 +42,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vue-tsc": "2.2.0" }, "publishConfig": { diff --git a/rendering/wikimodel/package.json b/rendering/wikimodel/package.json index 374881988..3eeaa7cc7 100644 --- a/rendering/wikimodel/package.json +++ b/rendering/wikimodel/package.json @@ -29,7 +29,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vue-tsc": "2.2.0" }, "publishConfig": { diff --git a/sharedworker/api/package.json b/sharedworker/api/package.json index 62d10d54f..8a706d4b3 100644 --- a/sharedworker/api/package.json +++ b/sharedworker/api/package.json @@ -33,7 +33,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vite-plugin-comlink": "5.1.0", "vue-tsc": "2.2.0" }, diff --git a/sharedworker/impl/package.json b/sharedworker/impl/package.json index 85bb7a9c3..55f61d3fa 100644 --- a/sharedworker/impl/package.json +++ b/sharedworker/impl/package.json @@ -48,7 +48,7 @@ "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vite-plugin-comlink": "5.1.0", "vue-tsc": "2.2.0" }, diff --git a/skin/package.json b/skin/package.json index ae2741885..2ea72a282 100644 --- a/skin/package.json +++ b/skin/package.json @@ -61,7 +61,7 @@ "@xwiki/cristal-dsapi": "workspace:*", "ts-essentials": "10.0.4", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vitest": "3.0.5", "vitest-mock-extended": "2.0.2", "vue-tsc": "2.2.0" diff --git a/sources/xwiki/mock-server/package.json b/sources/xwiki/mock-server/package.json index 4e56716f2..7fa6f0ccc 100644 --- a/sources/xwiki/mock-server/package.json +++ b/sources/xwiki/mock-server/package.json @@ -31,6 +31,6 @@ "nodemon": "3.1.9", "ts-node": "10.9.2", "typescript": "5.7.3", - "vite": "6.0.11" + "vite": "6.1.0" } } diff --git a/web/package.json b/web/package.json index ba45defb6..8ead8b13a 100644 --- a/web/package.json +++ b/web/package.json @@ -55,7 +55,7 @@ "inversify": "6.2.2", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vite-plugin-dts": "4.5.0", "vite-plugin-vuetify": "2.1.0", "vue-tsc": "2.2.0" diff --git a/xwiki/remoteinlineeditor/package.json b/xwiki/remoteinlineeditor/package.json index c5cb40de3..1868600b6 100644 --- a/xwiki/remoteinlineeditor/package.json +++ b/xwiki/remoteinlineeditor/package.json @@ -39,7 +39,7 @@ "@xwiki/cristal-dev-config": "workspace:*", "reflect-metadata": "0.2.2", "typescript": "5.7.3", - "vite": "6.0.11", + "vite": "6.1.0", "vue-tsc": "2.2.0" }, "publishConfig": { From 76bfde6206f845a93f0f69bc45d6bfa70ae1dd2c Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 7 Feb 2025 09:38:11 +0100 Subject: [PATCH 05/18] [Misc] Update dependency happy-dom to v17 (#658) --- package.json | 2 +- pnpm-lock.yaml | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index 760ebfc18..cd8d029d5 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "eslint-plugin-prettier": "5.2.3", "eslint-plugin-tsdoc": "0.4.0", "eslint-plugin-vue": "9.32.0", - "happy-dom": "16.8.1", + "happy-dom": "17.0.0", "nx": "20.4.1", "prettier": "3.4.2", "rimraf": "6.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a441e71ec..f76454c39 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -34,7 +34,7 @@ importers: version: 5.2.1(vite@6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.3)) '@vitest/coverage-v8': specifier: 3.0.5 - version: 3.0.5(vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0)) + version: 3.0.5(vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@17.0.0)(tsx@4.19.2)(yaml@2.7.0)) concurrently: specifier: 9.1.2 version: 9.1.2 @@ -60,8 +60,8 @@ importers: specifier: 9.32.0 version: 9.32.0(eslint@9.19.0) happy-dom: - specifier: 16.8.1 - version: 16.8.1 + specifier: 17.0.0 + version: 17.0.0 nx: specifier: 20.4.1 version: 20.4.1 @@ -85,7 +85,7 @@ importers: version: 4.5.0(@types/node@22.13.1)(rollup@4.32.1)(typescript@5.7.3)(vite@6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)) vitest: specifier: 3.0.5 - version: 3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0) + version: 3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@17.0.0)(tsx@4.19.2)(yaml@2.7.0) vue-eslint-parser: specifier: 9.4.3 version: 9.4.3(eslint@9.19.0) @@ -353,10 +353,10 @@ importers: version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vitest: specifier: 3.0.5 - version: 3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0) + version: 3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@17.0.0)(tsx@4.19.2)(yaml@2.7.0) vitest-mock-extended: specifier: 2.0.2 - version: 2.0.2(typescript@5.7.3)(vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.0.2(typescript@5.7.3)(vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@17.0.0)(tsx@4.19.2)(yaml@2.7.0)) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -463,7 +463,7 @@ importers: version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vitest: specifier: 3.0.5 - version: 3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0) + version: 3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@17.0.0)(tsx@4.19.2)(yaml@2.7.0) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -646,7 +646,7 @@ importers: version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vitest-mock-extended: specifier: 2.0.2 - version: 2.0.2(typescript@5.7.3)(vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.0.2(typescript@5.7.3)(vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@17.0.0)(tsx@4.19.2)(yaml@2.7.0)) core/browser/browser-api: dependencies: @@ -834,7 +834,7 @@ importers: version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vitest-mock-extended: specifier: 2.0.2 - version: 2.0.2(typescript@5.7.3)(vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.0.2(typescript@5.7.3)(vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@17.0.0)(tsx@4.19.2)(yaml@2.7.0)) core/extra-tabs/extra-tabs-api: dependencies: @@ -1515,7 +1515,7 @@ importers: version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vitest-mock-extended: specifier: 2.0.2 - version: 2.0.2(typescript@5.7.3)(vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.0.2(typescript@5.7.3)(vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@17.0.0)(tsx@4.19.2)(yaml@2.7.0)) core/model/model-api: devDependencies: @@ -1586,7 +1586,7 @@ importers: version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vitest: specifier: 3.0.5 - version: 3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0) + version: 3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@17.0.0)(tsx@4.19.2)(yaml@2.7.0) core/model/model-reference/model-reference-api: dependencies: @@ -1695,10 +1695,10 @@ importers: version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vitest: specifier: 3.0.5 - version: 3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0) + version: 3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@17.0.0)(tsx@4.19.2)(yaml@2.7.0) vitest-mock-extended: specifier: 2.0.2 - version: 2.0.2(typescript@5.7.3)(vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.0.2(typescript@5.7.3)(vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@17.0.0)(tsx@4.19.2)(yaml@2.7.0)) vue: specifier: 3.5.13 version: 3.5.13(typescript@5.7.3) @@ -3680,10 +3680,10 @@ importers: version: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vitest: specifier: 3.0.5 - version: 3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0) + version: 3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@17.0.0)(tsx@4.19.2)(yaml@2.7.0) vitest-mock-extended: specifier: 2.0.2 - version: 2.0.2(typescript@5.7.3)(vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.0.2(typescript@5.7.3)(vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@17.0.0)(tsx@4.19.2)(yaml@2.7.0)) vue-tsc: specifier: 2.2.0 version: 2.2.0(typescript@5.7.3) @@ -6520,8 +6520,8 @@ packages: graphemer@1.4.0: resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} - happy-dom@16.8.1: - resolution: {integrity: sha512-n0QrmT9lD81rbpKsyhnlz3DgnMZlaOkJPpgi746doA+HvaMC79bdWkwjrNnGJRvDrWTI8iOcJiVTJ5CdT/AZRw==} + happy-dom@17.0.0: + resolution: {integrity: sha512-jGuUr3UrgMzt1Mopyof3RzD49/GudAp1suP5KFU+EvNXmqUAMXpxux2zEJbabE1YXs0APrY61iRZ0BKMMWCGTg==} engines: {node: '>=18.0.0'} has-bigints@1.1.0: @@ -10062,7 +10062,7 @@ snapshots: vite: 6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0) vue: 3.5.13(typescript@5.7.3) - '@vitest/coverage-v8@3.0.5(vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0))': + '@vitest/coverage-v8@3.0.5(vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@17.0.0)(tsx@4.19.2)(yaml@2.7.0))': dependencies: '@ampproject/remapping': 2.3.0 '@bcoe/v8-coverage': 1.0.2 @@ -10076,7 +10076,7 @@ snapshots: std-env: 3.8.0 test-exclude: 7.0.1 tinyrainbow: 2.0.0 - vitest: 3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0) + vitest: 3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@17.0.0)(tsx@4.19.2)(yaml@2.7.0) transitivePeerDependencies: - supports-color @@ -11925,7 +11925,7 @@ snapshots: graphemer@1.4.0: {} - happy-dom@16.8.1: + happy-dom@17.0.0: dependencies: webidl-conversions: 7.0.0 whatwg-mimetype: 3.0.0 @@ -13942,13 +13942,13 @@ snapshots: tsx: 4.19.2 yaml: 2.7.0 - vitest-mock-extended@2.0.2(typescript@5.7.3)(vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0)): + vitest-mock-extended@2.0.2(typescript@5.7.3)(vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@17.0.0)(tsx@4.19.2)(yaml@2.7.0)): dependencies: ts-essentials: 10.0.3(typescript@5.7.3) typescript: 5.7.3 - vitest: 3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0) + vitest: 3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@17.0.0)(tsx@4.19.2)(yaml@2.7.0) - vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@16.8.1)(tsx@4.19.2)(yaml@2.7.0): + vitest@3.0.5(@types/debug@4.1.12)(@types/node@22.13.1)(happy-dom@17.0.0)(tsx@4.19.2)(yaml@2.7.0): dependencies: '@vitest/expect': 3.0.5 '@vitest/mocker': 3.0.5(vite@6.1.0(@types/node@22.13.1)(tsx@4.19.2)(yaml@2.7.0)) @@ -13973,7 +13973,7 @@ snapshots: optionalDependencies: '@types/debug': 4.1.12 '@types/node': 22.13.1 - happy-dom: 16.8.1 + happy-dom: 17.0.0 transitivePeerDependencies: - jiti - less From 493992709a0a8bc40b0fd3eceeb4874fc75bec4d Mon Sep 17 00:00:00 2001 From: tkrieck <149672322+tkrieck@users.noreply.github.com> Date: Fri, 7 Feb 2025 05:39:51 -0300 Subject: [PATCH 06/18] CRISTAL-450: Code block are not styled (#652) --- skin/src/vue/c-article.vue | 12 ++++++++++++ skin/src/vue/c-view.vue | 10 +++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/skin/src/vue/c-article.vue b/skin/src/vue/c-article.vue index c7116a332..5744ec3d2 100644 --- a/skin/src/vue/c-article.vue +++ b/skin/src/vue/c-article.vue @@ -146,6 +146,18 @@ watch( } } +/* + * Code block style. + * TODO: replace with a code macro rendering as soon as we support macro. + */ +:deep(.box .code), +:deep(.doc-content.editor pre) { + font-family: var(--cr-font-mono); + background: var(--cr-color-neutral-100); + border-radius: var(--cr-border-radius-medium); + padding: var(--cr-spacing-small); +} + /*TABLE STYLES*/ /*TODO: Check a better way to write these styles without the global tag. Currently impossible to use :deep because the html inside the document content is not assigned an ID */ .content { diff --git a/skin/src/vue/c-view.vue b/skin/src/vue/c-view.vue index 73667dea7..0691f1a5f 100644 --- a/skin/src/vue/c-view.vue +++ b/skin/src/vue/c-view.vue @@ -253,6 +253,11 @@ TODO: these rules about opening and closing the sidebar should be better organiz display: block; } +/* +WIKI STYLES +TODO: Discuss and move them to a more appropriate place +*/ + /*LINKS*/ :deep(.content a) { @@ -316,11 +321,10 @@ TODO: these rules about opening and closing the sidebar should be better organiz } } } - /* -WIKI STYLES -TODO: Discuss and move them to a more appropriate place +END WIKI STYLES */ + @container xwCristal (max-width: 600px) { :deep(.wrapper.sidebar-is-collapsed) { &:has(.main-sidebar.is-visible) { From 08ca4f06055580bf50c0aec5ac7974002f4d4799 Mon Sep 17 00:00:00 2001 From: tkrieck <149672322+tkrieck@users.noreply.github.com> Date: Fri, 7 Feb 2025 05:40:33 -0300 Subject: [PATCH 07/18] CRISTAL-449: Blockquotes are not styled (#651) --- skin/src/vue/c-article.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/skin/src/vue/c-article.vue b/skin/src/vue/c-article.vue index 5744ec3d2..d01e325e5 100644 --- a/skin/src/vue/c-article.vue +++ b/skin/src/vue/c-article.vue @@ -140,6 +140,15 @@ watch( justify-content: center; } +:deep(blockquote) { + background-color: var(--cr-color-neutral-50); + color: var(--cr-color-neutral-600); + font-size: var(--cr-font-size-large); + border-inline-start: 2px solid var(--cr-color-neutral-200); + padding-inline-start: var(--cr-spacing-large); + margin: 0; +} + @container xwCristal (max-width: 600px) { .content { padding-left: 0 var(--cr-spacing-x-small); From 216f65971128619355a664120e65aca2b7b1fd27 Mon Sep 17 00:00:00 2001 From: ClementEXWiki Date: Wed, 19 Feb 2025 14:53:48 +0100 Subject: [PATCH 08/18] [Misc] Update pnpm to v10 Caused by https://github.com/xwiki-contrib/cristal/pull/641 --- package.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index cd8d029d5..738a39244 100644 --- a/package.json +++ b/package.json @@ -57,5 +57,15 @@ "engines": { "node": "22.13.1" }, - "packageManager": "pnpm@10.2.1" + "packageManager": "pnpm@10.2.1", + "pnpm": { + "ignoredBuiltDependencies": [ + "esbuild", + "nx", + "vue-demi" + ], + "onlyBuiltDependencies": [ + "electron" + ] + } } From c26644908ec0a54d2ad1ca0cf66286fcac5458ca Mon Sep 17 00:00:00 2001 From: ClementEXWiki Date: Wed, 19 Feb 2025 14:58:30 +0100 Subject: [PATCH 09/18] [Misc] Remove deprecated Vue TypeScript VSCode extension (#679) --- .vscode/extensions.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index aa122f3f4..97d8dddbb 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,7 +1,6 @@ { "recommendations": [ "Vue.volar", - "Vue.vscode-typescript-vue-plugin", "ms-playwright.playwright", "dbaeumer.vscode-eslint", "esbenp.prettier-vscode" From 3f8165a97db90855215281a99736f49030318c99 Mon Sep 17 00:00:00 2001 From: ClementEXWiki Date: Wed, 19 Feb 2025 15:17:01 +0100 Subject: [PATCH 10/18] CRISTAL-467: Add Flatpak image (#682) --- electron/.electron-builder.config.js | 5 +++++ electron/package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/electron/.electron-builder.config.js b/electron/.electron-builder.config.js index f05387122..9c22baded 100644 --- a/electron/.electron-builder.config.js +++ b/electron/.electron-builder.config.js @@ -50,6 +50,11 @@ module.exports = async function () { executableName: "cristal", category: "Application", }, + flatpak: { + artifactName: "${productName}-${version}-linux-${arch}.${ext}", + category: "Application", + mimeTypes: null, + }, mac: { artifactName: "${productName}-${version}-mac-${arch}.${ext}", executableName: "cristal", diff --git a/electron/package.json b/electron/package.json index e44e8876e..1937af6eb 100644 --- a/electron/package.json +++ b/electron/package.json @@ -15,7 +15,7 @@ }, "main": "./main/dist/index.cjs", "scripts": { - "build:linux": "electron-builder --linux snap deb rpm AppImage --x64 --config .electron-builder.config.js --dir", + "build:linux": "electron-builder --linux snap deb rpm flatpak AppImage --x64 --config .electron-builder.config.js --dir", "build:mac": "electron-builder --mac dmg --x64 --arm64 --config .electron-builder.config.js --dir", "build:win": "electron-builder --win nsis msi --x64 --ia32 --config .electron-builder.config.js --dir", "clean": "rimraf dist", From 8133dc7d70201b688a7a51262d9cb28d3a0cb5ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20E=2E?= Date: Wed, 19 Feb 2025 11:09:26 +0100 Subject: [PATCH 11/18] CRISTAL-463: Improve Cristal bundled size Fix configuration load timing issue on Electron. --- electron/main/src/index.ts | 5 ++++- lib/src/components/cristalAppLoader.ts | 14 +++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/electron/main/src/index.ts b/electron/main/src/index.ts index f092172d2..caa4ed479 100644 --- a/electron/main/src/index.ts +++ b/electron/main/src/index.ts @@ -30,6 +30,10 @@ import load from "@xwiki/cristal-electron-storage/main"; import { BrowserWindow, app } from "electron"; import { platform } from "node:process"; +// Set up IPC listener for configuration loading before the app actually starts +// It needs to be setup before the preload script runs, which means the first window mustn't have been created +loadConfiguration(); + /** * Prevent electron from running multiple instances. */ @@ -69,7 +73,6 @@ app restoreOrCreateWindow().then((w) => { loadBrowser(w); loadAuthentication(w, loadFile); - loadConfiguration(); }); /** * @see https://www.electronjs.org/docs/latest/api/app#event-activate-macos Event: 'activate'. diff --git a/lib/src/components/cristalAppLoader.ts b/lib/src/components/cristalAppLoader.ts index f276e9dfe..342c74e02 100644 --- a/lib/src/components/cristalAppLoader.ts +++ b/lib/src/components/cristalAppLoader.ts @@ -62,7 +62,7 @@ class CristalAppLoader extends CristalLoader { this.cristal.setAvailableConfigurations(config); await handleCallback(this.cristal.getContainer()); - configName = this.resolveCurrentConfiguration(isElectron); + configName = this.resolveCurrentConfiguration(isElectron, config); let wikiConfig = this.cristal.getAvailableConfigurations().get(configName); if (wikiConfig == null) { @@ -116,7 +116,7 @@ class CristalAppLoader extends CristalLoader { this.container, staticMode, additionalComponents, - config[this.resolveCurrentConfiguration(isElectron)], + config[this.resolveCurrentConfiguration(isElectron, config)], ); } @@ -156,13 +156,13 @@ class CristalAppLoader extends CristalLoader { ); } - private resolveCurrentConfiguration(isElectron: boolean) { + private resolveCurrentConfiguration( + isElectron: boolean, + config: Configurations, + ) { if (isElectron) { const localConfigName = window.localStorage.getItem("currentApp"); - if ( - localConfigName != null && - this.cristal.getAvailableConfigurations().has(localConfigName) - ) { + if (localConfigName != null && config[localConfigName]) { return localConfigName; } else { return "FileSystemSL"; From 93955faf761cb2d2286934a9166fcca68c961453 Mon Sep 17 00:00:00 2001 From: Pierre Jeanjean Date: Thu, 20 Feb 2025 07:37:47 -0800 Subject: [PATCH 12/18] CRISTAL-326: Missing tooltip and hints for the create page UI (#684) * Introduce NavigationTreeSelect as a new form component * Add help text to TextField component * Improve form styling for Vuetify * Update hierarchy API to use EntityReferences instead of PageData * Update navigation tree API to use EntityReferences instead of PageData * Update document change API to use EntityReferences instead of PageData * Improve buttons behavior on form modals * Overall style uniformization for existing forms * Add Select button to tree select --- core/document/document-api/src/index.ts | 13 +- .../src/defaultDocumentService.ts | 6 +- core/hierarchy/hierarchy-api/package.json | 3 +- core/hierarchy/hierarchy-api/src/index.ts | 12 +- core/hierarchy/hierarchy-default/package.json | 1 + .../src/components/componentsInit.ts | 13 +- core/hierarchy/hierarchy-default/src/utils.ts | 29 +++-- .../hierarchy-filesystem/package.json | 1 + .../src/components/componentsInit.ts | 12 +- core/hierarchy/hierarchy-github/package.json | 1 + .../src/components/componentsInit.ts | 19 ++- .../hierarchy-nextcloud/package.json | 1 + .../src/components/componentsInit.ts | 12 +- .../src/components/componentsInit.ts | 23 ++-- .../navigation-tree-api/src/index.ts | 11 +- .../navigation-tree-default/package.json | 1 + .../src/components/componentsInit.ts | 5 +- .../navigation-tree-default/src/utils.ts | 21 +-- .../src/components/componentsInit.ts | 5 +- .../src/components/componentsInit.ts | 5 +- .../src/components/componentsInit.ts | 5 +- .../src/components/componentsInit.ts | 30 ++--- .../page-actions-ui/langs/translation-en.json | 3 + .../page-actions-ui/langs/translation-fr.json | 3 + .../page-actions-ui/src/vue/DeletePage.vue | 7 +- .../page-actions-ui/src/vue/MovePage.vue | 73 +++++------ .../page-actions-ui/src/vue/PageActions.vue | 3 + .../src/vue/PageActionsCategory.vue | 3 + .../page-actions-ui/src/vue/RenamePage.vue | 36 +++--- ds/api/package.json | 1 + ds/api/src/XNavigationTree.ts | 8 +- ds/api/src/XNavigationTreeSelect.ts | 36 ++++++ ds/api/src/XTextField.ts | 5 + ds/api/src/index.ts | 5 + ds/shoelace/langs/translation-en.json | 4 + ds/shoelace/langs/translation-fr.json | 4 + ds/shoelace/package.json | 6 +- .../components/shoelaceDesignSystemLoader.ts | 5 + ds/shoelace/src/translations.ts | 28 ++++ ds/shoelace/src/vue/form/x-form.vue | 8 +- .../src/vue/form/x-navigation-tree-select.vue | 115 +++++++++++++++++ ds/shoelace/src/vue/form/x-text-field.vue | 1 + ds/shoelace/src/vue/x-navigation-tree.vue | 23 ++-- ds/vuetify/langs/translation-en.json | 4 +- ds/vuetify/langs/translation-fr.json | 4 +- ds/vuetify/package.json | 2 + .../components/vuetifyDesignSystemLoader.ts | 5 + ds/vuetify/src/translations.ts | 4 + ds/vuetify/src/vue/form/x-form.vue | 12 +- .../src/vue/form/x-navigation-tree-select.vue | 120 ++++++++++++++++++ ds/vuetify/src/vue/form/x-text-field.vue | 2 + ds/vuetify/src/vue/x-navigation-tree.vue | 32 ++--- editors/tiptap/src/vue/c-edit-tiptap.vue | 8 +- pnpm-lock.yaml | 39 ++++++ skin/langs/translation-en.json | 3 + skin/langs/translation-fr.json | 3 + skin/src/vue/__tests__/c-content.test.ts | 9 ++ skin/src/vue/c-article.vue | 6 +- skin/src/vue/c-content.vue | 3 + skin/src/vue/c-page-creation-menu.vue | 71 ++++------- skin/src/vue/c-sidebar.vue | 13 +- web/e2e/main-page.spec.ts | 8 +- 62 files changed, 698 insertions(+), 256 deletions(-) create mode 100644 ds/api/src/XNavigationTreeSelect.ts create mode 100644 ds/shoelace/langs/translation-en.json create mode 100644 ds/shoelace/langs/translation-fr.json create mode 100644 ds/shoelace/src/translations.ts create mode 100644 ds/shoelace/src/vue/form/x-navigation-tree-select.vue create mode 100644 ds/vuetify/src/vue/form/x-navigation-tree-select.vue diff --git a/core/document/document-api/src/index.ts b/core/document/document-api/src/index.ts index bff39e25e..2c4a8a2ca 100644 --- a/core/document/document-api/src/index.ts +++ b/core/document/document-api/src/index.ts @@ -101,21 +101,24 @@ interface DocumentService { * made on the whole Cristal instance. * @param change - the kind of change * @param listener - the listener to register - * @since 0.12 + * @since 0.15 */ registerDocumentChangeListener( change: DocumentChange, - listener: (page: PageData) => Promise, + listener: (page: DocumentReference) => Promise, ): void; /** * Notify that a document change happened. This will execute all registered * listeners for the given kind of change. * @param change - the kind of change - * @param page - the document changed - * @since 0.12 + * @param page - the reference to the changed document + * @since 0.15 */ - notifyDocumentChange(change: DocumentChange, page: PageData): Promise; + notifyDocumentChange( + change: DocumentChange, + page: DocumentReference, + ): Promise; } const name: string = "DocumentService"; diff --git a/core/document/document-default/src/defaultDocumentService.ts b/core/document/document-default/src/defaultDocumentService.ts index 74875677b..501cae7ce 100644 --- a/core/document/document-default/src/defaultDocumentService.ts +++ b/core/document/document-default/src/defaultDocumentService.ts @@ -187,7 +187,7 @@ export class DefaultDocumentService implements DocumentService { private readonly store: DocumentStore; private readonly documentChangeListeners: Map< DocumentChange, - Array<(page: PageData) => Promise> + Array<(page: DocumentReference) => Promise> > = new Map(); constructor(@inject("CristalApp") private cristal: CristalApp) { @@ -242,7 +242,7 @@ export class DefaultDocumentService implements DocumentService { registerDocumentChangeListener( change: DocumentChange, - listener: (page: PageData) => Promise, + listener: (page: DocumentReference) => Promise, ): void { if (this.documentChangeListeners.has(change)) { this.documentChangeListeners.get(change)!.push(listener); @@ -253,7 +253,7 @@ export class DefaultDocumentService implements DocumentService { async notifyDocumentChange( change: DocumentChange, - page: PageData, + page: DocumentReference, ): Promise { if (this.documentChangeListeners.has(change)) { await Promise.all( diff --git a/core/hierarchy/hierarchy-api/package.json b/core/hierarchy/hierarchy-api/package.json index 66d9ae7c4..1861f4033 100644 --- a/core/hierarchy/hierarchy-api/package.json +++ b/core/hierarchy/hierarchy-api/package.json @@ -23,7 +23,8 @@ "test": "vitest --run" }, "dependencies": { - "@xwiki/cristal-api": "workspace:*" + "@xwiki/cristal-api": "workspace:*", + "@xwiki/cristal-model-api": "workspace:*" }, "devDependencies": { "@xwiki/cristal-dev-config": "workspace:*", diff --git a/core/hierarchy/hierarchy-api/src/index.ts b/core/hierarchy/hierarchy-api/src/index.ts index 181862a22..a90678704 100644 --- a/core/hierarchy/hierarchy-api/src/index.ts +++ b/core/hierarchy/hierarchy-api/src/index.ts @@ -18,7 +18,10 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -import type { PageData } from "@xwiki/cristal-api"; +import type { + DocumentReference, + SpaceReference, +} from "@xwiki/cristal-model-api"; /** * Description of a hierarchy item for a given page. @@ -39,10 +42,13 @@ interface PageHierarchyResolver { /** * Returns the page hierarchy for a given page. * - * @param pageData - the page for which to compute the hierarchy + * @param page - the reference to the page for which to compute the hierarchy * @returns the page hierarchy + * @since 0.15 */ - getPageHierarchy(pageData: PageData): Promise>; + getPageHierarchy( + page: DocumentReference | SpaceReference, + ): Promise>; } /** diff --git a/core/hierarchy/hierarchy-default/package.json b/core/hierarchy/hierarchy-default/package.json index efedb4c03..c36b49233 100644 --- a/core/hierarchy/hierarchy-default/package.json +++ b/core/hierarchy/hierarchy-default/package.json @@ -25,6 +25,7 @@ "dependencies": { "@xwiki/cristal-api": "workspace:*", "@xwiki/cristal-hierarchy-api": "workspace:*", + "@xwiki/cristal-model-api": "workspace:*", "inversify": "6.2.2" }, "peerDependencies": { diff --git a/core/hierarchy/hierarchy-default/src/components/componentsInit.ts b/core/hierarchy/hierarchy-default/src/components/componentsInit.ts index 60e7b5243..8e0d2cf0e 100644 --- a/core/hierarchy/hierarchy-default/src/components/componentsInit.ts +++ b/core/hierarchy/hierarchy-default/src/components/componentsInit.ts @@ -19,13 +19,18 @@ */ import { name as PageHierarchyResolverName } from "@xwiki/cristal-hierarchy-api"; +import { EntityType } from "@xwiki/cristal-model-api"; import { Container, inject, injectable } from "inversify"; -import type { CristalApp, Logger, PageData } from "@xwiki/cristal-api"; +import type { CristalApp, Logger } from "@xwiki/cristal-api"; import type { PageHierarchyItem, PageHierarchyResolver, PageHierarchyResolverProvider, } from "@xwiki/cristal-hierarchy-api"; +import type { + DocumentReference, + SpaceReference, +} from "@xwiki/cristal-model-api"; /** * Default implementation for PageHierarchyResolver. @@ -48,7 +53,7 @@ class DefaultPageHierarchyResolver implements PageHierarchyResolver { } async getPageHierarchy( - pageData: PageData, + page: DocumentReference | SpaceReference, ): Promise> { const hierarchy: Array = [ { @@ -60,9 +65,9 @@ class DefaultPageHierarchyResolver implements PageHierarchyResolver { }).href, }, ]; - if (pageData != null) { + if (page.type == EntityType.DOCUMENT) { hierarchy.push({ - label: pageData.name, + label: (page as DocumentReference).name, pageId: this.cristalApp.getCurrentPage(), url: window.location.href, }); diff --git a/core/hierarchy/hierarchy-default/src/utils.ts b/core/hierarchy/hierarchy-default/src/utils.ts index 729efdc45..ac9a1f73b 100644 --- a/core/hierarchy/hierarchy-default/src/utils.ts +++ b/core/hierarchy/hierarchy-default/src/utils.ts @@ -18,37 +18,46 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ +import { EntityType } from "@xwiki/cristal-model-api"; import type { CristalApp, PageData } from "@xwiki/cristal-api"; import type { PageHierarchyItem } from "@xwiki/cristal-hierarchy-api"; +import type { + DocumentReference, + SpaceReference, +} from "@xwiki/cristal-model-api"; /** * Returns the page hierarchy for a path-like page id. * This does not include a Home segment. * - * @param pageData - the data of the page + * @param page - the reference to the page * @param cristalApp - the current app * @returns the page hierarchy - * @since 0.10 + * @since 0.15 **/ // TODO: reduce the number of statements in the following method and reactivate the disabled eslint rule. // eslint-disable-next-line max-statements export async function getPageHierarchyFromPath( - pageData: PageData, + page: DocumentReference | SpaceReference, cristalApp: CristalApp, ): Promise> { const hierarchy: Array = []; - const fileHierarchy = pageData.id.split("/"); + const fileHierarchy = []; + if (page.type == EntityType.SPACE) { + fileHierarchy.push(...(page as SpaceReference).names); + } else if (page.type == EntityType.DOCUMENT) { + fileHierarchy.push( + ...(page as DocumentReference).space!.names, + (page as DocumentReference).name, + ); + } let currentFile = ""; for (let i = 0; i < fileHierarchy.length; i++) { const file = fileHierarchy[i]; currentFile += `${i == 0 ? "" : "/"}${file}`; - let currentPageData: PageData | undefined; - if (i == fileHierarchy.length - 1) { - currentPageData = pageData; - } else { - currentPageData = await cristalApp.getPage(currentFile); - } + const currentPageData: PageData | undefined = + await cristalApp.getPage(currentFile); hierarchy.push({ label: currentPageData?.name ? currentPageData.name : file, pageId: currentFile, diff --git a/core/hierarchy/hierarchy-filesystem/package.json b/core/hierarchy/hierarchy-filesystem/package.json index 81cf0ae10..67e237ef6 100644 --- a/core/hierarchy/hierarchy-filesystem/package.json +++ b/core/hierarchy/hierarchy-filesystem/package.json @@ -26,6 +26,7 @@ "@xwiki/cristal-api": "workspace:*", "@xwiki/cristal-hierarchy-api": "workspace:*", "@xwiki/cristal-hierarchy-default": "workspace:*", + "@xwiki/cristal-model-api": "workspace:*", "inversify": "6.2.2" }, "peerDependencies": { diff --git a/core/hierarchy/hierarchy-filesystem/src/components/componentsInit.ts b/core/hierarchy/hierarchy-filesystem/src/components/componentsInit.ts index d71659edf..7ca936a12 100644 --- a/core/hierarchy/hierarchy-filesystem/src/components/componentsInit.ts +++ b/core/hierarchy/hierarchy-filesystem/src/components/componentsInit.ts @@ -21,11 +21,15 @@ import { name } from "@xwiki/cristal-hierarchy-api"; import { getPageHierarchyFromPath } from "@xwiki/cristal-hierarchy-default"; import { Container, inject, injectable } from "inversify"; -import type { CristalApp, Logger, PageData } from "@xwiki/cristal-api"; +import type { CristalApp, Logger } from "@xwiki/cristal-api"; import type { PageHierarchyItem, PageHierarchyResolver, } from "@xwiki/cristal-hierarchy-api"; +import type { + DocumentReference, + SpaceReference, +} from "@xwiki/cristal-model-api"; /** * Implementation of PageHierarchyResolver for the FileSystem backend. @@ -49,7 +53,7 @@ class FileSystemPageHierarchyResolver implements PageHierarchyResolver { } async getPageHierarchy( - pageData: PageData, + page: DocumentReference | SpaceReference, ): Promise> { let hierarchy: Array = [ { @@ -61,9 +65,9 @@ class FileSystemPageHierarchyResolver implements PageHierarchyResolver { }).href, }, ]; - if (pageData != null) { + if (page != null) { hierarchy = hierarchy.concat( - await getPageHierarchyFromPath(pageData, this.cristalApp), + await getPageHierarchyFromPath(page, this.cristalApp), ); } return hierarchy; diff --git a/core/hierarchy/hierarchy-github/package.json b/core/hierarchy/hierarchy-github/package.json index 581e9b581..06ee4d2b4 100644 --- a/core/hierarchy/hierarchy-github/package.json +++ b/core/hierarchy/hierarchy-github/package.json @@ -25,6 +25,7 @@ "dependencies": { "@xwiki/cristal-api": "workspace:*", "@xwiki/cristal-hierarchy-api": "workspace:*", + "@xwiki/cristal-model-api": "workspace:*", "inversify": "6.2.2" }, "peerDependencies": { diff --git a/core/hierarchy/hierarchy-github/src/components/componentsInit.ts b/core/hierarchy/hierarchy-github/src/components/componentsInit.ts index cc281da97..50c3d2686 100644 --- a/core/hierarchy/hierarchy-github/src/components/componentsInit.ts +++ b/core/hierarchy/hierarchy-github/src/components/componentsInit.ts @@ -19,12 +19,17 @@ */ import { name } from "@xwiki/cristal-hierarchy-api"; +import { EntityType } from "@xwiki/cristal-model-api"; import { Container, inject, injectable } from "inversify"; -import type { CristalApp, Logger, PageData } from "@xwiki/cristal-api"; +import type { CristalApp, Logger } from "@xwiki/cristal-api"; import type { PageHierarchyItem, PageHierarchyResolver, } from "@xwiki/cristal-hierarchy-api"; +import type { + DocumentReference, + SpaceReference, +} from "@xwiki/cristal-model-api"; /** * Implementation of PageHierarchyResolver for the GitHub backend. @@ -46,7 +51,7 @@ class GitHubPageHierarchyResolver implements PageHierarchyResolver { } async getPageHierarchy( - pageData: PageData, + page: DocumentReference | SpaceReference, ): Promise> { const hierarchy: Array = [ { @@ -58,8 +63,14 @@ class GitHubPageHierarchyResolver implements PageHierarchyResolver { }).href, }, ]; - if (pageData != null) { - const fileHierarchy = pageData.id.split("/"); + if (page != null) { + const fileHierarchy = + page.type == EntityType.SPACE + ? [...(page as SpaceReference).names] + : [ + ...(page as DocumentReference).space!.names, + (page as DocumentReference).name, + ]; let currentFile = ""; for (let i = 0; i < fileHierarchy.length; i++) { const file = fileHierarchy[i]; diff --git a/core/hierarchy/hierarchy-nextcloud/package.json b/core/hierarchy/hierarchy-nextcloud/package.json index a3a4c5593..c6bc01f13 100644 --- a/core/hierarchy/hierarchy-nextcloud/package.json +++ b/core/hierarchy/hierarchy-nextcloud/package.json @@ -26,6 +26,7 @@ "@xwiki/cristal-api": "workspace:*", "@xwiki/cristal-hierarchy-api": "workspace:*", "@xwiki/cristal-hierarchy-default": "workspace:*", + "@xwiki/cristal-model-api": "workspace:*", "inversify": "6.2.2" }, "peerDependencies": { diff --git a/core/hierarchy/hierarchy-nextcloud/src/components/componentsInit.ts b/core/hierarchy/hierarchy-nextcloud/src/components/componentsInit.ts index 536e9c70f..ab4bc88fc 100644 --- a/core/hierarchy/hierarchy-nextcloud/src/components/componentsInit.ts +++ b/core/hierarchy/hierarchy-nextcloud/src/components/componentsInit.ts @@ -21,11 +21,15 @@ import { name } from "@xwiki/cristal-hierarchy-api"; import { getPageHierarchyFromPath } from "@xwiki/cristal-hierarchy-default"; import { Container, inject, injectable } from "inversify"; -import type { CristalApp, Logger, PageData } from "@xwiki/cristal-api"; +import type { CristalApp, Logger } from "@xwiki/cristal-api"; import type { PageHierarchyItem, PageHierarchyResolver, } from "@xwiki/cristal-hierarchy-api"; +import type { + DocumentReference, + SpaceReference, +} from "@xwiki/cristal-model-api"; /** * Implementation of PageHierarchyResolver for Nextcloud backend. @@ -47,7 +51,7 @@ class NextcloudPageHierarchyResolver implements PageHierarchyResolver { } async getPageHierarchy( - pageData: PageData, + page: DocumentReference | SpaceReference, ): Promise> { let hierarchy: Array = [ { @@ -59,9 +63,9 @@ class NextcloudPageHierarchyResolver implements PageHierarchyResolver { }).href, }, ]; - if (pageData != null) { + if (page != null) { hierarchy = hierarchy.concat( - await getPageHierarchyFromPath(pageData, this.cristalApp), + await getPageHierarchyFromPath(page, this.cristalApp), ); } return hierarchy; diff --git a/core/hierarchy/hierarchy-xwiki/src/components/componentsInit.ts b/core/hierarchy/hierarchy-xwiki/src/components/componentsInit.ts index f954ece26..dc53c7621 100644 --- a/core/hierarchy/hierarchy-xwiki/src/components/componentsInit.ts +++ b/core/hierarchy/hierarchy-xwiki/src/components/componentsInit.ts @@ -19,16 +19,20 @@ */ import { name } from "@xwiki/cristal-hierarchy-api"; +import { EntityType } from "@xwiki/cristal-model-api"; import { getRestSpacesApiUrl } from "@xwiki/cristal-xwiki-utils"; import { Container, inject, injectable, named } from "inversify"; -import type { CristalApp, Logger, PageData } from "@xwiki/cristal-api"; +import type { CristalApp, Logger } from "@xwiki/cristal-api"; import type { AuthenticationManagerProvider } from "@xwiki/cristal-authentication-api"; import type { StorageProvider } from "@xwiki/cristal-backend-api"; import type { PageHierarchyItem, PageHierarchyResolver, } from "@xwiki/cristal-hierarchy-api"; -import type { DocumentReference } from "@xwiki/cristal-model-api"; +import type { + DocumentReference, + SpaceReference, +} from "@xwiki/cristal-model-api"; import type { ModelReferenceSerializer } from "@xwiki/cristal-model-reference-api"; import type { RemoteURLParser } from "@xwiki/cristal-model-remote-url-api"; @@ -61,14 +65,11 @@ class XWikiPageHierarchyResolver implements PageHierarchyResolver { // TODO: reduce the number of statements in the following method and reactivate the disabled eslint rule. // eslint-disable-next-line max-statements async getPageHierarchy( - pageData: PageData, + page: DocumentReference | SpaceReference, ): Promise> { - const documentId = pageData.document.getIdentifier(); - if (documentId == null) { - this.logger.debug( - `No identifier found for page ${pageData.name}, falling back to default hierarchy resolver.`, - ); - return this.defaultHierarchyResolver.getPageHierarchy(pageData); + let documentId = this.referenceSerializer.serialize(page)!; + if (page.type == EntityType.SPACE) { + documentId += ".WebHome"; } // TODO: support subwikis. const restApiUrl = getRestSpacesApiUrl( @@ -121,9 +122,9 @@ class XWikiPageHierarchyResolver implements PageHierarchyResolver { } catch (error) { this.logger.error(error); this.logger.debug( - `Could not load hierarchy for page ${pageData.name}, falling back to default hierarchy resolver.`, + `Could not load hierarchy for page ${documentId}, falling back to default hierarchy resolver.`, ); - return this.defaultHierarchyResolver.getPageHierarchy(pageData); + return this.defaultHierarchyResolver.getPageHierarchy(page); } } } diff --git a/core/navigation-tree/navigation-tree-api/src/index.ts b/core/navigation-tree/navigation-tree-api/src/index.ts index bd1493687..769b4e11e 100644 --- a/core/navigation-tree/navigation-tree-api/src/index.ts +++ b/core/navigation-tree/navigation-tree-api/src/index.ts @@ -18,8 +18,10 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -import type { PageData } from "@xwiki/cristal-api"; -import type { SpaceReference } from "@xwiki/cristal-model-api"; +import type { + DocumentReference, + SpaceReference, +} from "@xwiki/cristal-model-api"; /** * Description of a navigation tree node. @@ -53,10 +55,11 @@ interface NavigationTreeSource { /** * Returns the ids of the parents nodes for a given page. * - * @param page - the data of the page + * @param page - the reference to the page * @returns the parents nodes ids + * @since 0.15 **/ - getParentNodesId(page?: PageData): Array; + getParentNodesId(page?: DocumentReference): Array; } /** diff --git a/core/navigation-tree/navigation-tree-default/package.json b/core/navigation-tree/navigation-tree-default/package.json index 175a55ce6..82683e720 100644 --- a/core/navigation-tree/navigation-tree-default/package.json +++ b/core/navigation-tree/navigation-tree-default/package.json @@ -25,6 +25,7 @@ }, "dependencies": { "@xwiki/cristal-api": "workspace:*", + "@xwiki/cristal-model-api": "workspace:*", "@xwiki/cristal-navigation-tree-api": "workspace:*", "inversify": "6.2.2" }, diff --git a/core/navigation-tree/navigation-tree-default/src/components/componentsInit.ts b/core/navigation-tree/navigation-tree-default/src/components/componentsInit.ts index e47730e24..c1e9e9db4 100644 --- a/core/navigation-tree/navigation-tree-default/src/components/componentsInit.ts +++ b/core/navigation-tree/navigation-tree-default/src/components/componentsInit.ts @@ -21,7 +21,8 @@ import { getParentNodesIdFromPath } from "../utils"; import { name as NavigationTreeSourceName } from "@xwiki/cristal-navigation-tree-api"; import { Container, inject, injectable } from "inversify"; -import type { CristalApp, Logger, PageData } from "@xwiki/cristal-api"; +import type { CristalApp, Logger } from "@xwiki/cristal-api"; +import type { DocumentReference } from "@xwiki/cristal-model-api"; import type { NavigationTreeNode, NavigationTreeSource, @@ -48,7 +49,7 @@ class DefaultNavigationTreeSource implements NavigationTreeSource { return []; } - getParentNodesId(page?: PageData): Array { + getParentNodesId(page?: DocumentReference): Array { return getParentNodesIdFromPath(page); } } diff --git a/core/navigation-tree/navigation-tree-default/src/utils.ts b/core/navigation-tree/navigation-tree-default/src/utils.ts index a1ac31258..e1e83c8a4 100644 --- a/core/navigation-tree/navigation-tree-default/src/utils.ts +++ b/core/navigation-tree/navigation-tree-default/src/utils.ts @@ -18,30 +18,31 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -import type { PageData } from "@xwiki/cristal-api"; +import type { DocumentReference } from "@xwiki/cristal-model-api"; /** * Returns the ids of the parents nodes for a path-like page id. * - * @param pageData - the data of the page + * @param pageData - the page * @returns the parents nodes ids - * @since 0.10 + * @since 0.15 **/ -// TODO: reduce the number of statements in the following method and reactivate the disabled eslint rule. -// eslint-disable-next-line max-statements -export function getParentNodesIdFromPath(page?: PageData): Array { +export function getParentNodesIdFromPath( + page?: DocumentReference, +): Array { const result: Array = []; if (page) { - // TODO: Use a page resolver instead when CRISTAL-234 is fixed. - const parents = page.id.split("/"); + const parents = [ + ...(page as DocumentReference).space!.names, + (page as DocumentReference).name, + ]; let currentParent = ""; let i; - for (i = 0; i < parents.length - 1; i++) { + for (i = 0; i < parents.length; i++) { currentParent += parents[i]; result.push(currentParent); currentParent += "/"; } - result.push(page.id); } return result; } diff --git a/core/navigation-tree/navigation-tree-filesystem/src/components/componentsInit.ts b/core/navigation-tree/navigation-tree-filesystem/src/components/componentsInit.ts index 0f90f1c4a..3545ac232 100644 --- a/core/navigation-tree/navigation-tree-filesystem/src/components/componentsInit.ts +++ b/core/navigation-tree/navigation-tree-filesystem/src/components/componentsInit.ts @@ -22,7 +22,8 @@ import { SpaceReference } from "@xwiki/cristal-model-api"; import { name as NavigationTreeSourceName } from "@xwiki/cristal-navigation-tree-api"; import { getParentNodesIdFromPath } from "@xwiki/cristal-navigation-tree-default"; import { Container, inject, injectable } from "inversify"; -import type { CristalApp, Logger, PageData } from "@xwiki/cristal-api"; +import type { CristalApp, Logger } from "@xwiki/cristal-api"; +import type { DocumentReference } from "@xwiki/cristal-model-api"; import type { NavigationTreeNode, NavigationTreeSource, @@ -86,7 +87,7 @@ class FileSystemNavigationTreeSource implements NavigationTreeSource { return navigationTree; } - getParentNodesId(page?: PageData): Array { + getParentNodesId(page?: DocumentReference): Array { return getParentNodesIdFromPath(page); } } diff --git a/core/navigation-tree/navigation-tree-github/src/components/componentsInit.ts b/core/navigation-tree/navigation-tree-github/src/components/componentsInit.ts index 7285a71cb..a5e657f5b 100644 --- a/core/navigation-tree/navigation-tree-github/src/components/componentsInit.ts +++ b/core/navigation-tree/navigation-tree-github/src/components/componentsInit.ts @@ -22,7 +22,8 @@ import { SpaceReference } from "@xwiki/cristal-model-api"; import { name as NavigationTreeSourceName } from "@xwiki/cristal-navigation-tree-api"; import { getParentNodesIdFromPath } from "@xwiki/cristal-navigation-tree-default"; import { Container, inject, injectable } from "inversify"; -import type { CristalApp, Logger, PageData } from "@xwiki/cristal-api"; +import type { CristalApp, Logger } from "@xwiki/cristal-api"; +import type { DocumentReference } from "@xwiki/cristal-model-api"; import type { NavigationTreeNode, NavigationTreeSource, @@ -94,7 +95,7 @@ class GitHubNavigationTreeSource implements NavigationTreeSource { return navigationTree; } - getParentNodesId(page?: PageData): Array { + getParentNodesId(page?: DocumentReference): Array { return getParentNodesIdFromPath(page); } } diff --git a/core/navigation-tree/navigation-tree-nextcloud/src/components/componentsInit.ts b/core/navigation-tree/navigation-tree-nextcloud/src/components/componentsInit.ts index f60e0850d..8c07f714a 100644 --- a/core/navigation-tree/navigation-tree-nextcloud/src/components/componentsInit.ts +++ b/core/navigation-tree/navigation-tree-nextcloud/src/components/componentsInit.ts @@ -23,7 +23,8 @@ import { SpaceReference } from "@xwiki/cristal-model-api"; import { name as NavigationTreeSourceName } from "@xwiki/cristal-navigation-tree-api"; import { getParentNodesIdFromPath } from "@xwiki/cristal-navigation-tree-default"; import { Container, inject, injectable } from "inversify"; -import type { CristalApp, Logger, PageData } from "@xwiki/cristal-api"; +import type { CristalApp, Logger } from "@xwiki/cristal-api"; +import type { DocumentReference } from "@xwiki/cristal-model-api"; import type { NavigationTreeNode, NavigationTreeSource, @@ -123,7 +124,7 @@ class NextcloudNavigationTreeSource implements NavigationTreeSource { return subdirectories; } - getParentNodesId(page?: PageData): Array { + getParentNodesId(page?: DocumentReference): Array { return getParentNodesIdFromPath(page); } diff --git a/core/navigation-tree/navigation-tree-xwiki/src/components/componentsInit.ts b/core/navigation-tree/navigation-tree-xwiki/src/components/componentsInit.ts index 4ee062262..ae5a3ac15 100644 --- a/core/navigation-tree/navigation-tree-xwiki/src/components/componentsInit.ts +++ b/core/navigation-tree/navigation-tree-xwiki/src/components/componentsInit.ts @@ -20,7 +20,7 @@ import { name as NavigationTreeSourceName } from "@xwiki/cristal-navigation-tree-api"; import { Container, inject, injectable, named } from "inversify"; -import type { CristalApp, Logger, PageData } from "@xwiki/cristal-api"; +import type { CristalApp, Logger } from "@xwiki/cristal-api"; import type { AuthenticationManagerProvider } from "@xwiki/cristal-authentication-api"; import type { DocumentReference } from "@xwiki/cristal-model-api"; import type { ModelReferenceSerializer } from "@xwiki/cristal-model-reference-api"; @@ -80,31 +80,21 @@ class XWikiNavigationTreeSource implements NavigationTreeSource { return navigationTree; } - // TODO: reduce the number of statements in the following method and reactivate the disabled eslint rule. - // eslint-disable-next-line max-statements - getParentNodesId(page?: PageData): Array { + getParentNodesId(page?: DocumentReference): Array { const result = []; - if (page) { - const documentId = page.document.getIdentifier(); - if (!documentId) { - this.logger.debug( - `No identifier found for page ${page.name}, cannot resolve parents.`, - ); - return []; - } - // TODO: Use a page resolver instead when CRISTAL-234 is fixed. - const parents = documentId - .replace(/\.WebHome$/, "") - .split(/(?(); const cristal: CristalApp = inject("cristal")!; @@ -56,7 +58,7 @@ async function deletePage() { .getContainer() .get("PageHierarchyResolverProvider") .get() - .getPageHierarchy(props.currentPage!); + .getPageHierarchy(props.currentPageReference); const storage = cristal .getContainer() @@ -66,7 +68,7 @@ async function deletePage() { deleteDialogOpen.value = false; if (result.success) { - const deletedPage = props.currentPage!; + documentService.notifyDocumentChange("delete", props.currentPageReference); if (hierarchy.length > 1) { cristal.setCurrentPage(hierarchy[hierarchy.length - 2].pageId, "view"); } else { @@ -77,7 +79,6 @@ async function deletePage() { page: props.currentPageName, }), ); - documentService.notifyDocumentChange("delete", deletedPage); } else { alertsService.error( t("page.action.action.delete.page.error", { diff --git a/core/page-actions/page-actions-ui/src/vue/MovePage.vue b/core/page-actions/page-actions-ui/src/vue/MovePage.vue index 474319505..49ee956ae 100644 --- a/core/page-actions/page-actions-ui/src/vue/MovePage.vue +++ b/core/page-actions/page-actions-ui/src/vue/MovePage.vue @@ -32,12 +32,9 @@ import type { import type { ModelReferenceHandler, ModelReferenceHandlerProvider, - ModelReferenceParser, - ModelReferenceParserProvider, ModelReferenceSerializer, ModelReferenceSerializerProvider, } from "@xwiki/cristal-model-reference-api"; -import type { NavigationTreeNode } from "@xwiki/cristal-navigation-tree-api"; import type { PageRenameManager, PageRenameManagerProvider, @@ -50,6 +47,7 @@ const { t } = useI18n({ const props = defineProps<{ currentPage: PageData | undefined; currentPageName: string; + currentPageReference: DocumentReference; }>(); const cristal: CristalApp = inject("cristal")!; @@ -67,10 +65,6 @@ const referenceHandler: ModelReferenceHandler = cristal .getContainer() .get("ModelReferenceHandlerProvider") .get()!; -const referenceParser: ModelReferenceParser = cristal - .getContainer() - .get("ModelReferenceParserProvider") - .get()!; const referenceSerializer: ModelReferenceSerializer = cristal .getContainer() .get("ModelReferenceSerializerProvider") @@ -79,29 +73,23 @@ const referenceSerializer: ModelReferenceSerializer = cristal const dialogOpen: Ref = ref(false); const preserveChildren: Ref = ref(true); const existingPage: Ref = ref(undefined); -let locationReference: SpaceReference | undefined = undefined; -let newDocumentReference: string; - -function treeNodeClickAction(node: NavigationTreeNode) { - locationReference = node.location; -} +const locationReference: Ref = ref(undefined); +let newDocumentReference: DocumentReference; +let newDocumentReferenceSerialized: string; async function movePage() { - const documentReference: DocumentReference = referenceParser.parse( - props.currentPageName, - ) as DocumentReference; - newDocumentReference = referenceSerializer.serialize( - referenceHandler.createDocumentReference( - documentReference.name, - locationReference!, - ), - )!; + newDocumentReference = referenceHandler.createDocumentReference( + props.currentPageReference.name, + locationReference.value!, + ); + newDocumentReferenceSerialized = + referenceSerializer.serialize(newDocumentReference)!; - existingPage.value = await cristal.getPage(newDocumentReference); + existingPage.value = await cristal.getPage(newDocumentReferenceSerialized); if (!existingPage.value) { const result = await pageRenameManager.updateReference( props.currentPage!, - newDocumentReference, + newDocumentReferenceSerialized, preserveChildren.value, ); dialogOpen.value = false; @@ -112,17 +100,19 @@ async function movePage() { async function handleSuccess(result: { success: boolean; error?: string }) { if (result.success) { if (preserveChildren.value) { - documentService.notifyDocumentChange("delete", props.currentPage!); + documentService.notifyDocumentChange( + "delete", + props.currentPageReference, + ); } - cristal.setCurrentPage(newDocumentReference, "view"); + cristal.setCurrentPage(newDocumentReferenceSerialized, "view"); alertsService.success( t("page.action.action.move.page.success", { page: props.currentPageName, - newPage: newDocumentReference, + newPage: newDocumentReferenceSerialized, }), ); - const newPage: PageData = (await cristal.getPage(newDocumentReference))!; - documentService.notifyDocumentChange("update", newPage); + documentService.notifyDocumentChange("update", newDocumentReference); } else { alertsService.error( t("page.action.action.move.page.error", { @@ -152,7 +142,7 @@ async function handleSuccess(result: { success: boolean; error?: string }) { :href=" cristal.getRouter().resolve({ name: 'view', - params: { page: newDocumentReference }, + params: { page: newDocumentReferenceSerialized }, }).href " >{{ newDocumentReference }}
-
- -
-
+ + -
+
@@ -189,11 +179,6 @@ async function handleSuccess(result: { success: boolean; error?: string }) { diff --git a/core/page-actions/page-actions-ui/src/vue/PageActions.vue b/core/page-actions/page-actions-ui/src/vue/PageActions.vue index c4554d08a..f2dc62e70 100644 --- a/core/page-actions/page-actions-ui/src/vue/PageActions.vue +++ b/core/page-actions/page-actions-ui/src/vue/PageActions.vue @@ -22,6 +22,7 @@ import PageActionsCategory from "./PageActionsCategory.vue"; import { CIcon, Size } from "@xwiki/cristal-icons"; import { inject } from "vue"; import type { CristalApp, PageData } from "@xwiki/cristal-api"; +import type { DocumentReference } from "@xwiki/cristal-model-api"; import type { PageActionCategory, PageActionCategoryService, @@ -30,6 +31,7 @@ import type { defineProps<{ currentPage: PageData | undefined; currentPageName: string; + currentPageReference: DocumentReference; disabled: boolean; }>(); @@ -52,6 +54,7 @@ const actionCategories: PageActionCategory[] = actionCategoryService.list(); :category="category" :current-page="currentPage" :current-page-name="currentPageName" + :current-page-reference="currentPageReference" :is-last="i == actionCategories.length - 1" > diff --git a/core/page-actions/page-actions-ui/src/vue/PageActionsCategory.vue b/core/page-actions/page-actions-ui/src/vue/PageActionsCategory.vue index 022e2e724..ce217873d 100644 --- a/core/page-actions/page-actions-ui/src/vue/PageActionsCategory.vue +++ b/core/page-actions/page-actions-ui/src/vue/PageActionsCategory.vue @@ -20,6 +20,7 @@ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + + + + diff --git a/ds/shoelace/src/vue/form/x-text-field.vue b/ds/shoelace/src/vue/form/x-text-field.vue index a14fdc700..6260396fc 100644 --- a/ds/shoelace/src/vue/form/x-text-field.vue +++ b/ds/shoelace/src/vue/form/x-text-field.vue @@ -11,6 +11,7 @@ const input = defineModel(); void; - const cristal: CristalApp = inject("cristal")!; const documentService: DocumentService = cristal .getContainer() @@ -61,10 +61,7 @@ const items = useTemplateRef>("items"); var selectedTreeItem: SlTreeItem | undefined; -const props = defineProps<{ - clickAction?: OnClickAction; - currentPage?: PageData; -}>(); +const props = defineProps(); onBeforeMount(async () => { rootNodes.value.push(...(await treeSource.getChildNodes(""))); @@ -73,12 +70,14 @@ onBeforeMount(async () => { documentService.registerDocumentChangeListener("update", onDocumentUpdate); }); -watch(() => props.currentPage, expandTree); +watch(() => props.currentPageReference, expandTree); watch(items, expandTree); async function expandTree() { - if (props.currentPage) { - const nodesToExpand = treeSource.getParentNodesId(props.currentPage); + if (props.currentPageReference) { + const nodesToExpand = treeSource.getParentNodesId( + props.currentPageReference, + ); if (items.value) { await Promise.all( items.value!.map(async (it) => it.expandTree(nodesToExpand)), @@ -105,7 +104,7 @@ function onSelectionChange(selection: SlTreeItem) { selectedTreeItem = selection; } -async function onDocumentDelete(page: PageData) { +async function onDocumentDelete(page: DocumentReference) { const parents = treeSource.getParentNodesId(page); for (const i of rootNodes.value.keys()) { if (rootNodes.value[i].id == parents[0]) { @@ -122,7 +121,7 @@ async function onDocumentDelete(page: PageData) { // TODO: reduce the number of statements in the following method and reactivate the disabled eslint rule. // eslint-disable-next-line max-statements -async function onDocumentUpdate(page: PageData) { +async function onDocumentUpdate(page: DocumentReference) { const parents = treeSource.getParentNodesId(page); for (const i of rootNodes.value.keys()) { diff --git a/ds/vuetify/langs/translation-en.json b/ds/vuetify/langs/translation-en.json index b6480060d..49288b4dd 100644 --- a/ds/vuetify/langs/translation-en.json +++ b/ds/vuetify/langs/translation-en.json @@ -1,4 +1,6 @@ { "vuetify.file.input.mandatory": "Mandatory field", - "vuetify.text.input.mandatory": "Mandatory field" + "vuetify.text.input.mandatory": "Mandatory field", + "vuetify.tree.select.location.label": "Change Page Location", + "vuetify.tree.select.location.select": "Select" } diff --git a/ds/vuetify/langs/translation-fr.json b/ds/vuetify/langs/translation-fr.json index 3e6ed651d..e4de9aaac 100644 --- a/ds/vuetify/langs/translation-fr.json +++ b/ds/vuetify/langs/translation-fr.json @@ -1,4 +1,6 @@ { "vuetify.file.input.mandatory": "Champ obligatoire", - "vuetify.text.input.mandatory": "Champ obligatoire" + "vuetify.text.input.mandatory": "Champ obligatoire", + "vuetify.tree.select.location.label": "Changer l'emplacement de la page", + "vuetify.tree.select.location.select": "Sélectionner" } diff --git a/ds/vuetify/package.json b/ds/vuetify/package.json index c1e47a398..f464378fa 100644 --- a/ds/vuetify/package.json +++ b/ds/vuetify/package.json @@ -28,7 +28,9 @@ "dependencies": { "@xwiki/cristal-api": "workspace:*", "@xwiki/cristal-document-api": "workspace:*", + "@xwiki/cristal-hierarchy-api": "workspace:*", "@xwiki/cristal-model-api": "workspace:*", + "@xwiki/cristal-model-reference-api": "workspace:*", "@xwiki/cristal-navigation-tree-api": "workspace:*", "inversify": "6.2.2", "vue": "3.5.13", diff --git a/ds/vuetify/src/components/vuetifyDesignSystemLoader.ts b/ds/vuetify/src/components/vuetifyDesignSystemLoader.ts index 11692f747..ef952e022 100644 --- a/ds/vuetify/src/components/vuetifyDesignSystemLoader.ts +++ b/ds/vuetify/src/components/vuetifyDesignSystemLoader.ts @@ -147,5 +147,10 @@ export class VuetifyDesignSystemLoader implements DesignSystemLoader { "XCheckbox", () => import("../vue/form/x-checkbox.vue"), ); + registerAsyncComponent( + app, + "XNavigationTreeSelect", + () => import("../vue/form/x-navigation-tree-select.vue"), + ); } } diff --git a/ds/vuetify/src/translations.ts b/ds/vuetify/src/translations.ts index ba75b08f2..16d67865e 100644 --- a/ds/vuetify/src/translations.ts +++ b/ds/vuetify/src/translations.ts @@ -18,9 +18,13 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ +import de from "../langs/translation-de.json"; import en from "../langs/translation-en.json"; +import fr from "../langs/translation-fr.json"; const translations: Record> = { en, + fr, + de, }; export default translations; diff --git a/ds/vuetify/src/vue/form/x-form.vue b/ds/vuetify/src/vue/form/x-form.vue index 6457f7522..5f7f024fb 100644 --- a/ds/vuetify/src/vue/form/x-form.vue +++ b/ds/vuetify/src/vue/form/x-form.vue @@ -8,10 +8,14 @@ function submit() { - + diff --git a/ds/vuetify/src/vue/form/x-navigation-tree-select.vue b/ds/vuetify/src/vue/form/x-navigation-tree-select.vue new file mode 100644 index 000000000..1f31150fe --- /dev/null +++ b/ds/vuetify/src/vue/form/x-navigation-tree-select.vue @@ -0,0 +1,120 @@ + + + + + + diff --git a/ds/vuetify/src/vue/form/x-text-field.vue b/ds/vuetify/src/vue/form/x-text-field.vue index e23b40401..4b9638aa6 100644 --- a/ds/vuetify/src/vue/form/x-text-field.vue +++ b/ds/vuetify/src/vue/form/x-text-field.vue @@ -32,6 +32,8 @@ const rules = computed(() => { :label="label" :name="name" :autofocus="autofocus" + :hint="help" + :persistent-hint="help !== undefined" :rules="rules" > diff --git a/ds/vuetify/src/vue/x-navigation-tree.vue b/ds/vuetify/src/vue/x-navigation-tree.vue index cb1ab6e67..c3a89f7cc 100644 --- a/ds/vuetify/src/vue/x-navigation-tree.vue +++ b/ds/vuetify/src/vue/x-navigation-tree.vue @@ -31,11 +31,14 @@ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA */ import { inject, onBeforeMount, ref, watch } from "vue"; import { VTreeview } from "vuetify/labs/VTreeview"; -import type { CristalApp, PageData } from "@xwiki/cristal-api"; +import type { CristalApp } from "@xwiki/cristal-api"; import type { DocumentService } from "@xwiki/cristal-document-api"; -import type { SpaceReference } from "@xwiki/cristal-model-api"; +import type { NavigationTreeProps } from "@xwiki/cristal-dsapi"; +import type { + DocumentReference, + SpaceReference, +} from "@xwiki/cristal-model-api"; import type { - NavigationTreeNode, NavigationTreeSource, NavigationTreeSourceProvider, } from "@xwiki/cristal-navigation-tree-api"; @@ -49,8 +52,6 @@ type TreeItem = { _location: SpaceReference; }; -type OnClickAction = (node: NavigationTreeNode) => void; - const cristal: CristalApp = inject("cristal")!; const documentService: DocumentService = cristal .getContainer() @@ -66,10 +67,7 @@ const activatedNodes: Ref> = ref(new Array()); const expandedNodes: Ref> = ref(new Array()); var isExpanding: boolean = false; -const props = defineProps<{ - clickAction?: OnClickAction; - currentPage?: PageData; -}>(); +const props = defineProps(); onBeforeMount(async () => { for (const node of await treeSource.getChildNodes("")) { @@ -87,14 +85,16 @@ onBeforeMount(async () => { documentService.registerDocumentChangeListener("update", onDocumentUpdate); }); -watch(() => props.currentPage, expandTree); +watch(() => props.currentPageReference, expandTree); // TODO: reduce the number of statements in the following method and reactivate the disabled eslint rule. // eslint-disable-next-line max-statements async function expandTree() { - if (props.currentPage && !isExpanding) { + if (props.currentPageReference && !isExpanding) { isExpanding = true; - const newExpandedNodes = treeSource.getParentNodesId(props.currentPage); + const newExpandedNodes = treeSource.getParentNodesId( + props.currentPageReference, + ); let i; let currentNodes = rootNodes.value; for (i = 0; i < newExpandedNodes.length - 1; i++) { @@ -163,7 +163,7 @@ function clearSelection() { // TODO: reduce the number of statements in the following method and reactivate the disabled eslint rule. // eslint-disable-next-line max-statements -async function onDocumentDelete(page: PageData) { +async function onDocumentDelete(page: DocumentReference) { const parents = treeSource.getParentNodesId(page); let currentItem: TreeItem | undefined = undefined; let currentItemChildren: TreeItem[] | undefined = rootNodes.value; @@ -192,7 +192,7 @@ async function onDocumentDelete(page: PageData) { // TODO: reduce the number of statements in the following method and reactivate the disabled eslint rule. // eslint-disable-next-line max-statements -async function onDocumentUpdate(page: PageData) { +async function onDocumentUpdate(page: DocumentReference) { const parents = treeSource.getParentNodesId(page); let currentParent: string | undefined = undefined; let currentItems: TreeItem[] | undefined = rootNodes.value; @@ -238,7 +238,9 @@ async function onDocumentUpdate(page: PageData) { const newItems = await treeSource.getChildNodes( currentParent ? currentParent : "", ); - const currentPageParents = treeSource.getParentNodesId(props.currentPage); + const currentPageParents = treeSource.getParentNodesId( + props.currentPageReference, + ); newItemsLoop: for (const newItem of newItems) { for (const i of currentItems!.keys()) { if (newItem.id == currentItems![i].id) { diff --git a/editors/tiptap/src/vue/c-edit-tiptap.vue b/editors/tiptap/src/vue/c-edit-tiptap.vue index 06e3b1b3f..cbe15ffa0 100644 --- a/editors/tiptap/src/vue/c-edit-tiptap.vue +++ b/editors/tiptap/src/vue/c-edit-tiptap.vue @@ -68,6 +68,7 @@ import type { LinkSuggestService, LinkSuggestServiceProvider, } from "@xwiki/cristal-link-suggest-api"; +import type { DocumentReference } from "@xwiki/cristal-model-api"; import type { Markdown } from "tiptap-markdown"; import type { Ref } from "vue"; @@ -94,13 +95,15 @@ const loading = documentService.isLoading(); const error: Ref = documentService.getError(); const currentPage: Ref = documentService.getCurrentDocument(); +const currentPageReference: Ref = + documentService.getCurrentDocumentReference(); // TODO: load this content first, then initialize the editor. // Make the loading status first. const content = ref(""); const title = ref(""); const titlePlaceholder = modelReferenceHandler?.getTitle( - documentService.getCurrentDocumentReference().value!, + currentPageReference.value!, ); const hasRealtime = cristal.getWikiConfig().realtimeURL != undefined; @@ -158,7 +161,7 @@ const save = async () => { if (!currentPage.value) { documentService.setCurrentDocument(currentPageName.value ?? ""); } - documentService.notifyDocumentChange("update", currentPage.value!); + documentService.notifyDocumentChange("update", currentPageReference.value!); }; const submit = async () => { if (!hasRealtime) { @@ -336,6 +339,7 @@ watch( :loading="loading" :error="error" :current-page="currentPage" + :current-page-reference="currentPageReference" :page-exist="true" before-u-i-x-p-id="edit.before" after-u-i-x-p-id="edit.after" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f76454c39..24ac92d79 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -950,6 +950,9 @@ importers: '@xwiki/cristal-api': specifier: workspace:* version: link:../../../api + '@xwiki/cristal-model-api': + specifier: workspace:* + version: link:../../model/model-api devDependencies: '@xwiki/cristal-dev-config': specifier: workspace:* @@ -969,6 +972,9 @@ importers: '@xwiki/cristal-hierarchy-api': specifier: workspace:* version: link:../hierarchy-api + '@xwiki/cristal-model-api': + specifier: workspace:* + version: link:../../model/model-api inversify: specifier: 6.2.2 version: 6.2.2(reflect-metadata@0.2.2) @@ -997,6 +1003,9 @@ importers: '@xwiki/cristal-hierarchy-default': specifier: workspace:* version: link:../hierarchy-default + '@xwiki/cristal-model-api': + specifier: workspace:* + version: link:../../model/model-api inversify: specifier: 6.2.2 version: 6.2.2(reflect-metadata@0.2.2) @@ -1022,6 +1031,9 @@ importers: '@xwiki/cristal-hierarchy-api': specifier: workspace:* version: link:../hierarchy-api + '@xwiki/cristal-model-api': + specifier: workspace:* + version: link:../../model/model-api inversify: specifier: 6.2.2 version: 6.2.2(reflect-metadata@0.2.2) @@ -1050,6 +1062,9 @@ importers: '@xwiki/cristal-hierarchy-default': specifier: workspace:* version: link:../hierarchy-default + '@xwiki/cristal-model-api': + specifier: workspace:* + version: link:../../model/model-api inversify: specifier: 6.2.2 version: 6.2.2(reflect-metadata@0.2.2) @@ -1851,6 +1866,9 @@ importers: '@xwiki/cristal-api': specifier: workspace:* version: link:../../../api + '@xwiki/cristal-model-api': + specifier: workspace:* + version: link:../../model/model-api '@xwiki/cristal-navigation-tree-api': specifier: workspace:* version: link:../navigation-tree-api @@ -2436,6 +2454,9 @@ importers: '@xwiki/cristal-api': specifier: workspace:* version: link:../../api + '@xwiki/cristal-model-api': + specifier: workspace:* + version: link:../../core/model/model-api '@xwiki/cristal-navigation-tree-api': specifier: workspace:* version: link:../../core/navigation-tree/navigation-tree-api @@ -2504,9 +2525,18 @@ importers: '@xwiki/cristal-document-api': specifier: workspace:* version: link:../../core/document/document-api + '@xwiki/cristal-hierarchy-api': + specifier: workspace:* + version: link:../../core/hierarchy/hierarchy-api '@xwiki/cristal-icons': specifier: workspace:* version: link:../../core/icons + '@xwiki/cristal-model-api': + specifier: workspace:* + version: link:../../core/model/model-api + '@xwiki/cristal-model-reference-api': + specifier: workspace:* + version: link:../../core/model/model-reference/model-reference-api '@xwiki/cristal-navigation-tree-api': specifier: workspace:* version: link:../../core/navigation-tree/navigation-tree-api @@ -2516,6 +2546,9 @@ importers: vue: specifier: 3.5.13 version: 3.5.13(typescript@5.7.3) + vue-i18n: + specifier: 11.1.0 + version: 11.1.0(vue@3.5.13(typescript@5.7.3)) devDependencies: '@vue/runtime-dom': specifier: 3.5.13 @@ -2550,9 +2583,15 @@ importers: '@xwiki/cristal-document-api': specifier: workspace:* version: link:../../core/document/document-api + '@xwiki/cristal-hierarchy-api': + specifier: workspace:* + version: link:../../core/hierarchy/hierarchy-api '@xwiki/cristal-model-api': specifier: workspace:* version: link:../../core/model/model-api + '@xwiki/cristal-model-reference-api': + specifier: workspace:* + version: link:../../core/model/model-reference/model-reference-api '@xwiki/cristal-navigation-tree-api': specifier: workspace:* version: link:../../core/navigation-tree/navigation-tree-api diff --git a/skin/langs/translation-en.json b/skin/langs/translation-en.json index 263524d93..d45226b25 100644 --- a/skin/langs/translation-en.json +++ b/skin/langs/translation-en.json @@ -6,7 +6,10 @@ "page.creation.menu.alert.content.edit.link": "edit the existing page", "page.creation.menu.button": "New Page", "page.creation.menu.field.location": "Parent location", + "page.creation.menu.field.location.help": "Parent for the new page", "page.creation.menu.field.name": "Name", + "page.creation.menu.field.name.help": "Name of the new page", + "page.creation.menu.cancel": "Cancel", "page.creation.menu.submit": "Create", "page.creation.menu.title": "New Page", "page.edited.details": "Edited on {date}", diff --git a/skin/langs/translation-fr.json b/skin/langs/translation-fr.json index ff5260256..117ccddfa 100644 --- a/skin/langs/translation-fr.json +++ b/skin/langs/translation-fr.json @@ -6,7 +6,10 @@ "page.creation.menu.alert.content.edit.link": "éditez la page existante", "page.creation.menu.button": "Nouvelle page", "page.creation.menu.field.location": "Emplacement du parent", + "page.creation.menu.field.location.help": "Parent de la nouvelle page", "page.creation.menu.field.name": "Nom", + "page.creation.menu.field.name.help": "Nom de la nouvelle page", + "page.creation.menu.cancel": "Annuler", "page.creation.menu.submit": "Créer", "page.creation.menu.title": "Nouvelle page", "page.edited.details": "Édité le {date}", diff --git a/skin/src/vue/__tests__/c-content.test.ts b/skin/src/vue/__tests__/c-content.test.ts index 27c03eb3a..6877b2996 100644 --- a/skin/src/vue/__tests__/c-content.test.ts +++ b/skin/src/vue/__tests__/c-content.test.ts @@ -32,6 +32,7 @@ import { PageHierarchyResolverProvider, } from "@xwiki/cristal-hierarchy-api"; import { MarkdownRenderer } from "@xwiki/cristal-markdown-api"; +import { DocumentReference, SpaceReference } from "@xwiki/cristal-model-api"; import { ClickListener } from "@xwiki/cristal-model-click-listener"; import { Container } from "inversify"; import { DeepPartial } from "ts-essentials"; @@ -74,6 +75,14 @@ function mountCComponent(params: { return ref(undefined); } + getCurrentDocumentReference() { + return ref( + new DocumentReference( + "Reference", + new SpaceReference(undefined, "The", "Page"), + ), + ); + } getCurrentDocumentReferenceString() { return ref("The.Page.Reference"); } diff --git a/skin/src/vue/c-article.vue b/skin/src/vue/c-article.vue index d01e325e5..df0caf59d 100644 --- a/skin/src/vue/c-article.vue +++ b/skin/src/vue/c-article.vue @@ -15,16 +15,18 @@ import type { PageHierarchyItem, PageHierarchyResolverProvider, } from "@xwiki/cristal-hierarchy-api"; +import type { DocumentReference } from "@xwiki/cristal-model-api"; const { t } = useI18n({ messages, }); const cristal: CristalApp = inject("cristal")!; -const { currentPage } = defineProps<{ +const { currentPage, currentPageReference } = defineProps<{ loading: boolean; error: Error | undefined; currentPage: PageData | undefined; + currentPageReference: DocumentReference | undefined; pageExist: boolean; beforeUIXPId: string; afterUIXPId: string; @@ -32,7 +34,7 @@ const { currentPage } = defineProps<{ const breadcrumbItems: Ref> = ref([]); watch( - () => currentPage, + () => currentPageReference, async (p) => { if (p) { try { diff --git a/skin/src/vue/c-content.vue b/skin/src/vue/c-content.vue index d25728405..a15764de6 100644 --- a/skin/src/vue/c-content.vue +++ b/skin/src/vue/c-content.vue @@ -48,6 +48,7 @@ const currentPage: Ref = const currentPageRevision: Ref = documentService.getCurrentDocumentRevision(); const currentPageName = documentService.getCurrentDocumentReferenceString(); +const currentPageReference = documentService.getCurrentDocumentReference(); const displayTitle = documentService.getDisplayTitle(); const contentRoot = ref(undefined); @@ -85,6 +86,7 @@ onUpdated(() => { :loading="loading" :error="error" :current-page="currentPage" + :current-page-reference="currentPageReference" :page-exist="pageExist" before-u-i-x-p-id="content.before" after-u-i-x-p-id="content.after" @@ -108,6 +110,7 @@ onUpdated(() => { diff --git a/skin/src/vue/c-page-creation-menu.vue b/skin/src/vue/c-page-creation-menu.vue index f718b686e..867f236e6 100644 --- a/skin/src/vue/c-page-creation-menu.vue +++ b/skin/src/vue/c-page-creation-menu.vue @@ -20,17 +20,19 @@ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA