@24i/smartapps-bigscreen-rnv-build-engine 0.17.6-alpha.5 → 0.17.6-alpha.6

package/dist/src/constants/buildProductionPackages.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SUPPORTED_PACKAGE_PLATFORMS = void 0;
+const platforms_1 = require("./platforms");
+exports.SUPPORTED_PACKAGE_PLATFORMS = [
+    platforms_1.Platforms.ANDROIDTV,
+    platforms_1.Platforms.TIZEN,
+    platforms_1.Platforms.WEBOS,
+];

package/dist/src/resolvers/index.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProductionZipFileRelativePath = exports.resolveZippedPlatformBuildsRelativeFilePath = exports.resolvePackageVersions = exports.resolveBuildFileExtension = exports.resolveUsedFlavours = exports.resolveSupportedPlatforms = exports.getBaseConfig = exports.resolveBuildFileName = exports.resolveBuildFileBaseName = exports.resolveHbbtvDeployConfig = exports.resolveHbbtvDeployUrl = exports.resolveHbbtvRemoteBuildDirRelativePath = exports.resolveDeployLocations = exports.resolveBuildVersionOffset = exports.resolveBuildVersion = exports.resolveBuildEnvName = exports.resolveBaseUrl = void 0;
+exports.getProductionZipFileRelativePath = exports.resolveZippedPlatformBuildsRelativeFilePath = exports.resolvePackageVersions = exports.resolveBuildFileExtension = exports.resolveUsedFlavours = exports.resolveSupportedPlatforms = exports.getBaseConfig = exports.resolveBuildFileName = exports.resolveBuildFileBaseName = exports.resolveHbbtvDeployConfig = exports.resolveHbbtvDeployUrl = exports.resolveHbbtvRemoteBuildDirRelativePath = exports.resolveDeployLocations = exports.resolveBuildVersionOffset = exports.resolveBuildVersion = exports.resolveBuildEnvName = exports.resolveCustomBaseUrl = exports.resolveBaseUrl = void 0;
 var resolveBaseUrl_1 = require("./resolveBaseUrl");
 Object.defineProperty(exports, "resolveBaseUrl", { enumerable: true, get: function () { return resolveBaseUrl_1.resolveBaseUrl; } });
+Object.defineProperty(exports, "resolveCustomBaseUrl", { enumerable: true, get: function () { return resolveBaseUrl_1.resolveCustomBaseUrl; } });
 var resolveBuildEnvName_1 = require("./resolveBuildEnvName");
 Object.defineProperty(exports, "resolveBuildEnvName", { enumerable: true, get: function () { return resolveBuildEnvName_1.resolveBuildEnvName; } });
 var resolveBuildVersion_1 = require("./resolveBuildVersion");

package/dist/src/resolvers/resolveBaseUrl.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveBaseUrl = void 0;
+exports.resolveCustomBaseUrl = exports.resolveBaseUrl = void 0;
 const resolveGenericRnvConfig_1 = require("./resolveGenericRnvConfig");
 const resolveBuildEnvName_1 = require("./resolveBuildEnvName");
 const constants_1 = require("../constants");
@@ -34,3 +34,13 @@ const resolveBaseUrl = ({ platform, scheme, flavour }) => {
     }
 };
 exports.resolveBaseUrl = resolveBaseUrl;
+const resolveCustomBaseUrl = (c) => {
+    const { hostedUrl } = c.buildConfig.common;
+    const baseUrl = hostedUrl?.baseUrl;
+    const subpath = hostedUrl?.subpath ?? '';
+    if (!baseUrl) {
+        throw new Error('The resolveCustomBaseUrl failed because baseUrl is missing.');
+    }
+    return `${baseUrl}${subpath}`;
+};
+exports.resolveCustomBaseUrl = resolveCustomBaseUrl;

package/dist/src/resolvers/resolveGenericRnvConfig.js

@@ -37,8 +37,15 @@ const mergeFileJsonIntoObject = (filePath, targetObject) => {
     const fileContentAsJSON = JSON.parse(fileContentAsString);
     (0, assign_deep_1.default)(targetObject, fileContentAsJSON);
 };
-const getBaseConfig = () => {
-    const c = rnv_1.ConfigManager.createRnvConfig({ ci: true }, process);
+const getBaseConfig = (programOptions) => {
+    const { appConfigID, scheme } = programOptions || {};
+    const c = rnv_1.ConfigManager.createRnvConfig({ ci: true, ...programOptions }, process);
+    if (scheme) {
+        c.runtime.scheme = scheme;
+    }
+    if (appConfigID) {
+        c.runtime.appId = appConfigID;
+    }
     c.buildConfig = {};
     const packageJsonfileContent = fs.readFileSync('package.json').toString();
     c.files.project.package = JSON.parse(packageJsonfileContent);

package/dist/src/scripts/{buildProductionAll.js → buildProductionPackagesAll.js}

@@ -28,38 +28,48 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const fse = __importStar(require("fs-extra"));
 const forEachSupportedPlatformFlavour_1 = require("../utils/forEachSupportedPlatformFlavour");
+const constants_1 = require("../constants");
+const buildProductionPackages_1 = require("../constants/buildProductionPackages");
 const resolvers_1 = require("../resolvers");
 const getZippedDirRelativePath = (c) => {
     const { platformBuildsDir } = c.buildConfig.paths;
     return path.join(platformBuildsDir, 'zipped_production_packages');
 };
-const buildTask = (options, c) => {
+const buildProductionTask = (options, c) => {
     const { scheme, platform, flavour } = options;
-    const cmd = `npx rnv build -s ${scheme} -p ${platform} -c ${flavour} --ci`;
-    (0, child_process_1.execSync)(cmd, { stdio: 'inherit' });
     const { platformBuildsDir } = c.buildConfig.paths;
     const buildDirName = `${flavour}_${platform}`;
     const buildDirPath = path.join(platformBuildsDir, buildDirName);
     const buildOutputDirPath = path.join(buildDirPath, 'output');
+    fs.rmSync(buildDirPath, { recursive: true, force: true });
+    const cmd = `npx rnv build -s ${scheme} -p ${platform} -c ${flavour} --ci --hostedUrl`;
+    (0, child_process_1.execSync)(cmd, { stdio: 'inherit' });
     const zippedDir = path.join(getZippedDirRelativePath(c), platform);
     fse.copySync(buildOutputDirPath, zippedDir);
-    fs.rmSync(buildDirPath, { recursive: true, force: true });
 };
-const buildProductionAll = () => {
+const buildProductionPackagesAll = () => {
+    console.log('buildProductionPackagesAll');
     const schemes = process.argv.slice(2);
+    if (!schemes.length) {
+        throw new Error('Missing scheme parameter');
+    }
+    if (schemes[0] !== constants_1.BuildSchemes.RELEASE_PROD_DIST) {
+        throw new Error(`Supported only "${constants_1.BuildSchemes.RELEASE_PROD_DIST}" scheme`);
+    }
     const c = (0, resolvers_1.getBaseConfig)();
-    schemes.forEach((scheme, schemeIndex, schemes) => {
-        c.runtime.scheme = scheme;
-        (0, forEachSupportedPlatformFlavour_1.forEachSupportedPlatformFlavour)(c, (options) => buildTask(options, c), { schemes, schemeIndex });
-    });
+    c.runtime.scheme = schemes[0];
+    const platforms = (0, resolvers_1.resolveSupportedPlatforms)(c);
+    const skipPlatforms = platforms.filter((platform) => (!buildProductionPackages_1.SUPPORTED_PACKAGE_PLATFORMS.includes(platform)));
+    (0, forEachSupportedPlatformFlavour_1.forEachSupportedPlatformFlavour)(c, (options) => buildProductionTask(options, c), { ignoredPlatforms: skipPlatforms });
     const zippedDirPath = path.resolve(getZippedDirRelativePath(c));
     const zipFilePath = path.resolve((0, resolvers_1.getProductionZipFileRelativePath)(c));
+    fs.rmSync(zipFilePath, { force: true });
     (0, child_process_1.execSync)(`zip -r ${zipFilePath} *`, { cwd: `${zippedDirPath}` });
     fs.rmSync(zippedDirPath, { recursive: true, force: true });
     return true;
 };
 const startTimestamp = Date.now();
-buildProductionAll();
+buildProductionPackagesAll();
 const msPerSecond = 1000;
 const scriptTotalTimeInSeconds = Math.ceil((Date.now() - startTimestamp) / msPerSecond);
-console.log(`buildProductionAll: done in ${scriptTotalTimeInSeconds} second(s)!`);
+console.log(`buildProductionPackagesAll: done in ${scriptTotalTimeInSeconds} second(s)!`);

package/dist/src/scripts/release/appCenter/{deployProductionToAppCenter.js → deployProductionPackagesToAppCenter.js}

@@ -23,11 +23,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deployProductionToAppCenter = void 0;
+exports.deployProductionPackagesToAppCenter = void 0;
 const child_process_1 = require("child_process");
 const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-const index_1 = require("../../../resolvers/index");
+const index_1 = require("../../../constants/index");
+const buildProductionPackages_1 = require("../../../constants/buildProductionPackages");
+const index_2 = require("../../../resolvers/index");
 const appCenter_1 = require("./appCenter");
 const newLine = '\r\n';
 const getAppCenterConfig = (c) => {
@@ -38,51 +39,67 @@ const getAppCenterConfig = (c) => {
         return null;
     }
 };
-const getPlatformPackagesListFromZip = (zipFilePath) => {
-    const zipFileParsedPath = path.parse(zipFilePath);
-    const tmpOutputDir = path.join(zipFileParsedPath.dir, zipFileParsedPath.name);
-    fs.rmSync(tmpOutputDir, { force: true, recursive: true });
-    (0, child_process_1.execSync)(`unzip ${zipFilePath} -d ${tmpOutputDir}`);
+const getPlatformPackagesList = (c) => {
+    const scheme = index_1.BuildSchemes.RELEASE_PROD_DIST;
     const packagesList = [];
-    fs.readdirSync(tmpOutputDir).forEach((platformDirName) => {
-        const platform = {
-            platformName: platformDirName,
-            packageNames: fs.readdirSync(path.join(tmpOutputDir, platformDirName)),
+    const platforms = (0, index_2.resolveSupportedPlatforms)(c)
+        .filter((platform) => buildProductionPackages_1.SUPPORTED_PACKAGE_PLATFORMS.includes(platform));
+    platforms.forEach((platform) => {
+        const { supportedFlavours = [] } = c.buildConfig.platforms[platform]?.deploy || {};
+        const platformObj = {
+            platformName: platform,
+            packages: supportedFlavours.map((appConfigID) => {
+                const c = (0, index_2.getBaseConfig)({ platform, scheme, appConfigID, hostedUrl: true });
+                return {
+                    name: (0, index_2.resolveBuildFileName)(c),
+                    flavour: appConfigID,
+                    hostedUrl: `${(0, index_2.resolveCustomBaseUrl)(c)}/public`,
+                };
+            })
         };
-        packagesList.push(platform);
+        packagesList.push(platformObj);
     });
-    fs.rmSync(tmpOutputDir, { force: true, recursive: true });
     return packagesList;
 };
 const getAppCenterToken = () => {
     return process.env['APPCENTER_TOKEN_PRODUCTION_PACKAGES'] || '';
 };
-const deployProductionToAppCenter = (c) => {
+const deployProductionPackagesToAppCenter = (c) => {
+    console.log('deployProductionPackagesToAppCenter');
     const appCenterConfig = getAppCenterConfig(c);
-    if (!appCenterConfig)
-        return;
+    if (!appCenterConfig) {
+        throw new Error('Not found App Center Config (for production packages) in build config');
+    }
     const { appName: centerAppName } = appCenterConfig;
     const token = getAppCenterToken();
-    const zipPath = (0, index_1.getProductionZipFileRelativePath)(c);
+    const zipPath = (0, index_2.getProductionZipFileRelativePath)(c);
     const { appName, packageVersion } = c.buildConfig.common;
-    if (!centerAppName || !token || !zipPath || !packageVersion)
-        return;
+    if (!centerAppName)
+        throw new Error('Missing centerAppName in appCenterConfig');
+    if (!token)
+        throw new Error('Missing App Center Token');
+    if (!zipPath)
+        throw new Error('Missing path of zip file to be upload to the App Center');
+    if (!packageVersion)
+        throw new Error('Missing packageVersion to be send to the App Center');
     const tempReleaseNotesPath = `RELEASE_NOTES_APPCENTER_PRODUCTION_PACKAGES.md`;
     if (fs.existsSync(tempReleaseNotesPath)) {
         fs.unlinkSync(tempReleaseNotesPath);
     }
-    const packagesList = getPlatformPackagesListFromZip(zipPath);
+    const packagesList = getPlatformPackagesList(c);
     const notes = [
         `# ${appName} Production Packages`,
         '',
         '## List of Production Packages',
-        ...packagesList.reduce((acc, { platformName, packageNames }) => ([
+        ...packagesList.reduce((acc, { platformName, packages }) => ([
             ...acc,
             `- ${platformName}`,
-            ...packageNames.map((packageName) => ` - ${packageName}`),
+            ...packages.reduce((accPackages, { name, hostedUrl }) => ([
+                ...accPackages,
+                `  - ${name}`,
+                `    - App URL: ${hostedUrl}`
+            ]), []),
         ]), []),
-        '',
-        'URL: <hosted_URL>'
     ];
     const packagesMarkdown = notes.join(newLine);
     (0, child_process_1.execSync)(`echo "${packagesMarkdown}" >> ${tempReleaseNotesPath}`);
@@ -95,4 +112,4 @@ const deployProductionToAppCenter = (c) => {
         token,
     });
 };
-exports.deployProductionToAppCenter = deployProductionToAppCenter;
+exports.deployProductionPackagesToAppCenter = deployProductionPackagesToAppCenter;

package/dist/src/scripts/releaseProductionPackagesAll.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const index_1 = require("../resolvers/index");
+const deployProductionPackagesToAppCenter_1 = require("./release/appCenter/deployProductionPackagesToAppCenter");
+const releaseProductionPackagesAll = () => {
+    const c = (0, index_1.getBaseConfig)();
+    (0, deployProductionPackagesToAppCenter_1.deployProductionPackagesToAppCenter)(c);
+};
+const startTimestamp = Date.now();
+releaseProductionPackagesAll();
+const msPerSecond = 1000;
+const scriptTotalTimeInSeconds = Math.ceil((Date.now() - startTimestamp) / msPerSecond);
+console.log(`releaseProductionPackagesAll: done in ${scriptTotalTimeInSeconds} second(s)!`);

package/dist/src/sdks/sdk-androidtv/sdkAndroidtv.js

@@ -165,11 +165,17 @@ const configureProject = (c) => {
 };
 const getHostedAppEntryUrl = (c) => {
     const { platform, runtime } = c;
-    const baseUrl = (0, resolvers_1.resolveBaseUrl)({
-        platform,
-        scheme: runtime.scheme || '',
-        flavour: runtime.appId,
-    });
+    let baseUrl = '';
+    if (c.program.hostedUrl) {
+        baseUrl = (0, resolvers_1.resolveCustomBaseUrl)(c);
+    }
+    else {
+        baseUrl = (0, resolvers_1.resolveBaseUrl)({
+            platform,
+            scheme: runtime.scheme || '',
+            flavour: runtime.appId,
+        });
+    }
     return `${baseUrl}/public/index.html`;
 };
 const configureEntryUrl = (c) => {

package/dist/src/sdks/sdk-webpack/sdkWebpack.js

@@ -8,6 +8,7 @@ const path_1 = __importDefault(require("path"));
 const ip_1 = __importDefault(require("ip"));
 const rnv_1 = require("rnv");
 const sdk_webpack_1 = require("@rnv/sdk-webpack");
+const resolvers_1 = require("../../resolvers");
 const copyEnvironmentFolder_1 = require("../../utils/copyEnvironmentFolder");
 const configureWebProject = async (c) => {
     rnv_1.Logger.logTask('configureWebProject');
@@ -51,7 +52,13 @@ const buildCoreWebpackProject = async (c) => {
     if (wp === '') {
         rnv_1.Logger.logWarning('Webpack not found. Will try to use globally installed one');
     }
-    const envVars = `PLATFORM=${platform} NODE_ENV=${environment} ${debugVariables}`;
+    let hostedUrlVariable = '';
+    if (c.program.hostedUrl) {
+        hostedUrlVariable = `HOSTED_URL=${(0, resolvers_1.resolveCustomBaseUrl)(c)}`;
+    }
+    const envVars = [
+        `PLATFORM=${platform}`, `NODE_ENV=${environment}`, debugVariables, hostedUrlVariable,
+    ].filter(Boolean).join(' ');
     const wpConfigPath = `./platformBuilds/${appId}_${platform}/webpack.config.${configName}.js`;
     const wpCmd = `node ${wp} build --mode production --config ${wpConfigPath}`;
     await rnv_1.Exec.executeAsync(c, `npx cross-env ${envVars}  ${wpCmd}`);

package/dist/src/tasks/task.rnv.build.js

@@ -31,6 +31,12 @@ const constants_1 = require("../constants");
 const sdks_1 = require("../sdks");
 const resolvers_1 = require("../resolvers");
 const { TASK_BUILD, TASK_PACKAGE, PARAMS } = rnv_1.Constants;
+const PARAM_KEYS = {
+    hostedUrl: {
+        key: 'hostedUrl',
+        description: 'Uses hosted URL of App',
+    }
+};
 const makeZipOutput = (c) => {
     const platformBuildDir = rnv_1.Common.getPlatformBuildDir(c);
     const copiedProjectBuildDir = `${platformBuildDir}/build`;
@@ -59,6 +65,9 @@ const buildFn = async (c, parentTask, originTask) => {
     rnv_1.Logger.logTask('taskRnvBuild', `parent:${parentTask}`);
     const { platform } = c;
     c.runtime.forceBundleAssets = true;
+    if (c.program.rawArgs.includes(`--${PARAM_KEYS.hostedUrl.key}`)) {
+        c.program[PARAM_KEYS.hostedUrl.key] = true;
+    }
     await (0, sdks_1.handlePlatformSdk)(c);
     await rnv_1.TaskManager.executeOrSkipTask(c, TASK_PACKAGE, TASK_BUILD, originTask);
     switch (platform) {
@@ -93,7 +102,7 @@ const customRnvBuildTask = {
     description: 'Build project binary',
     fn: buildFn,
     task: 'build',
-    params: PARAMS.withBase(PARAMS.withConfigure()),
+    params: PARAMS.withBase(PARAMS.withConfigure([PARAM_KEYS.hostedUrl])),
     platforms: Object.values(constants_1.Platforms),
 };
 exports.customRnvBuildTask = customRnvBuildTask;

package/dist/src/utils/forEachSupportedPlatformFlavour.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.forEachSupportedPlatformFlavour = exports.getProgressMessage = void 0;
+exports.forEachSupportedPlatformFlavour = exports.forEachPlatformFlavour = exports.getProgressMessage = void 0;
 const resolvers_1 = require("../resolvers");
 const getProgressMessage = ({ schemes, schemeIndex, platforms, platformIndex, flavours, flavourIndex, }) => {
     const printScheme = schemes && schemes.length && schemeIndex !== undefined;
@@ -16,8 +16,8 @@ const getProgressMessage = ({ schemes, schemeIndex, platforms, platformIndex, fl
     return string;
 };
 exports.getProgressMessage = getProgressMessage;
-const forEachSupportedPlatformFlavour = (c, cb, options = {}) => {
-    const { ignoredPlatforms = [], schemes = [], schemeIndex = 0, disableProgressMessage = false, } = options;
+const _forEachPlatformFlavour = (platforms, c, cb, options = {}) => {
+    const { ignoredPlatforms = [], schemes = [], schemeIndex = 0, } = options;
     const processPlatformFlavours = (platform, platformIndex, platforms) => {
         if (ignoredPlatforms.includes(platform)) {
             console.log(`\nSkipping "${platforms[platformIndex]}" platform (${platformIndex + 1}/${platforms.length}).`);
@@ -33,6 +33,14 @@ const forEachSupportedPlatformFlavour = (c, cb, options = {}) => {
         const { supportedFlavours = [] } = c.buildConfig.platforms[platform]?.deploy || {};
         supportedFlavours.forEach(processFlavour);
     };
-    (0, resolvers_1.resolveSupportedPlatforms)(c).forEach(processPlatformFlavours);
+    platforms.forEach(processPlatformFlavours);
+};
+const forEachSupportedPlatformFlavour = (c, cb, options = {}) => {
+    const supportedPlatforms = (0, resolvers_1.resolveSupportedPlatforms)(c);
+    _forEachPlatformFlavour(supportedPlatforms, c, cb, options);
 };
 exports.forEachSupportedPlatformFlavour = forEachSupportedPlatformFlavour;
+const forEachPlatformFlavour = (platforms, c, cb) => {
+    _forEachPlatformFlavour(platforms, c, cb);
+};
+exports.forEachPlatformFlavour = forEachPlatformFlavour;

package/dist/templates/platforms/_shared/webpack.base.js

@@ -125,13 +125,13 @@ function generateConfig(config) {
         scheme: config.scheme,
         flavour: config.appConfigId,
     };
+    const { PLATFORM, HOSTED_URL } = process.env;
     const { buildConfig } = smartapps_bigscreen_rnv_build_engine_1.Resolvers.getBaseConfig();
     const buildVersion = smartapps_bigscreen_rnv_build_engine_1.Resolvers.resolveBuildVersion(platformSchemeAppIdObj);
-    const baseUrl = smartapps_bigscreen_rnv_build_engine_1.Resolvers.resolveBaseUrl(platformSchemeAppIdObj);
+    const baseUrl = HOSTED_URL || smartapps_bigscreen_rnv_build_engine_1.Resolvers.resolveBaseUrl(platformSchemeAppIdObj);
     const packageVersions = smartapps_bigscreen_rnv_build_engine_1.Resolvers.resolvePackageVersions(projectDir);
     const devServerHost = config.devServerHost || '0.0.0.0';
     const isDevServer = appBuildEngineProjectDir.endsWith('/server');
-    const { PLATFORM } = process.env;
     const isBuildHosted = config.isBuildHosted || false;
     const appContentPath = getAppContentPath(baseUrl, isBuildHosted);
     const copiedDirWithPublicContentPath = path_1.default.join(appBuildDir, `../${path_1.default.parse(appBuildDir).name}-public`);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@24i/smartapps-bigscreen-rnv-build-engine",
-	"version": "0.17.6-alpha.5",
+	"version": "0.17.6-alpha.6",
 	"description": "Package with build engine for SmartApps BIGscreen projects...",
 	"main": "dist/src/index.js",
 	"scripts": {

package/dist/src/scripts/releaseProductionAll.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const resolvers_1 = require("../resolvers");
-const deployProductionToAppCenter_1 = require("./release/appCenter/deployProductionToAppCenter");
-const releaseProductionAll = () => {
-    const c = (0, resolvers_1.getBaseConfig)();
-    (0, deployProductionToAppCenter_1.deployProductionToAppCenter)(c);
-};
-const startTimestamp = Date.now();
-releaseProductionAll();
-const msPerSecond = 1000;
-const scriptTotalTimeInSeconds = Math.ceil((Date.now() - startTimestamp) / msPerSecond);
-console.log(`releaseProductionAll: done in ${scriptTotalTimeInSeconds} second(s)!`);