@24i/smartapps-bigscreen-rnv-build-engine 0.12.2-alpha.1693 → 0.13.0

package/dist/src/__tests__/resolvers/resolveDeployLocations.spec.js

@@ -13,7 +13,7 @@ const c = {
         appId: 'flavour1',
     },
     buildConfig: {
-        defaults: { supportedPlatforms: [constants_1.Platforms.TIZEN, constants_1.Platforms.WEBTV, constants_1.Platforms.HBBTV] },
+        defaults: { supportedPlatforms: [constants_1.Platforms.TIZEN, constants_1.Platforms.WEBTV, constants_1.Platforms.HBBTV, constants_1.Platforms.XBOX] },
         common: {
             appNameInFileName: 'appName',
             packageVersion: '1.0.0',
@@ -39,6 +39,11 @@ const c = {
                     supportedFlavours: ['flavour3'],
                 },
             },
+            xbox: {
+                deploy: {
+                    supportedFlavours: ['flavour1'],
+                },
+            },
         },
     },
 };
@@ -79,6 +84,12 @@ describe('resolveDeployLocations', () => {
                                 packageUrl: `${bucketBaseUrl}/builds/webtv/flavour1/latest/release/build/appName_webtv_latest.release_flavour1.zip`,
                             },
                         },
+                        xbox: {
+                            flavour1: {
+                                indexUrl: `${bucketBaseUrl}/builds/xbox/flavour1/latest/release/public/index.html`,
+                                packageUrl: `${bucketBaseUrl}/builds/xbox/flavour1/latest/release/build/appName_xbox_latest.release_flavour1.zip`,
+                            },
+                        },
                     },
                 },
             },

package/dist/src/sdks/index.js

@@ -19,7 +19,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handlePlatformSdk = exports.SDKWebpack = exports.SDKTizen = exports.SDKWebos = void 0;
+exports.handlePlatformSdk = exports.SDKXbox = exports.SDKWebpack = exports.SDKTizen = exports.SDKWebos = void 0;
 const constants_1 = require("../constants");
 const SDKWebos = __importStar(require("./sdk-webos"));
 exports.SDKWebos = SDKWebos;
@@ -27,6 +27,8 @@ const SDKTizen = __importStar(require("./sdk-tizen"));
 exports.SDKTizen = SDKTizen;
 const SDKWebpack = __importStar(require("./sdk-webpack"));
 exports.SDKWebpack = SDKWebpack;
+const SDKXbox = __importStar(require("./sdk-xbox"));
+exports.SDKXbox = SDKXbox;
 const handlePlatformSdk = async (c) => {
     switch (c.platform) {
         case constants_1.Platforms.TIZEN:

package/dist/src/sdks/sdk-xbox/index.js

@@ -0,0 +1,13 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./sdkXbox"), exports);

package/dist/src/sdks/sdk-xbox/sdkXbox.js

@@ -0,0 +1,159 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildXboxProject = void 0;
+const rnv_1 = require("rnv");
+const sdk_webpack_1 = require("@rnv/sdk-webpack");
+const child_process_1 = require("child_process");
+const fs_1 = require("fs");
+const manifoldjs_windows10_1 = require("manifoldjs-windows10");
+const resolvers_1 = require("../../resolvers");
+const fs = fs_1.promises;
+const { logTask } = rnv_1.Logger;
+const hostedAppOutputPath = '/output/hosted';
+const packagedAppOutputPath = '/output/packaged';
+const packagedAppSrcDestination = '/output/packaged/windows10/source/src';
+const appSourcePath = '/project/public';
+const packagedAppEntryUrl = 'src/index.html';
+const wrapperConfigPath = '/wrapperConfig.json';
+const hostedSourceImages = '/output/hosted/windows10/source/images';
+const packagedSourceImages = '/output/packaged/windows10/source/images';
+const hostedManifestImages = '/output/hosted/windows10/manifest/images';
+const packagedManifestImages = '/output/packaged/windows10/manifest/images';
+const identityNamePlaceholder = 'INSERT-YOUR-PACKAGE-IDENTITY-NAME-HERE';
+const identityPublisherPlaceholder = 'INSERT-YOUR-PACKAGE-IDENTITY-PUBLISHER-HERE';
+const publisherDisplayNamePlaceholder = 'INSERT-YOUR-PACKAGE-PROPERTIES-PUBLISHERDISPLAYNAME-HERE';
+class Manifest {
+    content = { start_url: '', short_name: '', theme_color: 'white' };
+    format = 'w3c';
+}
+const getHostedAppEntryUrl = (c) => {
+    const deployLocations = (0, resolvers_1.resolveDeployLocations)(c);
+    const keys = Object.keys(deployLocations.versions);
+    let url = '';
+    if (keys.length > 0) {
+        const version = keys[0];
+        if (version !== null) {
+            const flavour = c.runtime.appId;
+            url = deployLocations.versions[version].platforms.xbox?.[flavour].indexUrl ?? '';
+        }
+    }
+    return url;
+};
+const getBuildFolder = (c) => `${rnv_1.Common.getPlatformBuildDir(c)}`;
+const zipOutput = async (c) => {
+    logTask('zipOutput');
+    const defaultZipFileName = `${c.platform}_${c.runtime.appId}.zip`;
+    const fileName = (0, resolvers_1.resolveBuildFileName)(c) || defaultZipFileName;
+    const outputDirectory = `${getBuildFolder(c)}/output`;
+    const tmpOutputDirectory = `${getBuildFolder(c)}/tmpOutput`;
+    try {
+        await fs.mkdir(tmpOutputDirectory);
+        (0, child_process_1.execSync)(`cp -r ${outputDirectory} ${tmpOutputDirectory}`);
+        await fs.rm(outputDirectory, { recursive: true, force: true });
+        await fs.mkdir(outputDirectory);
+        (0, child_process_1.execSync)(`zip -r ${outputDirectory}/${fileName} *`, { cwd: `${tmpOutputDirectory}` });
+        await fs.rm(tmpOutputDirectory, { recursive: true, force: true });
+    }
+    catch {
+        throw new Error('Unable to zip the output folder');
+    }
+};
+const createVSSolution = async (c, outputPath, manifest) => {
+    logTask('createVSSolution');
+    try {
+        manifest.content.short_name = c.buildConfig.common.appName;
+        const platform = new manifoldjs_windows10_1.Platform('package', ['windows10']);
+        await platform.create(manifest, outputPath, ['windows10'], '');
+    }
+    catch (e) {
+        if (e instanceof Error
+            && !e.message.includes('Error retrieving information for module')) {
+            console.error(e.message);
+            throw new Error('Failed to create VSSolution');
+        }
+    }
+};
+const createHostedApplication = async (c) => {
+    logTask('createHostedApplication');
+    const manifest = new Manifest();
+    manifest.content.start_url = getHostedAppEntryUrl(c);
+    await createVSSolution(c, `${getBuildFolder(c)}${hostedAppOutputPath}`, manifest);
+};
+const createPackagedApplication = async (c) => {
+    logTask('createPackagedApplication');
+    const manifest = new Manifest();
+    manifest.content.start_url = packagedAppEntryUrl;
+    const sourceDir = `${getBuildFolder(c)}${appSourcePath}`;
+    const destinationDirectory = `${getBuildFolder(c)}${packagedAppSrcDestination}`;
+    await createVSSolution(c, `${getBuildFolder(c)}${packagedAppOutputPath}`, manifest);
+    (0, child_process_1.execSync)(`cp -r ${sourceDir} ${destinationDirectory}`);
+};
+const replacePublisherId = async (c, basePath) => {
+    logTask('replacePublisherId');
+    const output = `${basePath}/windows10/manifest/appxmanifest.xml`;
+    const configPath = `${getBuildFolder(c)}${wrapperConfigPath}`;
+    let appxmanifest = null;
+    let identityName = null;
+    let identityPublisher = null;
+    let publisherDisplayName = null;
+    try {
+        const data = await fs.readFile(configPath, 'utf-8');
+        const config = JSON.parse(data);
+        ({
+            identityName = null,
+            identityPublisher = null,
+            publisherDisplayName = null,
+        } = config);
+        const appxmanifestData = await fs.readFile(output, 'utf-8');
+        appxmanifest = appxmanifestData;
+        if (identityName !== null
+            && identityPublisher !== null
+            && publisherDisplayName !== null) {
+            appxmanifest = appxmanifest.replace(identityNamePlaceholder, identityName)
+                .replace(identityPublisherPlaceholder, identityPublisher)
+                .replace(publisherDisplayNamePlaceholder, publisherDisplayName);
+        }
+        else {
+            throw new Error('failed to obtain store settings');
+        }
+        await fs.writeFile(output, appxmanifest ?? '');
+    }
+    catch (e) {
+        if (e instanceof Error) {
+            throw new Error(`Failed to modify the xbox appxmanifest.xml - ${e.message}`);
+        }
+    }
+};
+const replaceImages = async (c) => {
+    logTask('replaceImages');
+    const hostedOutputDirectory = `${getBuildFolder(c)}${hostedSourceImages}`;
+    const packagedOutputDirectory = `${getBuildFolder(c)}${packagedSourceImages}`;
+    const hostedOutputManifestDirectory = `${getBuildFolder(c)}${hostedManifestImages}`;
+    const packagedOutputManifestDirectory = `${getBuildFolder(c)}${packagedManifestImages}`;
+    const appIconsDirectory = `${getBuildFolder(c)}/project/appIcons`;
+    try {
+        await fs.rm(hostedOutputDirectory, { recursive: true, force: true });
+        await fs.rm(packagedOutputDirectory, { recursive: true, force: true });
+        (0, child_process_1.execSync)(`cp -r ${appIconsDirectory} ${hostedOutputDirectory}`);
+        (0, child_process_1.execSync)(`cp -r ${appIconsDirectory} ${packagedOutputDirectory}`);
+        (0, child_process_1.execSync)(`cp -r ${appIconsDirectory} ${hostedOutputManifestDirectory}`);
+        (0, child_process_1.execSync)(`cp -r ${appIconsDirectory} ${packagedOutputManifestDirectory}`);
+        await fs.rm(appIconsDirectory, { recursive: true, force: true });
+    }
+    catch {
+        throw new Error('Failed to replace the xbox icons');
+    }
+};
+const buildXboxProject = async (c) => {
+    logTask('buildXboxProject');
+    const outputDirectory = `${getBuildFolder(c)}/output`;
+    await (0, sdk_webpack_1.buildCoreWebpackProject)(c);
+    await fs.rm(outputDirectory, { recursive: true, force: true });
+    await createHostedApplication(c);
+    await createPackagedApplication(c);
+    await replacePublisherId(c, `${getBuildFolder(c)}${hostedAppOutputPath}`);
+    await replacePublisherId(c, `${getBuildFolder(c)}${packagedAppOutputPath}`);
+    await replaceImages(c);
+    await zipOutput(c);
+};
+exports.buildXboxProject = buildXboxProject;

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

@@ -32,6 +32,7 @@ const { logTask } = rnv_1.Logger;
 const { buildWeb } = sdks_1.SDKWebpack;
 const { buildTizenProject } = sdks_1.SDKTizen;
 const { buildWebOSProject } = sdks_1.SDKWebos;
+const { buildXboxProject } = sdks_1.SDKXbox;
 const { executeOrSkipTask } = rnv_1.TaskManager;
 const { TASK_BUILD, TASK_PACKAGE, PARAMS } = rnv_1.Constants;
 const makeZipOutput = (c) => {
@@ -70,10 +71,12 @@ const buildFn = async (c, parentTask, originTask) => {
         case constants_1.Platforms.KREATV:
         case constants_1.Platforms.SAPHI:
         case constants_1.Platforms.WEBTV:
-        case constants_1.Platforms.XBOX:
             await buildWeb(c);
             makeZipOutput(c);
             return;
+        case constants_1.Platforms.XBOX:
+            await buildXboxProject(c);
+            return;
         case constants_1.Platforms.TIZEN:
             await buildTizenProject(c);
             renameOutput(c);

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

@@ -96,7 +96,7 @@ const makeRules = (config, projectDir, isDevServer) => ({
         test: /\.[tj]sx$/,
         use: ['source-map-loader'],
         enforce: 'pre',
-        exclude: [/node_modules/, /build/, /__test__/, /__tests__/],
+        exclude: [/node_modules/, /build/, /__tests__/],
     },
 });
 const makeAliases = (config, projectDir) => {

package/fixDependency.js

@@ -0,0 +1,25 @@
+/* eslint-disable */
+
+const process = require('process');
+const fs = require('fs').promises;
+
+const main = async (deleteDependencies) => {
+
+    console.log("Fix dependencies")
+
+    if (deleteDependencies === undefined) return;
+    
+    for (dependency of deleteDependencies) {
+
+        const packageLockFilePath = `${dependency.path}`;
+        
+        console.log(packageLockFilePath);
+        try {
+            await fs.rm(packageLockFilePath, { recursive: true, force: true });
+        } catch {
+            console.log("error")
+        }
+    }
+};
+
+main(require('./package.json').deleteDependencies);

package/jest.config.js

@@ -2,6 +2,7 @@ module.exports = {
     ...require('../../jest.config.base'),
     transformIgnorePatterns: [
         '/node_modules/ansi-color/', // compiler error: Octal literal in strict mode
+        '/node_modules/fstream', // compiler error: Octal literal in strict mode
     ],
     testEnvironment: 'node',
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@24i/smartapps-bigscreen-rnv-build-engine",
-	"version": "0.12.2-alpha.1693+5ba1dfd9",
+	"version": "0.13.0",
 	"description": "Package with build engine for SmartApps BIGscreen projects...",
 	"main": "dist/src/index.js",
 	"scripts": {
@@ -16,17 +16,32 @@
 		"lintcheck:cached": "npm run eslint -- --cache && npm run stylelint -- --cache",
 		"typecheck:cached": "tsc --noEmit --incremental",
 		"test": "jest --passWithNoTests",
-		"prepublishOnly": "npm run build"
+		"prepublishOnly": "npm run build",
+		"postinstall": "node fixDependency.js"
 	},
+	"deleteDependencies": [
+		{
+			"path": "../../unzip2/node_modules/graceful-fs/",
+			"version": "^4.2.8"
+		},
+		{
+			"path": "./node_modules/fstream/node_modules/graceful-fs/",
+			"version": "^4.2.8"
+		},
+		{
+			"path": "../../fstream/node_modules/graceful-fs/",
+			"version": "^4.2.8"
+		}
+	],
 	"devDependencies": {
-		"@types/inquirer": "8.1.3",
+		"@types/inquirer": "8.2.0",
 		"@types/mini-css-extract-plugin": "1.2.2",
-		"@types/node": "17.0.7",
+		"@types/node": "17.0.14",
 		"@types/semver": "7.3.9",
-		"@types/ssh2": "0.5.50",
+		"@types/ssh2": "0.5.51",
 		"@types/tapable": "1.0.6",
 		"@types/webpack": "4.41.26",
-		"nock": "13.2.1",
+		"nock": "13.2.2",
 		"svgo": "1.3.2"
 	},
 	"peerDependencies": {
@@ -43,6 +58,7 @@
 		"glob": "7.1.7",
 		"html-webpack-harddisk-plugin": "1.0.2",
 		"html-webpack-plugin": "4.5.2",
+		"manifoldjs-windows10": "^0.1.8",
 		"mini-css-extract-plugin": "1.6.2",
 		"node-ssh": "11.1.1",
 		"ora": "5.4.1",
@@ -63,5 +79,5 @@
 	"keywords": [],
 	"author": "24i",
 	"license": "ISC",
-	"gitHead": "5ba1dfd9109aedea738e0cef5af65edfcacc5689"
+	"gitHead": "8118c9fff07ffff6132bb33eb542b3074a33a396"
 }