diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc74f13..7cc385c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -179,7 +179,7 @@ jobs: - name: Print media tree if: always() - run: tree ${{ env.XBK_DIR}} /f + run: tree ${{ github.workspace }} /f - name: Print content items table if: always() diff --git a/Directory.Build.props b/Directory.Build.props index bee8dec..b90719c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -5,7 +5,7 @@ $(Company) Copyright © $(Company) $([System.DateTime]::Now.Year) $(Company)™ - 2.0.0 + 3.0.0 MIT diff --git a/Directory.Packages.props b/Directory.Packages.props index 844df47..6dd3bf3 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -7,32 +7,36 @@ - - - - - + + + + + + + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - - - - - + + + + + + - + \ No newline at end of file diff --git a/README.md b/README.md index 615d335..d609fa5 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ The Xperience by Kentico: Universal Migration Tool (UMT) is an open-source set o | Xperience Version | Library Version | | ----------------- | --------------- | +| >= 30.0.0 | >= 3.0.0 | | >= 29.7.0 | >= 1.10.0 | | >= 29.6.0 | >= 1.9.0 | | >= 29.5.0 | >= 1.7.0 | diff --git a/docs/Enums/FormComponents.md b/docs/Enums/FormComponents.md index 862e19f..e17e0a6 100644 --- a/docs/Enums/FormComponents.md +++ b/docs/Enums/FormComponents.md @@ -71,9 +71,9 @@ |`string`|`Kentico.Administration.CodeEditor`|`CodeEditorComponent`|`CodeEditorProperties`|| |`string`|`Kentico.Administration.ConditionBuilder`|`ConditionBuilderComponent`|`ConditionBuilderProperties`|| |`string`|`Kentico.Administration.DropDownSelector`|`DropDownComponent`|`DropDownProperties`|| +|`string`||`DropDownComponentBase`|`TProperties`|**abstract**| |`string`|`Kentico.Administration.ExtensionSelector`|`ExtensionSelectorComponent`|`ExtensionSelectorProperties`|| -|`string`|`Kentico.Administration.IconSelector`|`IconSelectorComponent`|`IconSelectorClientProperties`|| -|`string`|`Kentico.Administration.IconSelector`|`IconSelectorComponent`|`IconSelectorClientProperties`|| +|`string`|`Kentico.Administration.IconSelector`|`IconSelectorComponent`|`IconSelectorProperties`|| |`string`|`Kentico.Administration.Link`|`LinkComponent`|`LinkProperties`|| |`string`|`Kentico.Administration.Password`|`PasswordComponent`|`PasswordProperties`|| |`string`|`Kentico.Administration.RadioGroup`|`RadioGroupComponent`|`RadioGroupProperties`|| diff --git a/docs/Model/ContentFolderModel.md b/docs/Model/ContentFolderModel.md index 0c87908..d91b1d3 100644 --- a/docs/Model/ContentFolderModel.md +++ b/docs/Model/ContentFolderModel.md @@ -8,6 +8,7 @@ Model [discriminator](../UmtModel.md#discriminator): `ContentFolder` |---|---|---|---| |ContentFolderGUID\*||System.Guid?|[UniqueId](../UmtModel.md#UniqueId)| |ContentFolderParentFolderGUID|parent folder guid. If null is specified, folder is created directly under root|System.Guid?|Reference to [ContentFolderInfo](../References.md#ContentFolderInfo) on property ContentFolderParentFolderID| +|ContentFolderWorkspaceGUID|workspace guid. If null is specified, default workspace is used|System.Guid?|Reference to [ContentFolderInfo](../References.md#ContentFolderInfo) on property ContentFolderWorkspaceID| |ContentFolderName\*||string?|| |ContentFolderDisplayName\*||string?|| |ContentFolderTreePath\*||string?|| diff --git a/docs/Model/ContentItemCommonDataModel.md b/docs/Model/ContentItemCommonDataModel.md index e50b03a..b6f5d36 100644 --- a/docs/Model/ContentItemCommonDataModel.md +++ b/docs/Model/ContentItemCommonDataModel.md @@ -9,8 +9,8 @@ Model [discriminator](../UmtModel.md#discriminator): `ContentItemCommonData` |ContentItemCommonDataContentLanguageGuid\*||System.Guid?|Reference to [ContentLanguageInfo](../References.md#ContentLanguageInfo) on property ContentItemCommonDataContentLanguageID **required**| |ContentItemCommonDataVersionStatus\*||CMS.ContentEngine.VersionStatus?|| |ContentItemCommonDataIsLatest\*||bool?|| -|ContentItemCommonDataPageBuilderWidgets||string?|| -|ContentItemCommonDataPageTemplateConfiguration||string?|| +|ContentItemCommonDataVisualBuilderWidgets||string?|| +|ContentItemCommonDataVisualBuilderTemplateConfiguration||string?|| |[customPropertyName]|custom property defined by created [DataClass](./DataClassModel.md)|.NET type defined by data class field||

*) value is required

diff --git a/docs/Model/ContentItemModel.md b/docs/Model/ContentItemModel.md index 70449a7..f60d96e 100644 --- a/docs/Model/ContentItemModel.md +++ b/docs/Model/ContentItemModel.md @@ -6,6 +6,7 @@ Model [discriminator](../UmtModel.md#discriminator): `ContentItem` |---|---|---|---| |ContentItemGUID\*||System.Guid?|[UniqueId](../UmtModel.md#UniqueId)| |ContentItemContentFolderGUID|reference to content folder|System.Guid?|Reference to [ContentFolderInfo](../References.md#ContentFolderInfo) on property ContentItemContentFolderID| +|ContentItemWorkspaceGUID|reference to workspace|System.Guid?|Reference to [WorkspaceInfo](../References.md#WorkspaceInfo) on property ContentItemWorkspaceID| |ContentItemName\*||string?|| |ContentItemIsReusable\*||bool?|| |ContentItemIsSecured||bool?|| diff --git a/docs/Model/ContentItemSimplifiedModel.md b/docs/Model/ContentItemSimplifiedModel.md index a3d24c3..119dd81 100644 --- a/docs/Model/ContentItemSimplifiedModel.md +++ b/docs/Model/ContentItemSimplifiedModel.md @@ -6,6 +6,7 @@ Model [discriminator](../UmtModel.md#discriminator): `ContentItemSimplified` |---|---|---|---| |ContentItemGUID\*||System.Guid?|[UniqueId](../UmtModel.md#UniqueId)| |ContentItemContentFolderGUID|Reference to content folder|System.Guid?|| +|ContentItemWorkspaceGUID|Reference to workspace|System.Guid?|| |IsSecured||bool?|| |ContentTypeName\*|Content item type name.|string?|| |Name\*|Code name of the content item.|string?|| diff --git a/docs/Model/UMT.schema.json b/docs/Model/UMT.schema.json index d1d6960..25f4393 100644 --- a/docs/Model/UMT.schema.json +++ b/docs/Model/UMT.schema.json @@ -119,13 +119,13 @@ "ContentItemCommonDataIsLatest": { "type": "boolean" }, - "ContentItemCommonDataPageBuilderWidgets": { + "ContentItemCommonDataVisualBuilderWidgets": { "type": [ "null", "string" ] }, - "ContentItemCommonDataPageTemplateConfiguration": { + "ContentItemCommonDataVisualBuilderTemplateConfiguration": { "type": [ "null", "string" @@ -323,6 +323,14 @@ "description": "reference to content folder", "format": "guid" }, + "ContentItemWorkspaceGUID": { + "type": [ + "null", + "string" + ], + "description": "reference to workspace", + "format": "guid" + }, "ContentItemName": { "type": "string", "minLength": 1 @@ -445,6 +453,14 @@ "description": "parent folder guid. If null is specified, folder is created directly under root", "format": "guid" }, + "ContentFolderWorkspaceGUID": { + "type": [ + "null", + "string" + ], + "description": "workspace guid. If null is specified, default workspace is used", + "format": "guid" + }, "ContentFolderName": { "type": "string", "minLength": 1 diff --git a/docs/Samples/basic.json b/docs/Samples/basic.json index cf914c6..a848974 100644 --- a/docs/Samples/basic.json +++ b/docs/Samples/basic.json @@ -478,6 +478,7 @@ "$type": "ContentItem", "ContentItemGUID": "c354427d-3d02-4876-8ed4-4de817fae929", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "ContentItemName": "NewsLetterExampleName", "ContentItemIsReusable": true, "ContentItemIsSecured": true, @@ -556,6 +557,7 @@ "$type": "ContentItem", "ContentItemGUID": "b64b3e3e-f5a9-4d02-8cdb-6d81805c0fee", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "ContentItemName": "SampleReusableFaq", "ContentItemIsReusable": true, "ContentItemIsSecured": true, @@ -569,8 +571,8 @@ "ContentItemCommonDataContentLanguageGuid": "f454e93b-5fe9-42a9-b1af-b572234ed9c4", "ContentItemCommonDataVersionStatus": 2, "ContentItemCommonDataIsLatest": true, - "ContentItemCommonDataPageBuilderWidgets": null, - "ContentItemCommonDataPageTemplateConfiguration": null + "ContentItemCommonDataVisualBuilderWidgets": null, + "ContentItemCommonDataVisualBuilderTemplateConfiguration": null }, { "$type": "ContentItemCommonData", @@ -579,8 +581,8 @@ "ContentItemCommonDataContentLanguageGuid": "a6c0a558-8b33-47b6-87a8-491b437c9923", "ContentItemCommonDataVersionStatus": 2, "ContentItemCommonDataIsLatest": true, - "ContentItemCommonDataPageBuilderWidgets": null, - "ContentItemCommonDataPageTemplateConfiguration": null + "ContentItemCommonDataVisualBuilderWidgets": null, + "ContentItemCommonDataVisualBuilderTemplateConfiguration": null }, { "$type": "ContentItemData", @@ -632,6 +634,7 @@ "$type": "ContentItem", "ContentItemGUID": "df81215e-1414-4d87-befd-ae123f4e5653", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "ContentItemName": "CreationOfUmtModel", "ContentItemIsReusable": false, "ContentItemIsSecured": false, @@ -645,8 +648,8 @@ "ContentItemCommonDataContentLanguageGuid": "f454e93b-5fe9-42a9-b1af-b572234ed9c4", "ContentItemCommonDataVersionStatus": 2, "ContentItemCommonDataIsLatest": true, - "ContentItemCommonDataPageBuilderWidgets": null, - "ContentItemCommonDataPageTemplateConfiguration": null + "ContentItemCommonDataVisualBuilderWidgets": null, + "ContentItemCommonDataVisualBuilderTemplateConfiguration": null }, { "$type": "ContentItemCommonData", @@ -655,8 +658,8 @@ "ContentItemCommonDataContentLanguageGuid": "a6c0a558-8b33-47b6-87a8-491b437c9923", "ContentItemCommonDataVersionStatus": 2, "ContentItemCommonDataIsLatest": true, - "ContentItemCommonDataPageBuilderWidgets": null, - "ContentItemCommonDataPageTemplateConfiguration": null + "ContentItemCommonDataVisualBuilderWidgets": null, + "ContentItemCommonDataVisualBuilderTemplateConfiguration": null }, { "$type": "ContentItemData", @@ -765,6 +768,7 @@ "$type": "ContentItem", "ContentItemGUID": "e09121ad-dd97-472f-b8f6-85fe5428ed6a", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "ContentItemName": "Content-item-with-relations", "ContentItemIsReusable": false, "ContentItemIsSecured": true, @@ -778,8 +782,8 @@ "ContentItemCommonDataContentLanguageGuid": "f454e93b-5fe9-42a9-b1af-b572234ed9c4", "ContentItemCommonDataVersionStatus": 0, "ContentItemCommonDataIsLatest": true, - "ContentItemCommonDataPageBuilderWidgets": null, - "ContentItemCommonDataPageTemplateConfiguration": null + "ContentItemCommonDataVisualBuilderWidgets": null, + "ContentItemCommonDataVisualBuilderTemplateConfiguration": null }, { "$type": "ContentItemCommonData", @@ -788,8 +792,8 @@ "ContentItemCommonDataContentLanguageGuid": "a6c0a558-8b33-47b6-87a8-491b437c9923", "ContentItemCommonDataVersionStatus": 2, "ContentItemCommonDataIsLatest": true, - "ContentItemCommonDataPageBuilderWidgets": null, - "ContentItemCommonDataPageTemplateConfiguration": null + "ContentItemCommonDataVisualBuilderWidgets": null, + "ContentItemCommonDataVisualBuilderTemplateConfiguration": null }, { "$type": "ContentItemData", @@ -904,6 +908,7 @@ "$type": "ContentFolder", "ContentFolderGUID": "7665a8fc-53a2-4aff-86e8-99b009104ff2", "ContentFolderParentFolderGUID": null, + "ContentFolderWorkspaceGUID": null, "ContentFolderName": "articles", "ContentFolderDisplayName": "Articles", "ContentFolderTreePath": "/articles" @@ -912,6 +917,7 @@ "$type": "ContentFolder", "ContentFolderGUID": "ae29c1d1-217a-45da-8b30-585d1881387e", "ContentFolderParentFolderGUID": "7665a8fc-53a2-4aff-86e8-99b009104ff2", + "ContentFolderWorkspaceGUID": null, "ContentFolderName": "obsolete", "ContentFolderDisplayName": "Obsolete", "ContentFolderTreePath": "/articles/obsolete" @@ -920,6 +926,7 @@ "$type": "ContentItemSimplified", "ContentItemGUID": "37c3f5dd-6f2a-4eff-b46e-a36eddebf572", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "IsSecured": false, "ContentTypeName": "UMT.Article", "Name": "SimplifiedModelSample", @@ -990,6 +997,7 @@ "$type": "ContentItemSimplified", "ContentItemGUID": "9ed8de86-859c-4f6c-94f2-cdd6baed99fe", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "IsSecured": false, "ContentTypeName": "UMT.Article", "Name": "SimplifiedModelSampleAsSubPage", @@ -1058,6 +1066,7 @@ "$type": "ContentItemSimplified", "ContentItemGUID": "017edc1e-95c6-43e4-89d5-716c6ae594b2", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "IsSecured": false, "ContentTypeName": "UMT.Article", "Name": "SimplifiedModelSampleAsSubPage2_Draft", @@ -1168,6 +1177,7 @@ "$type": "ContentItemSimplified", "ContentItemGUID": "73298f71-0bb1-4083-a674-a876769e3dd9", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "IsSecured": false, "ContentTypeName": "UMT.Article", "Name": "SimplifiedModelSampleAsSubPage3_Draft", @@ -1278,6 +1288,7 @@ "$type": "ContentItemSimplified", "ContentItemGUID": "8e957ecc-083b-4c86-b761-8db516c13737", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "IsSecured": false, "ContentTypeName": "UMT.Article", "Name": "SimplifiedModelSampleAsSubPage4", @@ -1331,6 +1342,7 @@ "$type": "ContentItemSimplified", "ContentItemGUID": "bb5c0eb4-e688-4a97-99c7-fa97cad8f1d5", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "IsSecured": false, "ContentTypeName": "UMT.Article", "Name": "SimplifiedModelSampleAsSubPage5", @@ -1384,6 +1396,7 @@ "$type": "ContentItemSimplified", "ContentItemGUID": "1d542076-dd88-4c13-a8aa-0ffecdabba69", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "IsSecured": false, "ContentTypeName": "UMT.Article", "Name": "SimplifiedModelSampleAsSubPage6", @@ -1437,6 +1450,7 @@ "$type": "ContentItemSimplified", "ContentItemGUID": "fb66242f-4186-4f71-b0b8-fc68b51d52c1", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "IsSecured": false, "ContentTypeName": "UMT.Article", "Name": "SimplifiedModelSampleAsSubPage7", @@ -1490,6 +1504,7 @@ "$type": "ContentItemSimplified", "ContentItemGUID": "f9cb9484-ce90-460f-a5c8-ad953e2b9286", "ContentItemContentFolderGUID": "ae29c1d1-217a-45da-8b30-585d1881387e", + "ContentItemWorkspaceGUID": null, "IsSecured": false, "ContentTypeName": "UMT.Faq", "Name": "SimplifiedModelSampleReusable", @@ -1529,6 +1544,7 @@ "$type": "ContentItemSimplified", "ContentItemGUID": "c82cdc96-65ec-4f4c-aec2-3d657e6d5ce1", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "IsSecured": false, "ContentTypeName": "UMT.Event", "Name": "SimplifiedModelSampleEventWithAssets", @@ -1556,7 +1572,9 @@ "Name": "byteArraySample.jpg", "Extension": ".jpg", "Size": null, - "LastModified": null + "LastModified": null, + "ImageWidth": null, + "ImageHeight": null } } }, @@ -1581,7 +1599,9 @@ "Name": "urlSourceSample.jpg", "Extension": ".jpg", "Size": null, - "LastModified": null + "LastModified": null, + "ImageWidth": null, + "ImageHeight": null } } } diff --git a/examples/Kentico.Xperience.UMT.Example.AdminApp/Client/package-lock.json b/examples/Kentico.Xperience.UMT.Example.AdminApp/Client/package-lock.json index b9cb1ba..cd9a286 100644 --- a/examples/Kentico.Xperience.UMT.Example.AdminApp/Client/package-lock.json +++ b/examples/Kentico.Xperience.UMT.Example.AdminApp/Client/package-lock.json @@ -8,11 +8,11 @@ "name": "umt-web-admin", "version": "1.0.0", "dependencies": { - "@kentico/xperience-admin-base": "^29.7.0", - "@kentico/xperience-admin-components": "^29.7.0", + "@kentico/xperience-admin-base": "^30.0.0", + "@kentico/xperience-admin-components": "^30.0.0", "copy-webpack-plugin": "^12.0.2", - "react": "^18.3.1", - "react-dom": "^18.3.1", + "react": "^19.0.0", + "react-dom": "^19.0.0", "sse": "^0.0.8", "sse.js": "^2.5.0" }, @@ -20,23 +20,23 @@ "@babel/core": "^7.26.0", "@babel/plugin-transform-runtime": "^7.25.9", "@babel/preset-env": "^7.26.0", - "@babel/preset-react": "^7.25.9", + "@babel/preset-react": "^7.26.3", "@babel/preset-typescript": "^7.26.0", - "@kentico/xperience-webpack-config": "^29.7.0", - "@types/react": "^18.3.12", - "@types/react-dom": "^18.3.1", + "@kentico/xperience-webpack-config": "^30.0.0", + "@types/react": "^19.0.1", + "@types/react-dom": "^19.0.2", "babel-loader": "^9.2.1", "css-loader": "^7.1.2", "style-loader": "^4.0.0", - "webpack": "^5.96.1", + "webpack": "^5.97.1", "webpack-cli": "^5.1.4", - "webpack-dev-server": "^5.1.0" + "webpack-dev-server": "^5.2.0" } }, "node_modules/@amcharts/amcharts5": { - "version": "5.10.7", - "resolved": "https://registry.npmjs.org/@amcharts/amcharts5/-/amcharts5-5.10.7.tgz", - "integrity": "sha512-8ZH2DwZzx3hIVUaoClrxps18qq6duBvorCNAZ45OWnP5xfHEHvYn1ofsMw0FhBjKjj8QZHu8KDwKwLG5sLWMgg==", + "version": "5.10.8", + "resolved": "https://registry.npmjs.org/@amcharts/amcharts5/-/amcharts5-5.10.8.tgz", + "integrity": "sha512-w4mMzhJuay5aOB27UR12WTBUE3/8Y3uOZ0TAEkK7iLDwcQC3uu7o5IqrTD4necvkaIwxKZ1q6dI5okTAGwcmBA==", "dependencies": { "@types/d3": "^7.0.0", "@types/d3-chord": "^3.0.0", @@ -1587,9 +1587,9 @@ } }, "node_modules/@babel/preset-react": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz", - "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==", + "version": "7.26.3", + "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz", + "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.25.9", @@ -1707,9 +1707,9 @@ } }, "node_modules/@codemirror/lang-css": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.3.0.tgz", - "integrity": "sha512-CyR4rUNG9OYcXDZwMPvJdtb6PHbBDKUc/6Na2BIwZ6dKab1JQqKa4di+RNRY9Myn7JB81vayKwJeQ7jEdmNVDA==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.3.1.tgz", + "integrity": "sha512-kr5fwBGiGtmz6l0LSJIbno9QrifNMUusivHbnA1H6Dmqy4HZFte3UAICix1VuKo0lMPKQr2rqB+0BkKi/S3Ejg==", "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.0.0", @@ -1775,9 +1775,9 @@ } }, "node_modules/@codemirror/language": { - "version": "6.10.3", - "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.3.tgz", - "integrity": "sha512-kDqEU5sCP55Oabl6E7m5N+vZRoc0iWqgDVhEKifcHzPzjqCegcO4amfrYVL9PmPZpl4G0yjkpTpUO/Ui8CzO8A==", + "version": "6.10.6", + "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.6.tgz", + "integrity": "sha512-KrsbdCnxEztLVbB5PycWXFxas4EOyk/fPAfruSOnDDppevQgid2XZ+KbJ9u+fDikP/e7MW7HPBTvTb8JlZK9vA==", "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.23.0", @@ -1788,19 +1788,19 @@ } }, "node_modules/@codemirror/lint": { - "version": "6.8.2", - "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.2.tgz", - "integrity": "sha512-PDFG5DjHxSEjOXk9TQYYVjZDqlZTFaDBfhQixHnQOEVDDNHUbEh/hstAjcQJaA6FQdZTD1hquXTK0rVBLADR1g==", + "version": "6.8.4", + "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.4.tgz", + "integrity": "sha512-u4q7PnZlJUojeRe8FJa/njJcMctISGgPQ4PnWsd9268R4ZTtU+tfFYmwkBvgcrK2+QQ8tYFVALVb5fVJykKc5A==", "dependencies": { "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.0.0", + "@codemirror/view": "^6.35.0", "crelt": "^1.0.5" } }, "node_modules/@codemirror/search": { - "version": "6.5.7", - "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.7.tgz", - "integrity": "sha512-6+iLsXvITWKHYlkgHPCs/qiX4dNzn8N78YfhOFvPtPYCkuXqZq10rAfsUMhOq7O/1VjJqdXRflyExlfVcu/9VQ==", + "version": "6.5.8", + "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.8.tgz", + "integrity": "sha512-PoWtZvo7c1XFeZWmmyaOp2G0XVbOnm+fJzvghqGAktBW3cufwJUWvSCcNG0ppXiBEM05mZu6RhMtXPv2hpllig==", "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", @@ -1808,9 +1808,12 @@ } }, "node_modules/@codemirror/state": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz", - "integrity": "sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==" + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.0.tgz", + "integrity": "sha512-MwBHVK60IiIHDcoMet78lxt6iw5gJOGSbNbOIVBHWVXIH4/Nq1+GQgLLGgI1KlnN86WDXsPudVaqYHKBIx7Eyw==", + "dependencies": { + "@marijn/find-cluster-break": "^1.0.0" + } }, "node_modules/@codemirror/theme-one-dark": { "version": "6.1.2", @@ -1824,11 +1827,11 @@ } }, "node_modules/@codemirror/view": { - "version": "6.34.2", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.34.2.tgz", - "integrity": "sha512-d6n0WFvL970A9Z+l9N2dO+Hk9ev4hDYQzIx+B9tCyBP0W5wPEszi1rhuyFesNSkLZzXbQE5FPH7F/z/TMJfoPA==", + "version": "6.35.3", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.35.3.tgz", + "integrity": "sha512-ScY7L8+EGdPl4QtoBiOzE4FELp7JmNUsBvgBcCakXWM2uiv/K89VAzU3BMDscf0DsACLvTKePbd5+cFDTcei6g==", "dependencies": { - "@codemirror/state": "^6.4.0", + "@codemirror/state": "^6.5.0", "style-mod": "^4.1.0", "w3c-keyname": "^2.2.4" } @@ -1843,15 +1846,15 @@ } }, "node_modules/@emotion/babel-plugin": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.12.0.tgz", - "integrity": "sha512-y2WQb+oP8Jqvvclh8Q55gLUyb7UFvgv7eJfsj7td5TToBrIUtPay2kMrZi4xjq9qw2vD0ZR5fSho0yqoFgX7Rw==", + "version": "11.13.5", + "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz", + "integrity": "sha512-pxHCpT2ex+0q+HH91/zsdHkw/lXd468DIN2zvfvLtPKLLMo6gQj7oLObq8PhkrxOZb/gGCq03S3Z7PDhS8pduQ==", "dependencies": { "@babel/helper-module-imports": "^7.16.7", "@babel/runtime": "^7.18.3", "@emotion/hash": "^0.9.2", "@emotion/memoize": "^0.9.0", - "@emotion/serialize": "^1.2.0", + "@emotion/serialize": "^1.3.3", "babel-plugin-macros": "^3.1.0", "convert-source-map": "^1.5.0", "escape-string-regexp": "^4.0.0", @@ -1865,25 +1868,14 @@ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" }, - "node_modules/@emotion/babel-plugin/node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/@emotion/cache": { - "version": "11.13.1", - "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.13.1.tgz", - "integrity": "sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw==", + "version": "11.14.0", + "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.14.0.tgz", + "integrity": "sha512-L/B1lc/TViYk4DcpGxtAVbx0ZyiKM5ktoIyafGkH6zg/tj+mA+NE//aPYKG0k8kCHSHVJrpLpcAlOBEXQ3SavA==", "dependencies": { "@emotion/memoize": "^0.9.0", "@emotion/sheet": "^1.4.0", - "@emotion/utils": "^1.4.0", + "@emotion/utils": "^1.4.2", "@emotion/weak-memoize": "^0.4.0", "stylis": "4.2.0" } @@ -1899,16 +1891,16 @@ "integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==" }, "node_modules/@emotion/react": { - "version": "11.13.3", - "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.13.3.tgz", - "integrity": "sha512-lIsdU6JNrmYfJ5EbUCf4xW1ovy5wKQ2CkPRM4xogziOxH1nXxBSjpC9YqbFAP7circxMfYp+6x676BqWcEiixg==", + "version": "11.14.0", + "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz", + "integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==", "dependencies": { "@babel/runtime": "^7.18.3", - "@emotion/babel-plugin": "^11.12.0", - "@emotion/cache": "^11.13.0", - "@emotion/serialize": "^1.3.1", - "@emotion/use-insertion-effect-with-fallbacks": "^1.1.0", - "@emotion/utils": "^1.4.0", + "@emotion/babel-plugin": "^11.13.5", + "@emotion/cache": "^11.14.0", + "@emotion/serialize": "^1.3.3", + "@emotion/use-insertion-effect-with-fallbacks": "^1.2.0", + "@emotion/utils": "^1.4.2", "@emotion/weak-memoize": "^0.4.0", "hoist-non-react-statics": "^3.3.1" }, @@ -1922,14 +1914,14 @@ } }, "node_modules/@emotion/serialize": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.2.tgz", - "integrity": "sha512-grVnMvVPK9yUVE6rkKfAJlYZgo0cu3l9iMC77V7DW6E1DUIrU68pSEXRmFZFOFB1QFo57TncmOcvcbMDWsL4yA==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.3.tgz", + "integrity": "sha512-EISGqt7sSNWHGI76hC7x1CksiXPahbxEOrC5RjmFRJTqLyEK9/9hZvBbiYn70dw4wuwMKiEMCUlR6ZXTSWQqxA==", "dependencies": { "@emotion/hash": "^0.9.2", "@emotion/memoize": "^0.9.0", "@emotion/unitless": "^0.10.0", - "@emotion/utils": "^1.4.1", + "@emotion/utils": "^1.4.2", "csstype": "^3.0.2" } }, @@ -1944,17 +1936,17 @@ "integrity": "sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg==" }, "node_modules/@emotion/use-insertion-effect-with-fallbacks": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.1.0.tgz", - "integrity": "sha512-+wBOcIV5snwGgI2ya3u99D7/FJquOIniQT1IKyDsBmEgwvpxMNeS65Oib7OnE2d2aY+3BU4OiH+0Wchf8yk3Hw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.2.0.tgz", + "integrity": "sha512-yJMtVdH59sxi/aVJBpk9FQq+OR8ll5GT8oWd57UpeaKEVGab41JWaCFA7FRLoMLloOZF/c/wsPoe+bfGmRKgDg==", "peerDependencies": { "react": ">=16.8.0" } }, "node_modules/@emotion/utils": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.4.1.tgz", - "integrity": "sha512-BymCXzCG3r72VKJxaYVwOXATqXIZ85cuvg0YOUDxMGNrKc1DJRZk8MgV5wyXRyEayIMd4FuXJIUgTBXvDNW5cA==" + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.4.2.tgz", + "integrity": "sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA==" }, "node_modules/@emotion/weak-memoize": { "version": "0.4.0", @@ -1970,9 +1962,9 @@ } }, "node_modules/@floating-ui/dom": { - "version": "1.6.11", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.11.tgz", - "integrity": "sha512-qkMCxSR24v2vGkhYDo/UzxfJN3D4syqSjyuTFz6C7XcpU1pASPRieNI0Kj5VP3/503mOfYiGY891ugBX1GlABQ==", + "version": "1.6.12", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.12.tgz", + "integrity": "sha512-NP83c0HjokcGVEMeoStg317VD9W7eDlGK7457dMBANbKA6GJZdc7rjujdgqzTaz93jkGgc5P/jeWbaCHnMNc+w==", "dependencies": { "@floating-ui/core": "^1.6.0", "@floating-ui/utils": "^0.2.8" @@ -2051,79 +2043,80 @@ "integrity": "sha512-59SgoZ3EXbkfSX7b63tsou/SDGzwUEK6MuB5sKqgVK1/XE0fxmpsOb9DQI8LXW3KfGnAjImCGhhEb7uPPAUVNA==" }, "node_modules/@formatjs/ecma402-abstract": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.2.3.tgz", - "integrity": "sha512-aElGmleuReGnk2wtYOzYFmNWYoiWWmf1pPPCYg0oiIQSJj0mjc4eUfzUXaSOJ4S8WzI/cLqnCTWjqz904FT2OQ==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.3.1.tgz", + "integrity": "sha512-Ip9uV+/MpLXWRk03U/GzeJMuPeOXpJBSB5V1tjA6kJhvqssye5J5LoYLc7Z5IAHb7nR62sRoguzrFiVCP/hnzw==", "dependencies": { - "@formatjs/fast-memoize": "2.2.3", - "@formatjs/intl-localematcher": "0.5.7", + "@formatjs/fast-memoize": "2.2.5", + "@formatjs/intl-localematcher": "0.5.9", + "decimal.js": "10", "tslib": "2" } }, "node_modules/@formatjs/fast-memoize": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-2.2.3.tgz", - "integrity": "sha512-3jeJ+HyOfu8osl3GNSL4vVHUuWFXR03Iz9jjgI7RwjG6ysu/Ymdr0JRCPHfF5yGbTE6JCrd63EpvX1/WybYRbA==", + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-2.2.5.tgz", + "integrity": "sha512-6PoewUMrrcqxSoBXAOJDiW1m+AmkrAj0RiXnOMD59GRaswjXhm3MDhgepXPBgonc09oSirAJTsAggzAGQf6A6g==", "dependencies": { "tslib": "2" } }, "node_modules/@formatjs/icu-messageformat-parser": { - "version": "2.9.3", - "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.9.3.tgz", - "integrity": "sha512-9L99QsH14XjOCIp4TmbT8wxuffJxGK8uLNO1zNhLtcZaVXvv626N0s4A2qgRCKG3dfYWx9psvGlFmvyVBa6u/w==", + "version": "2.9.7", + "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.9.7.tgz", + "integrity": "sha512-cuEHyRM5VqLQobANOjtjlgU7+qmk9Q3fDQuBiRRJ3+Wp3ZoZhpUPtUfuimZXsir6SaI2TaAJ+SLo9vLnV5QcbA==", "dependencies": { - "@formatjs/ecma402-abstract": "2.2.3", - "@formatjs/icu-skeleton-parser": "1.8.7", + "@formatjs/ecma402-abstract": "2.3.1", + "@formatjs/icu-skeleton-parser": "1.8.11", "tslib": "2" } }, "node_modules/@formatjs/icu-skeleton-parser": { - "version": "1.8.7", - "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.7.tgz", - "integrity": "sha512-fI+6SmS2g7h3srfAKSWa5dwreU5zNEfon2uFo99OToiLF6yxGE+WikvFSbsvMAYkscucvVmTYNlWlaDPp0n5HA==", + "version": "1.8.11", + "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.11.tgz", + "integrity": "sha512-8LlHHE/yL/zVJZHAX3pbKaCjZKmBIO6aJY1mkVh4RMSEu/2WRZ4Ysvv3kKXJ9M8RJLBHdnk1/dUQFdod1Dt7Dw==", "dependencies": { - "@formatjs/ecma402-abstract": "2.2.3", + "@formatjs/ecma402-abstract": "2.3.1", "tslib": "2" } }, "node_modules/@formatjs/intl-localematcher": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.7.tgz", - "integrity": "sha512-GGFtfHGQVFe/niOZp24Kal5b2i36eE2bNL0xi9Sg/yd0TR8aLjcteApZdHmismP5QQax1cMnZM9yWySUUjJteA==", + "version": "0.5.9", + "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.9.tgz", + "integrity": "sha512-8zkGu/sv5euxbjfZ/xmklqLyDGQSxsLqg8XOq88JW3cmJtzhCP8EtSJXlaKZnVO4beEaoiT9wj4eIoCQ9smwxA==", "dependencies": { "tslib": "2" } }, "node_modules/@internationalized/date": { - "version": "3.5.6", - "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.5.6.tgz", - "integrity": "sha512-jLxQjefH9VI5P9UQuqB6qNKnvFt1Ky1TPIzHGsIlCi7sZZoMR8SdYbBGRvM0y+Jtb+ez4ieBzmiAUcpmPYpyOw==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.6.0.tgz", + "integrity": "sha512-+z6ti+CcJnRlLHok/emGEsWQhe7kfSmEW+/6qCzvKY67YPh7YOBfvc7+/+NXq+zJlbArg30tYpqLjNgcAYv2YQ==", "dependencies": { "@swc/helpers": "^0.5.0" } }, "node_modules/@internationalized/message": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@internationalized/message/-/message-3.1.5.tgz", - "integrity": "sha512-hjEpLKFlYA3m5apldLqzHqw531qqfOEq0HlTWdfyZmcloWiUbWsYXD6YTiUmQmOtarthzhdjCAwMVrB8a4E7uA==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@internationalized/message/-/message-3.1.6.tgz", + "integrity": "sha512-JxbK3iAcTIeNr1p0WIFg/wQJjIzJt9l/2KNY/48vXV7GRGZSv3zMxJsce008fZclk2cDC8y0Ig3odceHO7EfNQ==", "dependencies": { "@swc/helpers": "^0.5.0", "intl-messageformat": "^10.1.0" } }, "node_modules/@internationalized/number": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/@internationalized/number/-/number-3.5.4.tgz", - "integrity": "sha512-h9huwWjNqYyE2FXZZewWqmCdkw1HeFds5q4Siuoms3hUQC5iPJK3aBmkFZoDSLN4UD0Bl8G22L/NdHpeOr+/7A==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/@internationalized/number/-/number-3.6.0.tgz", + "integrity": "sha512-PtrRcJVy7nw++wn4W2OuePQQfTqDzfusSuY1QTtui4wa7r+rGVtR75pO8CyKvHvzyQYi3Q1uO5sY0AsB4e65Bw==", "dependencies": { "@swc/helpers": "^0.5.0" } }, "node_modules/@internationalized/string": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@internationalized/string/-/string-3.2.4.tgz", - "integrity": "sha512-BcyadXPn89Ae190QGZGDUZPqxLj/xsP4U1Br1oSy8yfIjmpJ8cJtGYleaodqW/EmzFjwELtwDojLkf3FhV6SjA==", + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/@internationalized/string/-/string-3.2.5.tgz", + "integrity": "sha512-rKs71Zvl2OKOHM+mzAFMIyqR5hI1d1O6BBkMK2/lkfg3fkmVh9Eeg0awcA8W2WqYqDOv6a86DIOlFpggwLtbuw==", "dependencies": { "@swc/helpers": "^0.5.0" } @@ -2240,11 +2233,11 @@ "integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==" }, "node_modules/@kentico/xperience-admin-base": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@kentico/xperience-admin-base/-/xperience-admin-base-29.7.0.tgz", - "integrity": "sha512-sj7/RA7Zl/6qKfguu+QZFFIDibuFi11EJ8I0w/QYXRr5dMGdhBY9pLSSfzwGOSHp2cXLcS3vGTWwpyxZxJWVfg==", + "version": "30.0.0", + "resolved": "https://registry.npmjs.org/@kentico/xperience-admin-base/-/xperience-admin-base-30.0.0.tgz", + "integrity": "sha512-xlo52QWieMMyG5j4j4rrweFwsXup/G8ystj56a56T1GzyKMVwjbGuVSM/h2RvaQPHzw8alJDXXEEypN0y2oc6g==", "dependencies": { - "@kentico/xperience-admin-components": "29.7.0", + "@kentico/xperience-admin-components": "30.0.0", "@react-aria/focus": "^3.15.0", "@react-aria/visually-hidden": "^3.8.7", "classnames": "^2.5.1", @@ -2254,21 +2247,22 @@ "react-dnd": "^16.0.1", "react-dnd-html5-backend": "^16.0.1", "react-dom": "^18.3.1", - "react-router-dom": "^6.28.0", + "react-image-crop": "^11.0.7", + "react-router-dom": "6.27.0", "react-select": "^5.8.3", - "react-select-async-paginate": "^0.7.6", + "react-select-async-paginate": "^0.7.7", "use-debounce": "^10.0.4", "use-resize-observer": "9.1.0", "uuid": "^11.0.3" } }, "node_modules/@kentico/xperience-admin-components": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@kentico/xperience-admin-components/-/xperience-admin-components-29.7.0.tgz", - "integrity": "sha512-pVuYkaVLy4uM8MlKZBR8fL9s8gPOPRsyI8I35/Ro7rfo+XJhfM67rPuanLHZPzbP83Hbr81oAO86yLT9lPcRIA==", + "version": "30.0.0", + "resolved": "https://registry.npmjs.org/@kentico/xperience-admin-components/-/xperience-admin-components-30.0.0.tgz", + "integrity": "sha512-nlm1TncPUGXPiOnPdvNZRnuSYjy/vzInnotWg7FKrqONzHvT5TnhvUgVbpo23H+pt5rcTG/Pglhy722I8PnyTw==", "dependencies": { - "@amcharts/amcharts5": "5.10.7", - "@codemirror/lang-css": "^6.3.0", + "@amcharts/amcharts5": "5.10.8", + "@codemirror/lang-css": "^6.3.1", "@codemirror/lang-html": "^6.4.9", "@codemirror/lang-javascript": "^6.2.2", "@codemirror/lang-sql": "^6.8.0", @@ -2284,17 +2278,17 @@ "@tippyjs/react": "^4.2.6", "@uiw/react-codemirror": "^4.23.6", "classnames": "^2.5.1", - "froala-editor": "4.3.0", + "froala-editor": "4.3.1", "react": "^18.3.1", "react-beautiful-dnd": "^13.1.1", "react-datepicker": "^7.5.0", "react-dnd": "^16.0.1", "react-dnd-html5-backend": "^16.0.1", "react-dom": "^18.3.1", - "react-froala-wysiwyg": "4.3.0", + "react-froala-wysiwyg": "4.3.1", "react-modal": "^3.16.1", - "react-router-dom": "^6.28.0", - "react-textarea-autosize": "8.5.4", + "react-router-dom": "6.27.0", + "react-textarea-autosize": "8.5.6", "use-debounce": "^10.0.4", "use-resize-observer": "9.1.0" } @@ -2338,9 +2332,9 @@ } }, "node_modules/@kentico/xperience-webpack-config": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@kentico/xperience-webpack-config/-/xperience-webpack-config-29.7.0.tgz", - "integrity": "sha512-CTVttgqpQeQ6fxd5hK3mlVhsxpwdIRivuI97R4L3mc6rLhskpo7/vbY3ZfeJfNsiGCq6LLyWtXZL0+aonSIsOw==", + "version": "30.0.0", + "resolved": "https://registry.npmjs.org/@kentico/xperience-webpack-config/-/xperience-webpack-config-30.0.0.tgz", + "integrity": "sha512-YXL2cWGn68zhYKD37BxAdfyRzIIpk8NK/kPS/Lc/WCGKfM+YYO+trX5i27GTR2yU50WSYEXNZYvMQ5fM5YJwbA==", "dev": true, "dependencies": { "systemjs-webpack-interop": "^2.3.7" @@ -2386,9 +2380,9 @@ } }, "node_modules/@lezer/javascript": { - "version": "1.4.19", - "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.19.tgz", - "integrity": "sha512-j44kbR1QL26l6dMunZ1uhKBFteVGLVCBGNUD2sUaMnic+rbTviVuoK0CD1l9FTW31EueWvFFswCKMH7Z+M3JRA==", + "version": "1.4.21", + "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.21.tgz", + "integrity": "sha512-lL+1fcuxWYPURMM/oFZLEDm0XuLN128QPV+VuGtKpeaOGdcl9F2LYC3nh1S9LkPqx9M0mndZFdXCipNAZpzIkQ==", "dependencies": { "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.1.3", @@ -2413,6 +2407,11 @@ "@lezer/lr": "^1.0.0" } }, + "node_modules/@marijn/find-cluster-break": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz", + "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==" + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -2455,50 +2454,50 @@ } }, "node_modules/@react-aria/focus": { - "version": "3.18.4", - "resolved": "https://registry.npmjs.org/@react-aria/focus/-/focus-3.18.4.tgz", - "integrity": "sha512-91J35077w9UNaMK1cpMUEFRkNNz0uZjnSwiyBCFuRdaVuivO53wNC9XtWSDNDdcO5cGy87vfJRVAiyoCn/mjqA==", + "version": "3.19.0", + "resolved": "https://registry.npmjs.org/@react-aria/focus/-/focus-3.19.0.tgz", + "integrity": "sha512-hPF9EXoUQeQl1Y21/rbV2H4FdUR2v+4/I0/vB+8U3bT1CJ+1AFj1hc/rqx2DqEwDlEwOHN+E4+mRahQmlybq0A==", "dependencies": { - "@react-aria/interactions": "^3.22.4", - "@react-aria/utils": "^3.25.3", - "@react-types/shared": "^3.25.0", + "@react-aria/interactions": "^3.22.5", + "@react-aria/utils": "^3.26.0", + "@react-types/shared": "^3.26.0", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1" } }, "node_modules/@react-aria/focus/node_modules/@react-aria/interactions": { - "version": "3.22.4", - "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.4.tgz", - "integrity": "sha512-E0vsgtpItmknq/MJELqYJwib+YN18Qag8nroqwjk1qOnBa9ROIkUhWJerLi1qs5diXq9LHKehZDXRlwPvdEFww==", + "version": "3.22.5", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.5.tgz", + "integrity": "sha512-kMwiAD9E0TQp+XNnOs13yVJghiy8ET8L0cbkeuTgNI96sOAp/63EJ1FSrDf17iD8sdjt41LafwX/dKXW9nCcLQ==", "dependencies": { - "@react-aria/ssr": "^3.9.6", - "@react-aria/utils": "^3.25.3", - "@react-types/shared": "^3.25.0", + "@react-aria/ssr": "^3.9.7", + "@react-aria/utils": "^3.26.0", + "@react-types/shared": "^3.26.0", "@swc/helpers": "^0.5.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1" } }, "node_modules/@react-aria/i18n": { - "version": "3.12.3", - "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.3.tgz", - "integrity": "sha512-0Tp/4JwnCVNKDfuknPF+/xf3/woOc8gUjTU2nCjO3mCVb4FU7KFtjxQ2rrx+6hpIVG6g+N9qfMjRa/ggVH0CJg==", - "dependencies": { - "@internationalized/date": "^3.5.6", - "@internationalized/message": "^3.1.5", - "@internationalized/number": "^3.5.4", - "@internationalized/string": "^3.2.4", - "@react-aria/ssr": "^3.9.6", - "@react-aria/utils": "^3.25.3", - "@react-types/shared": "^3.25.0", + "version": "3.12.4", + "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.4.tgz", + "integrity": "sha512-j9+UL3q0Ls8MhXV9gtnKlyozq4aM95YywXqnmJtzT1rYeBx7w28hooqrWkCYLfqr4OIryv1KUnPiCSLwC2OC7w==", + "dependencies": { + "@internationalized/date": "^3.6.0", + "@internationalized/message": "^3.1.6", + "@internationalized/number": "^3.6.0", + "@internationalized/string": "^3.2.5", + "@react-aria/ssr": "^3.9.7", + "@react-aria/utils": "^3.26.0", + "@react-types/shared": "^3.26.0", "@swc/helpers": "^0.5.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1" } }, "node_modules/@react-aria/interactions": { @@ -2516,16 +2515,16 @@ } }, "node_modules/@react-aria/label": { - "version": "3.7.12", - "resolved": "https://registry.npmjs.org/@react-aria/label/-/label-3.7.12.tgz", - "integrity": "sha512-u9xT90lAlgb7xiv+p0md9QwCHz65XL7tjS5e29e88Rs3ptkv3aQubTqxVOUTEwzbNUT4A1QqTjUm1yfHewIRUw==", + "version": "3.7.13", + "resolved": "https://registry.npmjs.org/@react-aria/label/-/label-3.7.13.tgz", + "integrity": "sha512-brSAXZVTey5RG/Ex6mTrV/9IhGSQFU4Al34qmjEDho+Z2qT4oPwf8k7TRXWWqzOU0ugYxekYbsLd2zlN3XvWcg==", "dependencies": { - "@react-aria/utils": "^3.25.3", - "@react-types/shared": "^3.25.0", + "@react-aria/utils": "^3.26.0", + "@react-types/shared": "^3.26.0", "@swc/helpers": "^0.5.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1" } }, "node_modules/@react-aria/overlays": { @@ -2570,9 +2569,9 @@ } }, "node_modules/@react-aria/ssr": { - "version": "3.9.6", - "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.9.6.tgz", - "integrity": "sha512-iLo82l82ilMiVGy342SELjshuWottlb5+VefO3jOQqQRNYnJBFpUSadswDPbRimSgJUZuFwIEYs6AabkP038fA==", + "version": "3.9.7", + "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.9.7.tgz", + "integrity": "sha512-GQygZaGlmYjmYM+tiNBA5C6acmiDWF52Nqd40bBp0Znk4M4hP+LTmI0lpI1BuKMw45T8RIhrAsICIfKwZvi2Gg==", "dependencies": { "@swc/helpers": "^0.5.0" }, @@ -2580,7 +2579,7 @@ "node": ">= 12" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1" } }, "node_modules/@react-aria/switch": { @@ -2598,90 +2597,91 @@ } }, "node_modules/@react-aria/toggle": { - "version": "3.10.9", - "resolved": "https://registry.npmjs.org/@react-aria/toggle/-/toggle-3.10.9.tgz", - "integrity": "sha512-dtfnyIU2/kcH9rFAiB48diSmaXDv45K7UCuTkMQLjbQa3QHC1oYNbleVN/VdGyAMBsIWtfl8L4uuPrAQmDV/bg==", - "dependencies": { - "@react-aria/focus": "^3.18.4", - "@react-aria/interactions": "^3.22.4", - "@react-aria/utils": "^3.25.3", - "@react-stately/toggle": "^3.7.8", - "@react-types/checkbox": "^3.8.4", - "@react-types/shared": "^3.25.0", + "version": "3.10.10", + "resolved": "https://registry.npmjs.org/@react-aria/toggle/-/toggle-3.10.10.tgz", + "integrity": "sha512-QwMT/vTNrbrILxWVHfd9zVQ3mV2NdBwyRu+DphVQiFAXcmc808LEaIX2n0lI6FCsUDC9ZejCyvzd91/YemdZ1Q==", + "dependencies": { + "@react-aria/focus": "^3.19.0", + "@react-aria/interactions": "^3.22.5", + "@react-aria/utils": "^3.26.0", + "@react-stately/toggle": "^3.8.0", + "@react-types/checkbox": "^3.9.0", + "@react-types/shared": "^3.26.0", "@swc/helpers": "^0.5.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1" } }, "node_modules/@react-aria/toggle/node_modules/@react-aria/interactions": { - "version": "3.22.4", - "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.4.tgz", - "integrity": "sha512-E0vsgtpItmknq/MJELqYJwib+YN18Qag8nroqwjk1qOnBa9ROIkUhWJerLi1qs5diXq9LHKehZDXRlwPvdEFww==", + "version": "3.22.5", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.5.tgz", + "integrity": "sha512-kMwiAD9E0TQp+XNnOs13yVJghiy8ET8L0cbkeuTgNI96sOAp/63EJ1FSrDf17iD8sdjt41LafwX/dKXW9nCcLQ==", "dependencies": { - "@react-aria/ssr": "^3.9.6", - "@react-aria/utils": "^3.25.3", - "@react-types/shared": "^3.25.0", + "@react-aria/ssr": "^3.9.7", + "@react-aria/utils": "^3.26.0", + "@react-types/shared": "^3.26.0", "@swc/helpers": "^0.5.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1" } }, "node_modules/@react-aria/toggle/node_modules/@react-stately/toggle": { - "version": "3.7.8", - "resolved": "https://registry.npmjs.org/@react-stately/toggle/-/toggle-3.7.8.tgz", - "integrity": "sha512-ySOtkByvIY54yIu8IZ4lnvomQA0H+/mkZnd6T5fKN3tjvIzHmkUk3TAPmNInUxHX148tSW6mWwec0xvjYqEd6w==", + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/@react-stately/toggle/-/toggle-3.8.0.tgz", + "integrity": "sha512-pyt/k/J8BwE/2g6LL6Z6sMSWRx9HEJB83Sm/MtovXnI66sxJ2EfQ1OaXB7Su5PEL9OMdoQF6Mb+N1RcW3zAoPw==", "dependencies": { - "@react-stately/utils": "^3.10.4", - "@react-types/checkbox": "^3.8.4", + "@react-stately/utils": "^3.10.5", + "@react-types/checkbox": "^3.9.0", + "@react-types/shared": "^3.26.0", "@swc/helpers": "^0.5.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1" } }, "node_modules/@react-aria/utils": { - "version": "3.25.3", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.3.tgz", - "integrity": "sha512-PR5H/2vaD8fSq0H/UB9inNbc8KDcVmW6fYAfSWkkn+OAdhTTMVKqXXrZuZBWyFfSD5Ze7VN6acr4hrOQm2bmrA==", + "version": "3.26.0", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.26.0.tgz", + "integrity": "sha512-LkZouGSjjQ0rEqo4XJosS4L3YC/zzQkfRM3KoqK6fUOmUJ9t0jQ09WjiF+uOoG9u+p30AVg3TrZRUWmoTS+koQ==", "dependencies": { - "@react-aria/ssr": "^3.9.6", - "@react-stately/utils": "^3.10.4", - "@react-types/shared": "^3.25.0", + "@react-aria/ssr": "^3.9.7", + "@react-stately/utils": "^3.10.5", + "@react-types/shared": "^3.26.0", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1" } }, "node_modules/@react-aria/visually-hidden": { - "version": "3.8.17", - "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.17.tgz", - "integrity": "sha512-WFgny1q2CbxxU6gu46TGQXf1DjsnuSk+RBDP4M7bm1mUVZzoCp7U7AtjNmsBrWg0NejxUdgD7+7jkHHCQ91qRA==", + "version": "3.8.18", + "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.18.tgz", + "integrity": "sha512-l/0igp+uub/salP35SsNWq5mGmg3G5F5QMS1gDZ8p28n7CgjvzyiGhJbbca7Oxvaw1HRFzVl9ev+89I7moNnFQ==", "dependencies": { - "@react-aria/interactions": "^3.22.4", - "@react-aria/utils": "^3.25.3", - "@react-types/shared": "^3.25.0", + "@react-aria/interactions": "^3.22.5", + "@react-aria/utils": "^3.26.0", + "@react-types/shared": "^3.26.0", "@swc/helpers": "^0.5.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1" } }, "node_modules/@react-aria/visually-hidden/node_modules/@react-aria/interactions": { - "version": "3.22.4", - "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.4.tgz", - "integrity": "sha512-E0vsgtpItmknq/MJELqYJwib+YN18Qag8nroqwjk1qOnBa9ROIkUhWJerLi1qs5diXq9LHKehZDXRlwPvdEFww==", + "version": "3.22.5", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.5.tgz", + "integrity": "sha512-kMwiAD9E0TQp+XNnOs13yVJghiy8ET8L0cbkeuTgNI96sOAp/63EJ1FSrDf17iD8sdjt41LafwX/dKXW9nCcLQ==", "dependencies": { - "@react-aria/ssr": "^3.9.6", - "@react-aria/utils": "^3.25.3", - "@react-types/shared": "^3.25.0", + "@react-aria/ssr": "^3.9.7", + "@react-aria/utils": "^3.26.0", + "@react-types/shared": "^3.26.0", "@swc/helpers": "^0.5.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1" } }, "node_modules/@react-dnd/asap": { @@ -2700,16 +2700,16 @@ "integrity": "sha512-/RVXdLvJxLg4QKvMoM5WlwNR9ViO9z8B/qPcc+C0Sa/teJY7QG7kJ441DwzOjMYEY7GmU4dj5EcGHIkKZiQZCA==" }, "node_modules/@react-stately/overlays": { - "version": "3.6.11", - "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.11.tgz", - "integrity": "sha512-usuxitwOx4FbmOW7Og4VM8R8ZjerbHZLLbFaxZW7pWLs7Ypway1YhJ3SWcyNTYK7NEk4o602kSoU6MSev1Vgag==", + "version": "3.6.12", + "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.12.tgz", + "integrity": "sha512-QinvZhwZgj8obUyPIcyURSCjTZlqZYRRCS60TF8jH8ZpT0tEAuDb3wvhhSXuYA3Xo9EHLwvLjEf3tQKKdAQArw==", "dependencies": { - "@react-stately/utils": "^3.10.4", - "@react-types/overlays": "^3.8.10", + "@react-stately/utils": "^3.10.5", + "@react-types/overlays": "^3.8.11", "@swc/helpers": "^0.5.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1" } }, "node_modules/@react-stately/radio": { @@ -2741,83 +2741,83 @@ } }, "node_modules/@react-stately/utils": { - "version": "3.10.4", - "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.4.tgz", - "integrity": "sha512-gBEQEIMRh5f60KCm7QKQ2WfvhB2gLUr9b72sqUdIZ2EG+xuPgaIlCBeSicvjmjBvYZwOjoOEnmIkcx2GHp/HWw==", + "version": "3.10.5", + "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.5.tgz", + "integrity": "sha512-iMQSGcpaecghDIh3mZEpZfoFH3ExBwTtuBEcvZ2XnGzCgQjeYXcMdIUwAfVQLXFTdHUHGF6Gu6/dFrYsCzySBQ==", "dependencies": { "@swc/helpers": "^0.5.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1" } }, "node_modules/@react-types/button": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/@react-types/button/-/button-3.10.0.tgz", - "integrity": "sha512-rAyU+N9VaHLBdZop4zasn8IDwf9I5Q1EzHUKMtzIFf5aUlMUW+K460zI/l8UESWRSWAXK9/WPSXGxfcoCEjvAA==", + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/@react-types/button/-/button-3.10.1.tgz", + "integrity": "sha512-XTtap8o04+4QjPNAshFWOOAusUTxQlBjU2ai0BTVLShQEjHhRVDBIWsI2B2FKJ4KXT6AZ25llaxhNrreWGonmA==", "dependencies": { - "@react-types/shared": "^3.25.0" + "@react-types/shared": "^3.26.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1" } }, "node_modules/@react-types/checkbox": { - "version": "3.8.4", - "resolved": "https://registry.npmjs.org/@react-types/checkbox/-/checkbox-3.8.4.tgz", - "integrity": "sha512-fvZrlQmlFNsYHZpl7GVmyYQlKdUtO5MczMSf8z3TlSiCb5Kl3ha9PsZgLhJqGuVnzB2ArIBz0eZrYa3k0PhcpA==", + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/@react-types/checkbox/-/checkbox-3.9.0.tgz", + "integrity": "sha512-9hbHx0Oo2Hp5a8nV8Q75LQR0DHtvOIJbFaeqESSopqmV9EZoYjtY/h0NS7cZetgahQgnqYWQi44XGooMDCsmxA==", "dependencies": { - "@react-types/shared": "^3.25.0" + "@react-types/shared": "^3.26.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1" } }, "node_modules/@react-types/overlays": { - "version": "3.8.10", - "resolved": "https://registry.npmjs.org/@react-types/overlays/-/overlays-3.8.10.tgz", - "integrity": "sha512-IcnB+VYfAJazRjWhBKZTmVMh3KTp/B1rRbcKkPx6t8djP9UQhKcohP7lAALxjJ56Jjz/GFC6rWyUcnYH0NFVRA==", + "version": "3.8.11", + "resolved": "https://registry.npmjs.org/@react-types/overlays/-/overlays-3.8.11.tgz", + "integrity": "sha512-aw7T0rwVI3EuyG5AOaEIk8j7dZJQ9m34XAztXJVZ/W2+4pDDkLDbJ/EAPnuo2xGYRGhowuNDn4tDju01eHYi+w==", "dependencies": { - "@react-types/shared": "^3.25.0" + "@react-types/shared": "^3.26.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1" } }, "node_modules/@react-types/radio": { - "version": "3.8.4", - "resolved": "https://registry.npmjs.org/@react-types/radio/-/radio-3.8.4.tgz", - "integrity": "sha512-GCuOwQL19iwKa74NAIk9hv4ivyI8oW1+ZCuc2fzyDdeQjzTIlv3qrIyShwpVy1IoI7/4DYTMZm/YXPoKhu5TTA==", + "version": "3.8.5", + "resolved": "https://registry.npmjs.org/@react-types/radio/-/radio-3.8.5.tgz", + "integrity": "sha512-gSImTPid6rsbJmwCkTliBIU/npYgJHOFaI3PNJo7Y0QTAnFelCtYeFtBiWrFodSArSv7ASqpLLUEj9hZu/rxIg==", "dependencies": { - "@react-types/shared": "^3.25.0" + "@react-types/shared": "^3.26.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1" } }, "node_modules/@react-types/shared": { - "version": "3.25.0", - "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.25.0.tgz", - "integrity": "sha512-OZSyhzU6vTdW3eV/mz5i6hQwQUhkRs7xwY2d1aqPvTdMe0+2cY7Fwp45PAiwYLEj73i9ro2FxF9qC4DvHGSCgQ==", + "version": "3.26.0", + "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.26.0.tgz", + "integrity": "sha512-6FuPqvhmjjlpEDLTiYx29IJCbCNWPlsyO+ZUmCUXzhUv2ttShOXfw8CmeHWHftT/b2KweAWuzqSlfeXPR76jpw==", "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1" } }, "node_modules/@react-types/switch": { - "version": "3.5.6", - "resolved": "https://registry.npmjs.org/@react-types/switch/-/switch-3.5.6.tgz", - "integrity": "sha512-gJ8t2yTCgcitz4ON4ELcLLmtlDkn2MUjjfu3ez/cwA1X/NUluPYkhXj5Z6H+KOlnveqrKCZDRoTgK74cQ6Cvfg==", + "version": "3.5.7", + "resolved": "https://registry.npmjs.org/@react-types/switch/-/switch-3.5.7.tgz", + "integrity": "sha512-1IKiq510rPTHumEZuhxuazuXBa2Cuxz6wBIlwf3NCVmgWEvU+uk1ETG0sH2yymjwCqhtJDKXi+qi9HSgPEDwAg==", "dependencies": { - "@react-types/shared": "^3.25.0" + "@react-types/shared": "^3.26.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1" } }, "node_modules/@remix-run/router": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.21.0.tgz", - "integrity": "sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==", + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.20.0.tgz", + "integrity": "sha512-mUnk8rPJBI9loFDZ+YzPGdeniYK+FTmRD1TMCz7ev2SNIozyKKpnGgsxO34u6Z4z/t0ITuu7voi/AshfsGsgFg==", "engines": { "node": ">=14.0.0" } @@ -3090,9 +3090,9 @@ } }, "node_modules/@types/d3-scale-chromatic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.0.3.tgz", - "integrity": "sha512-laXM4+1o5ImZv3RpFAsTRn3TEkzqkytiOY0Dz0sq5cnd1dtNlk6sHLon4OvqaiJb28T0S/TdsBI3Sjsy+keJrw==" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz", + "integrity": "sha512-iWMJgwkK7yTRmWqRB5plb1kadXyQ5Sj8V/zYlFGMUBbIPKQScw+Dku9cAAMgJG+z5GYDoMjWGLVOvjghDEFnKQ==" }, "node_modules/@types/d3-selection": { "version": "3.0.11", @@ -3108,9 +3108,9 @@ } }, "node_modules/@types/d3-time": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.3.tgz", - "integrity": "sha512-2p6olUZ4w3s+07q3Tm2dbiMZy5pCDfYwtLXXHUnVzXgQlZ/OyPtUz6OL382BkOuGlLXqfT+wqv8Fw2v8/0geBw==" + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz", + "integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==" }, "node_modules/@types/d3-time-format": { "version": "4.0.3", @@ -3187,14 +3187,14 @@ } }, "node_modules/@types/geojson": { - "version": "7946.0.14", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz", - "integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==" + "version": "7946.0.15", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.15.tgz", + "integrity": "sha512-9oSxFzDCT2Rj6DfcHF8G++jxBKS7mBqXl5xrRW+Kbvjry6Uduya2iiwqHPhVXpasAVMBYKkEPGgKhd3+/HZ6xA==" }, "node_modules/@types/hoist-non-react-statics": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz", - "integrity": "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.6.tgz", + "integrity": "sha512-lPByRJUer/iN/xa4qpyL0qmL11DqNW81iU/IG1S3uvRUq4oKagz8VCxZjiWkumgt66YT3vOdDgZ0o32sGKtCEw==", "dependencies": { "@types/react": "*", "hoist-non-react-statics": "^3.3.0" @@ -3253,11 +3253,6 @@ "resolved": "https://registry.npmjs.org/@types/polylabel/-/polylabel-1.1.3.tgz", "integrity": "sha512-9Zw2KoDpi+T4PZz2G6pO2xArE0m/GSMTW1MIxF2s8ZY8x9XDO6fv9um0ydRGvcbkFLlaq8yNK6eZxnmMZtDgWQ==" }, - "node_modules/@types/prop-types": { - "version": "15.7.12", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz", - "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==" - }, "node_modules/@types/qs": { "version": "6.9.15", "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz", @@ -3271,21 +3266,20 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.3.12", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.12.tgz", - "integrity": "sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==", + "version": "19.0.1", + "resolved": "https://registry.npmjs.org/@types/react/-/react-19.0.1.tgz", + "integrity": "sha512-YW6614BDhqbpR5KtUYzTA+zlA7nayzJRA9ljz9CQoxthR0sDisYZLuvSMsil36t4EH/uAt8T52Xb4sVw17G+SQ==", "dependencies": { - "@types/prop-types": "*", "csstype": "^3.0.2" } }, "node_modules/@types/react-dom": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.1.tgz", - "integrity": "sha512-qW1Mfv8taImTthu4KoXgDfLuk4bydU6Q/TkADnDWWHwi4NX4BR+LWfTp2sVmTqRrsHvyDDTelgelxJ+SsejKKQ==", + "version": "19.0.2", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.0.2.tgz", + "integrity": "sha512-c1s+7TKFaDRRxr1TxccIX2u7sfCnc3RxkVyBIUA2lCpyqCF+QoAwQ/CBg7bsMdVwP120HEH143VQezKtef5nCg==", "dev": true, - "dependencies": { - "@types/react": "*" + "peerDependencies": { + "@types/react": "^19.0.0" } }, "node_modules/@types/react-redux": { @@ -3300,10 +3294,10 @@ } }, "node_modules/@types/react-transition-group": { - "version": "4.4.11", - "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.11.tgz", - "integrity": "sha512-RM05tAniPZ5DZPzzNFP+DmrcOdD0efDUxMy3145oljWSl3x9ZV5vhme98gTxFrj2lhXvmGNnUiuDyJgY9IKkNA==", - "dependencies": { + "version": "4.4.12", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.12.tgz", + "integrity": "sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==", + "peerDependencies": { "@types/react": "*" } }, @@ -3426,133 +3420,133 @@ } }, "node_modules/@webassemblyjs/ast": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", - "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz", + "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==", "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" + "@webassemblyjs/helper-numbers": "1.13.2", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2" } }, "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", - "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==" + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz", + "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==" }, "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", - "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==" + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz", + "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==" }, "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", - "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==" + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz", + "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==" }, "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", - "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz", + "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==", "dependencies": { - "@webassemblyjs/floating-point-hex-parser": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/floating-point-hex-parser": "1.13.2", + "@webassemblyjs/helper-api-error": "1.13.2", "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", - "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==" + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz", + "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==" }, "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", - "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz", + "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==", "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/wasm-gen": "1.12.1" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/wasm-gen": "1.14.1" } }, "node_modules/@webassemblyjs/ieee754": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", - "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz", + "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==", "dependencies": { "@xtuc/ieee754": "^1.2.0" } }, "node_modules/@webassemblyjs/leb128": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", - "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz", + "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==", "dependencies": { "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/utf8": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", - "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==" + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz", + "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==" }, "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", - "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz", + "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==", "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.12.1", - "@webassemblyjs/wasm-gen": "1.12.1", - "@webassemblyjs/wasm-opt": "1.12.1", - "@webassemblyjs/wasm-parser": "1.12.1", - "@webassemblyjs/wast-printer": "1.12.1" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/helper-wasm-section": "1.14.1", + "@webassemblyjs/wasm-gen": "1.14.1", + "@webassemblyjs/wasm-opt": "1.14.1", + "@webassemblyjs/wasm-parser": "1.14.1", + "@webassemblyjs/wast-printer": "1.14.1" } }, "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", - "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz", + "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==", "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/ieee754": "1.13.2", + "@webassemblyjs/leb128": "1.13.2", + "@webassemblyjs/utf8": "1.13.2" } }, "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", - "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz", + "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==", "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/wasm-gen": "1.12.1", - "@webassemblyjs/wasm-parser": "1.12.1" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/wasm-gen": "1.14.1", + "@webassemblyjs/wasm-parser": "1.14.1" } }, "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", - "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz", + "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==", "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-api-error": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-api-error": "1.13.2", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/ieee754": "1.13.2", + "@webassemblyjs/leb128": "1.13.2", + "@webassemblyjs/utf8": "1.13.2" } }, "node_modules/@webassemblyjs/wast-printer": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", - "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz", + "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==", "dependencies": { - "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/ast": "1.14.1", "@xtuc/long": "4.2.2" } }, @@ -3950,15 +3944,41 @@ } }, "node_modules/call-bind": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", - "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", + "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==", "dependencies": { + "call-bind-apply-helpers": "^1.0.0", "es-define-property": "^1.0.0", - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", "get-intrinsic": "^1.2.4", - "set-function-length": "^1.2.1" + "set-function-length": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz", + "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.2.tgz", + "integrity": "sha512-0lk0PHFe/uz0vl527fG9CgdE9WdafjDbCXvBbs+LUv000TVt2Jjhqbs4Jwm8gz070w8xXyEAxrPOMullsxXeGg==", + "dependencies": { + "call-bind": "^1.0.8", + "get-intrinsic": "^1.2.5" }, "engines": { "node": ">= 0.4" @@ -4289,9 +4309,9 @@ "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==" }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "dependencies": { "path-key": "^3.1.0", @@ -4870,6 +4890,11 @@ } } }, + "node_modules/decimal.js": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", + "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==" + }, "node_modules/deep-equal": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz", @@ -5030,6 +5055,19 @@ "csstype": "^3.0.2" } }, + "node_modules/dunder-proto": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.0.tgz", + "integrity": "sha512-9+Sj30DIu+4KvHqMfLUGLFYL2PkURSYMVXJyXe92nFRvlYq5hBjLEhblKB+vkd/WVlUYMWigiY07T91Fkk0+4A==", + "dependencies": { + "call-bind-apply-helpers": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -5083,12 +5121,9 @@ } }, "node_modules/es-define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", - "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", - "dependencies": { - "get-intrinsic": "^1.2.4" - }, + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", "engines": { "node": ">= 0.4" } @@ -5106,6 +5141,17 @@ "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz", "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==" }, + "node_modules/es-object-atoms": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", + "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/escalade": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", @@ -5120,6 +5166,17 @@ "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", "dev": true }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -5197,9 +5254,9 @@ "integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw==" }, "node_modules/express": { - "version": "4.21.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", - "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", + "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", "dev": true, "dependencies": { "accepts": "~1.3.8", @@ -5221,7 +5278,7 @@ "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.10", + "path-to-regexp": "0.1.12", "proxy-addr": "~2.0.7", "qs": "6.13.0", "range-parser": "~1.2.1", @@ -5236,6 +5293,10 @@ }, "engines": { "node": ">= 0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/express/node_modules/debug": { @@ -5457,9 +5518,9 @@ } }, "node_modules/froala-editor": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/froala-editor/-/froala-editor-4.3.0.tgz", - "integrity": "sha512-F0vOUrgO2KYa/z9eWEpIXCsArbYejiArfFmR0TaVlqecXRcDqXIJ1VxvECreoy6tC+B5FtO1CDV7GW3d0HXgtg==" + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/froala-editor/-/froala-editor-4.3.1.tgz", + "integrity": "sha512-WN/wqPsKjz0BT4SrJVTMpNYTuYfFPDwU+y7NpgCyNXZ+SrTUnopsFTaVnoDNSPDSXSAzK7YiNRZtqa0b2pEJug==" }, "node_modules/fsevents": { "version": "2.3.3", @@ -5501,15 +5562,20 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", - "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.6.tgz", + "integrity": "sha512-qxsEs+9A+u85HhllWJJFicJfPDhRmjzoYdl64aMWW9yRIJmSyxdn8IEkuIM530/7T+lv0TIHd8L6Q/ra0tEoeA==", "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "dunder-proto": "^1.0.0", + "es-define-property": "^1.0.1", "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", "function-bind": "^1.1.2", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "hasown": "^2.0.0" + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -5562,11 +5628,11 @@ } }, "node_modules/gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dependencies": { - "get-intrinsic": "^1.1.3" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5594,21 +5660,10 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/has-proto": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", - "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", "engines": { "node": ">= 0.4" }, @@ -5691,22 +5746,6 @@ "safe-buffer": "~5.1.0" } }, - "node_modules/html-entities": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.5.2.tgz", - "integrity": "sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/mdevils" - }, - { - "type": "patreon", - "url": "https://patreon.com/mdevils" - } - ] - }, "node_modules/http-deceiver": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", @@ -5944,13 +5983,13 @@ } }, "node_modules/intl-messageformat": { - "version": "10.7.6", - "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.7.6.tgz", - "integrity": "sha512-IsMU/hqyy3FJwNJ0hxDfY2heJ7MteSuFvcnCebxRp67di4Fhx1gKKE+qS0bBwUF8yXkX9SsPUhLeX/B6h5SKUA==", + "version": "10.7.10", + "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.7.10.tgz", + "integrity": "sha512-hp7iejCBiJdW3zmOe18FdlJu8U/JsADSDiBPQhfdSeI8B9POtvPRvPh3nMlvhYayGMKLv6maldhR7y3Pf1vkpw==", "dependencies": { - "@formatjs/ecma402-abstract": "2.2.3", - "@formatjs/fast-memoize": "2.2.3", - "@formatjs/icu-messageformat-parser": "2.9.3", + "@formatjs/ecma402-abstract": "2.3.1", + "@formatjs/fast-memoize": "2.2.5", + "@formatjs/icu-messageformat-parser": "2.9.7", "tslib": "2" } }, @@ -5964,12 +6003,12 @@ } }, "node_modules/is-arguments": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", - "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.2.0.tgz", + "integrity": "sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==", "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.2", + "has-tostringtag": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -6010,11 +6049,12 @@ } }, "node_modules/is-date-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz", + "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==", "dependencies": { - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.2", + "has-tostringtag": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -6120,12 +6160,14 @@ } }, "node_modules/is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz", + "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==", "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.2", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" }, "engines": { "node": ">= 0.4" @@ -6331,6 +6373,14 @@ "resolved": "https://registry.npmjs.org/markerjs2/-/markerjs2-2.32.3.tgz", "integrity": "sha512-D7oD4BT5NOsQbugdcO2TFmcw9ZMHp96Ih09A5f0UndxiQNWuz+j5zymtkTHs0WU+oOR8K6dyTufv4KtfJ6diBg==" }, + "node_modules/math-intrinsics": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.0.0.tgz", + "integrity": "sha512-4MqMiKP90ybymYvsut0CH2g4XWbfLtmlCkXmtmdcDCxNB+mQcu1w/1+L/VD7vi/PSv7X2JYV7SCcR+jiPXnQtA==", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -6463,9 +6513,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "dev": true, "funding": [ { @@ -6525,9 +6575,9 @@ } }, "node_modules/object-inspect": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", - "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz", + "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==", "dev": true, "engines": { "node": ">= 0.4" @@ -6734,9 +6784,9 @@ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" }, "node_modules/path-to-regexp": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", - "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==", + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", "dev": true }, "node_modules/path-type": { @@ -7053,12 +7103,9 @@ } }, "node_modules/react": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", - "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==", - "dependencies": { - "loose-envify": "^1.1.0" - }, + "version": "19.0.0", + "resolved": "https://registry.npmjs.org/react/-/react-19.0.0.tgz", + "integrity": "sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ==", "engines": { "node": ">=0.10.0" } @@ -7143,30 +7190,37 @@ } }, "node_modules/react-dom": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz", - "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==", + "version": "19.0.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.0.0.tgz", + "integrity": "sha512-4GV5sHFG0e/0AD4X+ySy6UJd3jVl1iNsNHdpad0qhABJ11twS3TTBnseqsKurKcsNqCEFeGL3uLpVChpIO3QfQ==", "dependencies": { - "loose-envify": "^1.1.0", - "scheduler": "^0.23.2" + "scheduler": "^0.25.0" }, "peerDependencies": { - "react": "^18.3.1" + "react": "^19.0.0" } }, "node_modules/react-froala-wysiwyg": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/react-froala-wysiwyg/-/react-froala-wysiwyg-4.3.0.tgz", - "integrity": "sha512-TqseaxDaSZwI8YoF/CxwGFDxQwCI/LPQU/ETlz+JdgARaJlUr5WtJe8/3//lwoT3RLTIbzoicy3ZoEKzCdmSpw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/react-froala-wysiwyg/-/react-froala-wysiwyg-4.3.1.tgz", + "integrity": "sha512-ji/56R1D9ss0PNmWmC8fFg0MXTplE3FrV/6sPFFG70D0VeWhEYvtY7/YcRHnWXzMBgrj/enBsCWvegpFjDMF5g==", "dependencies": { "create-react-class": "^15.5.2", - "froala-editor": "4.3.0" + "froala-editor": "4.3.1" }, "peerDependencies": { "react": "~0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", "react-dom": "~0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0" } }, + "node_modules/react-image-crop": { + "version": "11.0.7", + "resolved": "https://registry.npmjs.org/react-image-crop/-/react-image-crop-11.0.7.tgz", + "integrity": "sha512-ZciKWHDYzmm366JDL18CbrVyjnjH0ojufGDmScfS4ZUqLHg4nm6ATY+K62C75W4ZRNt4Ii+tX0bSjNk9LQ2xzQ==", + "peerDependencies": { + "react": ">=16.13.1" + } + }, "node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", @@ -7225,11 +7279,11 @@ "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" }, "node_modules/react-router": { - "version": "6.28.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.28.0.tgz", - "integrity": "sha512-HrYdIFqdrnhDw0PqG/AKjAqEqM7AvxCz0DQ4h2W8k6nqmc5uRBYDag0SBxx9iYz5G8gnuNVLzUe13wl9eAsXXg==", + "version": "6.27.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.27.0.tgz", + "integrity": "sha512-YA+HGZXz4jaAkVoYBE98VQl+nVzI+cVI2Oj/06F5ZM+0u3TgedN9Y9kmMRo2mnkSK2nCpNQn0DVob4HCsY/WLw==", "dependencies": { - "@remix-run/router": "1.21.0" + "@remix-run/router": "1.20.0" }, "engines": { "node": ">=14.0.0" @@ -7239,12 +7293,12 @@ } }, "node_modules/react-router-dom": { - "version": "6.28.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.28.0.tgz", - "integrity": "sha512-kQ7Unsl5YdyOltsPGl31zOjLrDv+m2VcIEcIHqYYD3Lp0UppLjrzcfJqDJwXxFw3TH/yvapbnUvPlAj7Kx5nbg==", + "version": "6.27.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.27.0.tgz", + "integrity": "sha512-+bvtFWMC0DgAFrfKXKG9Fc+BcXWRUO1aJIihbB79xaeq0v5UzfvnM5houGUm1Y461WVRcgAQ+Clh5rdb1eCx4g==", "dependencies": { - "@remix-run/router": "1.21.0", - "react-router": "6.28.0" + "@remix-run/router": "1.20.0", + "react-router": "6.27.0" }, "engines": { "node": ">=14.0.0" @@ -7255,9 +7309,9 @@ } }, "node_modules/react-select": { - "version": "5.8.3", - "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.8.3.tgz", - "integrity": "sha512-lVswnIq8/iTj1db7XCG74M/3fbGB6ZaluCzvwPGT5ZOjCdL/k0CLWhEK0vCBLuU5bHTEf6Gj8jtSvi+3v+tO1w==", + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.9.0.tgz", + "integrity": "sha512-nwRKGanVHGjdccsnzhFte/PULziueZxGD8LL2WojON78Mvnq7LdAMEtu2frrwld1fr3geixg3iiMBIc/LLAZpw==", "dependencies": { "@babel/runtime": "^7.12.0", "@emotion/cache": "^11.4.0", @@ -7267,17 +7321,17 @@ "memoize-one": "^6.0.0", "prop-types": "^15.6.0", "react-transition-group": "^4.3.0", - "use-isomorphic-layout-effect": "^1.1.2" + "use-isomorphic-layout-effect": "^1.2.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0 || ^18.0.0", - "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" + "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", + "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "node_modules/react-select-async-paginate": { - "version": "0.7.6", - "resolved": "https://registry.npmjs.org/react-select-async-paginate/-/react-select-async-paginate-0.7.6.tgz", - "integrity": "sha512-aaQpzdfSUbGC8AaagxE8PuqJrwnDVu6Nx/J4cWPzpMwDyP1SEJonwnjZg3iI/zbUIRIpP+Mj5hrp2m7YeZXJvA==", + "version": "0.7.7", + "resolved": "https://registry.npmjs.org/react-select-async-paginate/-/react-select-async-paginate-0.7.7.tgz", + "integrity": "sha512-4u8ULcwVOY9CFMuEMwb8LnTqcVaalZHWJEYuaTlhkORh20/jGMcMKwzAfOsBD/eViUYYCOYBARbFoZ1hwcVt/g==", "dependencies": { "@seznam/compose-react-refs": "^1.0.6", "@vtaits/use-lazy-ref": "^0.1.3", @@ -7287,7 +7341,7 @@ "use-latest": "^1.2.1" }, "peerDependencies": { - "react": "^16.14.0 || ^17.0.0 || ^18.0.0", + "react": "^16.14.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-select": "^5.0.0" } }, @@ -7297,9 +7351,9 @@ "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==" }, "node_modules/react-textarea-autosize": { - "version": "8.5.4", - "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-8.5.4.tgz", - "integrity": "sha512-eSSjVtRLcLfFwFcariT77t9hcbVJHQV76b51QjQGarQIHml2+gM2lms0n3XrhnDmgK5B+/Z7TmQk5OHNzqYm/A==", + "version": "8.5.6", + "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-8.5.6.tgz", + "integrity": "sha512-aT3ioKXMa8f6zHYGebhbdMD2L00tKeRX1zuVuDx9YQK/JLLRSaSxq3ugECEmUB9z2kvk6bFSIoRHLkkUv0RJiw==", "dependencies": { "@babel/runtime": "^7.20.13", "use-composed-ref": "^1.3.0", @@ -7309,7 +7363,7 @@ "node": ">=10" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "node_modules/react-transition-group": { @@ -7608,12 +7662,9 @@ "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==" }, "node_modules/scheduler": { - "version": "0.23.2", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz", - "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==", - "dependencies": { - "loose-envify": "^1.1.0" - } + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0.tgz", + "integrity": "sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA==" }, "node_modules/schema-utils": { "version": "4.2.0", @@ -7900,15 +7951,69 @@ } }, "node_modules/side-channel": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", - "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4", - "object-inspect": "^1.13.1" + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "dev": true, + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "dev": true, + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" }, "engines": { "node": ">= 0.4" @@ -8431,11 +8536,16 @@ } }, "node_modules/use-composed-ref": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/use-composed-ref/-/use-composed-ref-1.3.0.tgz", - "integrity": "sha512-GLMG0Jc/jiKov/3Ulid1wbv3r54K9HlMW29IWcDFPEqFkSO2nS0MuefWgMJpeHQ9YJeXDL3ZUF+P3jdXlZX/cQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/use-composed-ref/-/use-composed-ref-1.4.0.tgz", + "integrity": "sha512-djviaxuOOh7wkj0paeO1Q/4wMZ8Zrnag5H6yBvzN7AKKe8beOaED9SF5/ByLqsku8NP4zQqsvM2u3ew/tJK8/w==", "peerDependencies": { - "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } }, "node_modules/use-debounce": { @@ -8458,11 +8568,11 @@ } }, "node_modules/use-isomorphic-layout-effect": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz", - "integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.2.0.tgz", + "integrity": "sha512-q6ayo8DWoPZT0VdG4u3D3uxcgONP3Mevx2i2b0434cwWBoL+aelL1DzkXI6w3PhTZzUeR2kaVlZn70iCiseP6w==", "peerDependencies": { - "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" }, "peerDependenciesMeta": { "@types/react": { @@ -8471,14 +8581,14 @@ } }, "node_modules/use-latest": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/use-latest/-/use-latest-1.2.1.tgz", - "integrity": "sha512-xA+AVm/Wlg3e2P/JiItTziwS7FK92LWrDB0p+hgXloIMuVCeJJ8v6f0eeHyPZaJrM+usM1FkFfbNCrJGs8A/zw==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/use-latest/-/use-latest-1.3.0.tgz", + "integrity": "sha512-mhg3xdm9NaM8q+gLT8KryJPnRFOz1/5XPBhmDEVZK1webPzDjrPk7f/mbpeLqTgB9msytYWANxgALOCJKnLvcQ==", "dependencies": { "use-isomorphic-layout-effect": "^1.1.1" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" }, "peerDependenciesMeta": { "@types/react": { @@ -8577,15 +8687,15 @@ } }, "node_modules/webpack": { - "version": "5.96.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.96.1.tgz", - "integrity": "sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==", + "version": "5.97.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.97.1.tgz", + "integrity": "sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==", "dependencies": { "@types/eslint-scope": "^3.7.7", "@types/estree": "^1.0.6", - "@webassemblyjs/ast": "^1.12.1", - "@webassemblyjs/wasm-edit": "^1.12.1", - "@webassemblyjs/wasm-parser": "^1.12.1", + "@webassemblyjs/ast": "^1.14.1", + "@webassemblyjs/wasm-edit": "^1.14.1", + "@webassemblyjs/wasm-parser": "^1.14.1", "acorn": "^8.14.0", "browserslist": "^4.24.0", "chrome-trace-event": "^1.0.2", @@ -8705,9 +8815,9 @@ } }, "node_modules/webpack-dev-server": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.1.0.tgz", - "integrity": "sha512-aQpaN81X6tXie1FoOB7xlMfCsN19pSvRAeYUHOdFWOlhpQ/LlbfTqYwwmEDFV0h8GGuqmCmKmT+pxcUV/Nt2gQ==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.2.0.tgz", + "integrity": "sha512-90SqqYXA2SK36KcT6o1bvwvZfJFcmoamqeJY7+boioffX9g9C0wjjJRGUrQIuh43pb0ttX7+ssavmj/WN2RHtA==", "dev": true, "dependencies": { "@types/bonjour": "^3.5.13", @@ -8723,10 +8833,9 @@ "colorette": "^2.0.10", "compression": "^1.7.4", "connect-history-api-fallback": "^2.0.0", - "express": "^4.19.2", + "express": "^4.21.2", "graceful-fs": "^4.2.6", - "html-entities": "^2.4.0", - "http-proxy-middleware": "^2.0.3", + "http-proxy-middleware": "^2.0.7", "ipaddr.js": "^2.1.0", "launch-editor": "^2.6.1", "open": "^10.0.3", diff --git a/examples/Kentico.Xperience.UMT.Example.AdminApp/Client/package.json b/examples/Kentico.Xperience.UMT.Example.AdminApp/Client/package.json index f2369a6..839d193 100644 --- a/examples/Kentico.Xperience.UMT.Example.AdminApp/Client/package.json +++ b/examples/Kentico.Xperience.UMT.Example.AdminApp/Client/package.json @@ -8,11 +8,11 @@ "build": "webpack --mode=production" }, "dependencies": { - "@kentico/xperience-admin-base": "^29.7.0", - "@kentico/xperience-admin-components": "^29.7.0", + "@kentico/xperience-admin-base": "^30.0.0", + "@kentico/xperience-admin-components": "^30.0.0", "copy-webpack-plugin": "^12.0.2", - "react": "^18.3.1", - "react-dom": "^18.3.1", + "react": "^19.0.0", + "react-dom": "^19.0.0", "sse": "^0.0.8", "sse.js": "^2.5.0" }, @@ -20,17 +20,17 @@ "@babel/core": "^7.26.0", "@babel/plugin-transform-runtime": "^7.25.9", "@babel/preset-env": "^7.26.0", - "@babel/preset-react": "^7.25.9", + "@babel/preset-react": "^7.26.3", "@babel/preset-typescript": "^7.26.0", - "@kentico/xperience-webpack-config": "^29.7.0", - "@types/react": "^18.3.12", - "@types/react-dom": "^18.3.1", + "@kentico/xperience-webpack-config": "^30.0.0", + "@types/react": "^19.0.1", + "@types/react-dom": "^19.0.2", "babel-loader": "^9.2.1", "css-loader": "^7.1.2", "style-loader": "^4.0.0", - "webpack": "^5.96.1", + "webpack": "^5.97.1", "webpack-cli": "^5.1.4", - "webpack-dev-server": "^5.1.0" + "webpack-dev-server": "^5.2.0" }, "overrides": { "react": "$react", diff --git a/examples/Kentico.Xperience.UMT.Example.AdminApp/Data/Samples.json b/examples/Kentico.Xperience.UMT.Example.AdminApp/Data/Samples.json index cf914c6..a848974 100644 --- a/examples/Kentico.Xperience.UMT.Example.AdminApp/Data/Samples.json +++ b/examples/Kentico.Xperience.UMT.Example.AdminApp/Data/Samples.json @@ -478,6 +478,7 @@ "$type": "ContentItem", "ContentItemGUID": "c354427d-3d02-4876-8ed4-4de817fae929", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "ContentItemName": "NewsLetterExampleName", "ContentItemIsReusable": true, "ContentItemIsSecured": true, @@ -556,6 +557,7 @@ "$type": "ContentItem", "ContentItemGUID": "b64b3e3e-f5a9-4d02-8cdb-6d81805c0fee", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "ContentItemName": "SampleReusableFaq", "ContentItemIsReusable": true, "ContentItemIsSecured": true, @@ -569,8 +571,8 @@ "ContentItemCommonDataContentLanguageGuid": "f454e93b-5fe9-42a9-b1af-b572234ed9c4", "ContentItemCommonDataVersionStatus": 2, "ContentItemCommonDataIsLatest": true, - "ContentItemCommonDataPageBuilderWidgets": null, - "ContentItemCommonDataPageTemplateConfiguration": null + "ContentItemCommonDataVisualBuilderWidgets": null, + "ContentItemCommonDataVisualBuilderTemplateConfiguration": null }, { "$type": "ContentItemCommonData", @@ -579,8 +581,8 @@ "ContentItemCommonDataContentLanguageGuid": "a6c0a558-8b33-47b6-87a8-491b437c9923", "ContentItemCommonDataVersionStatus": 2, "ContentItemCommonDataIsLatest": true, - "ContentItemCommonDataPageBuilderWidgets": null, - "ContentItemCommonDataPageTemplateConfiguration": null + "ContentItemCommonDataVisualBuilderWidgets": null, + "ContentItemCommonDataVisualBuilderTemplateConfiguration": null }, { "$type": "ContentItemData", @@ -632,6 +634,7 @@ "$type": "ContentItem", "ContentItemGUID": "df81215e-1414-4d87-befd-ae123f4e5653", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "ContentItemName": "CreationOfUmtModel", "ContentItemIsReusable": false, "ContentItemIsSecured": false, @@ -645,8 +648,8 @@ "ContentItemCommonDataContentLanguageGuid": "f454e93b-5fe9-42a9-b1af-b572234ed9c4", "ContentItemCommonDataVersionStatus": 2, "ContentItemCommonDataIsLatest": true, - "ContentItemCommonDataPageBuilderWidgets": null, - "ContentItemCommonDataPageTemplateConfiguration": null + "ContentItemCommonDataVisualBuilderWidgets": null, + "ContentItemCommonDataVisualBuilderTemplateConfiguration": null }, { "$type": "ContentItemCommonData", @@ -655,8 +658,8 @@ "ContentItemCommonDataContentLanguageGuid": "a6c0a558-8b33-47b6-87a8-491b437c9923", "ContentItemCommonDataVersionStatus": 2, "ContentItemCommonDataIsLatest": true, - "ContentItemCommonDataPageBuilderWidgets": null, - "ContentItemCommonDataPageTemplateConfiguration": null + "ContentItemCommonDataVisualBuilderWidgets": null, + "ContentItemCommonDataVisualBuilderTemplateConfiguration": null }, { "$type": "ContentItemData", @@ -765,6 +768,7 @@ "$type": "ContentItem", "ContentItemGUID": "e09121ad-dd97-472f-b8f6-85fe5428ed6a", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "ContentItemName": "Content-item-with-relations", "ContentItemIsReusable": false, "ContentItemIsSecured": true, @@ -778,8 +782,8 @@ "ContentItemCommonDataContentLanguageGuid": "f454e93b-5fe9-42a9-b1af-b572234ed9c4", "ContentItemCommonDataVersionStatus": 0, "ContentItemCommonDataIsLatest": true, - "ContentItemCommonDataPageBuilderWidgets": null, - "ContentItemCommonDataPageTemplateConfiguration": null + "ContentItemCommonDataVisualBuilderWidgets": null, + "ContentItemCommonDataVisualBuilderTemplateConfiguration": null }, { "$type": "ContentItemCommonData", @@ -788,8 +792,8 @@ "ContentItemCommonDataContentLanguageGuid": "a6c0a558-8b33-47b6-87a8-491b437c9923", "ContentItemCommonDataVersionStatus": 2, "ContentItemCommonDataIsLatest": true, - "ContentItemCommonDataPageBuilderWidgets": null, - "ContentItemCommonDataPageTemplateConfiguration": null + "ContentItemCommonDataVisualBuilderWidgets": null, + "ContentItemCommonDataVisualBuilderTemplateConfiguration": null }, { "$type": "ContentItemData", @@ -904,6 +908,7 @@ "$type": "ContentFolder", "ContentFolderGUID": "7665a8fc-53a2-4aff-86e8-99b009104ff2", "ContentFolderParentFolderGUID": null, + "ContentFolderWorkspaceGUID": null, "ContentFolderName": "articles", "ContentFolderDisplayName": "Articles", "ContentFolderTreePath": "/articles" @@ -912,6 +917,7 @@ "$type": "ContentFolder", "ContentFolderGUID": "ae29c1d1-217a-45da-8b30-585d1881387e", "ContentFolderParentFolderGUID": "7665a8fc-53a2-4aff-86e8-99b009104ff2", + "ContentFolderWorkspaceGUID": null, "ContentFolderName": "obsolete", "ContentFolderDisplayName": "Obsolete", "ContentFolderTreePath": "/articles/obsolete" @@ -920,6 +926,7 @@ "$type": "ContentItemSimplified", "ContentItemGUID": "37c3f5dd-6f2a-4eff-b46e-a36eddebf572", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "IsSecured": false, "ContentTypeName": "UMT.Article", "Name": "SimplifiedModelSample", @@ -990,6 +997,7 @@ "$type": "ContentItemSimplified", "ContentItemGUID": "9ed8de86-859c-4f6c-94f2-cdd6baed99fe", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "IsSecured": false, "ContentTypeName": "UMT.Article", "Name": "SimplifiedModelSampleAsSubPage", @@ -1058,6 +1066,7 @@ "$type": "ContentItemSimplified", "ContentItemGUID": "017edc1e-95c6-43e4-89d5-716c6ae594b2", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "IsSecured": false, "ContentTypeName": "UMT.Article", "Name": "SimplifiedModelSampleAsSubPage2_Draft", @@ -1168,6 +1177,7 @@ "$type": "ContentItemSimplified", "ContentItemGUID": "73298f71-0bb1-4083-a674-a876769e3dd9", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "IsSecured": false, "ContentTypeName": "UMT.Article", "Name": "SimplifiedModelSampleAsSubPage3_Draft", @@ -1278,6 +1288,7 @@ "$type": "ContentItemSimplified", "ContentItemGUID": "8e957ecc-083b-4c86-b761-8db516c13737", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "IsSecured": false, "ContentTypeName": "UMT.Article", "Name": "SimplifiedModelSampleAsSubPage4", @@ -1331,6 +1342,7 @@ "$type": "ContentItemSimplified", "ContentItemGUID": "bb5c0eb4-e688-4a97-99c7-fa97cad8f1d5", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "IsSecured": false, "ContentTypeName": "UMT.Article", "Name": "SimplifiedModelSampleAsSubPage5", @@ -1384,6 +1396,7 @@ "$type": "ContentItemSimplified", "ContentItemGUID": "1d542076-dd88-4c13-a8aa-0ffecdabba69", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "IsSecured": false, "ContentTypeName": "UMT.Article", "Name": "SimplifiedModelSampleAsSubPage6", @@ -1437,6 +1450,7 @@ "$type": "ContentItemSimplified", "ContentItemGUID": "fb66242f-4186-4f71-b0b8-fc68b51d52c1", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "IsSecured": false, "ContentTypeName": "UMT.Article", "Name": "SimplifiedModelSampleAsSubPage7", @@ -1490,6 +1504,7 @@ "$type": "ContentItemSimplified", "ContentItemGUID": "f9cb9484-ce90-460f-a5c8-ad953e2b9286", "ContentItemContentFolderGUID": "ae29c1d1-217a-45da-8b30-585d1881387e", + "ContentItemWorkspaceGUID": null, "IsSecured": false, "ContentTypeName": "UMT.Faq", "Name": "SimplifiedModelSampleReusable", @@ -1529,6 +1544,7 @@ "$type": "ContentItemSimplified", "ContentItemGUID": "c82cdc96-65ec-4f4c-aec2-3d657e6d5ce1", "ContentItemContentFolderGUID": null, + "ContentItemWorkspaceGUID": null, "IsSecured": false, "ContentTypeName": "UMT.Event", "Name": "SimplifiedModelSampleEventWithAssets", @@ -1556,7 +1572,9 @@ "Name": "byteArraySample.jpg", "Extension": ".jpg", "Size": null, - "LastModified": null + "LastModified": null, + "ImageWidth": null, + "ImageHeight": null } } }, @@ -1581,7 +1599,9 @@ "Name": "urlSourceSample.jpg", "Extension": ".jpg", "Size": null, - "LastModified": null + "LastModified": null, + "ImageWidth": null, + "ImageHeight": null } } } diff --git a/examples/Kentico.Xperience.UMT.Example.AdminApp/packages.lock.json b/examples/Kentico.Xperience.UMT.Example.AdminApp/packages.lock.json index 7ed006b..de814ea 100644 --- a/examples/Kentico.Xperience.UMT.Example.AdminApp/packages.lock.json +++ b/examples/Kentico.Xperience.UMT.Example.AdminApp/packages.lock.json @@ -4,21 +4,21 @@ "net8.0": { "Kentico.Xperience.Admin": { "type": "Direct", - "requested": "[29.7.0, )", - "resolved": "29.7.0", - "contentHash": "mISIyMsPBfv/6a7X/9pSF2YSyct2VTRKd7WNjDIvZIUZJnS6YAgiya2qhdTGU7G+6Bo59MjCDfccV2B3TOan6w==", + "requested": "[30.0.0, )", + "resolved": "30.0.0", + "contentHash": "nB4afHUyBvpcZfUtbqX707qP5ieCSH/QaqCQ7cvQ32pjhRJzWCjzM85xUmbU2yqtrzUjH2o3MGssDTJsLdaXeg==", "dependencies": { "Kentico.Aira.Client": "1.0.25", - "Kentico.Xperience.WebApp": "[29.7.0]", - "Microsoft.AspNetCore.SpaServices.Extensions": "6.0.35", - "Microsoft.Extensions.FileProviders.Embedded": "6.0.35" + "Kentico.Xperience.WebApp": "[30.0.0]", + "Microsoft.AspNetCore.SpaServices.Extensions": "8.0.11", + "Microsoft.Extensions.FileProviders.Embedded": "8.0.11" } }, "SonarAnalyzer.CSharp": { "type": "Direct", - "requested": "[9.32.0.97167, )", - "resolved": "9.32.0.97167", - "contentHash": "Yxk86RV+8ynJpUhku1Yw2hITFmnmXKkXJ73cIFSy85ol5SnWREQg9RuTyV8nI7V7+pyLKpCfRmD7P0widsgjkg==" + "requested": "[10.3.0.106239, )", + "resolved": "10.3.0.106239", + "contentHash": "Ne5QHx0nUULk7PF+3GIQIC2EnFI93SPRilyqVY6US4JolZOCc9XyUKzvOVsufp7cyrqbOTL07U5mb6poYzllNQ==" }, "AngleSharp": { "type": "Transitive", @@ -355,18 +355,32 @@ }, "Kentico.Xperience.WebApp": { "type": "Transitive", - "resolved": "29.7.0", - "contentHash": "mAz+ipB+lEKxr4AETZJFlhzOJRXyJ7YCfOROpl1GSVuqgWf1PKxhDWRZtYKx/Dv1bbFKyJ2RBn18FK3hA12IjQ==", + "resolved": "30.0.0", + "contentHash": "/pU+MjOqVXXE/7VYW2CAFR5bkoJSzk63ldAIupWX3GimFEsQaEVnfnUxdodC7AH3vtp6NiC4KpPEG4rIk0SPnw==", "dependencies": { "CommandLineParser": "2.9.1", "HotChocolate.AspNetCore": "13.9.14", "HotChocolate.Data": "13.9.14", "HtmlSanitizer": "8.1.870", - "Kentico.Xperience.Core": "[29.7.0]", - "Microsoft.Extensions.Caching.Memory": "6.0.2", - "Microsoft.Extensions.FileProviders.Embedded": "6.0.35" + "Kentico.Xperience.Core": "[30.0.0]", + "Microsoft.Extensions.Caching.Memory": "8.0.1", + "Microsoft.Extensions.FileProviders.Embedded": "8.0.11", + "System.Text.Json": "8.0.5" } }, + "Magick.NET-Q8-AnyCPU": { + "type": "Transitive", + "resolved": "14.2.0", + "contentHash": "K4r9bNkm9bWBm/YrnXiYBj0+bR2axcb8EaF/IP6k2GpvJUqcdsViPh1z+Ap/4MrmwB2vvbSMF3bHWYJkEOXfEQ==", + "dependencies": { + "Magick.NET.Core": "14.2.0" + } + }, + "Magick.NET.Core": { + "type": "Transitive", + "resolved": "14.2.0", + "contentHash": "1F0vtPJwmoVg9tvi59VEy6KdmpUXbzKYJOH+TL37DT6kXfqj4iFtOMqD7CXC3G6z2zMgFeF5LX9SSApn8Jhhqg==" + }, "MailKit": { "type": "Transitive", "resolved": "4.8.0", @@ -378,10 +392,10 @@ }, "Microsoft.AspNetCore.SpaServices.Extensions": { "type": "Transitive", - "resolved": "6.0.35", - "contentHash": "DMm0luvoaBZ5QB8KVyzqKIQPYyYHkT6JqguXLqfaCrcq6W4b6OUsryv8YK17k709pom/QkgqFS7vSZcl9jt6OA==", + "resolved": "8.0.11", + "contentHash": "bRXEa2m7tf2ouTCQvIeZG9T+IZTMqO3TLBwcU/VuyrqNsEKu2ryygkdgfYef7IGmJEHqMq22sCWUZpe2F/wJTg==", "dependencies": { - "Microsoft.Extensions.FileProviders.Physical": "6.0.0" + "Microsoft.Extensions.FileProviders.Physical": "8.0.0" } }, "Microsoft.Data.SqlClient": { @@ -406,101 +420,112 @@ }, "Microsoft.Extensions.Caching.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "bcz5sSFJbganH0+YrfvIjJDIcKNW7TL07C4d1eTmXy/wOt52iz4LVogJb6pazs7W0+74j0YpXFErvp++Aq5Bsw==", + "resolved": "8.0.0", + "contentHash": "3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Caching.Memory": { "type": "Transitive", - "resolved": "6.0.2", - "contentHash": "ANjkN9TiBZXm5cvj3bb3QbezBzqkupCzxwgNf46d4V4ToRBHcEp3IEgbc67M3ZqVHQxaJgEncZ/frdqznpVWIw==", + "resolved": "8.0.1", + "contentHash": "HFDnhYLccngrzyGgHkjEDU5FMLn4MpOsr5ElgsBMC4yx6lJh4jeWO7fHS8+TXPq+dgxCmUa/Trl8svObmwW4QA==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Caching.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==", + "resolved": "8.0.0", + "contentHash": "0J/9YNXTMWSZP2p2+nvl8p71zpSwokZXZuJW+VjdErkegAnFdO1XlqtA62SJtgVYHdKu3uPxJHcMR/r35HwFBA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "resolved": "8.0.0", + "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "b3ErKzND8LIC7o08QAVlKfaEIYEvLJbtmVbFZVBRXeu9YkKfSSzLZfR1SUfQPBIy9mKLhEtJgGYImkcMNaKE0A==", + "resolved": "8.0.0", + "contentHash": "mBMoXLsr5s1y2zOHWmKsE9veDcx8h1x/c3rz4baEdQKTeDcmQAPNbB54Pi/lhFO3K431eEq6PFbMgLaa6PHFfA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" } }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "V8S3bsm50ig6JSyrbcJJ8bW2b9QLGouz+G1miK3UTaOWmMtFwNNNzUf4AleyDWUmTrWMLNnFSLEQtxmxgNQnNQ==", + "resolved": "8.0.1", + "contentHash": "BmANAnR5Xd4Oqw7yQ75xOAYODybZQRzdeNucg7kS5wWKd2PNnMdYtJ2Vciy0QLylRmv42DGl5+AFL9izA6F1Rw==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + "resolved": "8.0.2", + "contentHash": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg==" + }, + "Microsoft.Extensions.Diagnostics.Abstractions": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "elH2vmwNmsXuKmUeMQ4YW9ldXiF+gSGDgg1vORksob5POnpaI6caj1Hu8zaYbEuibhqCoWg0YRWDazBY3zjBfg==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2" + } }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.FileProviders.Embedded": { "type": "Transitive", - "resolved": "6.0.35", - "contentHash": "TWTxSRcKNvpTvLKEdL8rca3tS3k1W5/+IwGw/uqf72g3+8MCTsbbpdwGvgUgqRZxIyOVTFOzdgGEg8z0hAhAHQ==", + "resolved": "8.0.11", + "contentHash": "1tn+c7d628+dASqo0UezdeWdKrEpp2XA376MUkr4nFYDj295iPWeWOV8rOvgR0Gma1xfOEjNJur1QvS6AVnjng==", "dependencies": { - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0" } }, "Microsoft.Extensions.FileProviders.Physical": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "QvkL7l0nM8udt3gfyu0Vw8bbCXblxaKOl7c2oBfgGy4LCURRaL9XWZX1FWJrQc43oMokVneVxH38iz+bY1sbhg==", + "resolved": "8.0.0", + "contentHash": "UboiXxpPUpwulHvIAVE36Knq0VSHaAmfrFkegLyBZeaADuKezJ/AIXYAW8F5GBlGk/VaibN2k/Zn1ca8YAfVdA==", "dependencies": { - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", - "Microsoft.Extensions.FileSystemGlobbing": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.FileSystemGlobbing": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.FileSystemGlobbing": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "ip8jnL1aPiaPeKINCqaTEbvBFDmVx9dXQEBZ2HOBRXPD1eabGNqP/bKlsIcp7U2lGxiXd5xIhoFcmY8nM4Hdiw==" + "resolved": "8.0.0", + "contentHash": "OK+670i7esqlQrPjdIKRbsyMCe9g5kSLpRRQGSr4Q58AOYEe/hCnfLZprh7viNisSUUQZmMrbbuDaIrP+V1ebQ==" }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "resolved": "8.0.1", + "contentHash": "nHwq9aPBdBPYXPti6wYEEfgXddfBrYC+CQLn+qISiwQq5tpfaqDZSKOJNxoe9rfQxGf1c+2wC/qWFe1QYJPYqw==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.1", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2" } }, "Microsoft.Extensions.Http": { @@ -516,19 +541,19 @@ }, "Microsoft.Extensions.Localization": { "type": "Transitive", - "resolved": "6.0.35", - "contentHash": "yeNoMGd3TG8hh8GLsLFzTVmXjHv6oFVx800x2tUdU3w7pTI3xbZTAQAdFDnng6FwigAZv3OjOQnxtYJ5UO72RA==", + "resolved": "8.0.11", + "contentHash": "yTb325+mCuoUBBMEztLv48kK/I/99TfVPh4V5kW8Qw+45mqAJs9bndOYxvjJvJxKVuwgzOYiWC/a34fr4pJ8IA==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Localization.Abstractions": "6.0.35", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Localization.Abstractions": "8.0.11", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2" } }, "Microsoft.Extensions.Localization.Abstractions": { "type": "Transitive", - "resolved": "6.0.35", - "contentHash": "4CHYRHp4GxdUsvAZJ4kNny7ASVPRo3lRXrtvnRABL3aVFlw8nVsBEiG0C/eVYnv1n6ZT3aKX5/allqsXDLFgcA==" + "resolved": "8.0.11", + "contentHash": "qyfVEOJ8PsYrwC6kTQFSTm4+FrpOAz3OfPXvRPfs7j34V+yHMuVUgIiP5yjrYHcpNbXTtCzoQc/ZdcbpdeX/Xg==" }, "Microsoft.Extensions.Logging": { "type": "Transitive", @@ -549,8 +574,8 @@ }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", + "resolved": "8.0.2", + "contentHash": "dWGKvhFybsaZpGmzkGCbNNwBD1rVlWzrZKANLW/CcbFJpCEceMCGzT7zZwHOGBCbwM0SzBuceMj5HN1LKV1QqA==", "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", "Microsoft.Extensions.Primitives": "8.0.0" @@ -558,14 +583,14 @@ }, "Microsoft.Extensions.Options.ConfigurationExtensions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "bXWINbTn0vC0FYc9GaQTISbxhQLAMrvtbuvD9N6JelEaIS/Pr62wUCinrq5bf1WRBGczt1v4wDhxFtVFNcMdUQ==", + "resolved": "8.0.0", + "contentHash": "0f4DMRqEd50zQh+UyJc+/HiBsZ3vhAQALgdkcQEalSH1L2isdC7Yj54M3cyo5e+BeO5fcBQ7Dxly8XiBBcvRgw==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Configuration.Binder": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Configuration.Binder": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Primitives": { @@ -790,16 +815,13 @@ }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" + "resolved": "4.7.2", + "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==" }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", - "dependencies": { - "System.Text.Encodings.Web": "8.0.0" - } + "resolved": "8.0.5", + "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==" }, "System.Threading.Channels": { "type": "Transitive", @@ -822,26 +844,27 @@ "kentico.xperience.umt": { "type": "Project", "dependencies": { - "Kentico.Xperience.Core": "[29.7.0, )", - "Microsoft.Bcl.AsyncInterfaces": "[9.0.0-rc.1.24431.7, )" + "Kentico.Xperience.Core": "[30.0.0, )", + "Microsoft.Bcl.AsyncInterfaces": "[9.0.0, )" } }, "Kentico.Xperience.Core": { "type": "CentralTransitive", - "requested": "[29.7.0, )", - "resolved": "29.7.0", - "contentHash": "9rJYLckkygRJCAKEA0Mz+OqtWMhV9dDXi542kbfKZPSd4E4wHpdyqbO7plQtIakO40cjAt5or/GTsOBjvzT59g==", + "requested": "[30.0.0, )", + "resolved": "30.0.0", + "contentHash": "9P6OhCXzwd1KLzzmmGUI5Vnm+5mrtIlniioC2zGuMqgxmFUaDuk0SHBOW9knBICeF24IHpnXBK32icr17e1vPA==", "dependencies": { "AngleSharp": "0.17.1", + "Magick.NET-Q8-AnyCPU": "14.2.0", "MailKit": "4.8.0", "Microsoft.Data.SqlClient": "5.2.2", - "Microsoft.Extensions.Caching.Memory": "6.0.2", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.DependencyInjection": "6.0.1", - "Microsoft.Extensions.FileProviders.Physical": "6.0.0", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Localization": "6.0.35", - "Microsoft.Extensions.Options.ConfigurationExtensions": "6.0.0", + "Microsoft.Extensions.Caching.Memory": "8.0.1", + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.DependencyInjection": "8.0.1", + "Microsoft.Extensions.FileProviders.Physical": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.1", + "Microsoft.Extensions.Localization": "8.0.11", + "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0", "Mono.Cecil": "0.11.6", "Newtonsoft.Json": "13.0.3", "System.CodeDom": "8.0.0" @@ -849,15 +872,18 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "CentralTransitive", - "requested": "[9.0.0-rc.1.24431.7, )", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "tvUDJVCPvPaKK/RWPhi4o+ob9tYoNpl9g1RcuFx7eehCscMwwizs2cNgF4lvMdj82wN1rE8eUmtdbDeJm63gCw==" + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "owmu2Cr3IQ8yQiBleBHlGk8dSQ12oaF2e7TpzwJKEl4m84kkZJjEY1n33L67Y3zM5jPOjmmbdHjbfiL0RqcMRQ==" }, "Microsoft.Extensions.Logging.Abstractions": { "type": "CentralTransitive", - "requested": "[9.0.0-rc.1.24431.7, )", - "resolved": "6.0.4", - "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" + "requested": "[9.0.0, )", + "resolved": "8.0.2", + "contentHash": "nroMDjS7hNBPtkZqVBbSiQaQjWRDxITI8Y7XnDs97rqG3EbzVTNLZQf7bIeUJcaHOV8bca47s1Uxq94+2oGdxA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" + } } } } diff --git a/examples/Kentico.Xperience.UMT.Example.Console/packages.lock.json b/examples/Kentico.Xperience.UMT.Example.Console/packages.lock.json index f1be8ac..a5b4cdb 100644 --- a/examples/Kentico.Xperience.UMT.Example.Console/packages.lock.json +++ b/examples/Kentico.Xperience.UMT.Example.Console/packages.lock.json @@ -4,68 +4,68 @@ "net8.0": { "Kentico.Xperience.ImageProcessing": { "type": "Direct", - "requested": "[29.7.0, )", - "resolved": "29.7.0", - "contentHash": "v5ScXaFGp+0PoyDo97Jgs9H6Tjl0ZVbGX1epWPqz7ENbmqf0IyhhiYjMYK7PVZknxV3CzKnqE2zXeFkWVzB8Dw==", + "requested": "[30.0.0, )", + "resolved": "30.0.0", + "contentHash": "bLlUN4grLF3L7JgI4qJp4WnJRiDI9dR1t3OhcW98V3xnp17edse0ZLZV5Yc89PqHCQeD+z4LzN8qfC/7u1eTxA==", "dependencies": { - "Kentico.Xperience.Core": "29.7.0", - "SkiaSharp": "2.88.9", - "SkiaSharp.NativeAssets.Linux.NoDependencies": "2.88.9" + "Kentico.Xperience.Core": "30.0.0", + "SkiaSharp": "3.116.1", + "SkiaSharp.NativeAssets.Linux.NoDependencies": "3.116.1" } }, "Microsoft.Extensions.Configuration.Json": { "type": "Direct", - "requested": "[9.0.0-rc.1.24431.7, )", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "MIeN3EAmQzn8sSnW7bPYrSxRdg1jMmDks4l9fJekrEDUq151MnWJVnmgGUEyE0qGDSggkcl1QbnRDd9ACa46+Q==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "WiTK0LrnsqmedrbzwL7f4ZUo+/wByqy2eKab39I380i2rd8ImfCRMrtkqJVGDmfqlkP/YzhckVOwPc5MPrSNpg==", "dependencies": { - "Microsoft.Extensions.Configuration": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Configuration.Abstractions": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Configuration.FileExtensions": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0-rc.1.24431.7", - "System.Text.Json": "9.0.0-rc.1.24431.7" + "Microsoft.Extensions.Configuration": "9.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0", + "Microsoft.Extensions.Configuration.FileExtensions": "9.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0", + "System.Text.Json": "9.0.0" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Direct", - "requested": "[9.0.0-rc.1.24431.7, )", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "Dq4rgVJXE1SwINhR/D36O5fd9yZ4hQ4sWTt+gykLbWotaBEz16NhU95VKE4umsex147ZfkmDWr2Q0XldBQjuaA==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "g0UfujELzlLbHoVG8kPKVBaW470Ewi+jnptGS9KUi6jcb+k2StujtK3m26DFSGGwQ/+bVgZfsWqNzlP6YOejvw==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0-rc.1.24431.7", - "System.Diagnostics.DiagnosticSource": "9.0.0-rc.1.24431.7" + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "System.Diagnostics.DiagnosticSource": "9.0.0" } }, "Microsoft.Extensions.Logging.Console": { "type": "Direct", - "requested": "[9.0.0-rc.1.24431.7, )", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "+LP22qMLuv5DcEd3DFcsM7qEfKlWveMCVQhfxl+whDQy39TB/DimQT6xXDPlb+JQ1w+6/19mQE1k8FVDsL+Zrg==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "yDZ4zsjl7N0K+R/1QTNpXBd79Kaf4qNLHtjk4NaG82UtNg2Z6etJywwv6OarOv3Rp7ocU7uIaRY4CrzHRO/d3w==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Logging": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Logging.Abstractions": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Logging.Configuration": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Options": "9.0.0-rc.1.24431.7", - "System.Text.Json": "9.0.0-rc.1.24431.7" + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "Microsoft.Extensions.Logging": "9.0.0", + "Microsoft.Extensions.Logging.Abstractions": "9.0.0", + "Microsoft.Extensions.Logging.Configuration": "9.0.0", + "Microsoft.Extensions.Options": "9.0.0", + "System.Text.Json": "9.0.0" } }, "Microsoft.Extensions.Logging.Debug": { "type": "Direct", - "requested": "[9.0.0-rc.1.24431.7, )", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "PDhn1ZM/pUYgfXPKk4L/5tIG1mXKYnZPe6hnOnsvoTPEfZH5aMil8wZrKcmCBsi23k11QWTwhG4OqK95XS3Klw==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "4wGlHsrLhYjLw4sFkfRixu2w4DK7dv60OjbvgbLGhUJk0eUPxYHhnszZ/P18nnAkfrPryvtOJ3ZTVev0kpqM6A==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Logging": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Logging.Abstractions": "9.0.0-rc.1.24431.7" + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "Microsoft.Extensions.Logging": "9.0.0", + "Microsoft.Extensions.Logging.Abstractions": "9.0.0" } }, "SonarAnalyzer.CSharp": { "type": "Direct", - "requested": "[9.32.0.97167, )", - "resolved": "9.32.0.97167", - "contentHash": "Yxk86RV+8ynJpUhku1Yw2hITFmnmXKkXJ73cIFSy85ol5SnWREQg9RuTyV8nI7V7+pyLKpCfRmD7P0widsgjkg==" + "requested": "[10.3.0.106239, )", + "resolved": "10.3.0.106239", + "contentHash": "Ne5QHx0nUULk7PF+3GIQIC2EnFI93SPRilyqVY6US4JolZOCc9XyUKzvOVsufp7cyrqbOTL07U5mb6poYzllNQ==" }, "AngleSharp": { "type": "Transitive", @@ -110,6 +110,19 @@ "resolved": "2.4.0", "contentHash": "SwXsAV3sMvAU/Nn31pbjhWurYSjJ+/giI/0n6tCrYoupEK34iIHCuk3STAd9fx8yudM85KkLSVdn951vTng/vQ==" }, + "Magick.NET-Q8-AnyCPU": { + "type": "Transitive", + "resolved": "14.2.0", + "contentHash": "K4r9bNkm9bWBm/YrnXiYBj0+bR2axcb8EaF/IP6k2GpvJUqcdsViPh1z+Ap/4MrmwB2vvbSMF3bHWYJkEOXfEQ==", + "dependencies": { + "Magick.NET.Core": "14.2.0" + } + }, + "Magick.NET.Core": { + "type": "Transitive", + "resolved": "14.2.0", + "contentHash": "1F0vtPJwmoVg9tvi59VEy6KdmpUXbzKYJOH+TL37DT6kXfqj4iFtOMqD7CXC3G6z2zMgFeF5LX9SSApn8Jhhqg==" + }, "MailKit": { "type": "Transitive", "resolved": "4.8.0", @@ -146,158 +159,169 @@ }, "Microsoft.Extensions.Caching.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "bcz5sSFJbganH0+YrfvIjJDIcKNW7TL07C4d1eTmXy/wOt52iz4LVogJb6pazs7W0+74j0YpXFErvp++Aq5Bsw==", + "resolved": "8.0.0", + "contentHash": "3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Caching.Memory": { "type": "Transitive", - "resolved": "6.0.2", - "contentHash": "ANjkN9TiBZXm5cvj3bb3QbezBzqkupCzxwgNf46d4V4ToRBHcEp3IEgbc67M3ZqVHQxaJgEncZ/frdqznpVWIw==", + "resolved": "8.0.1", + "contentHash": "HFDnhYLccngrzyGgHkjEDU5FMLn4MpOsr5ElgsBMC4yx6lJh4jeWO7fHS8+TXPq+dgxCmUa/Trl8svObmwW4QA==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Caching.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "uEAjIHD+iMZKDQHgSk8hHgGwIMF29G2OyEu1EZUzcG960MeFQq8dvvqcU/xkhkIOBa/Caz9JAouGTdi5tUp2aA==", + "resolved": "9.0.0", + "contentHash": "YIMO9T3JL8MeEXgVozKt2v79hquo/EFtnY0vgxmLnUvk1Rei/halI7kOWZL2RBeV9FMGzgM9LZA8CVaNwFMaNA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Primitives": "9.0.0-rc.1.24431.7" + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0", + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "ijTDu7t3u9rpwRHAwgb3mhyPkM0gKwbaFszhQJ0KIU35L+BwuoWjEZxl7/7DYqKUfQV3BZMnUl3xGfWiTl/+/A==", + "resolved": "9.0.0", + "contentHash": "lqvd7W3FGKUO1+ZoUEMaZ5XDJeWvjpy2/M/ptCGz3tXLD4HWVaSzjufsAsjemasBEg+2SxXVtYVvGt5r2nKDlg==", "dependencies": { - "Microsoft.Extensions.Primitives": "9.0.0-rc.1.24431.7" + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { "type": "Transitive", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "/Fgu95b0aaJSDcKcRd6f5jEQotHa6QvK6UgtCQBdw07j94iN9dQi6+9YwBqT7ztMzrcI3aFd66js76wzhW/57A==", + "resolved": "9.0.0", + "contentHash": "RiScL99DcyngY9zJA2ROrri7Br8tn5N4hP4YNvGdTN/bvg1A3dwvDOxHnNZ3Im7x2SJ5i4LkX1uPiR/MfSFBLQ==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "9.0.0-rc.1.24431.7" + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0" } }, "Microsoft.Extensions.Configuration.FileExtensions": { "type": "Transitive", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "3uNxkjlt47bCrpkHXpDrtfm6FbKPOxDp+/OD8UyefwQKvNbbCp6moBS/Q83W/XVNVuCJ8BFGfXo70IGdInO7JQ==", + "resolved": "9.0.0", + "contentHash": "4EK93Jcd2lQG4GY6PAw8jGss0ZzFP0vPc1J85mES5fKNuDTqgFXHba9onBw2s18fs3I4vdo2AWyfD1mPAxWSQQ==", "dependencies": { - "Microsoft.Extensions.Configuration": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Configuration.Abstractions": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.FileProviders.Physical": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Primitives": "9.0.0-rc.1.24431.7" + "Microsoft.Extensions.Configuration": "9.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0", + "Microsoft.Extensions.FileProviders.Physical": "9.0.0", + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "n/o5Ou4JIycIJZfTybYujLbfRaDsBNDY5fPxhFT7GDWTBqM59OJQuebiPNKj0nzrRvaes8Cnr763NSdCA2Cfzg==", + "resolved": "9.0.0", + "contentHash": "MCPrg7v3QgNMr0vX4vzRXvkNGgLg8vKWX0nKCWUxu2uPyMsaRgiRc1tHBnbTcfJMhMKj2slE/j2M9oGkd25DNw==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0-rc.1.24431.7" + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "/Gtbv7/vlcUUx8rsVwI3zMS2gUMewMU2ukUa1mh00lRwBBmPPnempruehrhq/3LHLE4LO8tEaFtTYi1Z33PCWQ==" + "resolved": "9.0.0", + "contentHash": "+6f2qv2a3dLwd5w6JanPIPs47CxRbnk+ZocMJUhv9NxP88VlOcJYZs9jY+MYSjxvady08bUZn6qgiNh7DadGgg==" + }, + "Microsoft.Extensions.Diagnostics.Abstractions": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "elH2vmwNmsXuKmUeMQ4YW9ldXiF+gSGDgg1vORksob5POnpaI6caj1Hu8zaYbEuibhqCoWg0YRWDazBY3zjBfg==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2" + } }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "O0BVMsvJAjReWVeoeCrGQmjPZKbDmaguc4XOPHgpMq4abcUvHsAVg6mkUFUGutrSUXiRUyyiGxEXIrbHcmjExg==", + "resolved": "9.0.0", + "contentHash": "uK439QzYR0q2emLVtYzwyK3x+T5bTY4yWsd/k/ZUS9LR6Sflp8MIdhGXW8kQCd86dQD4tLqvcbLkku8qHY263Q==", "dependencies": { - "Microsoft.Extensions.Primitives": "9.0.0-rc.1.24431.7" + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.FileProviders.Physical": { "type": "Transitive", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "bMO0Qv8byfFnjCCdAWhGAw+QNIIaF+tueGOIv/LtYIW3TQFbeg0s8cYM/M4DFGP/H7VFf1O6fqhPgB/R170whg==", + "resolved": "9.0.0", + "contentHash": "3+ZUSpOSmie+o8NnLIRqCxSh65XL/ExU7JYnFOg58awDRlY3lVpZ9A369jkoZL1rpsq7LDhEfkn2ghhGaY1y5Q==", "dependencies": { - "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.FileSystemGlobbing": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Primitives": "9.0.0-rc.1.24431.7" + "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0", + "Microsoft.Extensions.FileSystemGlobbing": "9.0.0", + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.FileSystemGlobbing": { "type": "Transitive", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "q4Bh5jg+dKPIHZU5cXAQsGggxQpbxCcGUitG3ZAwb7QWC0yOqFQ8uA4TaOKeoIbOgiSRMHoiPKkK6HNEjxIMFw==" + "resolved": "9.0.0", + "contentHash": "jGFKZiXs2HNseK3NK/rfwHNNovER71jSj4BD1a/649ml9+h6oEtYd0GSALZDNW8jZ2Rh+oAeadOa6sagYW1F2A==" }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "resolved": "8.0.1", + "contentHash": "nHwq9aPBdBPYXPti6wYEEfgXddfBrYC+CQLn+qISiwQq5tpfaqDZSKOJNxoe9rfQxGf1c+2wC/qWFe1QYJPYqw==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.1", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2" } }, "Microsoft.Extensions.Localization": { "type": "Transitive", - "resolved": "6.0.35", - "contentHash": "yeNoMGd3TG8hh8GLsLFzTVmXjHv6oFVx800x2tUdU3w7pTI3xbZTAQAdFDnng6FwigAZv3OjOQnxtYJ5UO72RA==", + "resolved": "8.0.11", + "contentHash": "yTb325+mCuoUBBMEztLv48kK/I/99TfVPh4V5kW8Qw+45mqAJs9bndOYxvjJvJxKVuwgzOYiWC/a34fr4pJ8IA==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Localization.Abstractions": "6.0.35", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Localization.Abstractions": "8.0.11", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2" } }, "Microsoft.Extensions.Localization.Abstractions": { "type": "Transitive", - "resolved": "6.0.35", - "contentHash": "4CHYRHp4GxdUsvAZJ4kNny7ASVPRo3lRXrtvnRABL3aVFlw8nVsBEiG0C/eVYnv1n6ZT3aKX5/allqsXDLFgcA==" + "resolved": "8.0.11", + "contentHash": "qyfVEOJ8PsYrwC6kTQFSTm4+FrpOAz3OfPXvRPfs7j34V+yHMuVUgIiP5yjrYHcpNbXTtCzoQc/ZdcbpdeX/Xg==" }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "y12goyBzy/ePVxUas/scjZNPvC2ZH9fYvTBt8+sVe3/SmPczhmo6+9D3F+DwzqFHT7H4LMw9nTv0HpyJvT3YPw==", + "resolved": "9.0.0", + "contentHash": "crjWyORoug0kK7RSNJBTeSE6VX8IQgLf3nUpTB9m62bPXp/tzbnOsnbe8TXEG0AASNaKZddnpHKw7fET8E++Pg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Logging.Abstractions": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Options": "9.0.0-rc.1.24431.7" + "Microsoft.Extensions.DependencyInjection": "9.0.0", + "Microsoft.Extensions.Logging.Abstractions": "9.0.0", + "Microsoft.Extensions.Options": "9.0.0" } }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "ZVLZmJAokgLf6JkCkDFNIegwtg+3ZcJpi1l55Od3h3RK0ofN9Cny5+WNA6sexDJP6OhPCCqsl6fK26j+ZN1kNQ==", + "resolved": "9.0.0", + "contentHash": "y2146b3jrPI3Q0lokKXdKLpmXqakYbDIPDV6r3M8SqvSf45WwOTzkyfDpxnZXJsJQEpAsAqjUq5Pu8RCJMjubg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Primitives": "9.0.0-rc.1.24431.7" + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { "type": "Transitive", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "p2raSIvQIpfZhQLkJLk8oEv8zUxxT6raCX89XELs4SxAa2dV0OjBsz92cZVDtQg8HiRoSn01CIWXMM/to4yWqA==", + "resolved": "9.0.0", + "contentHash": "Ob3FXsXkcSMQmGZi7qP07EQ39kZpSBlTcAZLbJLdI4FIf0Jug8biv2HTavWmnTirchctPlq9bl/26CXtQRguzA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Configuration.Binder": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Options": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Primitives": "9.0.0-rc.1.24431.7" + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0", + "Microsoft.Extensions.Configuration.Binder": "9.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "Microsoft.Extensions.Options": "9.0.0", + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "o0oZEbXbuc3jY3KriFAoTNAeHzv3OCzCx5chpuB+ecoloBI+zpNup0ai8RuTe4Ky9ULK9TyAUC9hgIDX0NnjRw==" + "resolved": "9.0.0", + "contentHash": "N3qEBzmLMYiASUlKxxFIISP4AiwuPTHF5uCh+2CWSwwzAJiIYx0kBJsS30cp1nvhSySFAVi30jecD307jV+8Kg==" }, "Microsoft.Identity.Client": { "type": "Transitive", @@ -406,30 +430,27 @@ }, "SkiaSharp": { "type": "Transitive", - "resolved": "2.88.9", - "contentHash": "3MD5VHjXXieSHCleRLuaTXmL2pD0mB7CcOB1x2kA1I4bhptf4e3R27iM93264ZYuAq6mkUyX5XbcxnZvMJYc1Q==", + "resolved": "3.116.1", + "contentHash": "DNDwbRjP+aMo27dV2h/uHCVTcWubWWxHnPLiePNyl24f4Pv43mQ8AQQeseOrKR+J3AOCEs6t0sUjo0aa3j3RWQ==", "dependencies": { - "SkiaSharp.NativeAssets.Win32": "2.88.9", - "SkiaSharp.NativeAssets.macOS": "2.88.9" + "SkiaSharp.NativeAssets.Win32": "3.116.1", + "SkiaSharp.NativeAssets.macOS": "3.116.1" } }, "SkiaSharp.NativeAssets.Linux.NoDependencies": { "type": "Transitive", - "resolved": "2.88.9", - "contentHash": "ZA9syMvIuoqxPhyFTgde/bNV6VMdeYT9gRdNQT5O+ZjPK+a/nVkKRrqBbn7EVA7XQiW+xIycyT4gW/sea9eh+w==", - "dependencies": { - "SkiaSharp": "2.88.9" - } + "resolved": "3.116.1", + "contentHash": "yER+zmZzK4G642j0fbOBg3ZfLUs93o1kmHEXEOPZgMCzGVSmLvGmsFYIIlIQaMEpWY/TktFiZGqEKkT1RJ/YjQ==" }, "SkiaSharp.NativeAssets.macOS": { "type": "Transitive", - "resolved": "2.88.9", - "contentHash": "Nv5spmKc4505Ep7oUoJ5vp3KweFpeNqxpyGDWyeEPTX2uR6S6syXIm3gj75dM0YJz7NPvcix48mR5laqs8dPuA==" + "resolved": "3.116.1", + "contentHash": "3KPvpKysDmEMt0NnAZPX5U6KFk0LmG/72/IjAIJemIksIZ0Tjs9pGpr3L+zboVCv1MLVoJLKl3nJDXUG6Jda6A==" }, "SkiaSharp.NativeAssets.Win32": { "type": "Transitive", - "resolved": "2.88.9", - "contentHash": "wb2kYgU7iy84nQLYZwMeJXixvK++GoIuECjU4ECaUKNuflyRlJKyiRhN1MAHswvlvzuvkrjRWlK0Za6+kYQK7w==" + "resolved": "3.116.1", + "contentHash": "dRQ75MCI8oz6zAs2Y1w6pq6ARs4MhdNG+gf3doOxOxdnueDXffQLGQIxON54GDoxc0WjKOoHMKBR4DhaduwwQw==" }, "System.Buffers": { "type": "Transitive", @@ -461,8 +482,8 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "uispgX4BWG36vMQyEw7UDzwr+jCeoPFrNQehUKeX+JeL7C182057tR5BNm6CscXf5T5ww0rtUNs/6ob9DgNwLw==" + "resolved": "9.0.0", + "contentHash": "ddppcFpnbohLWdYKr/ZeLZHmmI+DXFgZ3Snq+/E7SwcdW4UnvxmaugkwGywvGVWkHPGCSZjCP+MLzu23AL5SDw==" }, "System.Diagnostics.EventLog": { "type": "Transitive", @@ -485,8 +506,8 @@ }, "System.IO.Pipelines": { "type": "Transitive", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "lCjA/RqkqLt+qhl1P8j9wA1YDlj484TrcN2grMLm8nyDeuG+q5Wa66p4BNfNjBoUo6bSJRISuIi/y54NvBMwgw==" + "resolved": "9.0.0", + "contentHash": "eA3cinogwaNB4jdjQHOP3Z3EuyiDII7MT35jgtnsA4vkn0LUrrSHsU0nzHTzFzmaFYeKV7MYyMxOocFzsBHpTw==" }, "System.Memory": { "type": "Transitive", @@ -567,16 +588,16 @@ }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "SBanbiR1d2luqkVETgQ6VYEaH0lixc5klV2Ke7tBa7DZdmZgQaNlBC+J32UJn4zwM+J0jY4tZ8sJEhTtDSHyyg==" + "resolved": "9.0.0", + "contentHash": "e2hMgAErLbKyUUwt18qSBf9T5Y+SFAL3ZedM8fLupkVj8Rj2PZ9oxQ37XX2LF8fTO1wNIxvKpihD7Of7D/NxZw==" }, "System.Text.Json": { "type": "Transitive", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "f6EHMnCjPQbwIftWreac1RsDolPpRT47lBfdHM/7Y/phtdewEtn3+XKWUVZ5gpB04tpab5y/XaZRkq28p3xzFQ==", + "resolved": "9.0.0", + "contentHash": "js7+qAu/9mQvnhA4EfGMZNEzXtJCDxgkgj8ohuxq/Qxv+R56G+ljefhiJHOxTNiw54q8vmABCWUwkMulNdlZ4A==", "dependencies": { - "System.IO.Pipelines": "9.0.0-rc.1.24431.7", - "System.Text.Encodings.Web": "9.0.0-rc.1.24431.7" + "System.IO.Pipelines": "9.0.0", + "System.Text.Encodings.Web": "9.0.0" } }, "System.Threading.Tasks.Extensions": { @@ -587,32 +608,33 @@ "kentico.xperience.umt": { "type": "Project", "dependencies": { - "Kentico.Xperience.Core": "[29.7.0, )", - "Microsoft.Bcl.AsyncInterfaces": "[9.0.0-rc.1.24431.7, )" + "Kentico.Xperience.Core": "[30.0.0, )", + "Microsoft.Bcl.AsyncInterfaces": "[9.0.0, )" } }, "kentico.xperience.umt.examples": { "type": "Project", "dependencies": { - "Kentico.Xperience.UMT": "[1.9.0, )" + "Kentico.Xperience.UMT": "[2.0.0, )" } }, "Kentico.Xperience.Core": { "type": "CentralTransitive", - "requested": "[29.7.0, )", - "resolved": "29.7.0", - "contentHash": "9rJYLckkygRJCAKEA0Mz+OqtWMhV9dDXi542kbfKZPSd4E4wHpdyqbO7plQtIakO40cjAt5or/GTsOBjvzT59g==", + "requested": "[30.0.0, )", + "resolved": "30.0.0", + "contentHash": "9P6OhCXzwd1KLzzmmGUI5Vnm+5mrtIlniioC2zGuMqgxmFUaDuk0SHBOW9knBICeF24IHpnXBK32icr17e1vPA==", "dependencies": { "AngleSharp": "0.17.1", + "Magick.NET-Q8-AnyCPU": "14.2.0", "MailKit": "4.8.0", "Microsoft.Data.SqlClient": "5.2.2", - "Microsoft.Extensions.Caching.Memory": "6.0.2", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.DependencyInjection": "6.0.1", - "Microsoft.Extensions.FileProviders.Physical": "6.0.0", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Localization": "6.0.35", - "Microsoft.Extensions.Options.ConfigurationExtensions": "6.0.0", + "Microsoft.Extensions.Caching.Memory": "8.0.1", + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.DependencyInjection": "8.0.1", + "Microsoft.Extensions.FileProviders.Physical": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.1", + "Microsoft.Extensions.Localization": "8.0.11", + "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0", "Mono.Cecil": "0.11.6", "Newtonsoft.Json": "13.0.3", "System.CodeDom": "8.0.0" @@ -620,24 +642,24 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "CentralTransitive", - "requested": "[9.0.0-rc.1.24431.7, )", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "tvUDJVCPvPaKK/RWPhi4o+ob9tYoNpl9g1RcuFx7eehCscMwwizs2cNgF4lvMdj82wN1rE8eUmtdbDeJm63gCw==" + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "owmu2Cr3IQ8yQiBleBHlGk8dSQ12oaF2e7TpzwJKEl4m84kkZJjEY1n33L67Y3zM5jPOjmmbdHjbfiL0RqcMRQ==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "CentralTransitive", - "requested": "[8.0.0, )", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "bktVwInkAlgvdRs6vL0wMF/Y2U3adUjOyjSkkzJCbNW0EsnAiZ/P0OmqLO9+MgSeWQUQ+DIHf7WahN7jSJdRng==", - "dependencies": { - "Microsoft.Extensions.Configuration": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Configuration.Abstractions": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Configuration.Binder": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Logging": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Logging.Abstractions": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Options": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Options.ConfigurationExtensions": "9.0.0-rc.1.24431.7" + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "H05HiqaNmg6GjH34ocYE9Wm1twm3Oz2aXZko8GTwGBzM7op2brpAA8pJ5yyD1OpS1mXUtModBYOlcZ/wXeWsSg==", + "dependencies": { + "Microsoft.Extensions.Configuration": "9.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0", + "Microsoft.Extensions.Configuration.Binder": "9.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "Microsoft.Extensions.Logging": "9.0.0", + "Microsoft.Extensions.Logging.Abstractions": "9.0.0", + "Microsoft.Extensions.Options": "9.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "9.0.0" } } } diff --git a/examples/Kentico.Xperience.UMT.Examples/Samples/ContentItemSamples.cs b/examples/Kentico.Xperience.UMT.Examples/Samples/ContentItemSamples.cs index ac72e52..aef6e38 100644 --- a/examples/Kentico.Xperience.UMT.Examples/Samples/ContentItemSamples.cs +++ b/examples/Kentico.Xperience.UMT.Examples/Samples/ContentItemSamples.cs @@ -47,8 +47,8 @@ public static class ContentItemSamples ContentItemCommonDataContentLanguageGuid = ContentLanguageSamples.CONTENT_LANGUAGE_ENUS_SAMPLE_GUID, ContentItemCommonDataVersionStatus = VersionStatus.Published, ContentItemCommonDataIsLatest = true, - ContentItemCommonDataPageBuilderWidgets = null, - ContentItemCommonDataPageTemplateConfiguration = null + ContentItemCommonDataVisualBuilderWidgets = null, + ContentItemCommonDataVisualBuilderTemplateConfiguration = null }; [Sample("ContentItemDataModel.Sample.Article.enUS", "This sample describes how to create content item data inside XbyK", "ContentItemData article sample (en-US)")] @@ -110,8 +110,8 @@ public static class ContentItemSamples ContentItemCommonDataContentLanguageGuid = ContentLanguageSamples.CONTENT_LANGUAGE_ENGB_SAMPLE_GUID, ContentItemCommonDataVersionStatus = VersionStatus.Published, ContentItemCommonDataIsLatest = true, - ContentItemCommonDataPageBuilderWidgets = null, - ContentItemCommonDataPageTemplateConfiguration = null + ContentItemCommonDataVisualBuilderWidgets = null, + ContentItemCommonDataVisualBuilderTemplateConfiguration = null }; [Sample("ContentItemDataModel.Sample.Article.enGB", "This sample describes how to create content item data inside XbyK", "ContentItemData article sample (en-GB)")] @@ -228,8 +228,8 @@ public static class ContentItemSamples ContentItemCommonDataContentLanguageGuid = ContentLanguageSamples.CONTENT_LANGUAGE_ENUS_SAMPLE_GUID, ContentItemCommonDataVersionStatus = VersionStatus.InitialDraft, ContentItemCommonDataIsLatest = true, - ContentItemCommonDataPageBuilderWidgets = null, - ContentItemCommonDataPageTemplateConfiguration = null + ContentItemCommonDataVisualBuilderWidgets = null, + ContentItemCommonDataVisualBuilderTemplateConfiguration = null }; [Sample("ContentItemDataModel.Sample.Article.enUS.WithRelations", "This sample describes how to create content item data inside XbyK", "ContentItemData article sample (en-US)")] @@ -299,8 +299,8 @@ public static class ContentItemSamples ContentItemCommonDataContentLanguageGuid = ContentLanguageSamples.CONTENT_LANGUAGE_ENGB_SAMPLE_GUID, ContentItemCommonDataVersionStatus = VersionStatus.Published, ContentItemCommonDataIsLatest = true, - ContentItemCommonDataPageBuilderWidgets = null, - ContentItemCommonDataPageTemplateConfiguration = null + ContentItemCommonDataVisualBuilderWidgets = null, + ContentItemCommonDataVisualBuilderTemplateConfiguration = null }; [Sample("ContentItemDataModel.Sample.Article.enGB.WithRelations", "This sample describes how to create content item data inside XbyK", "ContentItemData article sample (en-GB)")] @@ -414,8 +414,8 @@ public static class ContentItemSamples ContentItemCommonDataContentLanguageGuid = ContentLanguageSamples.CONTENT_LANGUAGE_ENUS_SAMPLE_GUID, ContentItemCommonDataVersionStatus = VersionStatus.Published, ContentItemCommonDataIsLatest = true, - ContentItemCommonDataPageBuilderWidgets = null, - ContentItemCommonDataPageTemplateConfiguration = null + ContentItemCommonDataVisualBuilderWidgets = null, + ContentItemCommonDataVisualBuilderTemplateConfiguration = null }; [Sample("ContentItemDataModel.Sample.Faq.enUS", "This sample describes how to reusable create content item data inside XbyK", "Reusable ContentItemData faq (en-US)")] @@ -459,8 +459,8 @@ public static class ContentItemSamples ContentItemCommonDataContentLanguageGuid = ContentLanguageSamples.CONTENT_LANGUAGE_ENGB_SAMPLE_GUID, ContentItemCommonDataVersionStatus = VersionStatus.Published, ContentItemCommonDataIsLatest = true, - ContentItemCommonDataPageBuilderWidgets = null, - ContentItemCommonDataPageTemplateConfiguration = null + ContentItemCommonDataVisualBuilderWidgets = null, + ContentItemCommonDataVisualBuilderTemplateConfiguration = null }; [Sample("ContentItemDataModel.Sample.Faq.enGB", "This sample describes how to create content item data inside XbyK", "Reusable ContentItemData faq sample (en-GB)")] diff --git a/examples/Kentico.Xperience.UMT.Examples/packages.lock.json b/examples/Kentico.Xperience.UMT.Examples/packages.lock.json index 1daa71b..746efae 100644 --- a/examples/Kentico.Xperience.UMT.Examples/packages.lock.json +++ b/examples/Kentico.Xperience.UMT.Examples/packages.lock.json @@ -4,9 +4,9 @@ "net8.0": { "SonarAnalyzer.CSharp": { "type": "Direct", - "requested": "[9.32.0.97167, )", - "resolved": "9.32.0.97167", - "contentHash": "Yxk86RV+8ynJpUhku1Yw2hITFmnmXKkXJ73cIFSy85ol5SnWREQg9RuTyV8nI7V7+pyLKpCfRmD7P0widsgjkg==" + "requested": "[10.3.0.106239, )", + "resolved": "10.3.0.106239", + "contentHash": "Ne5QHx0nUULk7PF+3GIQIC2EnFI93SPRilyqVY6US4JolZOCc9XyUKzvOVsufp7cyrqbOTL07U5mb6poYzllNQ==" }, "AngleSharp": { "type": "Transitive", @@ -51,6 +51,19 @@ "resolved": "2.4.0", "contentHash": "SwXsAV3sMvAU/Nn31pbjhWurYSjJ+/giI/0n6tCrYoupEK34iIHCuk3STAd9fx8yudM85KkLSVdn951vTng/vQ==" }, + "Magick.NET-Q8-AnyCPU": { + "type": "Transitive", + "resolved": "14.2.0", + "contentHash": "K4r9bNkm9bWBm/YrnXiYBj0+bR2axcb8EaF/IP6k2GpvJUqcdsViPh1z+Ap/4MrmwB2vvbSMF3bHWYJkEOXfEQ==", + "dependencies": { + "Magick.NET.Core": "14.2.0" + } + }, + "Magick.NET.Core": { + "type": "Transitive", + "resolved": "14.2.0", + "contentHash": "1F0vtPJwmoVg9tvi59VEy6KdmpUXbzKYJOH+TL37DT6kXfqj4iFtOMqD7CXC3G6z2zMgFeF5LX9SSApn8Jhhqg==" + }, "MailKit": { "type": "Transitive", "resolved": "4.8.0", @@ -87,140 +100,147 @@ }, "Microsoft.Extensions.Caching.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "bcz5sSFJbganH0+YrfvIjJDIcKNW7TL07C4d1eTmXy/wOt52iz4LVogJb6pazs7W0+74j0YpXFErvp++Aq5Bsw==", + "resolved": "8.0.0", + "contentHash": "3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Caching.Memory": { "type": "Transitive", - "resolved": "6.0.2", - "contentHash": "ANjkN9TiBZXm5cvj3bb3QbezBzqkupCzxwgNf46d4V4ToRBHcEp3IEgbc67M3ZqVHQxaJgEncZ/frdqznpVWIw==", + "resolved": "8.0.1", + "contentHash": "HFDnhYLccngrzyGgHkjEDU5FMLn4MpOsr5ElgsBMC4yx6lJh4jeWO7fHS8+TXPq+dgxCmUa/Trl8svObmwW4QA==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Caching.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==", + "resolved": "8.0.0", + "contentHash": "0J/9YNXTMWSZP2p2+nvl8p71zpSwokZXZuJW+VjdErkegAnFdO1XlqtA62SJtgVYHdKu3uPxJHcMR/r35HwFBA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "resolved": "8.0.0", + "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "b3ErKzND8LIC7o08QAVlKfaEIYEvLJbtmVbFZVBRXeu9YkKfSSzLZfR1SUfQPBIy9mKLhEtJgGYImkcMNaKE0A==", + "resolved": "8.0.0", + "contentHash": "mBMoXLsr5s1y2zOHWmKsE9veDcx8h1x/c3rz4baEdQKTeDcmQAPNbB54Pi/lhFO3K431eEq6PFbMgLaa6PHFfA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" } }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", + "resolved": "8.0.1", + "contentHash": "BmANAnR5Xd4Oqw7yQ75xOAYODybZQRzdeNucg7kS5wWKd2PNnMdYtJ2Vciy0QLylRmv42DGl5+AFL9izA6F1Rw==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + "resolved": "8.0.2", + "contentHash": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg==" + }, + "Microsoft.Extensions.Diagnostics.Abstractions": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "elH2vmwNmsXuKmUeMQ4YW9ldXiF+gSGDgg1vORksob5POnpaI6caj1Hu8zaYbEuibhqCoWg0YRWDazBY3zjBfg==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2" + } }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.FileProviders.Physical": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "QvkL7l0nM8udt3gfyu0Vw8bbCXblxaKOl7c2oBfgGy4LCURRaL9XWZX1FWJrQc43oMokVneVxH38iz+bY1sbhg==", + "resolved": "8.0.0", + "contentHash": "UboiXxpPUpwulHvIAVE36Knq0VSHaAmfrFkegLyBZeaADuKezJ/AIXYAW8F5GBlGk/VaibN2k/Zn1ca8YAfVdA==", "dependencies": { - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", - "Microsoft.Extensions.FileSystemGlobbing": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.FileSystemGlobbing": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.FileSystemGlobbing": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "ip8jnL1aPiaPeKINCqaTEbvBFDmVx9dXQEBZ2HOBRXPD1eabGNqP/bKlsIcp7U2lGxiXd5xIhoFcmY8nM4Hdiw==" + "resolved": "8.0.0", + "contentHash": "OK+670i7esqlQrPjdIKRbsyMCe9g5kSLpRRQGSr4Q58AOYEe/hCnfLZprh7viNisSUUQZmMrbbuDaIrP+V1ebQ==" }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "resolved": "8.0.1", + "contentHash": "nHwq9aPBdBPYXPti6wYEEfgXddfBrYC+CQLn+qISiwQq5tpfaqDZSKOJNxoe9rfQxGf1c+2wC/qWFe1QYJPYqw==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.1", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2" } }, "Microsoft.Extensions.Localization": { "type": "Transitive", - "resolved": "6.0.35", - "contentHash": "yeNoMGd3TG8hh8GLsLFzTVmXjHv6oFVx800x2tUdU3w7pTI3xbZTAQAdFDnng6FwigAZv3OjOQnxtYJ5UO72RA==", + "resolved": "8.0.11", + "contentHash": "yTb325+mCuoUBBMEztLv48kK/I/99TfVPh4V5kW8Qw+45mqAJs9bndOYxvjJvJxKVuwgzOYiWC/a34fr4pJ8IA==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Localization.Abstractions": "6.0.35", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Localization.Abstractions": "8.0.11", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2" } }, "Microsoft.Extensions.Localization.Abstractions": { "type": "Transitive", - "resolved": "6.0.35", - "contentHash": "4CHYRHp4GxdUsvAZJ4kNny7ASVPRo3lRXrtvnRABL3aVFlw8nVsBEiG0C/eVYnv1n6ZT3aKX5/allqsXDLFgcA==" + "resolved": "8.0.11", + "contentHash": "qyfVEOJ8PsYrwC6kTQFSTm4+FrpOAz3OfPXvRPfs7j34V+yHMuVUgIiP5yjrYHcpNbXTtCzoQc/ZdcbpdeX/Xg==" }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "resolved": "8.0.2", + "contentHash": "dWGKvhFybsaZpGmzkGCbNNwBD1rVlWzrZKANLW/CcbFJpCEceMCGzT7zZwHOGBCbwM0SzBuceMj5HN1LKV1QqA==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "bXWINbTn0vC0FYc9GaQTISbxhQLAMrvtbuvD9N6JelEaIS/Pr62wUCinrq5bf1WRBGczt1v4wDhxFtVFNcMdUQ==", + "resolved": "8.0.0", + "contentHash": "0f4DMRqEd50zQh+UyJc+/HiBsZ3vhAQALgdkcQEalSH1L2isdC7Yj54M3cyo5e+BeO5fcBQ7Dxly8XiBBcvRgw==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Configuration.Binder": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Configuration.Binder": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" }, "Microsoft.Identity.Client": { "type": "Transitive", @@ -477,26 +497,27 @@ "kentico.xperience.umt": { "type": "Project", "dependencies": { - "Kentico.Xperience.Core": "[29.7.0, )", - "Microsoft.Bcl.AsyncInterfaces": "[9.0.0-rc.1.24431.7, )" + "Kentico.Xperience.Core": "[30.0.0, )", + "Microsoft.Bcl.AsyncInterfaces": "[9.0.0, )" } }, "Kentico.Xperience.Core": { "type": "CentralTransitive", - "requested": "[29.7.0, )", - "resolved": "29.7.0", - "contentHash": "9rJYLckkygRJCAKEA0Mz+OqtWMhV9dDXi542kbfKZPSd4E4wHpdyqbO7plQtIakO40cjAt5or/GTsOBjvzT59g==", + "requested": "[30.0.0, )", + "resolved": "30.0.0", + "contentHash": "9P6OhCXzwd1KLzzmmGUI5Vnm+5mrtIlniioC2zGuMqgxmFUaDuk0SHBOW9knBICeF24IHpnXBK32icr17e1vPA==", "dependencies": { "AngleSharp": "0.17.1", + "Magick.NET-Q8-AnyCPU": "14.2.0", "MailKit": "4.8.0", "Microsoft.Data.SqlClient": "5.2.2", - "Microsoft.Extensions.Caching.Memory": "6.0.2", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.DependencyInjection": "6.0.1", - "Microsoft.Extensions.FileProviders.Physical": "6.0.0", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Localization": "6.0.35", - "Microsoft.Extensions.Options.ConfigurationExtensions": "6.0.0", + "Microsoft.Extensions.Caching.Memory": "8.0.1", + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.DependencyInjection": "8.0.1", + "Microsoft.Extensions.FileProviders.Physical": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.1", + "Microsoft.Extensions.Localization": "8.0.11", + "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0", "Mono.Cecil": "0.11.6", "Newtonsoft.Json": "13.0.3", "System.CodeDom": "8.0.0" @@ -504,15 +525,18 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "CentralTransitive", - "requested": "[9.0.0-rc.1.24431.7, )", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "tvUDJVCPvPaKK/RWPhi4o+ob9tYoNpl9g1RcuFx7eehCscMwwizs2cNgF4lvMdj82wN1rE8eUmtdbDeJm63gCw==" + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "owmu2Cr3IQ8yQiBleBHlGk8dSQ12oaF2e7TpzwJKEl4m84kkZJjEY1n33L67Y3zM5jPOjmmbdHjbfiL0RqcMRQ==" }, "Microsoft.Extensions.Logging.Abstractions": { "type": "CentralTransitive", - "requested": "[9.0.0-rc.1.24431.7, )", - "resolved": "6.0.4", - "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" + "requested": "[9.0.0, )", + "resolved": "8.0.2", + "contentHash": "nroMDjS7hNBPtkZqVBbSiQaQjWRDxITI8Y7XnDs97rqG3EbzVTNLZQf7bIeUJcaHOV8bca47s1Uxq94+2oGdxA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" + } } } } diff --git a/src/Kentico.Xperience.UMT/Global.cs b/src/Kentico.Xperience.UMT/Global.cs index ec3e4f7..8ea12f0 100644 --- a/src/Kentico.Xperience.UMT/Global.cs +++ b/src/Kentico.Xperience.UMT/Global.cs @@ -5,4 +5,5 @@ namespace Kentico.Xperience.UMT; internal static class Global { public const string NOT_AVAILABLE = "N/A"; + public const string DEFAULT_WORKSPACE_NAME = "KenticoDefault"; } diff --git a/src/Kentico.Xperience.UMT/InfoAdapter/AdapterFactory.cs b/src/Kentico.Xperience.UMT/InfoAdapter/AdapterFactory.cs index 17a4282..6a0509f 100644 --- a/src/Kentico.Xperience.UMT/InfoAdapter/AdapterFactory.cs +++ b/src/Kentico.Xperience.UMT/InfoAdapter/AdapterFactory.cs @@ -8,6 +8,8 @@ using CMS.Membership; using CMS.Websites; using CMS.Websites.Internal; +using CMS.Workspaces; + using Kentico.Xperience.UMT.Model; using Kentico.Xperience.UMT.ProviderProxy; using Kentico.Xperience.UMT.Services; @@ -34,20 +36,20 @@ internal class AdapterFactory(ILoggerFactory loggerFactory, UmtModelService mode EmailChannelModel => new GenericInfoAdapter(loggerFactory.CreateLogger>(), adapterContext), ChannelModel => new GenericInfoAdapter(loggerFactory.CreateLogger>(), adapterContext), ContentLanguageModel => new GenericInfoAdapter(loggerFactory.CreateLogger>(), adapterContext), - ContentItemModel => new GenericInfoAdapter(loggerFactory.CreateLogger>(), adapterContext), + ContentItemModel => new ContentItemAdapter(loggerFactory.CreateLogger(), Service.Resolve>(), Service.Resolve>(), adapterContext), WebPageItemModel => new GenericInfoAdapter(loggerFactory.CreateLogger>(), adapterContext), WebPageAclModel => new GenericInfoAdapter(loggerFactory.CreateLogger>(), adapterContext), WebPageUrlPathModel => new WebPageUrlPathAdapter(loggerFactory.CreateLogger(), adapterContext), DataClassModel => new DataClassAdapter(loggerFactory.CreateLogger(), adapterContext), ContentTypeChannelModel => new GenericInfoAdapter(loggerFactory.CreateLogger>(), adapterContext), ContentItemReferenceModel => new GenericInfoAdapter(loggerFactory.CreateLogger>(), adapterContext), - ContentFolderModel => new ContentFolderAdapter(loggerFactory.CreateLogger(), adapterContext), + ContentFolderModel => new ContentFolderAdapter(loggerFactory.CreateLogger(), Service.Resolve>(), Service.Resolve>(), adapterContext), TaxonomyModel => new TaxonomyAdapter(loggerFactory.CreateLogger(), adapterContext), TagModel => new TagAdapter(loggerFactory.CreateLogger(), adapterContext), // macro models ContentItemSimplifiedModel => new ContentItemSimplifiedAdapter(providerProxyFactory.CreateProviderProxy(providerProxyContext), providerProxyFactory, Service.Resolve(), this, - loggerFactory.CreateLogger()), + loggerFactory.CreateLogger(), Service.Resolve>(), Service.Resolve>()), _ => null, }; } diff --git a/src/Kentico.Xperience.UMT/InfoAdapter/ContentFolderAdapter.cs b/src/Kentico.Xperience.UMT/InfoAdapter/ContentFolderAdapter.cs index f796bb9..b0eccfb 100644 --- a/src/Kentico.Xperience.UMT/InfoAdapter/ContentFolderAdapter.cs +++ b/src/Kentico.Xperience.UMT/InfoAdapter/ContentFolderAdapter.cs @@ -1,7 +1,9 @@ using CMS.ContentEngine; using CMS.Core; using CMS.Core.Internal; +using CMS.DataEngine; using CMS.Helpers; +using CMS.Workspaces; using Kentico.Xperience.UMT.Model; using Kentico.Xperience.UMT.ProviderProxy; @@ -13,8 +15,13 @@ namespace Kentico.Xperience.UMT.InfoAdapter; public class ContentFolderAdapter: GenericInfoAdapter { - internal ContentFolderAdapter(ILogger logger, GenericInfoAdapterContext adapterContext) : base(logger, adapterContext) + private readonly IInfoProvider contentFolderInfoProvider; + private readonly IInfoProvider workspaceInfoProvider; + + internal ContentFolderAdapter(ILogger logger, IInfoProvider contentFolderInfoProvider, IInfoProvider workspaceInfoProvider, GenericInfoAdapterContext adapterContext) : base(logger, adapterContext) { + this.contentFolderInfoProvider = contentFolderInfoProvider; + this.workspaceInfoProvider = workspaceInfoProvider; } public override ContentFolderInfo Adapt(IUmtModel input) @@ -30,17 +37,33 @@ public override ContentFolderInfo Adapt(IUmtModel input) if (input is ContentFolderModel { ContentFolderParentFolderGUID: null }) { - var root = ContentFolderInfoProvider.ProviderObject.Get() + var root = contentFolderInfoProvider.Get() .WhereEquals(nameof(ContentFolderInfo.ContentFolderTreePath), "/") .FirstOrDefault(); if (root != null) { - info.ContentFolderParentFolderID = root.ContentFolderID; + info.ContentFolderParentFolderID = root.ContentFolderID; + } + else + { + Logger.LogError("Failed to locate root content item folder"); + } + } + + if (input is ContentFolderModel { ContentFolderWorkspaceGUID: null }) + { + var defaultWorkspace = workspaceInfoProvider.Get() + .WhereEquals(nameof(WorkspaceInfo.WorkspaceName), DEFAULT_WORKSPACE_NAME) + .FirstOrDefault(); + + if (defaultWorkspace != null) + { + info.ContentFolderWorkspaceID = defaultWorkspace.WorkspaceID; } else { - Logger.LogError("Failed to located root content item folder"); + Logger.LogError("Failed to locate default workspace"); } } diff --git a/src/Kentico.Xperience.UMT/InfoAdapter/ContentItemAdapter.cs b/src/Kentico.Xperience.UMT/InfoAdapter/ContentItemAdapter.cs new file mode 100644 index 0000000..667f463 --- /dev/null +++ b/src/Kentico.Xperience.UMT/InfoAdapter/ContentItemAdapter.cs @@ -0,0 +1,44 @@ +using System.Diagnostics; +using System.Text.Json; + +using CMS.ContentEngine; +using CMS.ContentEngine.Internal; +using CMS.DataEngine; +using CMS.Workspaces; + +using Kentico.Xperience.UMT.Model; +using Kentico.Xperience.UMT.ProviderProxy; +using Kentico.Xperience.UMT.Serialization; +using Kentico.Xperience.UMT.Services.Model; +using Microsoft.Extensions.Logging; + +namespace Kentico.Xperience.UMT.InfoAdapter; + +internal class ContentItemAdapter : GenericInfoAdapter +{ + private readonly int defaultWorkspaceID; + private readonly int rootContentFolderID; + + internal ContentItemAdapter(ILogger logger, IInfoProvider contentFolderInfoProvider, IInfoProvider workspaceInfoProvider, GenericInfoAdapterContext adapterContext) : base(logger, adapterContext) + { + rootContentFolderID = contentFolderInfoProvider.Get().Where(x => x.WhereEquals(nameof(ContentFolderInfo.ContentFolderTreePath), "/")).FirstOrDefault()?.ContentFolderID + ?? throw new InvalidOperationException("Target instance doesn't contain root content folder"); + + defaultWorkspaceID = workspaceInfoProvider.Get().Where(x => x.WhereEquals(nameof(WorkspaceInfo.WorkspaceName), DEFAULT_WORKSPACE_NAME)).FirstOrDefault()?.WorkspaceID + ?? throw new InvalidOperationException($"Target instance doesn't contain default workspace (WorkspaceName=\"{DEFAULT_WORKSPACE_NAME}\""); + } + + public override ContentItemInfo Adapt(IUmtModel input) + { + var adapted = base.Adapt(input); + if (0 == adapted.ContentItemContentFolderID) + { + adapted.ContentItemContentFolderID = rootContentFolderID; + } + if (0 == adapted.ContentItemWorkspaceID) + { + adapted.ContentItemWorkspaceID = defaultWorkspaceID; + } + return adapted; + } +} diff --git a/src/Kentico.Xperience.UMT/InfoAdapter/ContentItemSimplifiedAdapter.cs b/src/Kentico.Xperience.UMT/InfoAdapter/ContentItemSimplifiedAdapter.cs index c020f13..ecbb757 100644 --- a/src/Kentico.Xperience.UMT/InfoAdapter/ContentItemSimplifiedAdapter.cs +++ b/src/Kentico.Xperience.UMT/InfoAdapter/ContentItemSimplifiedAdapter.cs @@ -1,5 +1,7 @@ using System.Text.Json; +using AngleSharp.Dom; + using CMS.ContentEngine; using CMS.ContentEngine.Internal; using CMS.Core; @@ -10,6 +12,7 @@ using CMS.Membership; using CMS.Websites; using CMS.Websites.Internal; +using CMS.Workspaces; using Kentico.Xperience.UMT.Model; using Kentico.Xperience.UMT.ProviderProxy; @@ -24,18 +27,23 @@ public class ContentItemSimplifiedAdapter : IInfoAdapter logger; + public IProviderProxy ProviderProxy { get; } internal ContentItemSimplifiedAdapter(IProviderProxy providerProxy, IProviderProxyFactory providerProxyFactory, IDateTimeNowService dateTimeNowService, AdapterFactory adapterFactory, - ILogger logger) + ILogger logger, + IInfoProvider contentFolderInfoProvider, + IInfoProvider workspaceInfoProvider) { this.providerProxyFactory = providerProxyFactory; this.dateTimeNowService = dateTimeNowService; this.adapterFactory = adapterFactory; this.logger = logger; + rootContentFolderGUID = contentFolderInfoProvider.Get().Where(x => x.WhereEquals(nameof(ContentFolderInfo.ContentFolderTreePath), "/")).FirstOrDefault()?.ContentFolderGUID; + defaultWorkspaceGUID = workspaceInfoProvider.Get().Where(x => x.WhereEquals(nameof(WorkspaceInfo.WorkspaceName), "KenticoDefault")).FirstOrDefault()?.WorkspaceGUID; ProviderProxy = providerProxy; } @@ -43,6 +51,9 @@ internal ContentItemSimplifiedAdapter(IProviderProxy providerProxy, Guid? IInfoAdapter.GetUniqueIdOrNull(IUmtModel input) => throw new NotImplementedException(); + private readonly Guid? rootContentFolderGUID; + private readonly Guid? defaultWorkspaceGUID; + public ContentItemInfo Adapt(IUmtModel input) { if (input is not ContentItemSimplifiedModel cim) @@ -79,7 +90,8 @@ public ContentItemInfo Adapt(IUmtModel input) ContentItemIsSecured = cim.IsSecured ?? false, ContentItemDataClassGuid = dataClassInfo.ClassGUID, ContentItemChannelGuid = channel?.ChannelGUID, - ContentItemContentFolderGUID = cim.ContentItemContentFolderGUID + ContentItemContentFolderGUID = cim.ContentItemContentFolderGUID ?? rootContentFolderGUID, + ContentItemWorkspaceGUID = cim.ContentItemWorkspaceGUID ?? defaultWorkspaceGUID, }; var contentItemAdapter = adapterFactory.CreateAdapter(contentItemModel, new ProviderProxyContext()); @@ -138,8 +150,8 @@ public ContentItemInfo Adapt(IUmtModel input) ContentItemCommonDataContentItemGuid = contentItemInfo.ContentItemGUID, ContentItemCommonDataContentLanguageGuid = contentLanguageInfo.ContentLanguageGUID, CustomProperties = customProperties, - ContentItemCommonDataPageBuilderWidgets = null, - ContentItemCommonDataPageTemplateConfiguration = null, + ContentItemCommonDataVisualBuilderWidgets = null, + ContentItemCommonDataVisualBuilderTemplateConfiguration = null, ContentItemCommonDataVersionStatus = languageData.VersionStatus, ContentItemCommonDataIsLatest = languageData.IsLatest, }; diff --git a/src/Kentico.Xperience.UMT/InfoAdapter/GenericAdapter.cs b/src/Kentico.Xperience.UMT/InfoAdapter/GenericAdapter.cs index 2ab381b..6453319 100644 --- a/src/Kentico.Xperience.UMT/InfoAdapter/GenericAdapter.cs +++ b/src/Kentico.Xperience.UMT/InfoAdapter/GenericAdapter.cs @@ -261,11 +261,9 @@ public virtual TTargetInfo Adapt(IUmtModel input) { ArgumentNullException.ThrowIfNull(asset.ContentItemGuid); - var metadataWithSource = assetManager + value = assetManager .SetAsset(current.TypeInfo.ObjectClassName, asset, customProperty, asset.ContentItemGuid.Value, CancellationToken.None) .GetAwaiter().GetResult(); - - value = metadataWithSource; } current.SetValue(customProperty, value); diff --git a/src/Kentico.Xperience.UMT/Model/Auxiliary/AssetSource.cs b/src/Kentico.Xperience.UMT/Model/Auxiliary/AssetSource.cs index 61e4310..fd97dd0 100644 --- a/src/Kentico.Xperience.UMT/Model/Auxiliary/AssetSource.cs +++ b/src/Kentico.Xperience.UMT/Model/Auxiliary/AssetSource.cs @@ -24,6 +24,8 @@ public class AssetSource public string? Extension { get; set; } public long? Size { get; set; } public DateTime? LastModified { get; set; } + public int? ImageWidth { get; set; } + public int? ImageHeight { get; set; } public virtual string InferExtension() => Extension ?? throw new InvalidOperationException($"{nameof(AssetFileSource)} has unknown extension. Specify explicitly by {nameof(Extension)} property"); } diff --git a/src/Kentico.Xperience.UMT/Model/ContentFolderModel.cs b/src/Kentico.Xperience.UMT/Model/ContentFolderModel.cs index 2e6444f..c3eb0f9 100644 --- a/src/Kentico.Xperience.UMT/Model/ContentFolderModel.cs +++ b/src/Kentico.Xperience.UMT/Model/ContentFolderModel.cs @@ -26,7 +26,13 @@ public sealed class ContentFolderModel: UmtModel /// [ReferenceProperty(typeof(ContentFolderInfo), "ContentFolderParentFolderID", IsRequired = false)] public Guid? ContentFolderParentFolderGUID { get; set; } - + + /// + /// workspace guid. If null is specified, default workspace is used + /// + [ReferenceProperty(typeof(ContentFolderInfo), "ContentFolderWorkspaceID", IsRequired = false)] + public Guid? ContentFolderWorkspaceGUID { get; set; } + [Map] [Required] public string? ContentFolderName { get; set; } diff --git a/src/Kentico.Xperience.UMT/Model/ContentItemCommonDataModel.cs b/src/Kentico.Xperience.UMT/Model/ContentItemCommonDataModel.cs index f982bf5..cfd1c61 100644 --- a/src/Kentico.Xperience.UMT/Model/ContentItemCommonDataModel.cs +++ b/src/Kentico.Xperience.UMT/Model/ContentItemCommonDataModel.cs @@ -41,10 +41,10 @@ public class ContentItemCommonDataModel: UmtModel public bool? ContentItemCommonDataIsLatest { get; set; } = true; [Map] - public string? ContentItemCommonDataPageBuilderWidgets { get; set; } = null; + public string? ContentItemCommonDataVisualBuilderWidgets { get; set; } = null; [Map] - public string? ContentItemCommonDataPageTemplateConfiguration { get; set; } = null; + public string? ContentItemCommonDataVisualBuilderTemplateConfiguration { get; set; } = null; protected override (Guid? uniqueId, string? name, string? displayName) GetPrintArgs() => (ContentItemCommonDataGUID, NOT_AVAILABLE, NOT_AVAILABLE); diff --git a/src/Kentico.Xperience.UMT/Model/ContentItemModel.cs b/src/Kentico.Xperience.UMT/Model/ContentItemModel.cs index fac0688..c39fc1d 100644 --- a/src/Kentico.Xperience.UMT/Model/ContentItemModel.cs +++ b/src/Kentico.Xperience.UMT/Model/ContentItemModel.cs @@ -1,6 +1,8 @@ using System.ComponentModel.DataAnnotations; using CMS.ContentEngine; using CMS.DataEngine; +using CMS.Workspaces; + using Kentico.Xperience.UMT.Attributes; namespace Kentico.Xperience.UMT.Model; @@ -26,7 +28,13 @@ public class ContentItemModel : UmtModel /// [ReferenceProperty(typeof(ContentFolderInfo), "ContentItemContentFolderID", IsRequired = false)] public Guid? ContentItemContentFolderGUID { get; set; } - + + /// + /// reference to workspace + /// + [ReferenceProperty(typeof(WorkspaceInfo), "ContentItemWorkspaceID", IsRequired = false)] + public Guid? ContentItemWorkspaceGUID { get; set; } + [Map] [Required] public string? ContentItemName { get; set; } diff --git a/src/Kentico.Xperience.UMT/Model/ContentItemSimplifiedModel.cs b/src/Kentico.Xperience.UMT/Model/ContentItemSimplifiedModel.cs index 58931bf..7453507 100644 --- a/src/Kentico.Xperience.UMT/Model/ContentItemSimplifiedModel.cs +++ b/src/Kentico.Xperience.UMT/Model/ContentItemSimplifiedModel.cs @@ -20,12 +20,17 @@ public class ContentItemSimplifiedModel : UmtModel [Required] [UniqueIdProperty] public Guid? ContentItemGUID { get; set; } - + /// /// Reference to content folder /// public Guid? ContentItemContentFolderGUID { get; set; } + /// + /// Reference to workspace + /// + public Guid? ContentItemWorkspaceGUID { get; set; } + public bool? IsSecured { get; set; } = false; @@ -38,7 +43,7 @@ public class ContentItemSimplifiedModel : UmtModel /// Code name of the content item. [Required] public string? Name { get; set; } - + /// /// Indicates if content item is reusable. By default, item will be created as reusable. /// diff --git a/src/Kentico.Xperience.UMT/Services/AssetManager.cs b/src/Kentico.Xperience.UMT/Services/AssetManager.cs index 56c24e2..4ff2e9c 100644 --- a/src/Kentico.Xperience.UMT/Services/AssetManager.cs +++ b/src/Kentico.Xperience.UMT/Services/AssetManager.cs @@ -1,12 +1,21 @@ -using CMS.ContentEngine; +using System.Threading; + +using CMS.Base; +using CMS.ContentEngine; using CMS.ContentEngine.Internal; using CMS.Core; using CMS.Core.Internal; +using CMS.DataEngine; +using CMS.FormEngine; +using CMS.Helpers; using Kentico.Xperience.UMT.Model; +using Kentico.Xperience.UMT.ProviderProxy; using Microsoft.Extensions.Logging; +using Newtonsoft.Json.Linq; + namespace Kentico.Xperience.UMT.Services; internal class AssetManager( @@ -16,9 +25,13 @@ ILogger logger private readonly IDateTimeNowService dateTimeNowService = Service.Resolve(); private readonly IContentItemAssetFieldsProvider contentItemAssetFieldsProvider = Service.Resolve(); private readonly IContentItemAssetFileService contentItemAssetFileService = Service.Resolve(); + private readonly IImageInfoRetrieverService imageInfoRetrieverService = Service.Resolve(); + private readonly IImageOptimizationPipeline imageOptimizationPipeline = Service.Resolve(); + private readonly IContentItemAssetPathProvider contentItemAssetPathProvider = Service.Resolve(); + private readonly HttpClient httpClient = new(); - public async Task SetAsset(string className, AssetSource assetSource, string columnName, Guid contentItemGuid, CancellationToken cancellationToken) + public async Task SetAsset(string className, AssetSource assetSource, string columnName, Guid contentItemGuid, CancellationToken cancellationToken) { logger.LogTrace("SetAsset {Args}", new { className, assetSource, columnName, contentItemGuid }); if (contentItemAssetFieldsProvider @@ -26,8 +39,11 @@ public async Task SetAsset(string className, AssetSour .FirstOrDefault(info => info.Name.Equals(columnName, StringComparison.InvariantCultureIgnoreCase)) is { } assetField) { // assumption & copnsideration: setting new assets doesn't mean removal of old ones - ContentItemAssetMetadataWithSource source; + ContentItemAssetMetadata assetMetadata; + + (int? imageWidth, int? imageHeight) dimensions = (assetSource.ImageWidth, assetSource.ImageHeight); + switch (assetSource) { case AssetDataSource byteSource: @@ -35,13 +51,21 @@ public async Task SetAsset(string className, AssetSour ArgumentNullException.ThrowIfNull(byteSource.Data); ArgumentNullException.ThrowIfNull(byteSource.Identifier); - var assetMetadata = new ContentItemAssetMetadata + if ((dimensions.imageWidth is null || dimensions.imageHeight is null) && !imageInfoRetrieverService.TryGetImageDimensions(byteSource.Data, out dimensions)) + { + logger.LogError("Unable to get image dimensions"); + throw new InvalidOperationException("Unable to create asset"); + } + + assetMetadata = new ContentItemAssetMetadata { Extension = assetSource.InferExtension(), Identifier = byteSource.Identifier.Value, LastModified = byteSource.LastModified ?? dateTimeNowService.GetDateTimeNow(), Name = byteSource.Name, - Size = byteSource.Size ?? byteSource.Data.LongLength + Size = byteSource.Size ?? byteSource.Data.LongLength, + Width = dimensions.imageWidth, + Height = dimensions.imageHeight, }; source = new ContentItemAssetMetadataWithSource( new ContentItemAssetStreamSource(_ => Task.FromResult(new MemoryStream(byteSource.Data))), @@ -54,9 +78,15 @@ public async Task SetAsset(string className, AssetSour { ArgumentException.ThrowIfNullOrWhiteSpace(fileSource.FilePath); ArgumentNullException.ThrowIfNull(fileSource.Identifier); - + var file = CMS.IO.FileInfo.New(fileSource.FilePath); - var assetMetadata = new ContentItemAssetMetadata + if ((dimensions.imageWidth is null || dimensions.imageHeight is null) && !imageInfoRetrieverService.TryGetImageDimensions(fileSource.FilePath, out dimensions)) + { + logger.LogError("Unable to get image dimensions"); + throw new InvalidOperationException("Unable to create asset"); + } + + assetMetadata = new ContentItemAssetMetadata { Extension = assetSource.InferExtension(), Identifier = fileSource.Identifier.Value, @@ -75,28 +105,30 @@ public async Task SetAsset(string className, AssetSour ArgumentException.ThrowIfNullOrWhiteSpace(urlSource.Url); ArgumentNullException.ThrowIfNull(urlSource.Identifier); - var assetMetadata = new ContentItemAssetMetadata + // Download the file + var response = await httpClient.GetAsync(urlSource.Url); + + await response.Content.LoadIntoBufferAsync(); + byte[] data = await response.Content.ReadAsByteArrayAsync(); + + if ((dimensions.imageWidth is null || dimensions.imageHeight is null) && !imageInfoRetrieverService.TryGetImageDimensions(data, out dimensions)) + { + logger.LogError("Unable to get image dimensions"); + throw new InvalidOperationException("Unable to create asset"); + } + + assetMetadata = new ContentItemAssetMetadata { Extension = assetSource.InferExtension(), Identifier = urlSource.Identifier.Value, LastModified = urlSource.LastModified ?? dateTimeNowService.GetDateTimeNow(), Name = urlSource.Name, - Size = urlSource.Size ?? 0L + Size = data.Length, + Width = dimensions.imageWidth, + Height = dimensions.imageHeight, }; source = new ContentItemAssetMetadataWithSource( - new ContentItemAssetStreamSource(async token => - { - var response = await httpClient.GetAsync(urlSource.Url, token); - - await response.Content.LoadIntoBufferAsync(); - long? contentLength = response.Content.Headers.ContentLength; - if (assetMetadata.Size == 0) - { - assetMetadata.Size = contentLength ?? 0; - } - - return await response.Content.ReadAsStreamAsync(token); - }), + new ContentItemAssetStreamSource(_ => Task.FromResult(new MemoryStream(data))), assetMetadata ); break; @@ -109,7 +141,15 @@ public async Task SetAsset(string className, AssetSour await contentItemAssetFileService.Delete(source, contentItemGuid, assetField.Guid, false, cancellationToken); await contentItemAssetFileService.Save(source, contentItemGuid, assetField.Guid, false, cancellationToken); - return source; + var optimizedMetadata = await Optimize(assetField, source, assetMetadata, contentItemGuid); + if (optimizedMetadata is not null) + { + return optimizedMetadata; + } + else + { + return source; + } } else { @@ -118,4 +158,127 @@ public async Task SetAsset(string className, AssetSour throw new InvalidOperationException("Unable to create asset"); } + + private async Task Optimize(FormFieldInfo assetField, ContentItemAssetMetadataWithSource source, ContentItemAssetMetadata assetMetadata, Guid contentItemGuid) + { + if (ImageHelper.IsImage(source.Extension)) + { + string? assetFilePath = GetAssetFilePath(assetMetadata, contentItemGuid, assetField) ?? throw new InvalidOperationException("Unable to get asset file path"); + + bool metadataChanged = false; + if (!source.Width.HasValue || source.Width == 0 || !source.Height.HasValue || source.Height == 0) + { + metadataChanged = TrySetImageDimensions(source, assetFilePath); + } + + if (source.Original == null) + { + var contentItemAssetMetadataWithSource = await OptimizeContentItemAsset(source, assetField, assetFilePath, contentItemGuid, CancellationToken.None); + if (contentItemAssetMetadataWithSource != null) + { + source = contentItemAssetMetadataWithSource; + metadataChanged = true; + } + } + + if (metadataChanged) + { + var dataType = DataTypeManager.GetDataType(typeof(ContentItemAssetMetadata)); + return dataType.ConvertToDbType(source, SystemContext.SystemCulture, dataType.ObjectDefaultValue); + } + } + return null; + } + + /// + /// Adopted from ContentItemAssetBinaryManager + /// + private string? GetAssetFilePath(ContentItemAssetMetadata assetMetadata, Guid contentItemGuid, FormFieldInfo assetField) + { + string fileLocation = contentItemAssetPathProvider.GetFileLocation(assetMetadata, contentItemGuid, assetField.Guid); + if (File.Exists(fileLocation)) + { + return fileLocation; + } + + return null; + } + + /// + /// Adopted from ContentItemAssetBinaryManager + /// + private static bool ShouldOptimizeImage(ContentItemAssetMetadataWithSource assetMetadataWithSource, AutomaticImageFormatConversionParameters formatConversionParameters) + { + if (formatConversionParameters != null && formatConversionParameters.IsFormatConversionEnabled && ImageHelper.IsOptimizableImage(assetMetadataWithSource.Extension) && formatConversionParameters.InputImageExtensions != null) + { + return formatConversionParameters.InputImageExtensions.Contains(assetMetadataWithSource.Extension.TrimStart('.'), StringComparer.OrdinalIgnoreCase); + } + + return false; + } + + /// + /// Adopted from ContentItemAssetBinaryManager + /// + private async Task OptimizeContentItemAsset(ContentItemAssetMetadataWithSource assetMetadataWithSource, FormFieldInfo assetField, string imagePath, Guid contentItemGuid, CancellationToken cancellationToken) + { + var automaticImageFormatConversionParameters = AutomaticImageFormatConversionParameters.FromField(assetField); + if (!ShouldOptimizeImage(assetMetadataWithSource, automaticImageFormatConversionParameters)) + { + return null; + } + + var parameters = new ImageOptimizationParameters + { + OutputExtension = automaticImageFormatConversionParameters.OutputImageExtension, + Quality = ValidationHelper.GetInteger(automaticImageFormatConversionParameters.OutputQuality, 100) + }; + var optimizedMetadata = await imageOptimizationPipeline.OptimizeContentItemAsset(assetMetadataWithSource, assetMetadataWithSource.Source, parameters, imagePath); + if (optimizedMetadata != null) + { + await SaveOptimizedAsset(optimizedMetadata, contentItemGuid, assetField, cancellationToken); + return optimizedMetadata; + } + + return null; + } + + /// + /// Adopted from ContentItemAssetBinaryManager + /// + private bool TrySetImageDimensions(ContentItemAssetMetadata assetMetadata, string imagePath) + { + if (!imageInfoRetrieverService.TryGetImageDimensions(imagePath, out (int?, int?) dimensions)) + { + return false; + } + + (assetMetadata.Width, assetMetadata.Height) = dimensions; + if (assetMetadata.Original != null) + { + assetMetadata.Original.Height = dimensions.Item2; + assetMetadata.Original.Width = dimensions.Item1; + } + + return true; + } + + /// + /// Adopted from ContentItemAssetBinaryManager + /// + private async Task SaveOptimizedAsset(ContentItemAssetMetadataWithSource optimizedMetadata, Guid contentItemGuid, FormFieldInfo assetField, CancellationToken cancellationToken) + { + var metadata = new ContentItemAssetMetadata + { + Name = optimizedMetadata.Name, + Identifier = optimizedMetadata.Identifier, + Extension = optimizedMetadata.Extension, + Size = optimizedMetadata.Size, + LastModified = optimizedMetadata.LastModified, + Height = optimizedMetadata.Height, + Width = optimizedMetadata.Width + }; + var assetMetadataWithSource = new ContentItemAssetMetadataWithSource(optimizedMetadata.Source, metadata); + await contentItemAssetFileService.Save(assetMetadataWithSource, contentItemGuid, assetField.Guid, logWebFarmTask: true, cancellationToken); + } } diff --git a/src/Kentico.Xperience.UMT/packages.lock.json b/src/Kentico.Xperience.UMT/packages.lock.json index 38fadc2..fdb8081 100644 --- a/src/Kentico.Xperience.UMT/packages.lock.json +++ b/src/Kentico.Xperience.UMT/packages.lock.json @@ -4,20 +4,21 @@ "net8.0": { "Kentico.Xperience.Core": { "type": "Direct", - "requested": "[29.7.0, )", - "resolved": "29.7.0", - "contentHash": "9rJYLckkygRJCAKEA0Mz+OqtWMhV9dDXi542kbfKZPSd4E4wHpdyqbO7plQtIakO40cjAt5or/GTsOBjvzT59g==", + "requested": "[30.0.0, )", + "resolved": "30.0.0", + "contentHash": "9P6OhCXzwd1KLzzmmGUI5Vnm+5mrtIlniioC2zGuMqgxmFUaDuk0SHBOW9knBICeF24IHpnXBK32icr17e1vPA==", "dependencies": { "AngleSharp": "0.17.1", + "Magick.NET-Q8-AnyCPU": "14.2.0", "MailKit": "4.8.0", "Microsoft.Data.SqlClient": "5.2.2", - "Microsoft.Extensions.Caching.Memory": "6.0.2", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.DependencyInjection": "6.0.1", - "Microsoft.Extensions.FileProviders.Physical": "6.0.0", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Localization": "6.0.35", - "Microsoft.Extensions.Options.ConfigurationExtensions": "6.0.0", + "Microsoft.Extensions.Caching.Memory": "8.0.1", + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.DependencyInjection": "8.0.1", + "Microsoft.Extensions.FileProviders.Physical": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.1", + "Microsoft.Extensions.Localization": "8.0.11", + "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0", "Mono.Cecil": "0.11.6", "Newtonsoft.Json": "13.0.3", "System.CodeDom": "8.0.0" @@ -25,15 +26,15 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Direct", - "requested": "[9.0.0-rc.1.24431.7, )", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "tvUDJVCPvPaKK/RWPhi4o+ob9tYoNpl9g1RcuFx7eehCscMwwizs2cNgF4lvMdj82wN1rE8eUmtdbDeJm63gCw==" + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "owmu2Cr3IQ8yQiBleBHlGk8dSQ12oaF2e7TpzwJKEl4m84kkZJjEY1n33L67Y3zM5jPOjmmbdHjbfiL0RqcMRQ==" }, "SonarAnalyzer.CSharp": { "type": "Direct", - "requested": "[9.32.0.97167, )", - "resolved": "9.32.0.97167", - "contentHash": "Yxk86RV+8ynJpUhku1Yw2hITFmnmXKkXJ73cIFSy85ol5SnWREQg9RuTyV8nI7V7+pyLKpCfRmD7P0widsgjkg==" + "requested": "[10.3.0.106239, )", + "resolved": "10.3.0.106239", + "contentHash": "Ne5QHx0nUULk7PF+3GIQIC2EnFI93SPRilyqVY6US4JolZOCc9XyUKzvOVsufp7cyrqbOTL07U5mb6poYzllNQ==" }, "AngleSharp": { "type": "Transitive", @@ -78,6 +79,19 @@ "resolved": "2.4.0", "contentHash": "SwXsAV3sMvAU/Nn31pbjhWurYSjJ+/giI/0n6tCrYoupEK34iIHCuk3STAd9fx8yudM85KkLSVdn951vTng/vQ==" }, + "Magick.NET-Q8-AnyCPU": { + "type": "Transitive", + "resolved": "14.2.0", + "contentHash": "K4r9bNkm9bWBm/YrnXiYBj0+bR2axcb8EaF/IP6k2GpvJUqcdsViPh1z+Ap/4MrmwB2vvbSMF3bHWYJkEOXfEQ==", + "dependencies": { + "Magick.NET.Core": "14.2.0" + } + }, + "Magick.NET.Core": { + "type": "Transitive", + "resolved": "14.2.0", + "contentHash": "1F0vtPJwmoVg9tvi59VEy6KdmpUXbzKYJOH+TL37DT6kXfqj4iFtOMqD7CXC3G6z2zMgFeF5LX9SSApn8Jhhqg==" + }, "MailKit": { "type": "Transitive", "resolved": "4.8.0", @@ -114,140 +128,147 @@ }, "Microsoft.Extensions.Caching.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "bcz5sSFJbganH0+YrfvIjJDIcKNW7TL07C4d1eTmXy/wOt52iz4LVogJb6pazs7W0+74j0YpXFErvp++Aq5Bsw==", + "resolved": "8.0.0", + "contentHash": "3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Caching.Memory": { "type": "Transitive", - "resolved": "6.0.2", - "contentHash": "ANjkN9TiBZXm5cvj3bb3QbezBzqkupCzxwgNf46d4V4ToRBHcEp3IEgbc67M3ZqVHQxaJgEncZ/frdqznpVWIw==", + "resolved": "8.0.1", + "contentHash": "HFDnhYLccngrzyGgHkjEDU5FMLn4MpOsr5ElgsBMC4yx6lJh4jeWO7fHS8+TXPq+dgxCmUa/Trl8svObmwW4QA==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Caching.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==", + "resolved": "8.0.0", + "contentHash": "0J/9YNXTMWSZP2p2+nvl8p71zpSwokZXZuJW+VjdErkegAnFdO1XlqtA62SJtgVYHdKu3uPxJHcMR/r35HwFBA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "resolved": "8.0.0", + "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "b3ErKzND8LIC7o08QAVlKfaEIYEvLJbtmVbFZVBRXeu9YkKfSSzLZfR1SUfQPBIy9mKLhEtJgGYImkcMNaKE0A==", + "resolved": "8.0.0", + "contentHash": "mBMoXLsr5s1y2zOHWmKsE9veDcx8h1x/c3rz4baEdQKTeDcmQAPNbB54Pi/lhFO3K431eEq6PFbMgLaa6PHFfA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" } }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", + "resolved": "8.0.1", + "contentHash": "BmANAnR5Xd4Oqw7yQ75xOAYODybZQRzdeNucg7kS5wWKd2PNnMdYtJ2Vciy0QLylRmv42DGl5+AFL9izA6F1Rw==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + "resolved": "8.0.2", + "contentHash": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg==" + }, + "Microsoft.Extensions.Diagnostics.Abstractions": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "elH2vmwNmsXuKmUeMQ4YW9ldXiF+gSGDgg1vORksob5POnpaI6caj1Hu8zaYbEuibhqCoWg0YRWDazBY3zjBfg==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2" + } }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.FileProviders.Physical": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "QvkL7l0nM8udt3gfyu0Vw8bbCXblxaKOl7c2oBfgGy4LCURRaL9XWZX1FWJrQc43oMokVneVxH38iz+bY1sbhg==", + "resolved": "8.0.0", + "contentHash": "UboiXxpPUpwulHvIAVE36Knq0VSHaAmfrFkegLyBZeaADuKezJ/AIXYAW8F5GBlGk/VaibN2k/Zn1ca8YAfVdA==", "dependencies": { - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", - "Microsoft.Extensions.FileSystemGlobbing": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.FileSystemGlobbing": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.FileSystemGlobbing": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "ip8jnL1aPiaPeKINCqaTEbvBFDmVx9dXQEBZ2HOBRXPD1eabGNqP/bKlsIcp7U2lGxiXd5xIhoFcmY8nM4Hdiw==" + "resolved": "8.0.0", + "contentHash": "OK+670i7esqlQrPjdIKRbsyMCe9g5kSLpRRQGSr4Q58AOYEe/hCnfLZprh7viNisSUUQZmMrbbuDaIrP+V1ebQ==" }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "resolved": "8.0.1", + "contentHash": "nHwq9aPBdBPYXPti6wYEEfgXddfBrYC+CQLn+qISiwQq5tpfaqDZSKOJNxoe9rfQxGf1c+2wC/qWFe1QYJPYqw==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.1", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2" } }, "Microsoft.Extensions.Localization": { "type": "Transitive", - "resolved": "6.0.35", - "contentHash": "yeNoMGd3TG8hh8GLsLFzTVmXjHv6oFVx800x2tUdU3w7pTI3xbZTAQAdFDnng6FwigAZv3OjOQnxtYJ5UO72RA==", + "resolved": "8.0.11", + "contentHash": "yTb325+mCuoUBBMEztLv48kK/I/99TfVPh4V5kW8Qw+45mqAJs9bndOYxvjJvJxKVuwgzOYiWC/a34fr4pJ8IA==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Localization.Abstractions": "6.0.35", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Localization.Abstractions": "8.0.11", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2" } }, "Microsoft.Extensions.Localization.Abstractions": { "type": "Transitive", - "resolved": "6.0.35", - "contentHash": "4CHYRHp4GxdUsvAZJ4kNny7ASVPRo3lRXrtvnRABL3aVFlw8nVsBEiG0C/eVYnv1n6ZT3aKX5/allqsXDLFgcA==" + "resolved": "8.0.11", + "contentHash": "qyfVEOJ8PsYrwC6kTQFSTm4+FrpOAz3OfPXvRPfs7j34V+yHMuVUgIiP5yjrYHcpNbXTtCzoQc/ZdcbpdeX/Xg==" }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "resolved": "8.0.2", + "contentHash": "dWGKvhFybsaZpGmzkGCbNNwBD1rVlWzrZKANLW/CcbFJpCEceMCGzT7zZwHOGBCbwM0SzBuceMj5HN1LKV1QqA==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "bXWINbTn0vC0FYc9GaQTISbxhQLAMrvtbuvD9N6JelEaIS/Pr62wUCinrq5bf1WRBGczt1v4wDhxFtVFNcMdUQ==", + "resolved": "8.0.0", + "contentHash": "0f4DMRqEd50zQh+UyJc+/HiBsZ3vhAQALgdkcQEalSH1L2isdC7Yj54M3cyo5e+BeO5fcBQ7Dxly8XiBBcvRgw==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Configuration.Binder": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Configuration.Binder": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" }, "Microsoft.Identity.Client": { "type": "Transitive", @@ -503,9 +524,12 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "CentralTransitive", - "requested": "[9.0.0-rc.1.24431.7, )", - "resolved": "6.0.4", - "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" + "requested": "[9.0.0, )", + "resolved": "8.0.2", + "contentHash": "nroMDjS7hNBPtkZqVBbSiQaQjWRDxITI8Y7XnDs97rqG3EbzVTNLZQf7bIeUJcaHOV8bca47s1Uxq94+2oGdxA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" + } } } } diff --git a/tests/Kentico.Xperience.UMT.Tests/Tests/Tests_06_Languages.cs b/tests/Kentico.Xperience.UMT.Tests/Tests/Tests_06_Languages.cs index 702254e..5018c92 100644 --- a/tests/Kentico.Xperience.UMT.Tests/Tests/Tests_06_Languages.cs +++ b/tests/Kentico.Xperience.UMT.Tests/Tests/Tests_06_Languages.cs @@ -9,7 +9,7 @@ public async Task Test00100_All_Expected_Languages_Present_And_Clickable_Without { await OpenAdminApplication("Languages"); - string[] expectedLanguages = new[] { "English - (default)", "English (United Kingdom)", "English (United States)", "Spanish" }; + string[] expectedLanguages = new[] { "English", "English (United Kingdom)", "English (United States)", "Spanish" }; foreach (string lang in expectedLanguages) { diff --git a/tests/Kentico.Xperience.UMT.Tests/packages.lock.json b/tests/Kentico.Xperience.UMT.Tests/packages.lock.json index 0ecc96f..d72ae8c 100644 --- a/tests/Kentico.Xperience.UMT.Tests/packages.lock.json +++ b/tests/Kentico.Xperience.UMT.Tests/packages.lock.json @@ -51,9 +51,9 @@ }, "SonarAnalyzer.CSharp": { "type": "Direct", - "requested": "[9.32.0.97167, )", - "resolved": "9.32.0.97167", - "contentHash": "Yxk86RV+8ynJpUhku1Yw2hITFmnmXKkXJ73cIFSy85ol5SnWREQg9RuTyV8nI7V7+pyLKpCfRmD7P0widsgjkg==" + "requested": "[10.3.0.106239, )", + "resolved": "10.3.0.106239", + "contentHash": "Ne5QHx0nUULk7PF+3GIQIC2EnFI93SPRilyqVY6US4JolZOCc9XyUKzvOVsufp7cyrqbOTL07U5mb6poYzllNQ==" }, "Microsoft.CodeCoverage": { "type": "Transitive", @@ -125,7 +125,7 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "CentralTransitive", - "requested": "[9.0.0-rc.1.24431.7, )", + "requested": "[9.0.0, )", "resolved": "6.0.0", "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, diff --git a/utils/Kentico.Xperience.UMT.DocUtils/Kentico.Xperience.UMT.DocUtils.csproj b/utils/Kentico.Xperience.UMT.DocUtils/Kentico.Xperience.UMT.DocUtils.csproj index 6de1d76..2a1acdd 100644 --- a/utils/Kentico.Xperience.UMT.DocUtils/Kentico.Xperience.UMT.DocUtils.csproj +++ b/utils/Kentico.Xperience.UMT.DocUtils/Kentico.Xperience.UMT.DocUtils.csproj @@ -11,6 +11,9 @@ + + + diff --git a/utils/Kentico.Xperience.UMT.DocUtils/packages.lock.json b/utils/Kentico.Xperience.UMT.DocUtils/packages.lock.json index e4e5d68..53281dc 100644 --- a/utils/Kentico.Xperience.UMT.DocUtils/packages.lock.json +++ b/utils/Kentico.Xperience.UMT.DocUtils/packages.lock.json @@ -4,9 +4,9 @@ "net8.0": { "Markdig": { "type": "Direct", - "requested": "[0.37.0, )", - "resolved": "0.37.0", - "contentHash": "biiu4MTPFjW55qw6v5Aphtj0MjDLJ14x8ndZwkJUHIeqvaSGKeqhLY7S7Vu/S3k7/c9KwhhnaCDP9hdFNUhcNA==" + "requested": "[0.38.0, )", + "resolved": "0.38.0", + "contentHash": "zKy3JFjQvr1wbuMtbfcZVjNNCIqHxSCjGMq/CBcyNsY/MPsxqcS3o8M7CZ2kcMGGIw5LI2ZZd8rFUaFeV6SvrQ==" }, "Microsoft.Build.Locator": { "type": "Direct", @@ -16,15 +16,15 @@ }, "Microsoft.CodeAnalysis": { "type": "Direct", - "requested": "[4.11.0, )", - "resolved": "4.11.0", - "contentHash": "liYhSvQO+cFgshRdrL1CVXwrTd7oP5PnYyE6hfwosv9zmnxszFIgI3ysWG9wXt3iLL1mvdWhtciuiQqZAgTbZQ==", + "requested": "[4.12.0, )", + "resolved": "4.12.0", + "contentHash": "aOS645PGfzpK5u9PRpga/PDeiZJIRfsaywJrg3J7kf4gX84yMPidgoSoiO4z7VXG7wru0lPMUL07m0U8I0OTTw==", "dependencies": { "Humanizer.Core": "2.14.1", "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "Microsoft.CodeAnalysis.Analyzers": "3.3.4", - "Microsoft.CodeAnalysis.CSharp.Workspaces": "[4.11.0]", - "Microsoft.CodeAnalysis.VisualBasic.Workspaces": "[4.11.0]", + "Microsoft.CodeAnalysis.CSharp.Workspaces": "[4.12.0]", + "Microsoft.CodeAnalysis.VisualBasic.Workspaces": "[4.12.0]", "System.Buffers": "4.5.1", "System.Collections.Immutable": "8.0.0", "System.Composition": "8.0.0", @@ -38,11 +38,90 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.CSharp.Features": { + "type": "Direct", + "requested": "[4.12.0, )", + "resolved": "4.12.0", + "contentHash": "AGIeRdiahhtZc1dJoMun/qPvNJshMMkZEQiMRdD8IfoqYckQ6rdutB888o33rmFKelmUCnHl/6YCNlUW5cgG4w==", + "dependencies": { + "Humanizer.Core": "2.14.1", + "Microsoft.CodeAnalysis.AnalyzerUtilities": "3.3.0", + "Microsoft.CodeAnalysis.Analyzers": "3.3.4", + "Microsoft.CodeAnalysis.CSharp": "[4.12.0]", + "Microsoft.CodeAnalysis.CSharp.Workspaces": "[4.12.0]", + "Microsoft.CodeAnalysis.Common": "[4.12.0]", + "Microsoft.CodeAnalysis.Elfie": "1.0.0", + "Microsoft.CodeAnalysis.Features": "[4.12.0]", + "Microsoft.CodeAnalysis.Workspaces.Common": "[4.12.0]", + "Microsoft.DiaSymReader": "2.0.0", + "System.Collections.Immutable": "8.0.0", + "System.Composition": "8.0.0", + "System.Configuration.ConfigurationManager": "8.0.0", + "System.Diagnostics.EventLog": "8.0.0", + "System.IO.Pipelines": "8.0.0", + "System.Reflection.Metadata": "8.0.0", + "System.Security.Cryptography.ProtectedData": "8.0.0", + "System.Text.Encodings.Web": "8.0.0", + "System.Text.Json": "8.0.4", + "System.Threading.Channels": "7.0.0" + } + }, + "Microsoft.CodeAnalysis.Features": { + "type": "Direct", + "requested": "[4.12.0, )", + "resolved": "4.12.0", + "contentHash": "4mfBVwYUiDoRE5vhNNHBC7/e1f7kqjwaSTC3K6kRaX0xZRCr2LAqT51KOGrhL2uNbAdOGh05wtvh1u+qogcaCQ==", + "dependencies": { + "Humanizer.Core": "2.14.1", + "Microsoft.CodeAnalysis.AnalyzerUtilities": "3.3.0", + "Microsoft.CodeAnalysis.Analyzers": "3.3.4", + "Microsoft.CodeAnalysis.Common": "[4.12.0]", + "Microsoft.CodeAnalysis.Elfie": "1.0.0", + "Microsoft.CodeAnalysis.Scripting.Common": "[4.12.0]", + "Microsoft.CodeAnalysis.Workspaces.Common": "[4.12.0]", + "Microsoft.DiaSymReader": "2.0.0", + "System.Collections.Immutable": "8.0.0", + "System.Composition": "8.0.0", + "System.Configuration.ConfigurationManager": "8.0.0", + "System.Diagnostics.EventLog": "8.0.0", + "System.IO.Pipelines": "8.0.0", + "System.Reflection.Metadata": "8.0.0", + "System.Security.Cryptography.ProtectedData": "8.0.0", + "System.Text.Encodings.Web": "8.0.0", + "System.Text.Json": "8.0.4", + "System.Threading.Channels": "7.0.0" + } + }, + "Microsoft.CodeAnalysis.VisualBasic.Features": { + "type": "Direct", + "requested": "[4.12.0, )", + "resolved": "4.12.0", + "contentHash": "Fz/wOGT425MbY9dofEoNjV5bMhn1yBl9JFkdcOX4H3gGZ0Xk1wQS3cIVnABCI1b4yiWmyToVpiIykDBItrQ2TQ==", + "dependencies": { + "Humanizer.Core": "2.14.1", + "Microsoft.CodeAnalysis.AnalyzerUtilities": "3.3.0", + "Microsoft.CodeAnalysis.Analyzers": "3.3.4", + "Microsoft.CodeAnalysis.Elfie": "1.0.0", + "Microsoft.CodeAnalysis.Features": "[4.12.0]", + "Microsoft.CodeAnalysis.VisualBasic.Workspaces": "[4.12.0]", + "Microsoft.DiaSymReader": "2.0.0", + "System.Collections.Immutable": "8.0.0", + "System.Composition": "8.0.0", + "System.Configuration.ConfigurationManager": "8.0.0", + "System.Diagnostics.EventLog": "8.0.0", + "System.IO.Pipelines": "8.0.0", + "System.Reflection.Metadata": "8.0.0", + "System.Security.Cryptography.ProtectedData": "8.0.0", + "System.Text.Encodings.Web": "8.0.0", + "System.Text.Json": "8.0.4", + "System.Threading.Channels": "7.0.0" + } + }, "Microsoft.CodeAnalysis.Workspaces.MSBuild": { "type": "Direct", - "requested": "[4.11.0, )", - "resolved": "4.11.0", - "contentHash": "d7koMWg2JAmf3DWLHNX4lvb7uEsi7YeynCg4TOrzVgaSJP61/XyTxOrIkqjXaTeu8fvCm9imZVZHJleo+pREAA==", + "requested": "[4.12.0, )", + "resolved": "4.12.0", + "contentHash": "IfSNN0IOV++dhLuU8dGBTT4ExLNBhGs7uP7HbbnF/LYAn4I+dpmxDK7kjrfhagT4aDUR7TeRBFWXYg394xN6yA==", "dependencies": { "Humanizer.Core": "2.14.1", "Microsoft.Build": "17.7.2", @@ -50,8 +129,8 @@ "Microsoft.Build.Tasks.Core": "17.7.2", "Microsoft.Build.Utilities.Core": "17.7.2", "Microsoft.CodeAnalysis.Analyzers": "3.3.4", - "Microsoft.CodeAnalysis.Common": "[4.11.0]", - "Microsoft.CodeAnalysis.Workspaces.Common": "[4.11.0]", + "Microsoft.CodeAnalysis.Common": "[4.12.0]", + "Microsoft.CodeAnalysis.Workspaces.Common": "[4.12.0]", "Microsoft.Extensions.DependencyInjection": "8.0.0", "Microsoft.Extensions.Logging": "8.0.0", "Microsoft.Extensions.Logging.Abstractions": "8.0.0", @@ -71,7 +150,7 @@ "System.Security.Cryptography.Xml": "7.0.1", "System.Security.Permissions": "8.0.0", "System.Text.Encodings.Web": "8.0.0", - "System.Text.Json": "8.0.0", + "System.Text.Json": "8.0.4", "System.Threading.Channels": "7.0.0", "System.Threading.Tasks.Dataflow": "8.0.0", "System.Windows.Extensions": "8.0.0" @@ -79,49 +158,49 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Direct", - "requested": "[9.0.0-rc.1.24431.7, )", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "Dq4rgVJXE1SwINhR/D36O5fd9yZ4hQ4sWTt+gykLbWotaBEz16NhU95VKE4umsex147ZfkmDWr2Q0XldBQjuaA==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "g0UfujELzlLbHoVG8kPKVBaW470Ewi+jnptGS9KUi6jcb+k2StujtK3m26DFSGGwQ/+bVgZfsWqNzlP6YOejvw==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0-rc.1.24431.7", - "System.Diagnostics.DiagnosticSource": "9.0.0-rc.1.24431.7" + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "System.Diagnostics.DiagnosticSource": "9.0.0" } }, "Microsoft.Extensions.Logging.Configuration": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "ixXXV0G/12g6MXK65TLngYN9V5hQQRuV+fZi882WIoVJT7h5JvoYoxTEwCgdqwLjSneqh1O+66gM8sMr9z/rsQ==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "H05HiqaNmg6GjH34ocYE9Wm1twm3Oz2aXZko8GTwGBzM7op2brpAA8pJ5yyD1OpS1mXUtModBYOlcZ/wXeWsSg==", "dependencies": { - "Microsoft.Extensions.Configuration": "8.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.Configuration.Binder": "8.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Logging": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0" + "Microsoft.Extensions.Configuration": "9.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0", + "Microsoft.Extensions.Configuration.Binder": "9.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "Microsoft.Extensions.Logging": "9.0.0", + "Microsoft.Extensions.Logging.Abstractions": "9.0.0", + "Microsoft.Extensions.Options": "9.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "9.0.0" } }, "Microsoft.Extensions.Logging.Debug": { "type": "Direct", - "requested": "[9.0.0-rc.1.24431.7, )", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "PDhn1ZM/pUYgfXPKk4L/5tIG1mXKYnZPe6hnOnsvoTPEfZH5aMil8wZrKcmCBsi23k11QWTwhG4OqK95XS3Klw==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "4wGlHsrLhYjLw4sFkfRixu2w4DK7dv60OjbvgbLGhUJk0eUPxYHhnszZ/P18nnAkfrPryvtOJ3ZTVev0kpqM6A==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Logging": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Logging.Abstractions": "9.0.0-rc.1.24431.7" + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "Microsoft.Extensions.Logging": "9.0.0", + "Microsoft.Extensions.Logging.Abstractions": "9.0.0" } }, "NJsonSchema": { "type": "Direct", - "requested": "[11.0.2, )", - "resolved": "11.0.2", - "contentHash": "BOgw+TOd1w7BSRIEWwkiSgHlKWC2eu0DHsSsb1LIwlC1Hq26A0ARZiMjsCsqfXqXdr7hLf1m4M84Z7LW1wmCGA==", + "requested": "[11.1.0, )", + "resolved": "11.1.0", + "contentHash": "H7QO+bM/2uzF81mVyy4U8ha4MXS9eOX06rTvBgJKquzIuLUGuiOTc4nknkCFKW7mr+xnWgzY7Spevz5ZEK8fGg==", "dependencies": { - "NJsonSchema.Annotations": "11.0.2", - "Namotion.Reflection": "3.1.1", + "NJsonSchema.Annotations": "11.1.0", + "Namotion.Reflection": "3.2.0", "Newtonsoft.Json": "13.0.3" } }, @@ -144,9 +223,9 @@ }, "SonarAnalyzer.CSharp": { "type": "Direct", - "requested": "[9.32.0.97167, )", - "resolved": "9.32.0.97167", - "contentHash": "Yxk86RV+8ynJpUhku1Yw2hITFmnmXKkXJ73cIFSy85ol5SnWREQg9RuTyV8nI7V7+pyLKpCfRmD7P0widsgjkg==" + "requested": "[10.3.0.106239, )", + "resolved": "10.3.0.106239", + "contentHash": "Ne5QHx0nUULk7PF+3GIQIC2EnFI93SPRilyqVY6US4JolZOCc9XyUKzvOVsufp7cyrqbOTL07U5mb6poYzllNQ==" }, "AngleSharp": { "type": "Transitive", @@ -196,6 +275,19 @@ "resolved": "2.14.1", "contentHash": "lQKvtaTDOXnoVJ20ibTuSIOf2i0uO0MPbDhd1jm238I+U/2ZnRENj0cktKZhtchBMtCUSRQ5v4xBCUbKNmyVMw==" }, + "Magick.NET-Q8-AnyCPU": { + "type": "Transitive", + "resolved": "14.2.0", + "contentHash": "K4r9bNkm9bWBm/YrnXiYBj0+bR2axcb8EaF/IP6k2GpvJUqcdsViPh1z+Ap/4MrmwB2vvbSMF3bHWYJkEOXfEQ==", + "dependencies": { + "Magick.NET.Core": "14.2.0" + } + }, + "Magick.NET.Core": { + "type": "Transitive", + "resolved": "14.2.0", + "contentHash": "1F0vtPJwmoVg9tvi59VEy6KdmpUXbzKYJOH+TL37DT6kXfqj4iFtOMqD7CXC3G6z2zMgFeF5LX9SSApn8Jhhqg==" + }, "MailKit": { "type": "Transitive", "resolved": "4.8.0", @@ -279,10 +371,15 @@ "resolved": "3.3.4", "contentHash": "AxkxcPR+rheX0SmvpLVIGLhOUXAKG56a64kV9VQZ4y9gR9ZmPXnqZvHJnmwLSwzrEP6junUF11vuc+aqo5r68g==" }, + "Microsoft.CodeAnalysis.AnalyzerUtilities": { + "type": "Transitive", + "resolved": "3.3.0", + "contentHash": "gyQ70pJ4T7hu/s0+QnEaXtYfeG/JrttGnxHJlrhpxsQjRIUGuRhVwNBtkHHYOrUAZ/l47L98/NiJX6QmTwAyrg==" + }, "Microsoft.CodeAnalysis.Common": { "type": "Transitive", - "resolved": "4.11.0", - "contentHash": "djf8ujmqYImFgB04UGtcsEhHrzVqzHowS+EEl/Yunc5LdrYrZhGBWUTXoCF0NzYXJxtfuD+UVQarWpvrNc94Qg==", + "resolved": "4.12.0", + "contentHash": "c1kNYihL2gdcuU1dqm8R8YeA4YkB43TpU3pa2r66Uooh6AAhRtENzj9A4Kj0a+H8JDDyuTjNZql9XlVUzV+UjA==", "dependencies": { "Microsoft.CodeAnalysis.Analyzers": "3.3.4", "System.Collections.Immutable": "8.0.0", @@ -291,25 +388,25 @@ }, "Microsoft.CodeAnalysis.CSharp": { "type": "Transitive", - "resolved": "4.11.0", - "contentHash": "6XYi2EusI8JT4y2l/F3VVVS+ISoIX9nqHsZRaG6W5aFeJ5BEuBosHfT/ABb73FN0RZ1Z3cj2j7cL28SToJPXOw==", + "resolved": "4.12.0", + "contentHash": "30vVQ1MizeC22iEdEvI2w0eTIYG43/L20yBzuQH01xKzJgHAoWehzI2F8u07o4mXh4DGMOjQF7aEm0zzvsG3Mg==", "dependencies": { "Microsoft.CodeAnalysis.Analyzers": "3.3.4", - "Microsoft.CodeAnalysis.Common": "[4.11.0]", + "Microsoft.CodeAnalysis.Common": "[4.12.0]", "System.Collections.Immutable": "8.0.0", "System.Reflection.Metadata": "8.0.0" } }, "Microsoft.CodeAnalysis.CSharp.Workspaces": { "type": "Transitive", - "resolved": "4.11.0", - "contentHash": "/oRJPIMvzOfiunIegSF6FEa4VvBAUSXlbLDKxyzXuOZN9nLHg3fHuX6Mr9JZLNIupbe2xqQZEmfsPxgB01vCmg==", + "resolved": "4.12.0", + "contentHash": "ZZ08UBgL3f3VeVvRA1k+PGZYbCIy2EBX4nBld/1ndsaoUZcwqkUaXbljjpoJ5reozpRrBPMUJ0E34REaVgYKjw==", "dependencies": { "Humanizer.Core": "2.14.1", "Microsoft.CodeAnalysis.Analyzers": "3.3.4", - "Microsoft.CodeAnalysis.CSharp": "[4.11.0]", - "Microsoft.CodeAnalysis.Common": "[4.11.0]", - "Microsoft.CodeAnalysis.Workspaces.Common": "[4.11.0]", + "Microsoft.CodeAnalysis.CSharp": "[4.12.0]", + "Microsoft.CodeAnalysis.Common": "[4.12.0]", + "Microsoft.CodeAnalysis.Workspaces.Common": "[4.12.0]", "System.Collections.Immutable": "8.0.0", "System.Composition": "8.0.0", "System.IO.Pipelines": "8.0.0", @@ -317,6 +414,15 @@ "System.Threading.Channels": "7.0.0" } }, + "Microsoft.CodeAnalysis.Elfie": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "r12elUp4MRjdnRfxEP+xqVSUUfG3yIJTBEJGwbfvF5oU4m0jb9HC0gFG28V/dAkYGMkRmHVi3qvrnBLQSw9X3Q==", + "dependencies": { + "System.Configuration.ConfigurationManager": "4.5.0", + "System.Data.DataSetExtensions": "4.5.0" + } + }, "Microsoft.CodeAnalysis.Razor": { "type": "Transitive", "resolved": "6.0.0", @@ -327,27 +433,38 @@ "Microsoft.CodeAnalysis.Common": "4.0.0" } }, + "Microsoft.CodeAnalysis.Scripting.Common": { + "type": "Transitive", + "resolved": "4.12.0", + "contentHash": "HS0nh9K+cSKLf04oDMExJKyZLzBv4tM2MNq6kmJCPuP7gf1chC7Iu6N1PYn7cw0PT9a3JuJf6Y1X7PXDpPJNrg==", + "dependencies": { + "Microsoft.CodeAnalysis.Analyzers": "3.3.4", + "Microsoft.CodeAnalysis.Common": "[4.12.0]", + "System.Collections.Immutable": "8.0.0", + "System.Reflection.Metadata": "8.0.0" + } + }, "Microsoft.CodeAnalysis.VisualBasic": { "type": "Transitive", - "resolved": "4.11.0", - "contentHash": "1ypssIzZvsDtzyN8tFqZdKS8cl7MAQQ6eBjHGCJ9paLNlmnBd2kCo1GRr8kO0yWaFN/Io2JXaTeeHRDZLiKKyw==", + "resolved": "4.12.0", + "contentHash": "RBxRpzTe2nqG96F/vJA5QK2YAuyFyg4+8VzSUW9DvZxNHGqz1taAC0KgOGd8VywGWIdZ7LhAdSI0Z6dlOkxN7w==", "dependencies": { "Microsoft.CodeAnalysis.Analyzers": "3.3.4", - "Microsoft.CodeAnalysis.Common": "[4.11.0]", + "Microsoft.CodeAnalysis.Common": "[4.12.0]", "System.Collections.Immutable": "8.0.0", "System.Reflection.Metadata": "8.0.0" } }, "Microsoft.CodeAnalysis.VisualBasic.Workspaces": { "type": "Transitive", - "resolved": "4.11.0", - "contentHash": "mXpuVE6TW+YbXbErkNFCy0iH5OY3HOva+CUpGxOJcLXol9/vevigR1FtC9lOl7fFB55r+T+lG/WAXd5nLsiDGg==", + "resolved": "4.12.0", + "contentHash": "//BOaYtbtQIFBNKS4AWVQStq3cpQRsItSnHGcZfRAnMZuMWuQ/dC6Lz7RR17nXkM6WwdCgJWTl0UBf2MElc3DQ==", "dependencies": { "Humanizer.Core": "2.14.1", "Microsoft.CodeAnalysis.Analyzers": "3.3.4", - "Microsoft.CodeAnalysis.Common": "[4.11.0]", - "Microsoft.CodeAnalysis.VisualBasic": "[4.11.0]", - "Microsoft.CodeAnalysis.Workspaces.Common": "[4.11.0]", + "Microsoft.CodeAnalysis.Common": "[4.12.0]", + "Microsoft.CodeAnalysis.VisualBasic": "[4.12.0]", + "Microsoft.CodeAnalysis.Workspaces.Common": "[4.12.0]", "System.Collections.Immutable": "8.0.0", "System.Composition": "8.0.0", "System.IO.Pipelines": "8.0.0", @@ -357,12 +474,12 @@ }, "Microsoft.CodeAnalysis.Workspaces.Common": { "type": "Transitive", - "resolved": "4.11.0", - "contentHash": "UtwEt42V7/LnvAcschSlmUXRLEj0poX1H7QeFbY5bezcS+tJBCssAq8C7GfisgIA0qZPo2xzOrwKGBbg51CetA==", + "resolved": "4.12.0", + "contentHash": "9WFrMPm/k72qo7pxn6hPIS/UIAFVS/2yKBWJAW+kkmcY8PCsuBgp5ms+pmRI3mjAf7J1SmpdgHpRj2x1Gqc+9A==", "dependencies": { "Humanizer.Core": "2.14.1", "Microsoft.CodeAnalysis.Analyzers": "3.3.4", - "Microsoft.CodeAnalysis.Common": "[4.11.0]", + "Microsoft.CodeAnalysis.Common": "[4.12.0]", "System.Collections.Immutable": "8.0.0", "System.Composition": "8.0.0", "System.IO.Pipelines": "8.0.0", @@ -395,63 +512,68 @@ "resolved": "5.2.0", "contentHash": "po1jhvFd+8pbfvJR/puh+fkHi0GRanAdvayh/0e47yaM6CXWZ6opUjCMFuYlAnD2LcbyvQE7fPJKvogmaUcN+w==" }, + "Microsoft.DiaSymReader": { + "type": "Transitive", + "resolved": "2.0.0", + "contentHash": "QcZrCETsBJqy/vQpFtJc+jSXQ0K5sucQ6NUFbTNVHD4vfZZOwjZ/3sBzczkC4DityhD3AVO/+K/+9ioLs1AgRA==" + }, "Microsoft.Extensions.Caching.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "bcz5sSFJbganH0+YrfvIjJDIcKNW7TL07C4d1eTmXy/wOt52iz4LVogJb6pazs7W0+74j0YpXFErvp++Aq5Bsw==", + "resolved": "8.0.0", + "contentHash": "3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Caching.Memory": { "type": "Transitive", - "resolved": "6.0.2", - "contentHash": "ANjkN9TiBZXm5cvj3bb3QbezBzqkupCzxwgNf46d4V4ToRBHcEp3IEgbc67M3ZqVHQxaJgEncZ/frdqznpVWIw==", + "resolved": "8.0.1", + "contentHash": "HFDnhYLccngrzyGgHkjEDU5FMLn4MpOsr5ElgsBMC4yx6lJh4jeWO7fHS8+TXPq+dgxCmUa/Trl8svObmwW4QA==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Caching.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "0J/9YNXTMWSZP2p2+nvl8p71zpSwokZXZuJW+VjdErkegAnFdO1XlqtA62SJtgVYHdKu3uPxJHcMR/r35HwFBA==", + "resolved": "9.0.0", + "contentHash": "YIMO9T3JL8MeEXgVozKt2v79hquo/EFtnY0vgxmLnUvk1Rei/halI7kOWZL2RBeV9FMGzgM9LZA8CVaNwFMaNA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0", + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", + "resolved": "9.0.0", + "contentHash": "lqvd7W3FGKUO1+ZoUEMaZ5XDJeWvjpy2/M/ptCGz3tXLD4HWVaSzjufsAsjemasBEg+2SxXVtYVvGt5r2nKDlg==", "dependencies": { - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "mBMoXLsr5s1y2zOHWmKsE9veDcx8h1x/c3rz4baEdQKTeDcmQAPNbB54Pi/lhFO3K431eEq6PFbMgLaa6PHFfA==", + "resolved": "9.0.0", + "contentHash": "RiScL99DcyngY9zJA2ROrri7Br8tn5N4hP4YNvGdTN/bvg1A3dwvDOxHnNZ3Im7x2SJ5i4LkX1uPiR/MfSFBLQ==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0" } }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "n/o5Ou4JIycIJZfTybYujLbfRaDsBNDY5fPxhFT7GDWTBqM59OJQuebiPNKj0nzrRvaes8Cnr763NSdCA2Cfzg==", + "resolved": "9.0.0", + "contentHash": "MCPrg7v3QgNMr0vX4vzRXvkNGgLg8vKWX0nKCWUxu2uPyMsaRgiRc1tHBnbTcfJMhMKj2slE/j2M9oGkd25DNw==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0-rc.1.24431.7" + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "/Gtbv7/vlcUUx8rsVwI3zMS2gUMewMU2ukUa1mh00lRwBBmPPnempruehrhq/3LHLE4LO8tEaFtTYi1Z33PCWQ==" + "resolved": "9.0.0", + "contentHash": "+6f2qv2a3dLwd5w6JanPIPs47CxRbnk+ZocMJUhv9NxP88VlOcJYZs9jY+MYSjxvady08bUZn6qgiNh7DadGgg==" }, "Microsoft.Extensions.DependencyModel": { "type": "Transitive", @@ -465,90 +587,101 @@ "System.Text.Json": "6.0.0" } }, + "Microsoft.Extensions.Diagnostics.Abstractions": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "elH2vmwNmsXuKmUeMQ4YW9ldXiF+gSGDgg1vORksob5POnpaI6caj1Hu8zaYbEuibhqCoWg0YRWDazBY3zjBfg==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2" + } + }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.FileProviders.Physical": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "QvkL7l0nM8udt3gfyu0Vw8bbCXblxaKOl7c2oBfgGy4LCURRaL9XWZX1FWJrQc43oMokVneVxH38iz+bY1sbhg==", + "resolved": "8.0.0", + "contentHash": "UboiXxpPUpwulHvIAVE36Knq0VSHaAmfrFkegLyBZeaADuKezJ/AIXYAW8F5GBlGk/VaibN2k/Zn1ca8YAfVdA==", "dependencies": { - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", - "Microsoft.Extensions.FileSystemGlobbing": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.FileSystemGlobbing": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.FileSystemGlobbing": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "ip8jnL1aPiaPeKINCqaTEbvBFDmVx9dXQEBZ2HOBRXPD1eabGNqP/bKlsIcp7U2lGxiXd5xIhoFcmY8nM4Hdiw==" + "resolved": "8.0.0", + "contentHash": "OK+670i7esqlQrPjdIKRbsyMCe9g5kSLpRRQGSr4Q58AOYEe/hCnfLZprh7viNisSUUQZmMrbbuDaIrP+V1ebQ==" }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "resolved": "8.0.1", + "contentHash": "nHwq9aPBdBPYXPti6wYEEfgXddfBrYC+CQLn+qISiwQq5tpfaqDZSKOJNxoe9rfQxGf1c+2wC/qWFe1QYJPYqw==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.1", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2" } }, "Microsoft.Extensions.Localization": { "type": "Transitive", - "resolved": "6.0.35", - "contentHash": "yeNoMGd3TG8hh8GLsLFzTVmXjHv6oFVx800x2tUdU3w7pTI3xbZTAQAdFDnng6FwigAZv3OjOQnxtYJ5UO72RA==", + "resolved": "8.0.11", + "contentHash": "yTb325+mCuoUBBMEztLv48kK/I/99TfVPh4V5kW8Qw+45mqAJs9bndOYxvjJvJxKVuwgzOYiWC/a34fr4pJ8IA==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Localization.Abstractions": "6.0.35", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Localization.Abstractions": "8.0.11", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2" } }, "Microsoft.Extensions.Localization.Abstractions": { "type": "Transitive", - "resolved": "6.0.35", - "contentHash": "4CHYRHp4GxdUsvAZJ4kNny7ASVPRo3lRXrtvnRABL3aVFlw8nVsBEiG0C/eVYnv1n6ZT3aKX5/allqsXDLFgcA==" + "resolved": "8.0.11", + "contentHash": "qyfVEOJ8PsYrwC6kTQFSTm4+FrpOAz3OfPXvRPfs7j34V+yHMuVUgIiP5yjrYHcpNbXTtCzoQc/ZdcbpdeX/Xg==" }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "y12goyBzy/ePVxUas/scjZNPvC2ZH9fYvTBt8+sVe3/SmPczhmo6+9D3F+DwzqFHT7H4LMw9nTv0HpyJvT3YPw==", + "resolved": "9.0.0", + "contentHash": "crjWyORoug0kK7RSNJBTeSE6VX8IQgLf3nUpTB9m62bPXp/tzbnOsnbe8TXEG0AASNaKZddnpHKw7fET8E++Pg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Logging.Abstractions": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Options": "9.0.0-rc.1.24431.7" + "Microsoft.Extensions.DependencyInjection": "9.0.0", + "Microsoft.Extensions.Logging.Abstractions": "9.0.0", + "Microsoft.Extensions.Options": "9.0.0" } }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "ZVLZmJAokgLf6JkCkDFNIegwtg+3ZcJpi1l55Od3h3RK0ofN9Cny5+WNA6sexDJP6OhPCCqsl6fK26j+ZN1kNQ==", + "resolved": "9.0.0", + "contentHash": "y2146b3jrPI3Q0lokKXdKLpmXqakYbDIPDV6r3M8SqvSf45WwOTzkyfDpxnZXJsJQEpAsAqjUq5Pu8RCJMjubg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0-rc.1.24431.7", - "Microsoft.Extensions.Primitives": "9.0.0-rc.1.24431.7" + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "0f4DMRqEd50zQh+UyJc+/HiBsZ3vhAQALgdkcQEalSH1L2isdC7Yj54M3cyo5e+BeO5fcBQ7Dxly8XiBBcvRgw==", + "resolved": "9.0.0", + "contentHash": "Ob3FXsXkcSMQmGZi7qP07EQ39kZpSBlTcAZLbJLdI4FIf0Jug8biv2HTavWmnTirchctPlq9bl/26CXtQRguzA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.Configuration.Binder": "8.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0", + "Microsoft.Extensions.Configuration.Binder": "9.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "Microsoft.Extensions.Options": "9.0.0", + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "o0oZEbXbuc3jY3KriFAoTNAeHzv3OCzCx5chpuB+ecoloBI+zpNup0ai8RuTe4Ky9ULK9TyAUC9hgIDX0NnjRw==" + "resolved": "9.0.0", + "contentHash": "N3qEBzmLMYiASUlKxxFIISP4AiwuPTHF5uCh+2CWSwwzAJiIYx0kBJsS30cp1nvhSySFAVi30jecD307jV+8Kg==" }, "Microsoft.Identity.Client": { "type": "Transitive", @@ -662,11 +795,8 @@ }, "Namotion.Reflection": { "type": "Transitive", - "resolved": "3.1.1", - "contentHash": "Qn0wM7u9TpSpja2x8UVexr2bLHb1DGMNhD2TCz3woklxaY1oH+Sitrw9fg/4YbNoNtczeH2jf+yPdXMQlgvFlQ==", - "dependencies": { - "Microsoft.CSharp": "4.3.0" - } + "resolved": "3.2.0", + "contentHash": "YfGjDPzMEs3vRMI4CMkJwOg75SV5JEDV72kMccD2GCo++TfgOYb5ZTpABYq3dUQqFtnAPpqMKM+deLlrUwnN1g==" }, "Newtonsoft.Json": { "type": "Transitive", @@ -675,8 +805,8 @@ }, "NJsonSchema.Annotations": { "type": "Transitive", - "resolved": "11.0.2", - "contentHash": "VbA0fmxVyqloGXYz863g6QHyojM1tgejwPQr9LjXdubs9YJt5YfRPCQOV/hnzpP2Bqd7nZFpDn9MCImmLAmqCw==" + "resolved": "11.1.0", + "contentHash": "2gU72pKhMLrQt7TjHv+nrb8CxxgUaBk2SD/CaB5f00SxuWdOT4YVQaGy+jTVx+8IgQit+9WWMvBWU9f6U2HNiQ==" }, "System.Buffers": { "type": "Transitive", @@ -759,10 +889,15 @@ "System.Security.Cryptography.ProtectedData": "8.0.0" } }, + "System.Data.DataSetExtensions": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "221clPs1445HkTBZPL+K9sDBdJRB8UN8rgjO3ztB0CQ26z//fmJXtlsr6whGatscsKGBrhJl5bwJuKSA8mwFOw==" + }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "uispgX4BWG36vMQyEw7UDzwr+jCeoPFrNQehUKeX+JeL7C182057tR5BNm6CscXf5T5ww0rtUNs/6ob9DgNwLw==" + "resolved": "9.0.0", + "contentHash": "ddppcFpnbohLWdYKr/ZeLZHmmI+DXFgZ3Snq+/E7SwcdW4UnvxmaugkwGywvGVWkHPGCSZjCP+MLzu23AL5SDw==" }, "System.Diagnostics.EventLog": { "type": "Transitive", @@ -907,8 +1042,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", + "resolved": "8.0.4", + "contentHash": "bAkhgDJ88XTsqczoxEMliSrpijKZHhbJQldhAmObj/RbrN3sU5dcokuXmWJWsdQAhiMJ9bTayWsL1C9fbbCRhw==", "dependencies": { "System.Text.Encodings.Web": "8.0.0" } @@ -936,32 +1071,33 @@ "kentico.xperience.umt": { "type": "Project", "dependencies": { - "Kentico.Xperience.Core": "[29.7.0, )", - "Microsoft.Bcl.AsyncInterfaces": "[9.0.0-rc.1.24431.7, )" + "Kentico.Xperience.Core": "[30.0.0, )", + "Microsoft.Bcl.AsyncInterfaces": "[9.0.0, )" } }, "kentico.xperience.umt.examples": { "type": "Project", "dependencies": { - "Kentico.Xperience.UMT": "[1.9.0, )" + "Kentico.Xperience.UMT": "[2.0.0, )" } }, "Kentico.Xperience.Core": { "type": "CentralTransitive", - "requested": "[29.7.0, )", - "resolved": "29.7.0", - "contentHash": "9rJYLckkygRJCAKEA0Mz+OqtWMhV9dDXi542kbfKZPSd4E4wHpdyqbO7plQtIakO40cjAt5or/GTsOBjvzT59g==", + "requested": "[30.0.0, )", + "resolved": "30.0.0", + "contentHash": "9P6OhCXzwd1KLzzmmGUI5Vnm+5mrtIlniioC2zGuMqgxmFUaDuk0SHBOW9knBICeF24IHpnXBK32icr17e1vPA==", "dependencies": { "AngleSharp": "0.17.1", + "Magick.NET-Q8-AnyCPU": "14.2.0", "MailKit": "4.8.0", "Microsoft.Data.SqlClient": "5.2.2", - "Microsoft.Extensions.Caching.Memory": "6.0.2", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.DependencyInjection": "6.0.1", - "Microsoft.Extensions.FileProviders.Physical": "6.0.0", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Localization": "6.0.35", - "Microsoft.Extensions.Options.ConfigurationExtensions": "6.0.0", + "Microsoft.Extensions.Caching.Memory": "8.0.1", + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.DependencyInjection": "8.0.1", + "Microsoft.Extensions.FileProviders.Physical": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.1", + "Microsoft.Extensions.Localization": "8.0.11", + "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0", "Mono.Cecil": "0.11.6", "Newtonsoft.Json": "13.0.3", "System.CodeDom": "8.0.0" @@ -969,9 +1105,9 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "CentralTransitive", - "requested": "[9.0.0-rc.1.24431.7, )", - "resolved": "9.0.0-rc.1.24431.7", - "contentHash": "tvUDJVCPvPaKK/RWPhi4o+ob9tYoNpl9g1RcuFx7eehCscMwwizs2cNgF4lvMdj82wN1rE8eUmtdbDeJm63gCw==" + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "owmu2Cr3IQ8yQiBleBHlGk8dSQ12oaF2e7TpzwJKEl4m84kkZJjEY1n33L67Y3zM5jPOjmmbdHjbfiL0RqcMRQ==" } } }