@openui5/sap.ui.fl 1.138.0 → 1.140.0

package/src/sap/ui/fl/apply/_internal/flexState/FlexObjectState.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
 	"sap/ui/fl/apply/_internal/flexState/DataSelector",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/Utils"
 ], function(
 	merge,
@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.flexState.FlexObjectState
 	 * @since 1.83
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -210,12 +210,12 @@ sap.ui.define([
 	};
 
 	/**
-	 * Waits for all the changes for all controls that are passed to be processed and a variant switch to be done.
+	 * Waits for all the changes for all controls that are passed to be processed.
 	 *
 	 * @param {object[]} aSelectorInformation - An array containing an object with {@link sap.ui.fl.Selector} and further configuration
 	 * @param {sap.ui.fl.Selector} aSelectorInformation.selector - A {@link sap.ui.fl.Selector}
 	 * @param {string[]} [aSelectorInformation.changeTypes] - An array containing the change types that will be considered. If empty no filtering will be done
-	 * @returns {Promise} Resolves when a variant switch is done and all changes on controls have been processed
+	 * @returns {Promise} Resolves when all changes on controls have been processed
 	 */
 	FlexObjectState.waitForFlexObjectsToBeApplied = async function(aSelectorInformation) {
 		const oAppComponent = Utils.getAppComponentForSelector(aSelectorInformation[0].selector);
@@ -224,7 +224,6 @@ sap.ui.define([
 		}
 		const sFlexReference = ManifestUtils.getFlexReferenceForControl(oAppComponent);
 
-		await VariantManagementState.getVariantSwitchPromise(sFlexReference);
 		await Promise.all(aSelectorInformation.map((oSelector) => {
 			const oControl = oSelector.selector.id && Element.getElementById(oSelector.selector.id) || oSelector.selector;
 
@@ -260,34 +259,21 @@ sap.ui.define([
 		}));
 	};
 
-	function getCompVariantEntities(sReference) {
-		const aEntities = [];
-		const mCompEntities = FlexState.getCompVariantsMap(sReference);
-		for (const sPersistencyKey in mCompEntities) {
-			const mCompVariantsOfPersistencyKey = mCompEntities[sPersistencyKey];
-			for (const sId in mCompVariantsOfPersistencyKey.byId) {
-				aEntities.push(mCompVariantsOfPersistencyKey.byId[sId]);
-			}
-		}
-		return aEntities;
-	}
-
-	function isNewChangeDeleted(oFlexObject) {
-		return !(oFlexObject.getState() === States.LifecycleState.DELETED && oFlexObject._sPreviousState === States.LifecycleState.NEW);
-	}
-
 	/**
 	 * Collects modified changes from the different states within the <code>sap.ui.fl</code> library.
-	 * TODO: remove special CompVariant handling todos#5
 	 *
 	 * @param {object} sReference - Flex Reference
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} All dirty Flex objects
 	 */
 	FlexObjectState.getDirtyFlexObjects = function(sReference) {
-		const aCompVariantEntities = getCompVariantEntities(sReference);
-		return oAllDirtyFlexObjectsDataSelector.get({reference: sReference})
-		.concat(aCompVariantEntities.filter((oFlexObject) => oFlexObject.getState() !== States.LifecycleState.PERSISTED))
-		// change is not dirty when it is created and deleted in the same session
+		function isNewChangeDeleted(oFlexObject) {
+			// Also consider the fileType in case it is a compVariant("variant") because there the state is already set to DELETED
+			return !(oFlexObject.getState() === States.LifecycleState.DELETED && oFlexObject._sPreviousState === States.LifecycleState.NEW)
+				|| (oFlexObject.getState() === States.LifecycleState.DELETED && oFlexObject.getFileType() === "variant");
+		}
+
+		return oAllDirtyFlexObjectsDataSelector
+		.get({reference: sReference})
 		.filter((oFlexObject) => isNewChangeDeleted(oFlexObject));
 	};
 

package/src/sap/ui/fl/apply/_internal/flexState/FlexState.js

@@ -14,11 +14,10 @@ sap.ui.define([
 	"sap/ui/core/Component",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
 	"sap/ui/fl/apply/_internal/flexObjects/States",
-	"sap/ui/fl/apply/_internal/flexState/compVariants/prepareCompVariantsMap",
 	"sap/ui/fl/apply/_internal/flexState/DataSelector",
 	"sap/ui/fl/apply/_internal/flexState/InitialPrepareFunctions",
-	"sap/ui/fl/apply/_internal/flexState/Loader",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/initial/_internal/Loader",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/initial/_internal/FlexInfoSession",
 	"sap/ui/fl/initial/_internal/StorageUtils",
 	"sap/ui/fl/LayerUtils"
@@ -32,7 +31,6 @@ sap.ui.define([
 	Component,
 	FlexObjectFactory,
 	States,
-	prepareCompVariantsMap,
 	DataSelector,
 	InitialPrepareFunctions,
 	Loader,
@@ -51,9 +49,6 @@ sap.ui.define([
 	 * The persistence happens inside an object mapped to the component reference, with the following properties:
 	 *
 	 *	{
-	 * 		preparedMaps: {
-	 * 			compVariantsMap: {},
-	 * 		},
 	 * 		storageResponse: {
 	 * 			changes: {
 	 * 				annotationChanges: [...],
@@ -73,7 +68,6 @@ sap.ui.define([
 	 * 			},
 	 * 			loadModules: <boolean>
 	 * 		},
-	 * 		unfilteredStorageResponse: {...}, // same as above but without layer filtering
 	 * 		runtimePersistence: {
 	 * 			flexObjects: [...],
 	 * 			runtimeOnlyData: {
@@ -82,22 +76,23 @@ sap.ui.define([
 	 * 		},
 	 * 		maxLayer: <string>,
 	 * 		emptyState: <boolean>,
-	 *		partialFlexState: <boolean>,
+	 *		skipLoadBundle: <boolean>,
 	 *		componentId: "<componentId>",
 	 *		componentData: {...}
 	 *	}
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexState
 	 * @since 1.73
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
-	var FlexState = {};
+	const FlexState = {};
 
-	var _mInstances = {};
-	var _mInitPromises = {};
-	var _mFlexObjectInfo = {
+	const _mInstances = {};
+	const _mCachedFlexData = {};
+	const _mInitPromises = {};
+	const _mFlexObjectInfo = {
 		appDescriptorChanges: {
 			pathInResponse: []
 		},
@@ -112,17 +107,17 @@ sap.ui.define([
 			initialPreparationFunctionName: "variants",
 			pathInResponse: ["variants", "variantChanges", "variantDependentControlChanges", "variantManagementChanges"]
 		},
-		compVariants: {
-			prepareFunction: prepareCompVariantsMap,
-			pathInResponse: ["comp.variants", "comp.standardVariants", "comp.defaultVariants", "comp.changes"]
+		comp: {
+			pathInResponse: ["comp.changes", "comp.defaultVariants", "comp.standardVariants", "comp.variants"]
 		}
 	};
+
 	// some runtime data is only fetched once (e.g. during control init) and has to survive an invalidation of the FlexState
 	// TODO: Move to runtime persistence as soon as flex objects are no longer deleted during cache invalidation
 	// but instead updated with the new data from the flex response
-	var _mExternalData = {
-		compVariants: {},
-		flexObjects: {}
+	const _mExternalData = {
+		flexObjects: {},
+		smartVariantManagementControls: {}
 	};
 
 	function prepareChangeDefinitions(sStorageResponseKey, vStorageResponsePart) {
@@ -187,14 +182,6 @@ sap.ui.define([
 		return undefined;
 	}
 
-	function initializeState(sMapName, mPropertyBag, sReference) {
-		mPropertyBag.reference = sReference;
-		var oUpdate = runInitialPreparation(sMapName, mPropertyBag);
-		if (oUpdate) {
-			updateInstance(sReference, oUpdate);
-		}
-	}
-
 	var oFlexObjectsDataSelector = new DataSelector({
 		id: "flexObjects",
 		parameterKey: "reference",
@@ -238,32 +225,6 @@ sap.ui.define([
 		}
 	});
 
-	function getInstanceEntryOrThrowError(sReference, sMapName) {
-		if (!_mInstances[sReference]) {
-			initializeEmptyState(sReference);
-		}
-
-		if (!_mInstances[sReference].preparedMaps[sMapName]) {
-			var mPropertyBag = {
-				unfilteredStorageResponse: _mInstances[sReference].unfilteredStorageResponse,
-				storageResponse: _mInstances[sReference].storageResponse,
-				componentId: _mInstances[sReference].componentId,
-				componentData: _mInstances[sReference].componentData,
-				reference: sReference,
-				runtimePersistence: _mInstances[sReference].runtimePersistence
-			};
-			_mInstances[sReference].preparedMaps[sMapName] = FlexState.callPrepareFunction(sMapName, mPropertyBag);
-			initializeState(sMapName, mPropertyBag, sReference);
-		}
-
-		return _mInstances[sReference].preparedMaps[sMapName];
-	}
-
-	function updateInstance(sReference, oUpdate) {
-		_mInstances[sReference] = merge(_mInstances[sReference], oUpdate);
-		oFlexObjectsDataSelector.checkUpdate({ reference: sReference });
-	}
-
 	function buildRuntimePersistence(oFlexStateInstance, aExternalFlexObjects) {
 		const oStorageResponse = oFlexStateInstance.storageResponse;
 		var oRuntimePersistence = {
@@ -357,7 +318,7 @@ sap.ui.define([
 			bDataUpdated = true;
 		}
 		if (!_mInstances[sReference].storageResponse) {
-			_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mInstances[sReference].unfilteredStorageResponse);
+			_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mCachedFlexData[sReference]);
 			// Flex objects need to be recreated
 			delete _mInstances[sReference].runtimePersistence;
 			bDataUpdated = true;
@@ -376,7 +337,7 @@ sap.ui.define([
 		}
 
 		if (bDataUpdated) {
-			oFlexObjectsDataSelector.checkUpdate({ reference: sReference });
+			oFlexObjectsDataSelector.checkUpdate({ reference: sReference});
 		}
 	}
 
@@ -399,31 +360,27 @@ sap.ui.define([
 		return mFilteredReturn;
 	}
 
-	async function loadFlexData(mPropertyBag) {
+	async function loadAndCacheFlexData(mPropertyBag) {
 		const mResponse = await Loader.loadFlexData(mPropertyBag);
-		if (!mPropertyBag.partialFlexState) {
+		if (!mPropertyBag.skipLoadBundle) {
 			mResponse.authors = await Loader.loadVariantsAuthors(mPropertyBag.reference);
 		}
+		_mCachedFlexData[mPropertyBag.reference] = merge({}, mResponse);
 		storeInfoInSession(mPropertyBag.reference, mResponse);
-
-		return mResponse;
 	}
 
-	function prepareNewInstance(mResponse, mPropertyBag) {
+	function prepareNewInstance(mPropertyBag) {
 		// The following line is used by the Flex Support Tool to set breakpoints - please adjust the tool if you change it!
 		_mInstances[mPropertyBag.reference] = merge({}, {
-			unfilteredStorageResponse: mResponse,
-			preparedMaps: {},
 			componentId: mPropertyBag.componentId,
 			componentData: mPropertyBag.componentData,
-			partialFlexState: mPropertyBag.partialFlexState,
+			skipLoadBundle: mPropertyBag.skipLoadBundle,
 			version: mPropertyBag.version,
 			allContextsProvided: mPropertyBag.allContextsProvided
 		});
 
 		// no further changes to storageResponse properties allowed
 		Object.freeze(_mInstances[mPropertyBag.reference].storageResponse);
-		Object.freeze(_mInstances[mPropertyBag.reference].unfilteredStorageResponse);
 	}
 
 	function storeInfoInSession(sReference, mResponse) {
@@ -437,19 +394,17 @@ sap.ui.define([
 
 	function checkPartialFlexState(mInitProperties) {
 		var oFlexInstance = _mInstances[mInitProperties.reference];
-		if (oFlexInstance.partialFlexState === true && mInitProperties.partialFlexState !== true) {
-			oFlexInstance.partialFlexState = false;
-			mInitProperties.partialFlexData = merge({}, oFlexInstance.unfilteredStorageResponse.changes);
+		if (oFlexInstance.skipLoadBundle === true && mInitProperties.skipLoadBundle !== true) {
+			oFlexInstance.skipLoadBundle = false;
+			mInitProperties.partialFlexData = merge({}, _mCachedFlexData[mInitProperties.reference].changes);
 			mInitProperties.reInitialize = true;
 		}
 	}
 
-	function checkComponentId(mInitProperties) {
+	function checkComponentIdChanged(mInitProperties) {
 		var sFlexInstanceComponentId = _mInstances[mInitProperties.reference].componentId;
 		// if the component with the same reference was rendered with a new ID - clear existing state
-		if (!mInitProperties.reInitialize && sFlexInstanceComponentId !== mInitProperties.componentId) {
-			mInitProperties.reInitialize = true;
-		}
+		return sFlexInstanceComponentId !== mInitProperties.componentId;
 	}
 
 	function checkVersionAndAllContexts(mInitProperties) {
@@ -471,18 +426,17 @@ sap.ui.define([
 
 	function initializeEmptyState(sReference) {
 		_mInstances[sReference] = {
-			unfilteredStorageResponse: { changes: StorageUtils.getEmptyFlexDataResponse() },
 			storageResponse: { changes: StorageUtils.getEmptyFlexDataResponse() },
-			preparedMaps: {},
 			emptyState: true,
 			// this makes sure that a proper initialize will still work as expected
 			reInitialize: true,
 			componentId: ""
 		};
+		_mCachedFlexData[sReference] = { changes: StorageUtils.getEmptyFlexDataResponse() };
 		const oNewInitPromise = new Deferred();
 		_mInitPromises[sReference] = oNewInitPromise;
 		oNewInitPromise.resolve();
-		initializeNewInstance({ reference: sReference });
+		initializeNewInstance({ reference: sReference});
 	}
 
 	FlexState.getRuntimeOnlyData = function(sReference) {
@@ -505,7 +459,7 @@ sap.ui.define([
 	 * @param {object} [mPropertyBag.asyncHints] - Async hints passed from the app index to the component processing
 	 * @param {string} [mPropertyBag.version] - Number of the version in which the state should be initialized
 	 * @param {string} [mPropertyBag.adaptationId] - Context-based adaptation for which the state should be initialized
-	 * @param {boolean} [mPropertyBag.partialFlexState=false] - if true state is initialized partially and does not include flex bundles
+	 * @param {boolean} [mPropertyBag.skipLoadBundle=false] - if true state is initialized partially and does not include flex bundles
 	 * @returns {Promise<undefined>} Resolves a promise as soon as FlexState is initialized
 	 */
 	FlexState.initialize = async function(mPropertyBag) {
@@ -520,17 +474,19 @@ sap.ui.define([
 		if (oOldInitPromise) {
 			await oOldInitPromise.promise;
 			checkPartialFlexState(mProperties);
-			checkComponentId(mProperties);
 			checkVersionAndAllContexts(mProperties);
 			if (mProperties.reInitialize) {
-				const oResponse = await loadFlexData(mProperties);
-				prepareNewInstance(oResponse, mProperties);
+				await loadAndCacheFlexData(mProperties);
+				prepareNewInstance(mProperties);
+			} else if (checkComponentIdChanged(mProperties)) {
+				// a changed component ID does not invalidate the cached flex data, only the instance
+				prepareNewInstance(mProperties);
 			} else {
 				rebuildResponseIfMaxLayerChanged(mPropertyBag.reference);
 			}
 		} else {
-			const oResponse = await loadFlexData(mProperties);
-			prepareNewInstance(oResponse, mProperties);
+			await loadAndCacheFlexData(mProperties);
+			prepareNewInstance(mProperties);
 		}
 
 		initializeNewInstance(mProperties);
@@ -582,9 +538,9 @@ sap.ui.define([
 		}
 		const oInstance = _mInstances[mPropertyBag.reference];
 		Object.entries(mPropertyBag.newData).forEach(([sKey, vValue]) => {
-			oInstance.unfilteredStorageResponse.changes[sKey].push(...vValue);
+			_mCachedFlexData[mPropertyBag.reference].changes[sKey].push(...vValue);
 		});
-		oInstance.storageResponse = filterByMaxLayer(mPropertyBag.reference, oInstance.unfilteredStorageResponse);
+		oInstance.storageResponse = filterByMaxLayer(mPropertyBag.reference, _mCachedFlexData[mPropertyBag.reference]);
 		oInstance.runtimePersistence.flexObjects =
 		[
 			...oInstance.runtimePersistence.flexObjects,
@@ -614,9 +570,9 @@ sap.ui.define([
 		const oNewInitPromise = new Deferred();
 		_mInitPromises[sReference] = oNewInitPromise;
 		await oOldInitPromise;
-		const oResponse = await loadFlexData(mPropertyBag);
-		prepareNewInstance(oResponse, mPropertyBag);
-		_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mInstances[sReference].unfilteredStorageResponse);
+		await loadAndCacheFlexData(mPropertyBag);
+		prepareNewInstance(mPropertyBag);
+		_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mCachedFlexData[sReference]);
 		const bUpdated = updateRuntimePersistence(
 			sReference,
 			_mInstances[sReference].storageResponse,
@@ -664,11 +620,11 @@ sap.ui.define([
 		const aFlexObjectUpdates = [];
 		aUpdates.forEach((oUpdate) => {
 			if (oUpdate.type === "ui2") {
-				_mInstances[sReference].unfilteredStorageResponse.changes.ui2personalization = oUpdate.newData;
+				_mCachedFlexData[sReference].changes.ui2personalization = oUpdate.newData;
 			} else {
 				const vPath = getChangeCategory(oUpdate.flexObject);
 				const sFileName = oUpdate.flexObject.fileName;
-				const aUnfiltered = ObjectPath.get(vPath, _mInstances[sReference].unfilteredStorageResponse.changes);
+				const aUnfiltered = ObjectPath.get(vPath, _mCachedFlexData[sReference].changes);
 				const aFiltered = ObjectPath.get(vPath, _mInstances[sReference].storageResponse.changes);
 				const iExistingFlexObjectIdx = _mInstances[sReference].runtimePersistence.flexObjects.findIndex(
 					(oFlexObject) => oFlexObject.getId() === sFileName
@@ -717,28 +673,12 @@ sap.ui.define([
 			delete _mInitPromises[sReference];
 			oFlexObjectsDataSelector.clearCachedResult({ reference: sReference });
 		} else {
-			_mInstances = {};
-			_mInitPromises = {};
+			Object.keys(_mInstances).forEach((sReference) => delete _mInstances[sReference]);
+			Object.keys(_mInitPromises).forEach((sReference) => delete _mInitPromises[sReference]);
 			oFlexObjectsDataSelector.clearCachedResult();
 		}
 	};
 
-	FlexState.setInitialNonFlCompVariantData = function(sReference, sPersistencyKey, oStandardVariant, aVariants, sSVMControlId) {
-		_mExternalData.compVariants[sReference] ||= {};
-		_mExternalData.compVariants[sReference][sPersistencyKey] = {};
-		_mExternalData.compVariants[sReference][sPersistencyKey].standardVariant = oStandardVariant;
-		_mExternalData.compVariants[sReference][sPersistencyKey].variants = aVariants;
-		_mExternalData.compVariants[sReference][sPersistencyKey].controlId = sSVMControlId;
-	};
-
-	FlexState.getInitialNonFlCompVariantData = function(sReference) {
-		return _mExternalData.compVariants[sReference];
-	};
-
-	FlexState.resetInitialNonFlCompVariantData = function(sReference) {
-		delete _mExternalData.compVariants[sReference];
-	};
-
 	/**
 	 * Adds a runtime-steady object to the external data map which survives when the FlexState is cleared.
 	 * For example: a fake standard variant.
@@ -785,8 +725,7 @@ sap.ui.define([
 	 */
 	FlexState.rebuildFilteredResponse = function(sReference) {
 		if (_mInstances[sReference]) {
-			_mInstances[sReference].preparedMaps = {};
-			_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mInstances[sReference].unfilteredStorageResponse);
+			_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mCachedFlexData[sReference]);
 			// Storage response has changed, recreate the flex objects
 			_mInstances[sReference].runtimePersistence = buildRuntimePersistence(
 				_mInstances[sReference],
@@ -869,11 +808,7 @@ sap.ui.define([
 	};
 
 	FlexState.getUI2Personalization = function(sReference) {
-		return merge({}, _mInstances[sReference].unfilteredStorageResponse.changes.ui2personalization);
-	};
-
-	FlexState.getCompVariantsMap = function(sReference) {
-		return getInstanceEntryOrThrowError(sReference, "compVariants");
+		return merge({}, _mCachedFlexData[sReference].changes.ui2personalization);
 	};
 
 	FlexState.callPrepareFunction = function(sMapName, mPropertyBag) {
@@ -884,7 +819,7 @@ sap.ui.define([
 	FlexState.getStorageResponse = function(sReference) {
 		if (_mInitPromises[sReference]) {
 			return _mInitPromises[sReference].promise.then(function() {
-				return _mInstances[sReference].unfilteredStorageResponse;
+				return _mCachedFlexData[sReference];
 			});
 		}
 		return Promise.resolve();
@@ -894,6 +829,15 @@ sap.ui.define([
 		return _mInstances[sReference] && _mInstances[sReference].componentData;
 	};
 
+	FlexState.addSVMControl = function(sReference, oControl) {
+		_mExternalData.smartVariantManagementControls[sReference] ||= [];
+		_mExternalData.smartVariantManagementControls[sReference].push(oControl);
+	};
+
+	FlexState.getSVMControls = function(sReference) {
+		return _mExternalData.smartVariantManagementControls[sReference] || [];
+	};
+
 	/**
 	 * This function is temporary and will be removed once the allContextsProvided property is part of the flex/data requests in ABAP
 	 * The allContextsProvided property is not part of the initial flex/data request and needs to be set later to prevent

package/src/sap/ui/fl/apply/_internal/flexState/UI2Personalization/UI2PersonalizationState.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.UI2Personalization.UI2PersonalizationState
 	 * @since 1.75
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.DependencyHandler
 	 * @since 1.74
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/changes/ExtensionPointState.js

@@ -15,8 +15,8 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler",
 	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerStorage",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/Utils"
 ], (
 	_omit,
@@ -29,8 +29,8 @@ sap.ui.define([
 	DependencyHandler,
 	FlexObjectState,
 	FlexState,
-	ManifestUtils,
 	ChangeHandlerStorage,
+	ManifestUtils,
 	Utils
 ) => {
 	"use strict";
@@ -41,7 +41,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.ExtensionPointState
 	 * @since 1.79
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/changes/UIChangesState.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.flexState.changes.UIChangesState
 	 * @since 1.121
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/communication/FLPAboutInfo.js

@@ -7,14 +7,14 @@
 sap.ui.define([
 	"sap/ui/core/Lib",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/apply/api/FlexRuntimeInfoAPI",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/Utils"
 ], function(
 	Lib,
 	FlexState,
-	ManifestUtils,
 	FlexRuntimeInfoAPI,
+	ManifestUtils,
 	FlexUtils
 ) {
 	"use strict";