@sap/ux-ui5-tooling 1.3.0 → 1.3.5

package/dist/templates/control-property-editor/vendor.js.LICENSE.txt

@@ -0,0 +1,56 @@
+/*
+object-assign
+(c) Sindre Sorhus
+@license MIT
+*/
+
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+
+/** @license React v0.19.1
+ * scheduler.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/** @license React v16.13.1
+ * react-is.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/** @license React v16.14.0
+ * react-dom.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/** @license React v16.14.0
+ * react.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */

package/dist/templates/variants-management/WorkspaceConnector.js

@@ -1,19 +1,35 @@
 sap.ui.define(
-    ['sap/base/util/merge', 'sap/ui/fl/write/api/connectors/ObjectStorageConnector', 'sap/ui/fl/Layer'],
-    function(merge, ObjectStorageConnector, Layer) {
+    [
+        'sap/base/util/merge',
+        'sap/ui/fl/write/api/connectors/ObjectStorageConnector',
+        'sap/ui/fl/Layer',
+        'sap/base/util/UriParameters'
+    ],
+    function(merge, ObjectStorageConnector, Layer, UriParameters) {
         'use strict';
         var url = new URL(window.location.toString());
+        var uriParameters = UriParameters.fromURL(url.href);
+        var rtaMode = uriParameters.get('fiori-tools-rta-mode');
+        var generator =
+            rtaMode === 'forAdaptation'
+                ? 'changeUtils: SAPFioriTools-propertyEditor'
+                : 'changeUtils: SAPFioriTools-variants';
+
         var trustedHosts = [/^localhost$/, /^.*.applicationstudio.cloud.sap$/];
         var isValidHost = trustedHosts.some((host) => {
             return host.test(url.hostname);
         });
 
         var WorkspaceConnector = merge({}, ObjectStorageConnector, {
-            layer: [Layer.VENDOR],
+            layers: [Layer.VENDOR, Layer.CUSTOMER_BASE],
             storage: {
                 _itemsStoredAsObjects: true,
                 setItem: function(sKey, vValue) {
                     if (isValidHost) {
+                        // update generator
+                        if (vValue && vValue.support) {
+                            vValue.support.generator = generator;
+                        }
                         $.ajax({
                             type: 'POST',
                             url: url.origin + '/FioriTools/api/writeChanges',
@@ -28,7 +44,7 @@ sap.ui.define(
                     if (isValidHost) {
                         $.ajax({
                             type: 'DELETE',
-                            url: url.orgigin + '/FioriTools/api/removeChanges',
+                            url: url.origin + '/FioriTools/api/removeChanges',
                             data: JSON.stringify({ fileName: sKey }),
                             contentType: 'application/json'
                         });
@@ -63,6 +79,9 @@ sap.ui.define(
                         settings.isVariantAdaptationEnabled = true;
                     }
 
+                    if (rtaMode === 'forAdaptation') {
+                        settings.isVariantAdaptationEnabled = false;
+                    }
                     return settings;
                 });
             }

package/dist/templates/variants-management/preview.html

@@ -5,12 +5,11 @@
 	<meta charset="UTF-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<title>{{appTitle}}</title>
-
 	<script>
 		window["sap-ushell-config"] = {
 			defaultRenderer: "fiori2",
 			applications: {
-				"preview-app": {
+				"<%- previewAppName %>": {
 					additionalInformation: "SAPUI5.Component=<%- component %>",
 					applicationType: "URL",
 					url: "./",
@@ -19,21 +18,9 @@
 			}
 		};
 	</script>
-
 	<script src="/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script
-			src="/resources/sap-ui-core.js"
-			data-sap-ui-libs="<%- libs %>"
-			data-sap-ui-async="true"
-			data-sap-ui-preload="async"
-			data-sap-ui-compatVersion="edge"
-			data-sap-ui-theme="<%- ui5Theme %>"
-			data-sap-ui-flexibilityServices='[{"applyConnector": "<%- component.replace(/\./g, '/') %>/WorkspaceConnector", "writeConnector": "<%- component.replace(/\./g, '/') %>/WorkspaceConnector", "custom": true}]'
-	data-sap-ui-frameOptions="allow"
-	data-sap-ui-bindingSyntax="complex"
-	></script><% if (reuseLibs) { %>
-	<script src="../utils/locate-reuse-libs.js"
-		data-sap-ui-manifest-uri="../manifest.json">
+	<script src="/resources/sap-ui-core.js" <%- ui5Configuration %>></script><% if (reuseLibs) { %>
+	<script src="../utils/locate-reuse-libs.js" data-sap-ui-manifest-uri="../manifest.json">
 	</script><% } %><% if (rtaMode) { %>
 	<script>
 		sap.ui.getCore().attachInit(function() {
@@ -41,15 +28,27 @@
 				sap.ushell.Container.getServiceAsync('AppLifeCycle').then((serviceInstance) => {
 					serviceInstance.attachAppLoaded((event) => {
 						var oView = event.getParameter('componentInstance');
-						sap.ui.require(["sap/ui/rta/api/startAdaptation"], function (startAdaptation) {
+						sap.ui.require(["sap/ui/rta/api/startAdaptation"], async function (startAdaptation) {
 							var options = {
 								rootControl: oView,
 								validateAppVersion: false,
 								flexSettings: {
-									layer: 'VENDOR'
+									layer: '<%- layer %>'
 								}
 							};
-							startAdaptation(options);
+							const rta = await startAdaptation(options);
+							<% if (flexMode) { %>
+								sap.ui.require(['editor/ui5-adaptation'], async function() {
+									const { init } = window['ui5-adaptation'];
+									await init({
+										rta,
+										view: oView,
+										layer: '<%- layer %>',
+										componentId: '<%- component %>',
+										generator: '<%- generator %>'
+									});
+								});
+							<% } %>
 						});
 					})
 				});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap/ux-ui5-tooling",
   "displayName": "SAP Fiori tools – UI5 Tooling",
-  "version": "1.3.0",
+  "version": "1.3.5",
   "description": "SAP Fiori tools – UI5 Tooling",
   "publisher": "SAPSE",
   "license": "SEE LICENSE IN LICENSE",
@@ -15,7 +15,7 @@
     "compile": "webpack --color --config webpack.prod.js",
     "watch": "yarn clean && webpack --color --config webpack.dev.js",
     "build": "npm-run-all clean compile",
-    "build:deps": "yarn lerna run --concurrency 1 --no-bail --stream --scope @sap/ux-odata-client --scope @sap/ux-common-utils --scope @sap/ux-store --scope @sap/ux-app-templates build",
+    "build:deps": "yarn lerna run --concurrency 1 --no-bail --stream --scope @sap/ux-telemetry --scope @sap/ux-odata-client --scope @sap/ux-common-utils --scope @sap/ux-store --scope @sap/ux-app-templates build",
     "bundle": "yarn build:deps && yarn build && npm pack",
     "test": "jest --maxWorkers=1 --ci --forceExit --detectOpenHandles --colors --silent",
     "test:sequence": "node -r ts-node/register test/test-project/request-sequence.ts",
@@ -23,7 +23,7 @@
     "lint:summary": "eslint . --ext .ts,.tsx -f summary",
     "lint:fix": "eslint --fix",
     "lint:fix:all": "eslint . --ext .ts,.tsx --fix",
-    "lint:report": "eslint . --ext .ts,.tsx -o reports/lint/eslint.jslint.xml -f jslint-xml",
+    "lint:report": "eslint . --ext .ts,.tsx -f multiple --report-unused-disable-directives",
     "format:fix": "prettier --write --loglevel silent --ignore-path ../../../.prettierignore",
     "format:fix:all": "prettier --write '**/*.{css,scss,html,js,json,ts,tsx,yaml,yml}' '!**/{out,dist,typings,node_modules}/**' '!**/*.{svg,png,xml}' --ignore-path ../../../.prettierignore",
     "tgz:package": "npm pack",
@@ -41,8 +41,11 @@
     "keytar": "7.7.0"
   },
   "devDependencies": {
-    "@sap/ux-app-templates": "1.3.0",
-    "@sap/ux-odata-client": "1.3.0",
+    "@sap/ux-app-templates": "1.3.5",
+    "@sap/ux-cds": "1.3.5",
+    "@sap/ux-control-property-editor": "1.3.5",
+    "@sap/ux-odata-client": "1.3.5",
+    "@sap/ux-telemetry": "1.3.5",
     "@types/body-parser": "1.19.0",
     "@types/prompts": "2.0.8",
     "@types/yazl": "2.4.2",
@@ -50,6 +53,7 @@
     "@ui5/logger": "2.0.1",
     "@ui5/project": "2.4.0",
     "@ui5/server": "2.2.10",
+    "axios": "0.21.1",
     "body-parser": "1.19.0",
     "chalk": "4.1.0",
     "connect-livereload": "0.6.1",
@@ -60,6 +64,8 @@
     "http-proxy-middleware": "1.3.1",
     "https-proxy-agent": "4.0.0",
     "i18next": "19.0.2",
+    "marked": "3.0.2",
+    "marked-terminal": "4.2.0",
     "mock-http-server": "1.4.2",
     "open": "7.0.3",
     "portfinder": "1.0.25",
@@ -85,5 +91,23 @@
   "jestSonar": {
     "reportPath": "reports/test/unit",
     "reportFile": "test-report.xml"
+  },
+  "eslint-formatter-multiple": {
+    "formatters": [
+      {
+        "name": "stylish",
+        "output": "console"
+      },
+      {
+        "name": "json",
+        "output": "file",
+        "path": "reports/lint/eslint.json"
+      },
+      {
+        "name": "checkstyle",
+        "output": "file",
+        "path": "reports/lint/eslint.checkstyle.xml"
+      }
+    ]
   }
 }