From bddd89fb44b5c87164ae8144d816690167185814 Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Thu, 4 Apr 2024 17:20:48 +0200 Subject: [PATCH] deps: Bump @sapui5/types to 1.120.12 --- npm-shrinkwrap.json | 8 ++++---- package.json | 2 +- resources/api-extract.json | 4 +++- scripts/metadataProvider/MetadataProvider.ts | 4 ++-- scripts/metadataProvider/createMetadataInfo.ts | 2 +- scripts/metadataProvider/model.ts | 4 ++-- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index d9f42a0d9..01773781f 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -11,7 +11,7 @@ "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15", "@jridgewell/trace-mapping": "^0.3.25", - "@sapui5/types": "1.120.11", + "@sapui5/types": "1.120.12", "@ui5/fs": "^3.0.5", "@ui5/logger": "^3.0.0", "@ui5/project": "^3.9.1", @@ -2412,9 +2412,9 @@ } }, "node_modules/@sapui5/types": { - "version": "1.120.11", - "resolved": "https://registry.npmjs.org/@sapui5/types/-/types-1.120.11.tgz", - "integrity": "sha512-SlfmdiPqHQzj0CyQI9xLj8Hb5wvXoRvrYPsa4buTOH7DnBjh/GIdK6lFyUV7cn24H8sEOmhZfaZLun7FPIhEBQ==", + "version": "1.120.12", + "resolved": "https://registry.npmjs.org/@sapui5/types/-/types-1.120.12.tgz", + "integrity": "sha512-ZFNQ73RrGZPOH1hEQoDJezQvTL9QDaou1K0K6nMnH/Zc2nIuB40YMpCiaav67emhxRkpQ/+jqw4bsJG/3FD6EQ==", "dependencies": { "@types/jquery": "3.5.13", "@types/offscreencanvas": "2019.6.4", diff --git a/package.json b/package.json index 83852a389..a40536a68 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15", "@jridgewell/trace-mapping": "^0.3.25", - "@sapui5/types": "1.120.11", + "@sapui5/types": "1.120.12", "@ui5/fs": "^3.0.5", "@ui5/logger": "^3.0.0", "@ui5/project": "^3.9.1", diff --git a/resources/api-extract.json b/resources/api-extract.json index a8dd6622e..236c5ee08 100644 --- a/resources/api-extract.json +++ b/resources/api-extract.json @@ -1,7 +1,7 @@ { "framework": { "name": "SAPUI5", - "version": "1.120.11" + "version": "1.120.12" }, "defaultAggregations": { "sap.ca.ui.CustomerControlListItem": "content", @@ -347,6 +347,7 @@ "sap.ui.vbm.ClusterDistance": "vizTemplate", "sap.ui.vbm.ClusterGrid": "vizTemplate", "sap.ui.vbm.ClusterTree": "vizTemplate", + "sap.ui.vbm.ContainerBase": "content", "sap.ui.vbm.Containers": "items", "sap.ui.vbm.FeatureCollection": "items", "sap.ui.vbm.GeoCircles": "items", @@ -354,6 +355,7 @@ "sap.ui.vbm.GeoMap": "vos", "sap.ui.vbm.Heatmap": "items", "sap.ui.vbm.Legend": "items", + "sap.ui.vbm.MapContainer": "content", "sap.ui.vbm.Pie": "items", "sap.ui.vbm.Pies": "items", "sap.ui.vbm.Routes": "items", diff --git a/scripts/metadataProvider/MetadataProvider.ts b/scripts/metadataProvider/MetadataProvider.ts index bd4239439..9f3ce3958 100644 --- a/scripts/metadataProvider/MetadataProvider.ts +++ b/scripts/metadataProvider/MetadataProvider.ts @@ -11,8 +11,8 @@ import { export default class MetadataProvider { #model: UI5SemanticModel | null = null; - async init(apiJsonsRoot: string) { - this.#model = await createSemanticModel(apiJsonsRoot); + async init(apiJsonsRoot: string, sapui5Version: string) { + this.#model = await createSemanticModel(apiJsonsRoot, sapui5Version); } getModel(): UI5SemanticModel { diff --git a/scripts/metadataProvider/createMetadataInfo.ts b/scripts/metadataProvider/createMetadataInfo.ts index bee943810..a73463f58 100644 --- a/scripts/metadataProvider/createMetadataInfo.ts +++ b/scripts/metadataProvider/createMetadataInfo.ts @@ -7,7 +7,7 @@ import { async function main(apiJsonsRoot: string, sapui5Version: string) { const metadataProvider = new MetadataProvider(); - await metadataProvider.init(apiJsonsRoot); + await metadataProvider.init(apiJsonsRoot, sapui5Version); const semanticModel = metadataProvider.getModel(); diff --git a/scripts/metadataProvider/model.ts b/scripts/metadataProvider/model.ts index ad50f7c00..960be2f76 100644 --- a/scripts/metadataProvider/model.ts +++ b/scripts/metadataProvider/model.ts @@ -50,7 +50,7 @@ function getTypeNameFix(): TypeNameFix { } let model: UI5SemanticModel | null = null; -export async function createSemanticModel(apiJsonsRoot: string): Promise { +export async function createSemanticModel(apiJsonsRoot: string, sapui5Version: string): Promise { if (model) { return model; } @@ -71,7 +71,7 @@ export async function createSemanticModel(apiJsonsRoot: string): Promise {}; } model = generate({ - version: "1.120.9", + version: sapui5Version, libraries: indexJson, typeNameFix: getTypeNameFix(), strict: false, // Throw instead of log errors