@jumoo/usync 17.5.3-prerelease.16 → 18.2.1

package/dist/repository/sources/SyncMigration.source.js

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _uSyncMigrationDataSource_host;
-import { MigrationsService } from '@jumoo/uSync';
+import { getCheckLegacy, postCopyLegacy, postIgnoreLegacy, } from '@jumoo/uSync';
 import { tryExecute } from '@umbraco-cms/backoffice/resources';
 export class uSyncMigrationDataSource {
     constructor(host) {
@@ -18,13 +18,13 @@ export class uSyncMigrationDataSource {
         __classPrivateFieldSet(this, _uSyncMigrationDataSource_host, host, "f");
     }
     async checkLegacy() {
-        return await tryExecute(__classPrivateFieldGet(this, _uSyncMigrationDataSource_host, "f"), MigrationsService.checkLegacy());
+        return await tryExecute(__classPrivateFieldGet(this, _uSyncMigrationDataSource_host, "f"), getCheckLegacy());
     }
     async ignoreLegacy() {
-        return await tryExecute(__classPrivateFieldGet(this, _uSyncMigrationDataSource_host, "f"), MigrationsService.ignoreLegacy());
+        return await tryExecute(__classPrivateFieldGet(this, _uSyncMigrationDataSource_host, "f"), postIgnoreLegacy());
     }
     async copyLegacy() {
-        return await tryExecute(__classPrivateFieldGet(this, _uSyncMigrationDataSource_host, "f"), MigrationsService.copyLegacy());
+        return await tryExecute(__classPrivateFieldGet(this, _uSyncMigrationDataSource_host, "f"), postCopyLegacy());
     }
 }
 _uSyncMigrationDataSource_host = new WeakMap();

package/dist/repository/sources/SyncSettings.source.d.ts

@@ -10,14 +10,24 @@ export declare class USyncSettingsDataSource implements SyncSettingsDataSource {
     constructor(host: UmbControllerHost);
     getSettings(): Promise<UmbDataSourceResponse<USyncSettings>>;
     getHandlerSettings(setName: string): Promise<UmbDataSourceResponse<USyncHandlerSetSettings>>;
-    getAddons(): Promise<import("@umbraco-cms/backoffice/resources").UmbApiResponse<{
+    getAddons(): Promise<import("@umbraco-cms/backoffice/resources").UmbApiResponse<({
         data: import("@jumoo/uSync").USyncAddonInfo;
-        request: Request;
-        response: Response;
+        error: undefined;
+    } | {
+        data: undefined;
+        error: unknown;
+    }) & {
+        request?: Request;
+        response?: Response;
     }>>;
-    getSets(): Promise<import("@umbraco-cms/backoffice/resources").UmbApiResponse<{
+    getSets(): Promise<import("@umbraco-cms/backoffice/resources").UmbApiResponse<({
         data: import("@jumoo/uSync").SyncSelectableSet[];
-        request: Request;
-        response: Response;
+        error: undefined;
+    } | {
+        data: undefined;
+        error: unknown;
+    }) & {
+        request?: Request;
+        response?: Response;
     }>>;
 }

package/dist/repository/sources/SyncSettings.source.js

@@ -11,23 +11,23 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _USyncSettingsDataSource_host;
 import { tryExecute } from '@umbraco-cms/backoffice/resources';
-import { SettingsService } from '@jumoo/uSync';
+import { getAddOns, getHandlerSettings, getSets, getSettings, } from '@jumoo/uSync';
 export class USyncSettingsDataSource {
     constructor(host) {
         _USyncSettingsDataSource_host.set(this, void 0);
         __classPrivateFieldSet(this, _USyncSettingsDataSource_host, host, "f");
     }
     async getSettings() {
-        return await tryExecute(__classPrivateFieldGet(this, _USyncSettingsDataSource_host, "f"), SettingsService.getSettings());
+        return await tryExecute(__classPrivateFieldGet(this, _USyncSettingsDataSource_host, "f"), getSettings());
     }
     async getHandlerSettings(setName) {
-        return await tryExecute(__classPrivateFieldGet(this, _USyncSettingsDataSource_host, "f"), SettingsService.getHandlerSetSettings({ query: { id: setName } }));
+        return await tryExecute(__classPrivateFieldGet(this, _USyncSettingsDataSource_host, "f"), getHandlerSettings({ query: { id: setName } }));
     }
     async getAddons() {
-        return await tryExecute(__classPrivateFieldGet(this, _USyncSettingsDataSource_host, "f"), SettingsService.getAddOns());
+        return await tryExecute(__classPrivateFieldGet(this, _USyncSettingsDataSource_host, "f"), getAddOns());
     }
     async getSets() {
-        return await tryExecute(__classPrivateFieldGet(this, _USyncSettingsDataSource_host, "f"), SettingsService.getSets());
+        return await tryExecute(__classPrivateFieldGet(this, _USyncSettingsDataSource_host, "f"), getSets());
     }
 }
 _USyncSettingsDataSource_host = new WeakMap();

package/dist/workspace/components/usync-action-button.d.ts

@@ -8,8 +8,9 @@ export declare class SyncActionButtonElement extends UmbLitElement {
     state?: UUIButtonState;
     disabled: boolean;
     _popoverOpen: boolean;
-    render(): import("lit-html").TemplateResult<1>;
-    renderDropdown(parent?: SyncActionButton): typeof nothing | import("lit-html").TemplateResult<1>;
+    render(): typeof nothing | import("lit-html").TemplateResult<1>;
+    renderSingleAction(): import("lit-html").TemplateResult<1>;
+    renderMultipleActions(parent?: SyncActionButton): typeof nothing | import("lit-html").TemplateResult<1>;
     static styles: import("lit").CSSResult;
 }
 declare global {

package/dist/workspace/components/usync-action-button.js

@@ -21,22 +21,21 @@ let SyncActionButtonElement = class SyncActionButtonElement extends UmbLitElemen
         this._popoverOpen = false;
     }
     render() {
-        return html `
-			<uui-button-group>
-				<uui-button
-					class="action-button"
-					.disabled=${this.disabled}
-					label=${this.localize.termOrDefault(`uSync_${this.button?.label}`, this.button?.label ?? '')}
-					color=${this.button?.color}
-					look=${this.button?.look}
-					state=${ifDefined(this.state)}
-					@click=${() => __classPrivateFieldGet(this, _SyncActionButtonElement_instances, "m", _SyncActionButtonElement_onClick).call(this, this.button)}></uui-button>
-
-				${this.renderDropdown(this.button)}
-			</uui-button-group>
-		`;
+        return (this.button?.children?.length ?? 0) > 0
+            ? this.renderMultipleActions(this.button)
+            : this.renderSingleAction();
+    }
+    renderSingleAction() {
+        return html ` <uui-button
+			class="action-button"
+			.disabled=${this.disabled}
+			label=${this.localize.termOrDefault(`uSync_${this.button?.label}`, this.button?.label ?? '')}
+			color=${this.button?.color}
+			look=${this.button?.look}
+			state=${ifDefined(this.state)}
+			@click=${() => __classPrivateFieldGet(this, _SyncActionButtonElement_instances, "m", _SyncActionButtonElement_onClick).call(this, this.button)}></uui-button>`;
     }
-    renderDropdown(parent) {
+    renderMultipleActions(parent) {
         if (!this.button?.children)
             return nothing;
         const buttons = this.button?.children.map((item) => {
@@ -49,21 +48,30 @@ let SyncActionButtonElement = class SyncActionButtonElement extends UmbLitElemen
             return nothing;
         const popoverId = `popover_${parent?.key}`;
         return html `
-			<uui-button
-				.disabled=${this.disabled}
-				popovertarget=${popoverId}
-				.label=${this.button.label}
-				color=${parent?.color}
-				look=${parent?.look}
-				compact>
-				<uui-symbol-expand
-					class="expand-symbol"
-					.open=${this._popoverOpen}></uui-symbol-expand>
-			</uui-button>
+			<uui-button-group class="action-button">
+				<uui-button
+					.disabled=${this.disabled}
+					.label=${this.button.label}
+					color=${parent?.color}
+					look=${parent?.look}
+					@click=${() => __classPrivateFieldGet(this, _SyncActionButtonElement_instances, "m", _SyncActionButtonElement_onClick).call(this, this.button)}>
+					${this.localize.termOrDefault(`uSync_${this.button?.label}`, this.button?.label ?? '')}
+				</uui-button>
+				<uui-button
+					.disabled=${this.disabled}
+					popovertarget=${popoverId}
+					.label=${this.button.label}
+					color=${parent?.color}
+					look=${parent?.look}
+					compact>
+					<uui-symbol-expand
+						class="expand-symbol"
+						.open=${this._popoverOpen}></uui-symbol-expand>
+				</uui-button>
+			</uui-button-group>
 
 			<uui-popover-container
 				id=${popoverId}
-				margin="6"
 				placement="bottom-end"
 				@toggle=${__classPrivateFieldGet(this, _SyncActionButtonElement_instances, "m", _SyncActionButtonElement_onPopoverToggle)}>
 				<umb-popover-layout>

package/dist/workspace/views/default/default.element.js

@@ -323,9 +323,9 @@ uSyncDefaultViewElement.styles = [
 
 			.action-buttons-box {
 				display: grid;
-				grid-template-columns: repeat(auto-fit, minmax(430px, 1fr));
+				grid-template-columns: repeat(auto-fit, minmax(370px, 1fr));
 				position: relative;
-				gap: var(--uui-size-space-5);
+				gap: var(--uui-size-space-4);
 				flex-wrap: wrap;
 				align-content: stretch;
 				z-index: 1;

package/dist/workspace/workspace.context.d.ts

@@ -33,8 +33,8 @@ export declare class uSyncWorkspaceContext extends UmbControllerBase implements
      * Get the current uSync settings
      */
     getSettings(): Promise<USyncSettings | undefined>;
-    getAddons(): Promise<import("@jumoo/uSync").USyncAddonInfo>;
-    getSyncFileInfo(): Promise<SyncFileVersionCheckResult>;
+    getAddons(): Promise<import("@jumoo/uSync").USyncAddonInfo | undefined>;
+    getSyncFileInfo(): Promise<SyncFileVersionCheckResult | undefined>;
     /**
      * Check to see if there is a legacy uSync folder on disk.
      */
@@ -64,10 +64,15 @@ export declare class uSyncWorkspaceContext extends UmbControllerBase implements
     dismissBackgroundRun(): void;
     uploadFile(): Promise<boolean | undefined>;
     downloadFile(): Promise<void>;
-    importSingle(item: USyncActionView): Promise<import("@umbraco-cms/backoffice/resources").UmbApiResponse<{
+    importSingle(item: USyncActionView): Promise<import("@umbraco-cms/backoffice/resources").UmbApiResponse<({
         data: USyncActionView;
-        request: Request;
-        response: Response;
+        error: undefined;
+    } | {
+        data: undefined;
+        error: unknown;
+    }) & {
+        request?: Request;
+        response?: Response;
     }> | undefined>;
 }
 export default uSyncWorkspaceContext;

package/package.json

@@ -8,7 +8,7 @@
 	"homepage": "https://jumoo.co.uk/uSync",
 	"license": "MPL-2.0",
 	"type": "module",
-	"version": "17.5.3-prerelease.16",
+	"version": "18.2.1",
 	"main": "./dist/usync.js",
 	"types": "./dist/index.d.ts",
 	"module": "./dist/usync.js",
@@ -39,13 +39,17 @@
 		"email": "info@jumoo.co.uk",
 		"url": "https://jumoo.co.uk"
 	},
+	"site": {
+		"port": "16903",
+		"api": "uSync"
+	},
 	"scripts": {
 		"client:build": "tsc --project ./tsconfig.dist.json",
 		"client:pack": "npm pack --pack-destination ./pack",
 		"client:publish": "npm publish --tag next",
 		"client:make": "npm run client:build && npm run client:pack && npm run client:publish",
 		"client:link": "npm link",
-		"generate": "openapi-ts",
+		"generate-client": "node scripts/generate-openapi.js https://localhost:44304/umbraco/openapi/uSync.json",
 		"format:fix": "npm run format -- --write",
 		"format": "prettier \"src/**/*.ts\" --check",
 		"build": "tsc && vite build",
@@ -56,9 +60,12 @@
 	"devDependencies": {
 		"@hey-api/openapi-ts": "^0.99.0",
 		"@microsoft/signalr": "^10.0.11",
-		"@umbraco-cms/backoffice": "^17.6.2",
+		"@umbraco-cms/backoffice": "^18.0.0-rc3",
+		"chalk": "^6.0.0",
+		"cross-env": "^10.1.0",
 		"eslint": "^10.13.0",
 		"lit": "^3.3.3",
+		"node-fetch": "^3.3.2",
 		"prettier": "^3.9.10",
 		"typescript": "^5.9.3",
 		"vite": "^8.3.4",

package/dist/components/usync-content-preview.d.ts

@@ -1,27 +0,0 @@
-import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import { type PropertyValues, nothing } from '@umbraco-cms/backoffice/external/lit';
-import '@umbraco-cms/backoffice/components';
-import type { SyncItemPreviewResponse } from '../api';
-/**
- * Shows the current and incoming versions of a content or media item side by
- * side, laid out the way the backoffice editor shows them, with every value
- * rendered by its real property editor. Values that change are highlighted.
- */
-export declare class uSyncContentPreviewElement extends UmbLitElement {
-    #private;
-    preview?: SyncItemPreviewResponse;
-    /** the tab shown on both sides (by name) */
-    private _activeTab?;
-    /** the culture shown on both sides (undefined for invariant items) */
-    private _culture?;
-    private _onlyChanges;
-    protected willUpdate(changed: PropertyValues<this>): void;
-    render(): typeof nothing | import("lit-html").TemplateResult<1>;
-    static styles: import("lit").CSSResult;
-}
-export default uSyncContentPreviewElement;
-declare global {
-    interface HTMLElementTagNameMap {
-        'usync-content-preview': uSyncContentPreviewElement;
-    }
-}