Skip to content

Commit 8a31632

Browse files
madsrasmussenmadsrasmussen
committed
Merge branch 'v14/chore/bundle-core-package' into v14/chore/check-paths-in-dist-cms
2 parents 6e072e2 + 9287f8c commit 8a31632

File tree

11 files changed

+136
-9
lines changed

11 files changed

+136
-9
lines changed

‎package-lock.json

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

‎package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@
126126
"url": "https://umbraco.com"
127127
},
128128
"workspaces": [
129+
"./src/packages/block",
130+
"./src/packages/core",
129131
"./src/packages/data-type",
130132
"./src/packages/dictionary",
131133
"./src/packages/documents",
@@ -257,7 +259,7 @@
257259
"tiny-glob": "^0.2.9",
258260
"tsc-alias": "^1.8.8",
259261
"typedoc": "^0.25.13",
260-
"typescript": "^5.4.5",
262+
"typescript": "^5.5.2",
261263
"typescript-json-schema": "^0.63.0",
262264
"vite": "^5.2.9",
263265
"vite-plugin-static-copy": "^1.0.5",

‎src/packages/block/block-type/components/block-type-card/block-type-card.element.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ export class UmbBlockTypeCardElement extends UmbLitElement {
4646
@state()
4747
_name?: string;
4848

49+
@state()
50+
_description?: string;
51+
4952
@state()
5053
_fallbackIcon?: string | null;
5154

@@ -57,6 +60,7 @@ export class UmbBlockTypeCardElement extends UmbLitElement {
5760
if (item) {
5861
this._fallbackIcon = item.icon;
5962
this._name = item.name;
63+
this._description = item.description ?? undefined;
6064
}
6165
});
6266
}
@@ -67,6 +71,7 @@ export class UmbBlockTypeCardElement extends UmbLitElement {
6771
<uui-card-block-type
6872
href=${ifDefined(this.href)}
6973
.name=${this._name ?? 'Unknown'}
74+
.description=${this._description}
7075
.background=${this.backgroundColor}>
7176
${this.iconFile
7277
? html`<img src=${this.iconFile} alt="" />`

‎src/packages/block/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"name": "@umbraco-backoffice/block",
3+
"private": true,
4+
"type": "module",
5+
"scripts": {
6+
"build": "vite build"
7+
}
8+
}

‎src/packages/block/vite.config.ts

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import { defineConfig } from 'vite';
2+
import { rmSync } from 'fs';
3+
import { getDefaultConfig } from '../../vite-config-base';
4+
5+
const dist = '../../../dist-cms/packages/block';
6+
7+
// delete the unbundled dist folder
8+
rmSync(dist, { recursive: true, force: true });
9+
10+
export default defineConfig({
11+
...getDefaultConfig({
12+
dist,
13+
entry: {
14+
'block/index': 'block/index.ts',
15+
'block-grid/index': 'block-grid/index.ts',
16+
'block-list/index': 'block-list/index.ts',
17+
'block-rte/index': 'block-rte/index.ts',
18+
'block-type/index': 'block-type/index.ts',
19+
manifests: 'manifests.ts',
20+
'umbraco-package': 'umbraco-package.ts',
21+
},
22+
}),
23+
});

‎src/packages/core/content-type/workspace/views/design/content-type-design-editor.element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
475475
renderTabInner(tab: UmbPropertyTypeContainerModel, tabActive: boolean, ownedTab: boolean) {
476476
// TODO: Localize this:
477477
if (this._sortModeActive) {
478-
return html`<div class="not-active">
478+
return html`<div class="tab">
479479
${ownedTab
480480
? html`<uui-icon name="icon-navigation" class="drag-${tab.id}"> </uui-icon>${tab.name!}
481481
<uui-input

‎src/packages/core/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"name": "@umbraco-backoffice/core",
3+
"private": true,
4+
"type": "module",
5+
"scripts": {
6+
"build": "vite build"
7+
}
8+
}

‎src/packages/core/vite.config.ts

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
import { defineConfig } from 'vite';
2+
import { rmSync } from 'fs';
3+
import { getDefaultConfig } from '../../vite-config-base';
4+
5+
const dist = '../../../dist-cms/packages/core';
6+
7+
// delete the unbundled dist folder
8+
rmSync(dist, { recursive: true, force: true });
9+
10+
export default defineConfig({
11+
...getDefaultConfig({
12+
dist,
13+
entry: {
14+
'action/index': './action/index.ts',
15+
'audit-log/index': './audit-log/index.ts',
16+
'auth/index': './auth/index.ts',
17+
'collection/index': './collection/index.ts',
18+
'components/index': './components/index.ts',
19+
'content-type/index': './content-type/index.ts',
20+
'content/index': './content/index.ts',
21+
'culture/index': './culture/index.ts',
22+
'debug/index': './debug/index.ts',
23+
'entity-action/index': './entity-action/index.ts',
24+
'entity-bulk-action/index': './entity-bulk-action/index.ts',
25+
'entity/index': './entity/index.ts',
26+
'entry-point': 'entry-point.ts',
27+
'event/index': './event/index.ts',
28+
'extension-registry/index': './extension-registry/index.ts',
29+
'icon-registry/index': './icon-registry/index.ts',
30+
'id/index': './id/index.ts',
31+
'lit-element/index': './lit-element/index.ts',
32+
'localization/index': './localization/index.ts',
33+
'menu/index': './menu/index.ts',
34+
'modal/index': './modal/index.ts',
35+
'models/index': './models/index.ts',
36+
'notification/index': './notification/index.ts',
37+
'picker-input/index': './picker-input/index.ts',
38+
'property-action/index': './property-action/index.ts',
39+
'property-editor/index': './property-editor/index.ts',
40+
'property/index': './property/index.ts',
41+
'recycle-bin/index': './recycle-bin/index.ts',
42+
'repository/index': './repository/index.ts',
43+
'resources/index': './resources/index.ts',
44+
'router/index': './router/index.ts',
45+
'section/index': './section/index.ts',
46+
'server-file-system/index': './server-file-system/index.ts',
47+
'sorter/index': './sorter/index.ts',
48+
'store/index': './store/index.ts',
49+
'style/index': './style/index.ts',
50+
'temporary-file/index': './temporary-file/index.ts',
51+
'themes/index': './themes/index.ts',
52+
'tree/index': './tree/index.ts',
53+
'utils/index': './utils/index.ts',
54+
'validation/index': './validation/index.ts',
55+
'variant/index': './variant/index.ts',
56+
'workspace/index': './workspace/index.ts',
57+
//'settings/index': './settings/index.ts', // currently no index file so it is left out
58+
manifests: 'manifests.ts',
59+
},
60+
}),
61+
});

‎src/packages/documents/document-types/repository/item/document-type-item.server.data-source.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,6 @@ const mapper = (item: DocumentTypeItemResponseModel): UmbDocumentTypeItemModel =
3535
icon: item.icon,
3636
unique: item.id,
3737
name: item.name,
38+
description: item.description,
3839
};
3940
};

‎src/packages/documents/document-types/repository/item/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ export type UmbDocumentTypeItemModel = {
66
name: string;
77
isElement: boolean;
88
icon?: string | null;
9+
description?: string | null;
910
};

0 commit comments

Comments
 (0)