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

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

@@ -8,6 +8,13 @@ describe('resolveBaseUrl', () => {
     const bucketName = 'test-bucket';
     const flavour = 'test_flavour';
     const packageVersion = '1.0.0';
+    const expectEmptyStringOutputForEachPlatformAndSchemeByFlavour = (customFlavour) => {
+        Object.values(constants_1.Platforms).forEach((platform) => {
+            Object.values(constants_1.BuildSchemes).forEach((scheme) => {
+                expect((0, resolveBaseUrl_1.resolveBaseUrl)({ platform, scheme, flavour: customFlavour })).toBe('');
+            });
+        });
+    };
     afterEach(() => {
         jest.clearAllMocks();
         jest.resetAllMocks();
@@ -23,22 +30,14 @@ describe('resolveBaseUrl', () => {
                 },
             },
         });
-        Object.values(constants_1.Platforms).forEach((platform) => {
-            Object.values(constants_1.BuildSchemes).forEach((scheme) => {
-                expect((0, resolveBaseUrl_1.resolveBaseUrl)({ platform, scheme, flavour })).toBe('');
-            });
-        });
+        expectEmptyStringOutputForEachPlatformAndSchemeByFlavour(flavour);
     });
     it('returns empty string when c.buildConfig.common.deploy.aws3.bucketName is not set', () => {
         resolveGenericRnvConfig_1.getBaseConfig.mockReturnValue({
             runtime: {},
             buildConfig: { common: { packageVersion } },
         });
-        Object.values(constants_1.Platforms).forEach((platform) => {
-            Object.values(constants_1.BuildSchemes).forEach((scheme) => {
-                expect((0, resolveBaseUrl_1.resolveBaseUrl)({ platform, scheme, flavour })).toBe('');
-            });
-        });
+        expectEmptyStringOutputForEachPlatformAndSchemeByFlavour(flavour);
     });
     describe('resolving baseUrl for configured schemes', () => {
         const bucketUrl = `http://${bucketName}.s3.amazonaws.com`;

package/dist/src/__tests__/utils/replaceRelevantStringsInConfig/replaceTemplateString.spec.js

@@ -52,7 +52,6 @@ describe('replaceTemplateString', () => {
                 expect((0, replaceTemplateString_1.replaceTemplateString)(rnvC, '{{configProps.deploy.notExistingProp}}')).toBe('');
             });
             it('returns correct value from rnv c object for pattern on input', () => {
-                expect((0, replaceTemplateString_1.replaceTemplateString)({ buildConfig: { projectName: 'prj' } }, '{{c.buildConfig.projectName}}')).toBe('prj');
                 expect((0, replaceTemplateString_1.replaceTemplateString)({
                     buildConfig: {
                         projectName: '{{c.buildConfig.common.id}}',

package/dist/src/engine.js

@@ -40,7 +40,10 @@ const generateEngineExtensions = (platformExtensions) => {
     return output;
 };
 exports.default = {
-    initializeRuntimeConfig: (c) => rnv_1.Config.initializeConfig(c),
+    initializeRuntimeConfig: (c) => {
+        rnv_1.FileUtils.configureFilesystem(rnv_1.Common.getConfigProp, rnv_1.Resolver.doResolve, rnv_1.Utils.isSystemWin);
+        return rnv_1.Config.initializeConfig(c);
+    },
     tasks: rnv_1.EngineManager.generateEngineTasks(engineTasks_1.engineTaskList),
     config: CNF,
     projectDirName: 'project',

package/dist/src/scripts/generateDeployUrls/generateDeployUrls.js

@@ -44,6 +44,7 @@ const makeTableMarkdownByScheme = (rnvC, scheme) => {
     const formattedTableData = (0, formatTableDataSpaces_1.formatTableDataSpaces)(tableData);
     return tableDataToMarkdown(formattedTableData);
 };
+const deployedEachTimeIntoTheSamePath = '> Deployed each time into the same path.';
 const makeMarkdownFileContentRows = (rnvC) => ([
     `# ${rnvC.buildConfig.projectName}`,
     '## Deploy URLs',
@@ -51,20 +52,20 @@ const makeMarkdownFileContentRows = (rnvC) => ([
     '---',
     '### Latest `development` builds',
     '> Latest builds against the development git branch.',
-    '> Deployed each time into the same path.',
+    deployedEachTimeIntoTheSamePath,
     '',
     makeTableMarkdownByScheme(rnvC, constants_1.BuildSchemes.DEV_LATEST),
     '',
     '---',
     '### Latest `release candidate` builds',
     '> Latest builds against the release candidate git branch.',
-    '> Deployed each time into the same path.',
+    deployedEachTimeIntoTheSamePath,
     '',
     makeTableMarkdownByScheme(rnvC, constants_1.BuildSchemes.RC_LATEST),
     '---',
     '### Latest `release` builds',
     '> Latest builds against the release git branch.',
-    '> Deployed each time into the same path.',
+    deployedEachTimeIntoTheSamePath,
     '',
     makeTableMarkdownByScheme(rnvC, constants_1.BuildSchemes.RELEASE_LATEST),
     '---',

package/dist/src/sdks/sdk-tizen/sdkTizen.js

@@ -85,7 +85,7 @@ const runTizen = async (c, target) => {
     else {
         const isPortActive = await checkPortInUse(c, platform, c.runtime.port);
         const isDebuggerEnabledForPlatform = REMOTE_DEBUGGER_ENABLED_PLATFORMS.includes(platform);
-        const isWeinreEnabled = isDebuggerEnabledForPlatform && !bundleAssets && !hosted;
+        const isWeinreEnabled = isDebuggerEnabledForPlatform && !hosted;
         if (!isPortActive) {
             logInfo(`Your ${chalk().white(platform)} devServer at port ${chalk().white(c.runtime.port)} is not running. Starting it up for you...`);
             (0, sdk_webpack_1.waitForWebpack)(c)

package/dist/src/sdks/sdk-webos/sdkWebos.js

@@ -57,7 +57,7 @@ const runWebOS = async (c) => {
     else {
         const isPortActive = await checkPortInUse(c, platform, c.runtime.port);
         const isDebuggerEnabledForPlatform = REMOTE_DEBUGGER_ENABLED_PLATFORMS.includes(platform);
-        const isWeinreEnabled = isDebuggerEnabledForPlatform && !bundleAssets && !hosted;
+        const isWeinreEnabled = isDebuggerEnabledForPlatform && !hosted;
         if (!isPortActive) {
             logInfo(`Your ${chalk().white(platform)} devServer at port ${chalk().white(c.runtime.port)} is not running. Starting it up for you...`);
             (0, sdk_webpack_1.waitForWebpack)(c)

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

@@ -3,17 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.customRnvPackageTask = void 0;
 const rnv_1 = require("rnv");
 const constants_1 = require("../constants");
-const { getConfigProp } = rnv_1.Common;
-const { configureFilesystem } = rnv_1.FileUtils;
-const { doResolve } = rnv_1.Resolver;
-const { isSystemWin } = rnv_1.Utils;
-const { logTask } = rnv_1.Logger;
 const { TASK_PACKAGE, TASK_CONFIGURE, PARAMS } = rnv_1.Constants;
-const { executeOrSkipTask } = rnv_1.TaskManager;
 const packageFn = async (c, parentTask, originTask) => {
-    logTask('taskRnvPackage', `parent:${parentTask}`);
-    configureFilesystem(getConfigProp, doResolve, isSystemWin);
-    await executeOrSkipTask(c, TASK_CONFIGURE, TASK_PACKAGE, originTask);
+    rnv_1.Logger.logTask('taskRnvPackage', `parent:${parentTask}`);
+    await rnv_1.TaskManager.executeOrSkipTask(c, TASK_CONFIGURE, TASK_PACKAGE, originTask);
     return true;
 };
 const customRnvPackageTask = {

package/dist/src/tasks/task.rnv.project.configure.js

@@ -42,12 +42,23 @@ const patchEngineTemplatesPath = (c) => {
     engine.originalTemplatePlatformProjectDir = path.join(templatesPath, 'platforms', 'project');
     c.paths.project.platformTemplatesDirs[c.platform] = engine.originalTemplatePlatformsDir;
 };
+const handleReset = async (c) => {
+    if (c.program.resetHard) {
+        logInfo(`You passed ${chalk().white('-R, --resetHard')} argument. "${chalk().white('./platformAssets')}" will be cleaned up first`);
+        await cleanPlaformAssets(c);
+    }
+    else if (c.program.resetAssets) {
+        logInfo(`You passed ${chalk().white('-a, --resetAssets')} argument. "${chalk().white('./platformAssets')}" will be cleaned up first`);
+        await cleanPlaformAssets(c);
+    }
+};
 const projectConfigureFn = async (c, parentTask, originTask) => {
     logTask('taskRnvProjectConfigure');
     patchEngineTemplatesPath(c);
-    if (c.paths.project.builds.dir && !fsExistsSync(c.paths.project.builds.dir)) {
-        logInfo(`Creating folder ${c.paths.project.builds.dir} ...DONE`);
-        fsMkdirSync(c.paths.project.builds.dir);
+    const buildsDirPath = c.paths.project.builds.dir;
+    if (buildsDirPath && !fsExistsSync(buildsDirPath)) {
+        logInfo(`Creating folder ${buildsDirPath} ...DONE`);
+        fsMkdirSync(buildsDirPath);
     }
     await updateRenativeConfigs(c);
     await checkIsRenativeProject(c);
@@ -80,14 +91,7 @@ const projectConfigureFn = async (c, parentTask, originTask) => {
         await configurePlugins(c);
         await configureRuntimeDefaults(c);
         if (!c.runtime.disableReset) {
-            if (c.program.resetHard) {
-                logInfo(`You passed ${chalk().white('-R, --resetHard')} argument. "${chalk().white('./platformAssets')}" will be cleaned up first`);
-                await cleanPlaformAssets(c);
-            }
-            else if (c.program.resetAssets) {
-                logInfo(`You passed ${chalk().white('-a, --resetAssets')} argument. "${chalk().white('./platformAssets')}" will be cleaned up first`);
-                await cleanPlaformAssets(c);
-            }
+            await handleReset(c);
         }
         await copyRuntimeAssets(c);
         await configureTemplateFiles(c);

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

@@ -43,79 +43,63 @@ const getAppContentPath = (baseUrl, isBuildHosted = false) => {
         ? `${baseUrl}/${relativePath}`
         : `./${relativePath}`;
 };
-function generateConfig(config) {
-    const projectDir = path_1.default.resolve(config.currentDir, '../../');
-    const platformBuildsDir = path_1.default.resolve(config.currentDir, '../');
-    const appBuildDir = path_1.default.resolve(config.currentDir);
-    const appBuildEngineProjectDir = path_1.default.resolve(config.currentDir, config.buildFolder);
-    const appBuildEngineProjectPublicDir = path_1.default.resolve(appBuildEngineProjectDir, 'public');
-    const platformSchemeAppIdObj = {
-        platform: config.platform,
-        scheme: config.scheme,
-        flavour: config.appConfigId,
-    };
-    const buildVersion = smartapps_bigscreen_rnv_build_engine_1.Resolvers.resolveBuildVersion(platformSchemeAppIdObj);
-    const baseUrl = smartapps_bigscreen_rnv_build_engine_1.Resolvers.resolveBaseUrl(platformSchemeAppIdObj);
-    const devServerHost = config.devServerHost || '0.0.0.0';
-    const isDevServer = appBuildEngineProjectDir.endsWith('/server');
-    const { PLATFORM } = process.env;
-    const isBuildHosted = config.isBuildHosted || false;
-    const rules = {
-        babel: {
-            test: /\.[tj]sx?$/,
-            exclude: (config.typescript?.exclude ?? []).map((exclusion) => (path_1.default.resolve(projectDir, exclusion))),
-            use: [
-                {
-                    loader: 'ts-loader',
-                    options: {
-                        transpileOnly: true,
-                        allowTsInNodeModules: true,
-                    },
-                },
-            ],
-        },
-        css: {
-            test: /\.s?css$/,
-            use: [
-                isDevServer ? 'css-hot-loader' : null,
-                mini_css_extract_plugin_1.default.loader,
-                'css-loader',
-                {
-                    loader: 'sass-loader',
-                    options: {
-                        sourceMap: false,
-                        additionalData: (0, extendSass_1.extendSass)(config),
-                    },
-                },
-            ].filter(Boolean),
-        },
-        image: {
-            test: /\.(gif|jpe?g|png|svg)$/,
-            use: {
-                loader: 'file-loader',
+const makeRules = (config, projectDir, isDevServer) => ({
+    babel: {
+        test: /\.[tj]sx?$/,
+        exclude: (config.typescript?.exclude ?? []).map((exclusion) => (path_1.default.resolve(projectDir, exclusion))),
+        use: [
+            {
+                loader: 'ts-loader',
                 options: {
-                    outputPath: 'content/assets/',
-                    publicPath: '../assets/',
+                    transpileOnly: true,
+                    allowTsInNodeModules: true,
                 },
             },
-        },
-        fonts: {
-            test: /\.(woff|woff2|eot|ttf|otf)(\?[\s\S]+)?$/,
-            use: {
-                loader: 'file-loader',
+        ],
+    },
+    css: {
+        test: /\.s?css$/,
+        use: [
+            isDevServer ? 'css-hot-loader' : null,
+            mini_css_extract_plugin_1.default.loader,
+            'css-loader',
+            {
+                loader: 'sass-loader',
                 options: {
-                    outputPath: 'content/fonts',
-                    publicPath: '../fonts/',
+                    sourceMap: false,
+                    additionalData: (0, extendSass_1.extendSass)(config),
                 },
             },
+        ].filter(Boolean),
+    },
+    image: {
+        test: /\.(gif|jpe?g|png|svg)$/,
+        use: {
+            loader: 'file-loader',
+            options: {
+                outputPath: 'content/assets/',
+                publicPath: '../assets/',
+            },
         },
-        sourcemap: {
-            test: /\.[tj]sx$/,
-            use: ['source-map-loader'],
-            enforce: 'pre',
-            exclude: [/node_modules/, /build/, /__test__/, /__tests__/],
+    },
+    fonts: {
+        test: /\.(woff|woff2|eot|ttf|otf)(\?[\s\S]+)?$/,
+        use: {
+            loader: 'file-loader',
+            options: {
+                outputPath: 'content/fonts',
+                publicPath: '../fonts/',
+            },
         },
-    };
+    },
+    sourcemap: {
+        test: /\.[tj]sx$/,
+        use: ['source-map-loader'],
+        enforce: 'pre',
+        exclude: [/node_modules/, /build/, /__test__/, /__tests__/],
+    },
+});
+const makeAliases = (config, projectDir) => {
     const aliases = {
         '@24i/smartapps-bigscreen-device': config.environment === 'production'
             ? '@24i/smartapps-bigscreen-device'
@@ -132,6 +116,25 @@ function generateConfig(config) {
             }
         });
     }
+    return aliases;
+};
+function generateConfig(config) {
+    const projectDir = path_1.default.resolve(config.currentDir, '../../');
+    const platformBuildsDir = path_1.default.resolve(config.currentDir, '../');
+    const appBuildDir = path_1.default.resolve(config.currentDir);
+    const appBuildEngineProjectDir = path_1.default.resolve(config.currentDir, config.buildFolder);
+    const appBuildEngineProjectPublicDir = path_1.default.resolve(appBuildEngineProjectDir, 'public');
+    const platformSchemeAppIdObj = {
+        platform: config.platform,
+        scheme: config.scheme,
+        flavour: config.appConfigId,
+    };
+    const buildVersion = smartapps_bigscreen_rnv_build_engine_1.Resolvers.resolveBuildVersion(platformSchemeAppIdObj);
+    const baseUrl = smartapps_bigscreen_rnv_build_engine_1.Resolvers.resolveBaseUrl(platformSchemeAppIdObj);
+    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`);
     const plugins = {
@@ -203,30 +206,24 @@ function generateConfig(config) {
             },
         }),
     };
-    const extensions = [
-        ...generateFlavourJSExtensions(config),
-        ...generateFlavourSCSSExtensions(config),
-    ];
-    const output = {
-        filename: 'content/js/[name].js',
-        publicPath: isBuildHosted ? `${baseUrl}/public` : '',
-        path: appBuildEngineProjectPublicDir,
-    };
-    const devServer = {
-        host: devServerHost,
-    };
-    const entry = {
-        polyfill: path_1.default.resolve(projectDir, 'polyfill/index.ts'),
-        bundle: path_1.default.resolve(projectDir, `${config.entryFile}.js`),
-    };
     return {
-        Rules: rules,
+        Rules: makeRules(config, projectDir, isDevServer),
+        extensions: [
+            ...generateFlavourJSExtensions(config),
+            ...generateFlavourSCSSExtensions(config),
+        ],
+        aliases: makeAliases(config, projectDir),
+        entry: {
+            polyfill: path_1.default.resolve(projectDir, 'polyfill/index.ts'),
+            bundle: path_1.default.resolve(projectDir, `${config.entryFile}.js`),
+        },
+        devServer: { host: devServerHost },
+        output: {
+            filename: 'content/js/[name].js',
+            publicPath: isBuildHosted ? `${baseUrl}/public` : '',
+            path: appBuildEngineProjectPublicDir,
+        },
         Plugins: plugins,
-        extensions,
-        aliases,
-        entry,
-        devServer,
-        output,
         projectDir,
         platformBuildsDir,
         appBuildDir,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@24i/smartapps-bigscreen-rnv-build-engine",
-	"version": "0.12.2-alpha.1692+d30ad4aa",
+	"version": "0.12.2-alpha.1693+5ba1dfd9",
 	"description": "Package with build engine for SmartApps BIGscreen projects...",
 	"main": "dist/src/index.js",
 	"scripts": {
@@ -63,5 +63,5 @@
 	"keywords": [],
 	"author": "24i",
 	"license": "ISC",
-	"gitHead": "d30ad4aa4a434b1919281d3926f50ef975cc57ba"
+	"gitHead": "5ba1dfd9109aedea738e0cef5af65edfcacc5689"
 }