@openui5/sap.ui.documentation 1.120.0 → 1.120.2

package/.reuse/dep5

@@ -223,7 +223,7 @@ License: Apache-2.0
 Comment: these files belong to: Google-Caja JS HTML Sanitizer
 
 Files: src/sap.ui.core/src/sap/ui/core/cldr/*
-Copyright: 1991-2014 Unicode, Inc.
+Copyright: 1991-2023 Unicode, Inc.
 License: Unicode-DFS-2015
 Comment: these files belong to: Unicode Common Locale Data Repository
 

package/THIRDPARTY.txt

@@ -180,7 +180,7 @@ License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/caja-html-sanitizer.js
 
 Component: Unicode Common Locale Data Repository, version: 43
-Copyright: 1991-2014 Unicode, Inc.
+Copyright: 1991-2023 Unicode, Inc.
 License: Unicode-DFS-2015
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Unicode-DFS-2015.txt
 Contained in: src/sap.ui.core/src/sap/ui/core/cldr/*

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.documentation",
-  "version": "1.120.0",
+  "version": "1.120.2",
   "description": "OpenUI5 UI Library sap.ui.documentation",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,11 +14,11 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.m": "1.120.0",
-    "@openui5/sap.ui.core": "1.120.0",
-    "@openui5/sap.ui.layout": "1.120.0",
-    "@openui5/themelib_sap_belize": "1.120.0",
-    "@openui5/themelib_sap_fiori_3": "1.120.0",
-    "@openui5/themelib_sap_horizon": "1.120.0"
+    "@openui5/sap.m": "1.120.2",
+    "@openui5/sap.ui.core": "1.120.2",
+    "@openui5/sap.ui.layout": "1.120.2",
+    "@openui5/themelib_sap_belize": "1.120.2",
+    "@openui5/themelib_sap_fiori_3": "1.120.2",
+    "@openui5/themelib_sap_horizon": "1.120.2"
   }
 }

package/src/sap/ui/documentation/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.120.0</version>
+  <version>1.120.2</version>
 
   <documentation>SAPUI5 library for the Demokit 2.0.</documentation>
 

package/src/sap/ui/documentation/library.js

@@ -25,13 +25,13 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.documentation
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @since 1.48
 	 * @public
 	 */
 	var thisLibrary = Core.initLibrary({
 		name : 'sap.ui.documentation',
-		version: '1.120.0',
+		version: '1.120.2',
 		dependencies : ['sap.ui.core','sap.m'],
 		types: [],
 		interfaces: [],

package/src/sap/ui/documentation/sdk/controller/Code.controller.js

@@ -315,7 +315,7 @@ sap.ui.define(
 				var sCompId = 'sampleComp-' + this._sId;
 				var sCompName = this._sId;
 
-				var oComp = Component.get(sCompId);
+				var oComp = Component.getComponentById(sCompId);
 
 				if (oComp) {
 					oComp.destroy();

package/src/sap/ui/documentation/sdk/controller/Sample.controller.js

@@ -652,7 +652,7 @@ sap.ui.define([
 				var sCompName = this._sId;
 				var oMainComponent = this.getOwnerComponent();
 
-				var oComp = Component.get(sCompId);
+				var oComp = Component.getComponentById(sCompId);
 
 				if (oComp) {
 					oComp.destroy();

package/src/sap/ui/documentation/sdk/controller/SampleBaseController.js

@@ -67,7 +67,7 @@ sap.ui.define([
 					bChangeBootstrap = oFile.name && (oFile.name === oData.iframe || oFile.name.split(".").pop() === "html");
 
 					if (oFile.name === "manifest.json") {
-						oManifestFile = oFile;
+						oManifestFile = JSON.parse(oFile.raw);
 						aPromises.push(this._addFileToZip({
 							name: this._formatWebAppPath(oFile.name),
 							url: sUrl,
@@ -80,7 +80,7 @@ sap.ui.define([
 						aPromises.push(this._addFileToZip({
 							name: this._formatWebAppPath(oFile.name.replace(new RegExp(/(\.\.\/)+/g), "./")),
 							url: sUrl,
-							formatter: (bChangeBootstrap && !bCustomIndexHTML) ? this._changeIframeBootstrapToCloud : undefined
+							formatter: (bChangeBootstrap && !bCustomIndexHTML) ? this._rewriteRelativeURLs.bind(this) : undefined
 						}, oZipFile));
 						aPromises.push(this.fetchSourceFile(sUrl).then(fnAddMockFileToZip.bind(this)));
 					}
@@ -100,22 +100,24 @@ sap.ui.define([
 
 
 					if (!bCustomIndexHTML) {
+						var sIndexHTMLFileName = this._formatWebAppPath("index.html");
 						aPromises.push(this._addFileToZip({
-							name: this._formatWebAppPath("index.html"),
+							name: sIndexHTMLFileName,
 							url: TMPL_REF + "/" + (bHasManifest ? "indexevo.html.tmpl" : "index.html.tmpl"),
 							formatter: function(sIndexFile) {
-								return this._changeIframeBootstrapToCloud(this._formatIndexHtmlFile(sIndexFile, oData));
+								return this._rewriteRelativeURLs(this._formatIndexHtmlFile(sIndexFile, oData, oManifestFile), sIndexHTMLFileName);
 							}.bind(this)
 						}, oZipFile, true));
 					}
 
 
 					if (!bHasManifest) {
+						var sIndexJSFileName = this._formatWebAppPath("index.js");
 						aPromises.push(this._addFileToZip({
-							name: this._formatWebAppPath("index.js"),
+							name: sIndexJSFileName,
 							url: TMPL_REF + "/" + "index.js.tmpl",
 							formatter: function(sIndexJsFile) {
-								return this._changeIframeBootstrapToCloud(this._formatIndexJsFile(sIndexJsFile, oData));
+								return this._rewriteRelativeURLs(this._formatIndexJsFile(sIndexJsFile, oData), sIndexJSFileName);
 							}.bind(this)
 						}, oZipFile, true));
 					}
@@ -181,7 +183,7 @@ sap.ui.define([
 						return; // ignore 404 responses, e.g. for Apache license text file in SAPUI5 environment
 					}
 					if (fnFileFormatter) {
-						vRawFile = fnFileFormatter(vRawFile);
+						vRawFile = fnFileFormatter(vRawFile, sFileName);
 					}
 					oZipFile.file(sFileName, vRawFile);
 				});
@@ -220,7 +222,7 @@ sap.ui.define([
 			return JSON.stringify(oPackageFile, null, 2);
 		},
 
-		_formatUI5Yaml: function(sYamlFile, oData, sManifestFile) {
+		_formatUI5Yaml: function(sYamlFile, oData, oManifestFile) {
 			let sFormattedYamlFile = sYamlFile.replace(/{{SAMPLE_ID}}/g, this._formatNameToNpmSpec(oData.id));
 			const bIsOpenUI5 = this.getModel("versionData").getProperty("/isOpenUI5");
 			const sUI5Version = this.getModel("versionData").getProperty("/fullVersion");
@@ -231,8 +233,7 @@ sap.ui.define([
 				sFormattedYamlFile = sFormattedYamlFile.replace(/libraries:/g, "libraries:" + this._getSnapshotNote());
 			}
 
-			if (sManifestFile) {
-				const oManifestFile = JSON.parse(sManifestFile.raw);
+			if (oManifestFile) {
 				const oUi5Config = oManifestFile["sap.ui5"];
 				const oDependencies = oUi5Config && oUi5Config.dependencies;
 
@@ -254,9 +255,20 @@ sap.ui.define([
 			return sRawManifestFileJs.replace(new RegExp(/(\.\.\/)+/g), "./");
 		 },
 
-		_formatIndexHtmlFile: function (sFile, oData) {
-			return sFile.replace(/{{TITLE}}/g, oData.name)
+		_formatIndexHtmlFile: function (sFile, oData, oManifestFile) {
+			let sFormattedIndexHtml = sFile.replace(/{{TITLE}}/g, oData.name)
 				.replace(/{{SAMPLE_ID}}/g, oData.id);
+
+			if (oManifestFile) {
+				const oUi5Config = oManifestFile["sap.ui5"];
+				const oDependencies = oUi5Config && oUi5Config.dependencies;
+
+				// samples using sap.ui.fl get a local flex provider to store flex changes locally
+				if (oDependencies && oDependencies.libs && oDependencies.libs["sap.ui.fl"]) {
+					sFormattedIndexHtml = sFormattedIndexHtml.replace(/<script id="sap-ui-bootstrap"/g, "<script id=\"sap-ui-bootstrap\"\n\t\tdata-sap-ui-flexibilityServices='[{\"connector\": \"LocalStorageConnector\"}]'");
+				}
+			}
+			return sFormattedIndexHtml;
 		},
 
 		_formatIndexJsFile: function (sFile, oData) {
@@ -274,12 +286,18 @@ sap.ui.define([
 			return sMockData.replace(oRegExp, sCorrectPath);
 		},
 
-		_changeIframeBootstrapToCloud: function (sRawIndexFileHtml) {
-			var rReplaceIndex = /src=(?:"[^"]*\/sap-ui-core\.js"|'[^']*\/sap-ui-core\.js')/,
-				oRelativeBootstrapURI = new URI(sap.ui.require.toUrl("") + "/sap-ui-core.js"),
-				sBootstrapURI = oRelativeBootstrapURI.toString();
+		_rewriteRelativeURLs: function (sRawHTMLFile, sFileName) {
+			const rQuotedUrl = /(['"])(?:[a-zA-Z0-9./])*(resources|test-resources)\//g;
+			const sRelativePathToRoot = this._getRelativePathToRoot(sFileName);
+			return sRawHTMLFile.replaceAll(rQuotedUrl, "$1" + sRelativePathToRoot + "$2/");
+		},
 
-			return sRawIndexFileHtml.replace(rReplaceIndex, 'src="' + sBootstrapURI + '"');
+		_getRelativePathToRoot: function(sFilePath) {
+			// webapp/test/unit/unitTests.qunit.html -> 2
+			// webapp/test/mockServer.html -> 1
+			// webapp/index.html -> 0
+			const iNumberOfLevels = sFilePath.split("/").length - 2;
+			return "../".repeat(iNumberOfLevels);
 		},
 
 		_formatWebAppPath: function(sPath) {

package/src/sap/ui/documentation/sdk/tmpl/index.html.tmpl

@@ -6,7 +6,7 @@
 	<title>{{TITLE}}</title>
 
 	<script id="sap-ui-bootstrap"
-		src="https://sdk.openui5.org/resources/sap-ui-core.js"
+		src="resources/sap-ui-core.js"
 		data-sap-ui-libs="sap.m"
 		data-sap-ui-theme="sap_horizon"
 		data-sap-ui-resourceroots='{

package/src/sap/ui/documentation/sdk/tmpl/indexevo.html.tmpl

@@ -6,7 +6,7 @@
 	<title>{{TITLE}}</title>
 
 	<script id="sap-ui-bootstrap"
-		src="https://sdk.openui5.org/resources/sap-ui-core.js"
+		src="resources/sap-ui-core.js"
 		data-sap-ui-theme="sap_horizon"
 		data-sap-ui-resourceroots='{
 			"{{SAMPLE_ID}}": "./",

package/src/sap/ui/documentation/sdk/tmpl/ui5.yaml.tmpl

@@ -1,9 +1,9 @@
-specVersion: '3.0'
+specVersion: "3.0"
 metadata:
   name: {{SAMPLE_ID}}
 type: application
 framework:
   name: {{UI5_KIND}}
-  version: '{{UI5_VERSION}}'
+  version: "{{UI5_VERSION}}"
   libraries:
     - name: themelib_sap_horizon