@ui5/task-adaptation 1.0.15 → 1.0.16

package/scripts/rollup/bundleDefinition-resourceBundle.js

@@ -0,0 +1,5 @@
+import ResourceBundle from "sap/base/i18n/ResourceBundle";
+
+export {
+    ResourceBundle
+};

package/scripts/rollup/overrides/sap/base/i18n/Localization.js

@@ -0,0 +1 @@
+export default class Localization {}

package/scripts/rollup/overrides/sap/base/string/formatMessage.js

@@ -0,0 +1 @@
+export default class formatMessage {}

package/scripts/rollup/overrides/sap/base/util/Properties.js

@@ -0,0 +1 @@
+export default class Properties {}

package/scripts/rollup/overrides/sap/base/util/merge.js

@@ -0,0 +1 @@
+export default class merge {}

package/scripts/rollup/project/ui5.yaml

@@ -6,7 +6,7 @@ metadata:
   allowSapInternal: true
 framework:
   name: SAPUI5
-  version: "0.0.0"
+  version: "1.115.0"
   libraries:
     - name: sap.ui.fl
     - name: sap.suite.ui.generic.template

package/scripts/rollup.ts

@@ -1,12 +1,8 @@
 import * as fs from "fs";
 import * as path from "path";
-
-import * as builtins from "builtin-modules";
-import { nodeResolve } from "@rollup/plugin-node-resolve";
-import * as rollup from "rollup";
 import * as semver from "semver";
 import * as yaml from "js-yaml";
-import ui5 from "./rollup/ui5Resolve";
+import Bundler from "./bundler";
 
 const { normalizer } = require("@ui5/project");
 const log = require("@ui5/logger").getLogger("rollup-plugin-ui5-resolve-task-adaptation");
@@ -60,55 +56,35 @@ export default class Builder {
         }
     }
 
-    static async run(destination: string): Promise<void> {
-        const bundledUI5Version = this.getBundledUI5Version(destination);
+    static async run(): Promise<void> {
         const project = await this.getProjectInfo(projectPaths);
         if (!project) {
             throw new Error("ui5.yaml is not found or incorrect");
         }
-        const isSapUiFl = (dependency: any) => dependency.id.endsWith("/sap.ui.fl");
-        const sapUiFlDependency = project.dependencies.find(isSapUiFl);
-        if (bundledUI5Version == null || sapUiFlDependency && semver.neq(bundledUI5Version, sapUiFlDependency.version)) {
-            if (sapUiFlDependency.version) {
-                log.info(`Using UI5 version ${sapUiFlDependency.version.toString()} to bundle`);
-            }
-            const inputOptions = <rollup.RollupOptions>{
-                input: "bundleDefinition.js",
-                plugins: [
-                    ui5({
-                        assets: [
-                            "/resources/sap/ui/fl/**",
-                            "/resources/sap/suite/ui/generic/template/**"
-                        ],
-                        skipTransformation: [
-                            "bundleDefinition.js",
-                            "sap/ui/thirdparty/URI"
-                        ],
-                        output: destination,
-                        project: project,
-                        ui5version: sapUiFlDependency.version
-                    }),
-                    nodeResolve({
-                        preferBuiltins: true
-                    })
-                ],
-                external: builtins
-            }
-            const bundle = await rollup.rollup(inputOptions);
-
-            const outputOptions = <rollup.RollupOptions>{
-                file: destination,
-                format: "commonjs"
-            }
-            await bundle.write(outputOptions);
-            await bundle.close();
-        } else {
-            log.info(`UI5 version ${bundledUI5Version!.toString()} is already bundled`);
-        }
-
+        await Bundler.run(
+            project,
+            "bundleDefinition.js",
+            "./dist/bundle.js",
+            "/sap.ui.fl",
+            [
+                "/resources/sap/ui/fl/**",
+                "/resources/sap/suite/ui/generic/template/**"
+            ],
+            [
+                "sap/ui/thirdparty/URI"
+            ]);
+        await Bundler.run(
+            project,
+            "bundleDefinition-resourceBundle.js",
+            "./dist/bundle-resourceBundle.js",
+            "/sap.ui.core",
+            [
+                "/resources/sap/base/**"
+            ]
+        );
     }
 }
 
-if (process.argv.length === 3) {
-    Builder.run(process.argv[2]);
-}
+if (process.argv.length === 2) {
+    Builder.run();
+}

package/dist/html5RepoManager.js

@@ -1,113 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const AdmZip = require("adm-zip");
-const cfUtil_1 = require("./util/cfUtil");
-const requestUtil_1 = require("./util/requestUtil");
-const commonUtil_1 = require("./util/commonUtil");
-const log = require("@ui5/logger").getLogger("@ui5/task-adaptation::HTML5RepoManager");
-class HTML5RepoManager {
-    static getBaseAppFiles(configuration) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { token, baseUri } = yield this.getHtml5RepoInfo(configuration);
-            const entries = yield this.getBaseAppZipEntries(configuration, baseUri, token);
-            return this.mapEntries(entries);
-        });
-    }
-    static getMetadata(configuration) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { token, baseUri } = yield this.getHtml5RepoInfo(configuration);
-            return this.requestMetadata(configuration, baseUri, token);
-        });
-    }
-    static getHtml5RepoInfo(configuration) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const spaceGuid = yield cfUtil_1.default.getSpaceGuid(configuration === null || configuration === void 0 ? void 0 : configuration.spaceGuid);
-            const credentials = yield this.getHTML5Credentials(spaceGuid);
-            const token = yield this.getToken(credentials);
-            return {
-                token,
-                baseUri: credentials.uri
-            };
-        });
-    }
-    static getHTML5Credentials(spaceGuid) {
-        return __awaiter(this, void 0, void 0, function* () {
-            log.verbose("Getting HTML5 Repo Runtime credentials from space " + spaceGuid);
-            const PLAN_NAME = "app-runtime";
-            const SERVIСE_INSTANCE_NAME = "html5-apps-repo-runtime";
-            const getParams = {
-                spaceGuids: [spaceGuid],
-                planNames: [PLAN_NAME],
-                names: [SERVIСE_INSTANCE_NAME]
-            };
-            const createParams = {
-                spaceGuid,
-                planName: PLAN_NAME,
-                serviceName: SERVIСE_INSTANCE_NAME,
-                tags: ["html5-apps-repo-rt"]
-            };
-            const serviceKeys = yield cfUtil_1.default.getServiceInstanceKeys(getParams, createParams);
-            return serviceKeys.credentials;
-        });
-    }
-    static getToken({ uaa }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            log.verbose("Getting HTML5 Repo token");
-            const auth = Buffer.from(uaa.clientid + ":" + uaa.clientsecret);
-            const options = {
-                headers: {
-                    "Content-Type": "application/json",
-                    "Authorization": "Basic " + auth.toString("base64")
-                }
-            };
-            const uri = `${uaa.url}/oauth/token?grant_type=client_credentials`;
-            return requestUtil_1.default.get(uri, options).then((json) => json["access_token"]);
-        });
-    }
-    static requestMetadata(options, html5RepoBaseUri, token) {
-        return __awaiter(this, void 0, void 0, function* () {
-            commonUtil_1.validateObject(options, ["appHostId", "appName", "appVersion"], "should be specified in ui5.yaml configuration");
-            const { appHostId, appName, appVersion } = options;
-            const uri = `${html5RepoBaseUri}/applications/metadata/`;
-            const requestOptions = {
-                headers: {
-                    "Content-Type": "application/json",
-                    "Authorization": "Bearer " + token,
-                    "x-app-host-id": appHostId
-                }
-            };
-            const metadata = yield requestUtil_1.default.get(uri, requestOptions);
-            return metadata.find((item) => item.appHostId === appHostId && item.applicationName === appName && item.applicationVersion === appVersion);
-        });
-    }
-    static getBaseAppZipEntries(options, html5RepoBaseUri, token) {
-        return __awaiter(this, void 0, void 0, function* () {
-            commonUtil_1.validateObject(options, ["appHostId", "appName", "appVersion"], "should be specified in ui5.yaml configuration");
-            const { appHostId, appName, appVersion } = options;
-            const uri = `${html5RepoBaseUri}/applications/content/${appName}-${appVersion}/`;
-            const zip = yield requestUtil_1.default.download(token, appHostId, uri);
-            let admZip;
-            try {
-                admZip = new AdmZip(zip);
-                return admZip.getEntries();
-            }
-            catch (error) {
-                throw new Error("Failed to parse zip content from HTML5 Repository: " + error.message);
-            }
-        });
-    }
-    static mapEntries(entries) {
-        return new Map(entries.filter(entry => !entry.isDirectory).map(entry => [entry.entryName, entry.getData().toString("utf8")]));
-    }
-}
-exports.default = HTML5RepoManager;
-//# sourceMappingURL=html5RepoManager.js.map

package/dist/updateCache.d.ts

@@ -1,5 +0,0 @@
-import { IConfiguration } from "./model/types";
-/**
- * Updates temporary stored original app files
- */
-export default function (configuration: IConfiguration): Promise<Map<string, string>>;

package/dist/updateCache.js

@@ -1,36 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const html5RepoManager_1 = require("./html5RepoManager");
-const resourceUtil_1 = require("./util/resourceUtil");
-const commonUtil_1 = require("./util/commonUtil");
-/**
- * Updates temporary stored original app files
- */
-function default_1(configuration) {
-    return __awaiter(this, void 0, void 0, function* () {
-        commonUtil_1.validateObject(configuration, ["appHostId", "appName", "appVersion"], "should be specified in ui5.yaml configuration");
-        const metadataPromise = html5RepoManager_1.default.getMetadata(configuration);
-        const tempMetadata = resourceUtil_1.default.readTempMetadata(configuration);
-        const metadata = yield metadataPromise;
-        if (metadata.changedOn !== (tempMetadata === null || tempMetadata === void 0 ? void 0 : tempMetadata.changedOn)) {
-            const baseAppFiles = yield html5RepoManager_1.default.getBaseAppFiles(configuration);
-            const metadataMap = new Map([[resourceUtil_1.default.METADATA_FILENAME, JSON.stringify(metadata)]]);
-            yield resourceUtil_1.default.writeTemp(configuration, new Map([...baseAppFiles, ...metadataMap]));
-            return baseAppFiles;
-        }
-        else {
-            return resourceUtil_1.default.readTemp(configuration);
-        }
-    });
-}
-exports.default = default_1;
-//# sourceMappingURL=updateCache.js.map