Skip to content

Commit 430aee3

Browse files
authored
Merge branch 'main' into v14/feature/property-type-workspace
2 parents e1bd845 + 9f9dc56 commit 430aee3

File tree

94 files changed

+248
-167
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+248
-167
lines changed

package-lock.json

Lines changed: 44 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@
141141
"./src/packages/health-check",
142142
"./src/packages/tags",
143143
"./src/packages/templating",
144-
"./src/packages/property-editors"
144+
"./src/packages/property-editors",
145+
"./src/packages/media"
145146
],
146147
"scripts": {
147148
"backoffice:test:e2e": "npx playwright test",
@@ -180,7 +181,7 @@
180181
"test:dev": "web-test-runner --config ./web-test-runner.dev.config.mjs",
181182
"test:dev-watch": "web-test-runner --watch --config ./web-test-runner.dev.config.mjs",
182183
"test:watch": "web-test-runner --watch",
183-
"test": "web-test-runner --coverage",
184+
"test": "web-test-runner",
184185
"wc-analyze:vscode": "wca **/*.element.ts --format vscode --outFile dist-cms/vscode-html-custom-data.json",
185186
"wc-analyze": "wca **/*.element.ts --outFile dist-cms/custom-elements.json",
186187
"generate:tsconfig": "node ./devops/tsconfig/index.js",
@@ -216,7 +217,7 @@
216217
"@hey-api/openapi-ts": "^0.48.1",
217218
"@mdx-js/react": "^3.0.0",
218219
"@open-wc/testing": "^4.0.0",
219-
"@playwright/test": "^1.41.1",
220+
"@playwright/test": "^1.45.1",
220221
"@rollup/plugin-commonjs": "^25.0.7",
221222
"@rollup/plugin-json": "^6.1.0",
222223
"@rollup/plugin-node-resolve": "^15.2.3",

src/packages/core/extension-registry/utils/create-extension-api-by-alias.test.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import type { ManifestApi } from '../../../../libs/extension-api/types/index.js';
2-
import type { UmbApi } from '../../../../libs/extension-api/models/api.interface.js';
31
import { createExtensionApiByAlias } from './create-extension-api-by-alias.function.js';
2+
import type { ManifestApi, UmbApi } from '@umbraco-cms/backoffice/extension-api';
43
import { expect, fixture } from '@open-wc/testing';
54
import { customElement, html } from '@umbraco-cms/backoffice/external/lit';
65
import { UmbControllerHostElementMixin } from '@umbraco-cms/backoffice/controller-api';
@@ -54,15 +53,16 @@ describe('Create Extension Api By Alias Method', () => {
5453
};
5554
umbExtensionsRegistry.register(manifest);
5655

57-
createExtensionApiByAlias<UmbExtensionApiBoolTestClass>(hostElement, manifest.alias, []).then(() => {
58-
umbExtensionsRegistry.unregister(manifest.alias);
59-
done(new Error('Should not resolve'));
60-
});
61-
62-
setTimeout(() => {
63-
umbExtensionsRegistry.unregister(manifest.alias);
64-
done();
65-
}, 10);
56+
createExtensionApiByAlias<UmbExtensionApiBoolTestClass>(hostElement, manifest.alias, []).then(
57+
() => {
58+
umbExtensionsRegistry.unregister(manifest.alias);
59+
done(new Error('Should not resolve'));
60+
},
61+
() => {
62+
umbExtensionsRegistry.unregister(manifest.alias);
63+
done();
64+
},
65+
);
6666
});
6767

6868
it('Handles when `api` property contains a class constructor', async () => {
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const UMB_IMAGING_REPOSITORY_ALIAS = 'Umb.Repository.Imaging';

src/packages/media/imaging/imaging.repository.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,5 @@ export class UmbImagingRepository extends UmbControllerBase implements UmbApi {
4040
return await this.requestResizedItems(uniques, imagingModel);
4141
}
4242
}
43+
44+
export { UmbImagingRepository as api };

src/packages/media/imaging/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
export { UmbImagingRepository } from './imaging.repository.js';
2-
export { UMB_IMAGING_REPOSITORY_ALIAS } from './manifests.js';
2+
export { UMB_IMAGING_REPOSITORY_ALIAS } from './constants.js';
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
import { UmbImagingRepository } from './imaging.repository.js';
1+
import { UMB_IMAGING_REPOSITORY_ALIAS } from './constants.js';
22
import type { ManifestRepository, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
33

4-
export const UMB_IMAGING_REPOSITORY_ALIAS = 'Umb.Repository.Imaging';
5-
64
const repository: ManifestRepository = {
75
type: 'repository',
86
alias: UMB_IMAGING_REPOSITORY_ALIAS,
97
name: 'Imaging Repository',
10-
api: UmbImagingRepository,
8+
api: () => import('./imaging.repository.js'),
119
};
1210

1311
export const manifests: Array<ManifestTypes> = [repository];

src/packages/media/manifests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { manifests as mediaManifests } from './media/manifests.js';
2-
import { manifests as mediaSectionManifests } from './section.manifests.js';
2+
import { manifests as mediaSectionManifests } from './media-section/manifests.js';
33
import { manifests as mediaTypesManifests } from './media-types/manifests.js';
44
import { manifests as imagingManifests } from './imaging/manifests.js';
55
import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const UMB_MEDIA_SECTION_ALIAS = 'Umb.Section.Media';

src/packages/media/section.manifests.ts renamed to src/packages/media/media-section/manifests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { UMB_MEDIA_ROOT_ENTITY_TYPE, UMB_MEDIA_MENU_ALIAS } from './media/index.js';
1+
import { UMB_MEDIA_ROOT_ENTITY_TYPE, UMB_MEDIA_MENU_ALIAS } from '../media/index.js';
22
import type {
33
ManifestSection,
44
ManifestSectionSidebarApp,

0 commit comments

Comments
 (0)