Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into CRISTAL-462
Browse files Browse the repository at this point in the history
  • Loading branch information
manuelleduc committed Feb 21, 2025
2 parents ea038d8 + cad520e commit a651587
Show file tree
Hide file tree
Showing 219 changed files with 1,554 additions and 885 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build_electron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ jobs:
key: ${{ github.ref }}-restore-cache-electron-linux
- run: pnpm install
- run: pnpm run build
- run: sudo apt install flatpak-builder
- run: flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
- run: pnpm run --filter @xwiki/cristal-electron build:linux
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
1 change: 0 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"recommendations": [
"Vue.volar",
"Vue.vscode-typescript-vue-plugin",
"ms-playwright.playwright",
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode"
Expand Down
2 changes: 1 addition & 1 deletion api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
11 changes: 10 additions & 1 deletion api/src/api/cristalApp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,16 @@ export interface CristalApp {

run(): Promise<void>;

getUIXTemplates(extensionPoint: string): Array<Component>;
/**
* 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<Array<Component>>;

getMenuEntries(): Array<string>;

Expand Down
2 changes: 1 addition & 1 deletion core/alerts/alerts-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion core/alerts/alerts-default/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion core/alerts/alerts-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion core/attachments/attachments-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"devDependencies": {
"@xwiki/cristal-dev-config": "workspace:*",
"typescript": "5.7.3",
"vite": "6.0.11"
"vite": "6.1.0"
},
"publishConfig": {
"exports": {
Expand Down
2 changes: 1 addition & 1 deletion core/attachments/attachments-default/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion core/attachments/attachments-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion core/authentication/authentication-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion core/authentication/authentication-default/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion core/authentication/authentication-nextcloud/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"devDependencies": {
"@xwiki/cristal-dev-config": "workspace:*",
"typescript": "5.7.3",
"vite": "6.0.11"
"vite": "6.1.0"
},
"publishConfig": {
"exports": {
Expand Down
2 changes: 1 addition & 1 deletion core/authentication/authentication-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion core/authentication/authentication-xwiki/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion core/backends/backend-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion core/backends/backend-dexie/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion core/backends/backend-github/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion core/backends/backend-nextcloud/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion core/backends/backend-xwiki/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion core/browser/browser-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"devDependencies": {
"@xwiki/cristal-dev-config": "workspace:*",
"typescript": "5.7.3",
"vite": "6.0.11"
"vite": "6.1.0"
},
"publishConfig": {
"exports": {
Expand Down
2 changes: 1 addition & 1 deletion core/browser/browser-default/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion core/configuration/configuration-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"devDependencies": {
"@xwiki/cristal-dev-config": "workspace:*",
"typescript": "5.7.3",
"vite": "6.0.11"
"vite": "6.1.0"
},
"publishConfig": {
"exports": {
Expand Down
2 changes: 1 addition & 1 deletion core/configuration/configuration-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"devDependencies": {
"@xwiki/cristal-dev-config": "workspace:*",
"typescript": "5.7.3",
"vite": "6.0.11"
"vite": "6.1.0"
},
"publishConfig": {
"exports": {
Expand Down
2 changes: 1 addition & 1 deletion core/date/date-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion core/date/date-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion core/document/document-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"devDependencies": {
"@xwiki/cristal-dev-config": "workspace:*",
"typescript": "5.7.3",
"vite": "6.0.11"
"vite": "6.1.0"
},
"publishConfig": {
"exports": {
Expand Down
13 changes: 8 additions & 5 deletions core/document/document-api/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<void>,
listener: (page: DocumentReference) => Promise<void>,
): 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<void>;
notifyDocumentChange(
change: DocumentChange,
page: DocumentReference,
): Promise<void>;
}

const name: string = "DocumentService";
Expand Down
2 changes: 1 addition & 1 deletion core/document/document-default/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
6 changes: 3 additions & 3 deletions core/document/document-default/src/defaultDocumentService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ export class DefaultDocumentService implements DocumentService {
private readonly store: DocumentStore;
private readonly documentChangeListeners: Map<
DocumentChange,
Array<(page: PageData) => Promise<void>>
Array<(page: DocumentReference) => Promise<void>>
> = new Map();

constructor(@inject("CristalApp") private cristal: CristalApp) {
Expand Down Expand Up @@ -242,7 +242,7 @@ export class DefaultDocumentService implements DocumentService {

registerDocumentChangeListener(
change: DocumentChange,
listener: (page: PageData) => Promise<void>,
listener: (page: DocumentReference) => Promise<void>,
): void {
if (this.documentChangeListeners.has(change)) {
this.documentChangeListeners.get(change)!.push(listener);
Expand All @@ -253,7 +253,7 @@ export class DefaultDocumentService implements DocumentService {

async notifyDocumentChange(
change: DocumentChange,
page: PageData,
page: DocumentReference,
): Promise<void> {
if (this.documentChangeListeners.has(change)) {
await Promise.all(
Expand Down
2 changes: 1 addition & 1 deletion core/extra-tabs/extra-tabs-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
6 changes: 3 additions & 3 deletions core/extra-tabs/extra-tabs-default/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@
"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",
"vite": "6.0.11"
"vite": "6.1.0"
},
"publishConfig": {
"exports": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/extra-tabs/extra-tabs-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion core/file-preview/file-preview-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
5 changes: 3 additions & 2 deletions core/hierarchy/hierarchy-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@
"test": "vitest --run"
},
"dependencies": {
"@xwiki/cristal-api": "workspace:*"
"@xwiki/cristal-api": "workspace:*",
"@xwiki/cristal-model-api": "workspace:*"
},
"devDependencies": {
"@xwiki/cristal-dev-config": "workspace:*",
"typescript": "5.7.3",
"vite": "6.0.11"
"vite": "6.1.0"
},
"publishConfig": {
"exports": {
Expand Down
Loading

0 comments on commit a651587

Please sign in to comment.