@24i/smartapps-bigscreen-rnv-build-engine 0.15.0 → 0.15.1-alpha.1956

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

@@ -27,13 +27,14 @@ const semver = __importStar(require("semver"));
 const child_process_1 = require("child_process");
 const rnv_1 = require("rnv");
 const sdk_webpack_1 = require("@rnv/sdk-webpack");
+const sdk_webpack_2 = require("../sdk-webpack");
 const sdk_utils_1 = require("../sdk-utils");
 const constants_1 = require("../../constants");
 const { createDevelopTizenCertificate, DEFAULT_CERTIFICATE_NAME, DEFAULT_SECURITY_PROFILE_NAME, } = rnv_1.SDKManager.Tizen;
 const DEFAULT_CERTIFICATE_NAME_WITH_EXTENSION = `${DEFAULT_CERTIFICATE_NAME}.p12`;
 const buildTizenProject = async (c) => {
     rnv_1.Logger.logTask('buildTizenProject');
-    await (0, sdk_webpack_1.buildCoreWebpackProject)(c);
+    await (0, sdk_webpack_2.buildCoreWebpackProject)(c);
     if (!c.program.hosted) {
         const projectDir = rnv_1.Common.getPlatformProjectDir(c);
         const projectParentDir = path.join(projectDir, '..');

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

@@ -25,11 +25,12 @@ const path = __importStar(require("path"));
 const os_1 = require("os");
 const rnv_1 = require("rnv");
 const sdk_webpack_1 = require("@rnv/sdk-webpack");
+const sdk_webpack_2 = require("../sdk-webpack");
 const sdk_utils_1 = require("../sdk-utils");
 const constants_1 = require("../../constants");
 const buildWebOSProject = async (c) => {
     rnv_1.Logger.logTask('buildWebOSProject');
-    await (0, sdk_webpack_1.buildCoreWebpackProject)(c);
+    await (0, sdk_webpack_2.buildCoreWebpackProject)(c);
     if (!c.program.hosted) {
         const tDir = rnv_1.Common.getPlatformProjectDir(c);
         const tOut = path.join(rnv_1.Common.getPlatformBuildDir(c), 'output');

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

@@ -1,6 +1,99 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.configureWebProject = exports.buildCoreWebpackProject = void 0;
+exports.runWebpackServer = exports.buildCoreWebpackProject = exports.configureWebProject = void 0;
+const path_1 = __importDefault(require("path"));
+const ip_1 = __importDefault(require("ip"));
+const rnv_1 = require("rnv");
 var sdk_webpack_1 = require("@rnv/sdk-webpack");
-Object.defineProperty(exports, "buildCoreWebpackProject", { enumerable: true, get: function () { return sdk_webpack_1.buildCoreWebpackProject; } });
 Object.defineProperty(exports, "configureWebProject", { enumerable: true, get: function () { return sdk_webpack_1.configureWebProject; } });
+const getWebpackPath = () => {
+    const binWebpackJs = 'bin/webpack.js';
+    const WEBPACK = path_1.default.join(__dirname, '../../../node_modules/webpack', binWebpackJs);
+    if (rnv_1.FileUtils.fsExistsSync(WEBPACK)) {
+        return WEBPACK;
+    }
+    const WP_ALTERNATIVE = `${rnv_1.Resolver.doResolve('webpack')}/${binWebpackJs}`;
+    if (rnv_1.FileUtils.fsExistsSync(WP_ALTERNATIVE)) {
+        return WP_ALTERNATIVE;
+    }
+    return '';
+};
+const buildCoreWebpackProject = async (c) => {
+    const { debug, debugIp } = c.program;
+    const { appId } = c.runtime;
+    const { platform } = c;
+    rnv_1.Logger.logTask('buildCoreWebpackProject');
+    let debugVariables = '';
+    if (debug) {
+        rnv_1.Logger.logInfo(`Starting a remote debugger build with ip ${debugIp
+            || ip_1.default.address()}. If this IP is not correct, you can always override it with --debugIp`);
+        debugVariables += `DEBUG=true DEBUG_IP=${debugIp || ip_1.default.address()}`;
+    }
+    const environment = rnv_1.Common.getConfigProp(c, platform, 'environment', 'production');
+    const configName = environment === 'production' ? 'prod' : 'dev';
+    const wp = getWebpackPath();
+    if (wp === '') {
+        rnv_1.Logger.logWarning('Webpack not found. Will try to use globally installed one');
+    }
+    const envVars = `PLATFORM=${platform} NODE_ENV=${environment} ${debugVariables}`;
+    const wpConfigPath = `./platformBuilds/${appId}_${platform}/webpack.config.${configName}.js`;
+    const wpCmd = `node ${wp} build --config ${wpConfigPath}`;
+    await rnv_1.Exec.executeAsync(c, `npx cross-env ${envVars}  ${wpCmd}`);
+    const coloredBuildDir = rnv_1.Logger.chalk().cyan(rnv_1.Common.getPlatformProjectDir(c));
+    rnv_1.Logger.logSuccess(`Your build is located in ${coloredBuildDir}.`);
+};
+exports.buildCoreWebpackProject = buildCoreWebpackProject;
+const runWebDevServer = async (c) => {
+    rnv_1.Logger.logTask('runWebDevServer');
+    const environment = rnv_1.Common.getConfigProp(c, c.platform, 'environment', 'production');
+    const configName = environment === 'production' ? 'prod' : 'dev';
+    const appFolder = rnv_1.Common.getPlatformBuildDir(c);
+    const wpConfig = path_1.default.join(appFolder, `webpack.config.${configName}.js`);
+    const debugObj = { lineBreaks: '\n\n\n', debugVariables: '', remoteDebuggerActive: false };
+    const devServerHost = rnv_1.Common.getDevServerHost(c);
+    const url = rnv_1.Logger.chalk().cyan(`http://${devServerHost}:${c.runtime.port}`);
+    rnv_1.Logger.logRaw(`${debugObj.lineBreaks}Dev server running at: ${url}\n\n`);
+    const envCmd = `cross-env PLATFORM=${c.platform} ${debugObj.debugVariables}`;
+    const webpackServerOptions = [
+        `--config ${wpConfig}`,
+        `--mode=${environment}`,
+        `--host ${devServerHost}`,
+        `--port ${c.runtime.port}`,
+        '--devtool source-map',
+        '--progress',
+        '--history-api-fallback',
+        '--hot',
+    ];
+    const serverCmd = `webpack serve ${webpackServerOptions.join(' ')}`;
+    const command = `npx ${envCmd} ${serverCmd}`;
+    try {
+        await rnv_1.Exec.executeAsync(c, command, { stdio: 'inherit', silent: true });
+        rnv_1.Logger.logDebug('runWebDevServer: running');
+    }
+    catch (e) {
+        rnv_1.Logger.logDebug(e);
+    }
+};
+const runWebpackServer = async (c) => {
+    const { port } = c.runtime;
+    const { platform } = c;
+    rnv_1.Logger.logTask('runWeb', `port:${port}`);
+    const bundleAssets = rnv_1.Common.getConfigProp(c, c.platform, 'bundleAssets', false);
+    if (bundleAssets) {
+        await (0, exports.buildCoreWebpackProject)(c);
+        rnv_1.Logger.logSuccess('bundleAssets set to true. webpack dev server will not run');
+        return;
+    }
+    if (await rnv_1.Common.checkPortInUse(c, platform, port)) {
+        const resetSuccessful = await rnv_1.Common.confirmActiveBundler(c);
+        if (!resetSuccessful) {
+            return;
+        }
+    }
+    rnv_1.Logger.logSummary('BUNDLER STARTED');
+    await runWebDevServer(c);
+};
+exports.runWebpackServer = runWebpackServer;

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

@@ -1,33 +1,12 @@
 "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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.customRnvStartTask = void 0;
-const open = __importStar(require("better-opn"));
 const rnv_1 = require("rnv");
-const sdk_webpack_1 = require("@rnv/sdk-webpack");
+const sdk_webpack_1 = require("../sdks/sdk-webpack");
 const constants_1 = require("../constants");
-const { getConfigProp } = rnv_1.Common;
 const { logErrorPlatform } = rnv_1.PlatformManager;
 const { logTask, logError } = rnv_1.Logger;
-const { TASK_START, TASK_CONFIGURE, REMOTE_DEBUGGER_ENABLED_PLATFORMS, PARAMS } = rnv_1.Constants;
+const { TASK_START, TASK_CONFIGURE, PARAMS } = rnv_1.Constants;
 const { executeTask } = rnv_1.TaskManager;
 const startFn = async (c, parentTask, originTask) => {
     const { platform, runtime, program } = c;
@@ -37,14 +16,6 @@ const startFn = async (c, parentTask, originTask) => {
     if (!parentTask) {
         await executeTask(c, TASK_CONFIGURE, TASK_START, originTask);
     }
-    if (hosted) {
-        (0, sdk_webpack_1.waitForWebpack)(c)
-            .then(() => open(`http://${c.runtime.localhost}:${port}/`))
-            .catch(logError);
-    }
-    const bundleAssets = getConfigProp(c, c.platform, 'bundleAssets');
-    const isDebuggerEnabledForPlatform = REMOTE_DEBUGGER_ENABLED_PLATFORMS.includes(platform);
-    const isWeinreEnabled = isDebuggerEnabledForPlatform && !bundleAssets && !hosted;
     switch (platform) {
         case constants_1.Platforms.ENTONE:
         case constants_1.Platforms.HBBTV:
@@ -54,7 +25,7 @@ const startFn = async (c, parentTask, originTask) => {
         case constants_1.Platforms.WEBOS:
         case constants_1.Platforms.WEBTV:
         case constants_1.Platforms.XBOX:
-            await (0, sdk_webpack_1.runWebpackServer)(c, isWeinreEnabled);
+            await (0, sdk_webpack_1.runWebpackServer)(c);
             break;
         default:
             if (hosted) {

package/dist/src/utils/generatePngSpriteMap.js

@@ -44,7 +44,11 @@ const runSpritesmith = (config) => (new Promise((resolve) => {
     const spritesmith = config.plugins[0];
     spritesmith.apply(webpackCompiler);
     spritesmith.compile(() => {
-        spritesmith.getWatcher().close();
+        webpackCompiler.close((err) => {
+            if (err instanceof Error) {
+                console.log(`Error during generating PNG spritesheet: ${err.message}`);
+            }
+        });
         resolve();
     });
 }));

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

@@ -74,23 +74,19 @@ const makeRules = (config, projectDir, isDevServer) => ({
     },
     image: {
         test: /\.(gif|jpe?g|png|svg)$/,
-        use: {
-            loader: 'file-loader',
-            options: {
-                outputPath: 'content/assets/',
-                publicPath: '../assets/',
-            },
+        type: 'asset/resource',
+        generator: {
+            outputPath: 'content/assets/',
+            publicPath: '../assets/',
         },
     },
     fonts: {
         test: /\.(woff|woff2|eot|ttf|otf)(\?[\s\S]+)?$/,
-        use: {
-            loader: 'file-loader',
-            options: {
-                outputPath: 'content/fonts',
-                publicPath: '../fonts/',
-            },
-        },
+        type: 'asset/resource',
+        generator: {
+            outputPath: 'content/fonts/',
+            publicPath: '../fonts/',
+        }
     },
     sourcemap: {
         test: /\.[tj]sx$/,
@@ -141,7 +137,6 @@ function generateConfig(config) {
     const plugins = {
         forkTsChecker: new fork_ts_checker_webpack_plugin_1.default({
             typescript: {
-                enabled: true,
                 memoryLimit: 4096,
             },
         }),
@@ -219,7 +214,10 @@ function generateConfig(config) {
             polyfill: path_1.default.resolve(projectDir, 'polyfill/index.ts'),
             bundle: path_1.default.resolve(projectDir, `${config.entryFile}.js`),
         },
-        devServer: { host: devServerHost },
+        devServer: {
+            host: devServerHost,
+            static: appBuildEngineProjectDir,
+        },
         output: {
             filename: 'content/js/[name].js',
             publicPath: isBuildHosted ? `${baseUrl}/public` : '',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@24i/smartapps-bigscreen-rnv-build-engine",
-	"version": "0.15.0",
+	"version": "0.15.1-alpha.1956+528644e7",
 	"description": "Package with build engine for SmartApps BIGscreen projects...",
 	"main": "dist/src/index.js",
 	"scripts": {
@@ -33,56 +33,55 @@
 			"version": "^4.2.8"
 		}
 	],
+	"dependencies": {
+		"xml2js": "^0.4.23"
+	},
 	"devDependencies": {
 		"@types/inquirer": "8.2.1",
-		"@types/mini-css-extract-plugin": "1.4.3",
+		"@types/ip": "1.1.0",
 		"@types/node": "17.0.31",
 		"@types/semver": "7.3.9",
 		"@types/ssh2": "0.5.52",
-		"@types/tapable": "1.0.6",
-		"@types/webpack": "4.41.26",
-		"@types/xml2js": "^0.4.11",
+		"@types/tapable": "2.2.2",
+		"@types/webpack": "5.28.0",
+		"@types/xml2js": "0.4.11",
 		"nock": "13.2.4",
 		"svgo": "1.3.2"
 	},
 	"peerDependencies": {
 		"@24i/smartapps-bigscreen-device": "*",
 		"@rnv/sdk-webpack": "0.35.0-alpha.2",
-		"assign-deep": "^1.0.1",
-		"better-opn": "1.0.0",
-		"core-js": "3.15.2",
+		"assign-deep": "1.0.1",
+		"core-js": "3.22.4",
 		"coveralls": "3.1.1",
 		"css-hot-loader": "1.4.4",
 		"css-loader": "5.2.7",
-		"file-loader": "6.2.0",
-		"filemanager-webpack-plugin": "3.1.1",
-		"fork-ts-checker-webpack-plugin": "6.2.12",
-		"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",
+		"filemanager-webpack-plugin": "6.1.7",
+		"fork-ts-checker-webpack-plugin": "7.2.11",
+		"glob": "8.0.1",
+		"html-webpack-harddisk-plugin": "2.0.0",
+		"html-webpack-plugin": "5.5.0",
+		"ip": "1.1.5",
+		"manifoldjs-windows10": "0.1.8",
+		"mini-css-extract-plugin": "2.6.0",
+		"node-ssh": "12.0.4",
 		"ora": "5.4.1",
 		"raf": "3.4.1",
-		"regenerator-runtime": "0.13.7",
+		"regenerator-runtime": "0.13.9",
 		"renative-template-blank": "0.35.0-alpha.2",
 		"rnv": "0.35.0-alpha.2",
-		"sass": "1.37.0",
-		"sass-loader": "10.1.1",
-		"source-map-loader": "1.1.3",
+		"sass": "1.51.0",
+		"sass-loader": "12.6.0",
+		"source-map-loader": "3.0.1",
 		"svgo": "1.3.2",
-		"ts-loader": "8.1.0",
-		"webpack": "4.46.0",
-		"webpack-cli": "3.3.12",
-		"webpack-dev-server": "3.11.2",
-		"webpack-spritesmith": "^1.1.0"
+		"ts-loader": "9.3.0",
+		"webpack": "5.72.0",
+		"webpack-cli": "4.9.2",
+		"webpack-dev-server": "4.9.0",
+		"webpack-spritesmith": "1.1.0"
 	},
 	"keywords": [],
 	"author": "24i",
 	"license": "ISC",
-	"gitHead": "287f24f9eecf9349c5a8cab183f30c87a2061a4e",
-	"dependencies": {
-		"xml2js": "^0.4.23"
-	}
+	"gitHead": "528644e72b4fa5bdd3fdc8853d7bb061c8cd9048"
 }