@rws-framework/client 2.14.1 → 2.15.2

package/builder/webpack/after/copy.js

@@ -32,6 +32,7 @@ module.exports = async (copyList = {}, pluginCfg) => {
         // If sourcePath is a directory, collect all files recursively
         const allFiles = collectFiles(sourcePath);
         allFiles.forEach((file) => {
+          
           const relativePath = path.relative(sourcePath, file);
           const targetFilePath = path.join(targetPath, relativePath);
           const targetFileDir = path.dirname(targetFilePath);

package/builder/webpack/after/sw.js

@@ -3,8 +3,8 @@ const chalk = require('chalk');
 const path = require('path');
 const tools = require('../../../_tools');
 
-module.exports = async (swPath) => {
-   const swFilePath = path.resolve(process.cwd(), swPath);
+module.exports = async (appRoot, swPath) => {
+   const swFilePath = path.resolve(appRoot, swPath);
 
    if(swPath.indexOf('.ts') === -1 || !fs.existsSync(swFilePath)){
       throw new Error('[RWS] Service worker TS file does not exist');

package/builder/webpack/loaders/rws_fast_scss_loader.js

@@ -8,12 +8,14 @@ module.exports = async function(content) {
     const componentPath = path.resolve(componentDir, 'component.ts');
     const isDev = this._compiler.options.mode === 'development';    
     const saveFile = content.indexOf('@save') > -1; 
-    const plugin = new RWSScssPlugin(); 
+    const plugin = new RWSScssPlugin({
+        rwsWorkspaceDir: this.query?.rwsWorkspaceDir
+    }); 
     let fromTs = false;    
 
     if(saveFile){
         try {        
-            const codeData = await plugin.compileScssCode(content, path.dirname(filePath), null, filePath, !isDev);                                
+            const codeData = await plugin.compileScssCode(content, path.dirname(filePath));                                
 
             const code = codeData.code;
             const deps = codeData.dependencies;        

package/builder/webpack/loaders/rws_fast_ts_loader.js

@@ -12,8 +12,7 @@ module.exports = async function(content) {
     const filePath = this.resourcePath;
     const isDev = this._compiler.options.mode === 'development';       
     let isIgnored = false;
-    let isDebugged = false;  
-
+    let isDebugged = false;      
     // timingStart('decorator_extraction');
     const decoratorExtract = LoadersHelper.extractRWSViewArgs(processedContent);    
     const decoratorData = decoratorExtract ? decoratorExtract.viewDecoratorData : null;
@@ -62,7 +61,7 @@ module.exports = async function(content) {
     try { 
         if(tagName){                                   
             const [template, htmlFastImports, templateExists] = await LoadersHelper.getTemplate(filePath, this.addDependency, templateName, isDev);         
-            const styles = await LoadersHelper.getStyles(filePath, this.addDependency, templateExists, stylesPath, isDev);  
+            const styles = await LoadersHelper.getStyles(filePath, this.query?.rwsWorkspaceDir, this.query?.appRootDir,this.addDependency, templateExists, stylesPath, isDev);  
 
             if(className){                
                 const replacedViewDecoratorContent =  decoratorExtract.replacedDecorator;  

package/builder/webpack/rws.webpack.config.js

@@ -18,11 +18,12 @@ const { executeRWSStartActions, timingActions, devActions } = require('../../cfg
 const { webpackDevServer } = require('../../cfg/build_steps/webpack/_dev_servers');
 const { RWS_WEBPACK_PLUGINS_BAG, addStartPlugins } = require('../../cfg/build_steps/webpack/_plugins');
 
-const _MAIN_PACKAGE = rwsPath.findRootWorkspacePath(process.cwd());
 
 // #SECTION INIT OPTIONS
 
-const RWSWebpackWrapper = async (rwsFrontendConfig) => {
+const RWSWebpackWrapper = async (appRoot, rwsFrontendConfig,  _packageDir) => {
+  const _MAIN_PACKAGE = rwsPath.findRootWorkspacePath(appRoot);
+
   const {
     executionDir,
     isWatcher,
@@ -42,11 +43,10 @@ const RWSWebpackWrapper = async (rwsFrontendConfig) => {
     devTools,
     devDebug,
     devRouteProxy,
-    tsConfigPath,
+    tsConfig,
     rwsPlugins,
-    _packageDir,
     BuildConfigurator
-  } = await getBuildConfig(rwsFrontendConfig);
+  } = await getBuildConfig(rwsFrontendConfig, _packageDir);
 
   timeLog({ devDebug });
 
@@ -55,25 +55,20 @@ const RWSWebpackWrapper = async (rwsFrontendConfig) => {
   }  
 
   rwsPath.removeDirectory(outputDir, true);
-  buildInfo.start(executionDir, tsConfigPath, outputDir, isDev, publicDir, isParted, partedPrefix, partedDirUrlPrefix, devTools, rwsFrontendConfig.rwsPlugins);
+  buildInfo.start(executionDir, tsConfig, outputDir, isDev, publicDir, isParted, partedPrefix, partedDirUrlPrefix, devTools, rwsFrontendConfig.rwsPlugins);
 
   // #SECTION INIT PLUGINS && ENV VARS DEFINES
-  addStartPlugins(rwsFrontendConfig, BuildConfigurator, devDebug, isHotReload, isReport, tsConfigPath);
+  addStartPlugins(rwsFrontendConfig, BuildConfigurator, devDebug, isHotReload, isReport);
 
   const WEBPACK_AFTER_ACTIONS = rwsFrontendConfig.actions || [];
   const WEBPACK_AFTER_ERROR_ACTIONS = rwsFrontendConfig.error_actions || [];
 
-  const modules_setup = ['node_modules'];
+  const modules_setup = [path.resolve(tools.findRootWorkspacePath(executionDir), 'node_modules')];
 
   let optimConfig = null;
   let aliases = rwsFrontendConfig.aliases || {};
 
-  console.log({  
-    __filename,
-    _packageDir
-  });
-
-  aliases = { ...aliases, ...loadAliases(__dirname, path.resolve(_MAIN_PACKAGE, 'node_modules'), executionDir) }  
+  aliases = { ...aliases, ...loadAliases(_packageDir, path.resolve(_MAIN_PACKAGE, 'node_modules'), executionDir) }  
 
   // #SECTION PLUGIN STARTING HOOKS
 
@@ -85,22 +80,15 @@ const RWSWebpackWrapper = async (rwsFrontendConfig) => {
 
 
    // #SECTION RWS COMPONENT SCAN && PARTED PROCESSING
-  const RWSComponents = scanComponents(await partedComponentsEvents(partedComponentsLocations, rwsPlugins, isParted), executionDir, __dirname);
+  const RWSComponents = scanComponents(await partedComponentsEvents(partedComponentsLocations, rwsPlugins, isParted), executionDir, _packageDir);
   console.log(`${chalk.cyanBright('RWS Scanned')} ${chalk.yellowBright(RWSComponents.length)} components`);
-  const { automatedChunks, automatedEntries } = setComponentsChunks(rwsFrontendConfig.entry, RWSComponents, isParted);
+  const { automatedChunks, automatedEntries } = setComponentsChunks(rwsFrontendConfig.entrypoint, RWSComponents, isParted);
 
   // #SECTION RWS INFO FILE
   generateRWSInfoFile(outputDir, automatedEntries);
   console.log(chalk.greenBright(`RWSInfo file generated.`));
 
 
-  // #SECTION TSCONFIG VALIDATION/SETUP
-  const tsValidated = tools.setupTsConfig(tsConfigPath, executionDir, rwsFrontendConfig.aliases);
-
-  if (!tsValidated) {
-    throw new Error('RWS Webpack build failed.');
-  }
-
   if (!isDev) {
     // #SECTION RWS PROD SETUP
 
@@ -121,14 +109,14 @@ const RWSWebpackWrapper = async (rwsFrontendConfig) => {
       actions: WEBPACK_AFTER_ACTIONS, 
       error_actions: WEBPACK_AFTER_ERROR_ACTIONS, 
       dev: isDev,
-      devDebug 
+      devDebug,
+      appRoot 
     }));
   }
 
   // #SECTION RWS WEBPACK BUILD
-  const cfgExport = createWebpackConfig(
+  const cfgExport = createWebpackConfig({
     executionDir,
-    path.resolve(__dirname, '..', '..'),
     _packageDir,
     isDev,
     devTools,
@@ -140,11 +128,13 @@ const RWSWebpackWrapper = async (rwsFrontendConfig) => {
     automatedChunks,
     modules_setup,
     aliases,
-    tsConfigPath,
-    RWS_WEBPACK_PLUGINS_BAG.getPlugins(),
+    tsConfig,
+    WEBPACK_PLUGINS: RWS_WEBPACK_PLUGINS_BAG.getPlugins(),
     rwsExternals,
-    devExternalsVars
-  );  
+    devExternalsVars,
+    appRootDir: appRoot,
+    entrypoint: rwsFrontendConfig.entrypoint
+});  
 
   if (optimConfig) {
     // setup production config if it got created above

package/builder/webpack/rws_scss_plugin.js

@@ -13,17 +13,25 @@ let _scss_fs = null;
 
 class RWSScssPlugin {
   autoCompile = [];
-
-  constructor(params) {
-    this.node_modules_dir = (fileDir) => path.relative(fileDir, _tools.findRootWorkspacePath(process.cwd())) + '/node_modules/'
+  rwsWorkspaceDir = null;
+
+  constructor(params = {
+    appRootDir: null,
+    rwsWorkspaceDir: null,
+    autoCompile: []
+  }) {
+    this.node_modules_dir = (fileDir) => path.relative(fileDir, path.join(this.getRWSRootDir(), '/node_modules'))
     _scss_import = _scss_import_builder(this);    
     _scss_fs = _scss_fs_builder(this);
     _scss_compiler = _scss_compiler_builder(this);
 
-    if (!params) {
-      params = {};
+    if(!params.rwsWorkspaceDir){      
+      throw new Error('Pass "rwsWorkspaceDir" to the "@rws-framework/client/builder/webpack/loaders/rws_fast_ts_loader.js" loader.');
     }
 
+    this.rwsWorkspaceDir = params.rwsWorkspaceDir;
+    this.appRootDir = params.appRootDir;
+
     if (!!params.autoCompile && params.autoCompile.length > 0) {
       this.autoCompile = params.autoCompile;
     }
@@ -33,7 +41,6 @@ class RWSScssPlugin {
       this.compileFile(sassFile, true);
     }
   }
-
   
   apply(compiler) {
     const _self = this;
@@ -42,21 +49,29 @@ class RWSScssPlugin {
   }
 
   async compileFile(scssPath) {    
-    scssPath = _scss_import.processImportPath(scssPath, path.dirname(scssPath))    
+    scssPath = _scss_import.processImportPath(scssPath, this.getRWSWorkspaceDir(), this.getRWSRootDir(),path.dirname(scssPath))    
 
 
-    let scssCode = _scss_fs.getCodeFromFile(scssPath);
+    let scssCode = _scss_fs.getCodeFromFile(scssPath, this.getRWSWorkspaceDir());
 
-    return await _scss_compiler.compileScssCode(scssCode, path.dirname(scssPath), null, scssPath);
+    return await _scss_compiler.compileScssCode(scssCode, path.dirname(scssPath), this.getRWSWorkspaceDir(), this.getRWSRootDir());
   }
 
   async compileScssCode(scssCode, scssPath){    
-    return await _scss_compiler.compileScssCode(scssCode, scssPath, null, scssPath);
+    return await _scss_compiler.compileScssCode(scssCode, scssPath, this.getRWSWorkspaceDir(), this.getRWSRootDir());
   }
 
   writeCssFile(scssFilePath, cssContent){
     return _scss_fs.writeCssFile(scssFilePath, cssContent);
   }
+
+  getRWSWorkspaceDir() {
+    return this.rwsWorkspaceDir;
+  }
+
+  getRWSRootDir() {
+    return this.rwsWorkspaceDir;
+  }
 }
 
 module.exports = RWSScssPlugin;

package/builder/webpack/rws_webpack_plugin.js

@@ -3,7 +3,7 @@ const rwsAfterSW = require('./after/sw');
 const deepmerge = require('deepmerge');
 
 
-const _DEFAULT_CONFIG = { actions: [], executionDir: process.cwd(), packageDir: process.cwd(), dev: false, devDebug: null }
+const _DEFAULT_CONFIG = { actions: [], executionDir: null, packageDir: null, dev: false, devDebug: null }
 
 const _DEFAULT_ACTION = {
     type: 'copy',
@@ -113,7 +113,7 @@ class RWSWebpackPlugin {
             case 'service_worker': {
 
                 const serviceWorkerPath = typeof action === 'function' ? await action() : action;
-                await rwsAfterSW(serviceWorkerPath);
+                await rwsAfterSW(this.config.appRoot, serviceWorkerPath);
                 return;
             };
 

package/builder/webpack/scss/_compiler.js

@@ -9,16 +9,15 @@ let _scss_fonts = null;
 const _scss_import_builder = require('./_import');
 let _scss_import = null;
 
-function compileScssCode(scssCode, fileRootDir, createFile = false, filePath = null, minify = false) {  
+function compileScssCode(scssCode, fileRootDir, rwsWorkspaceDir, appRoot) {  
     _scss_fonts = _scss_fonts_builder(this);
-    _scss_import = _scss_import_builder(this);
-
-    const [scssImports] = _scss_import.extractScssImports(scssCode, fileRootDir);
+    _scss_import = _scss_import_builder(this);    
+    const [scssImports] = _scss_import.extractScssImports(scssCode, rwsWorkspaceDir, appRoot, fileRootDir);
 
     const dependencies = scssImports.map((item) => item[2]);
 
     if (scssImports && scssImports.length) {
-      scssCode = _scss_import.replaceImports(_scss_import.processImports(scssImports, fileRootDir), scssCode);
+      scssCode = _scss_import.replaceImports(_scss_import.processImports(scssImports, rwsWorkspaceDir, fileRootDir), scssCode);
     }
 
     const uses = _scss_import.extractScssUses(scssCode)[0];
@@ -39,7 +38,7 @@ function compileScssCode(scssCode, fileRootDir, createFile = false, filePath = n
       const result = sass.compileString(scssCode, { loadPaths: [fileRootDir]});
 
       let compiledCode = result.css.toString();
-      compiledCode = _scss_fonts.replaceFontUrlWithBase64(compiledCode);
+      compiledCode = _scss_fonts.replaceFontUrlWithBase64(compiledCode, rwsWorkspaceDir, appRoot);
       compiledCode = replaceEmojisWithQuestionMark(compiledCode, fileRootDir);
       return { code: compiledCode, dependencies};
     } catch (err) {

package/builder/webpack/scss/_fonts.js

@@ -44,7 +44,7 @@ function convertFontToBase64(fontPath) {
     return fs.readFileSync(fontPath, { encoding: 'base64' });
 }
 
-function replaceFontUrlWithBase64(cssContent) {
+function replaceFontUrlWithBase64(cssContent, rwsWorkspaceDir, appRoot) {
     const fontFaceRegex = /@font-face\s*\{[^}]*\}/g;
     let fontFaces = [...cssContent.matchAll(fontFaceRegex)];
     _scss_import = _scss_import_builder(this);
@@ -58,7 +58,7 @@ function replaceFontUrlWithBase64(cssContent) {
 
         while ((match = urlRegex.exec(fontFaceContent)) !== null) {
             // Create a promise to convert each font to Base64 and replace in CSS
-            const base64 = convertFontToBase64(_scss_import.processImportPath(match[2], null, true));
+            const base64 = convertFontToBase64(_scss_import.processImportPath(match[2], rwsWorkspaceDir, appRoot, null, true));
             const base64Font = `data:font/woff2;base64,${base64}`;
 
             modifiedFontFaceContent = modifiedFontFaceContent.replace(match[2], base64Font);

package/builder/webpack/scss/_fs.js

@@ -47,13 +47,14 @@ function readSCSSFilesFromDirectory(dirPath) {
   };
 
 
-  function getCodeFromFile(filePath) {
+  function getCodeFromFile(filePath, rwsWorkspaceDir, appRootDir) {
     filePath = filePath.replace('//', '/');
     const _scss_import_builder = require('./_import');    
     _scss_import = _scss_import_builder(this);
 
     if (!fs.existsSync(filePath)) {
-      const processedImportPath = _scss_import.processImportPath(filePath, path.dirname(filePath));
+      const processedImportPath = _scss_import.processImportPath(filePath, rwsWorkspaceDir, appRootDir, path.dirname(filePath));
+
       if (!fs.existsSync(processedImportPath)) {
         throw new Error(`SCSS loader: File path "${filePath}" was not found.`);
       }

package/builder/webpack/scss/_import.js

@@ -1,5 +1,5 @@
 const { rwsPath } = require('@rws-framework/console');
-
+const chalk = require('chalk');
 const _scss_fs_builder = require('./_fs');
 let _scss_fs = null;
 const fs = require('fs');
@@ -7,26 +7,35 @@ const path = require('path');
 const CSS_IMPORT_REGEX = /^(?!.*\/\/)(?!.*\/\*).*@import\s+['"]((?![^'"]*:[^'"]*).+?)['"];?/gm;
 const SCSS_USE_REGEX = /^(?!.*\/\/)(?!.*\/\*).*@use\s+['"]?([^'"\s]+)['"]?;?/gm;
 
-const WORKSPACE = rwsPath.findRootWorkspacePath(process.cwd());
 
-function processImportPath(importPath, fileRootDir = null, noext = false) {
+function processImportPath(importPath, rwsWorkspaceDir, appRootDir, fileRootDir = null, noext = false) {
+
     _scss_fs = _scss_fs_builder(this);
-    
+    const workspaceDir = this.getRWSWorkspaceDir ? this.getRWSWorkspaceDir() : rwsWorkspaceDir;
+    const appRoot = this.getRWSWorkspaceDir ? this.getRWSRootDir() : appRootDir;
+
     if (importPath.split('')[0] === '~') {
-        return fillSCSSExt(replaceWithNodeModules(importPath, null, true), noext);
+        return fillSCSSExt(replaceWithNodeModules(importPath, appRootDir, null, true), noext);
     }
 
     if (importPath.indexOf('@rws-mixins') === 0) {
-        return path.resolve(rwsPath.findPackageDir(__dirname), 'src', 'styles', 'includes.scss');
+        return path.resolve(rwsPath.findPackageDir(workspaceDir), 'src', 'styles', 'includes.scss');
     }
 
     if (importPath.indexOf('@cwd') === 0) {
-        return fillSCSSExt(process.cwd() + '/' + importPath.slice(4), noext);
+        return fillSCSSExt(path.join(this.appRootDir, importPath.slice(4)), noext);
     }
 
     if (importPath.split('')[0] === '/') {
+        const originalImport = fillSCSSExt(importPath, noext);
+        
+        if(!fs.existsSync(originalImport)){
+            const absoluteImport = fillSCSSExt(path.join(workspaceDir, 'src', importPath), noext);
 
-        return fillSCSSExt(importPath, noext);
+            return absoluteImport;            
+        }
+        
+        return originalImport;
     }    
 
     if (fileRootDir) {
@@ -79,7 +88,30 @@ function fillSCSSExt(scssPath, noext = false) {
     return scssPath;
 }
 
-function extractScssImports(fileContent, importRootPath) {
+function fillSCSSExt(scssPath, noext = false) {
+    const underscoredPath = underscorePath(scssPath, noext);
+    let ext = scssPath;
+
+    if (!fs.existsSync(scssPath) && fs.existsSync(underscoredPath)) {
+        ext = underscoredPath;
+    }
+
+    if (noext) {
+        ext =  scssPath;
+    }
+
+    if ((!fs.existsSync(scssPath) || (fs.existsSync(scssPath) && fs.statSync(scssPath).isDirectory())) && fs.existsSync(`${scssPath}.scss`)) {
+        ext = `${scssPath}.scss`;
+    }
+
+    if (fs.existsSync(`_${scssPath}.scss`)) {
+        ext = `${scssPath}.scss`;
+    }   
+
+    return ext;
+}
+
+function extractScssImports(fileContent, rwsWorkspaceDir, appRootDir, importRootPath) {
     _scss_fs = _scss_fs_builder(this);
     let match;
     const imports = [];
@@ -92,9 +124,9 @@ function extractScssImports(fileContent, importRootPath) {
             importRootPath = path.dirname(importRootPath);
         }
 
-        const processedImportPath = processImportPath(importPath, importRootPath);
+        const processedImportPath = processImportPath(importPath, rwsWorkspaceDir, appRootDir, importRootPath);
 
-        imports.push([processedImportPath, importLine, path.resolve(processedImportPath)]);
+        imports.push([processedImportPath, importLine, path.resolve(processedImportPath), rwsWorkspaceDir, appRootDir]);
     }
 
     return [imports, fileContent];
@@ -123,13 +155,14 @@ function detectImports(code) {
     return CSS_IMPORT_REGEX.test(code);
 }
 
-function replaceWithNodeModules(input, fileDir = null, absolute = false, token = '~') {
+function replaceWithNodeModules(input, appRootDir, fileDir = null, absolute = false, token = '~') {
     _scss_fs = _scss_fs_builder(this);
-    return input.replace(token, absolute ? `${path.resolve(WORKSPACE, 'node_modules')}/` : this.node_modules_dir(fileDir ? fileDir : process.cwd()));
+    return input.replace(token, absolute ? `${path.resolve(appRootDir, 'node_modules')}/` : this.node_modules_dir(fileDir ? fileDir : appRootDir));
 }
 
-function processImports(imports, fileRootDir, importStorage = {}, sub = false) {
+function processImports(imports, fileRootDir, rwsWorkspaceDir, importStorage = {}, sub = false) {
     _scss_fs = _scss_fs_builder(this);
+
     const importResults = [];
 
     const getStorage = (sourceComponentPath, importedFileContent) => {
@@ -143,18 +176,21 @@ function processImports(imports, fileRootDir, importStorage = {}, sub = false) {
 
         return '';
     }
-  
+
+
     imports.forEach(importData => {
         const originalImportPath = importData[0];
-        let importPath = processImportPath(originalImportPath, fileRootDir);            
-        _scss_fs = _scss_fs_builder(this);
-        let replacedScssContent = getStorage(importPath, _scss_fs.getCodeFromFile(importPath).replace(/\/\*[\s\S]*?\*\//g, ''));
+        const workspaceDir = this.getRWSWorkspaceDir ? this.getRWSWorkspaceDir() : importData[3];
+        const appRoot = this.getRWSWorkspaceDir ? this.getRWSRootDir() : importData[4];
 
-        const recursiveImports = extractScssImports(replacedScssContent, importPath)[0];
+        let importPath = processImportPath(originalImportPath, workspaceDir, appRoot, fileRootDir);            
 
-        if (recursiveImports.length) {
+        let replacedScssContent = getStorage(importPath, _scss_fs.getCodeFromFile(importPath, workspaceDir).replace(/\/\*[\s\S]*?\*\//g, ''));
+
+        const recursiveImports = extractScssImports(replacedScssContent, workspaceDir, appRoot, importPath)[0];
 
-            replacedScssContent = replaceImports(processImports(recursiveImports, path.dirname(importPath), importStorage, true), replacedScssContent);
+        if (recursiveImports.length) {
+            replacedScssContent = replaceImports(processImports(recursiveImports, path.dirname(importPath), workspaceDir, importStorage, true), replacedScssContent);
         }
 
         importResults.push({

package/cfg/build_steps/webpack/_aliases.js

@@ -1,8 +1,7 @@
 const path = require('path');
 
 function loadAliases(packageDir, nodeModulesPath, srcDir){    
-    return {
-        'src': srcDir + '/src',        
+    return {        
         '@rws-framework/foundation': path.resolve(packageDir, 'foundation', 'rws-foundation.js')
     }
 }

package/cfg/build_steps/webpack/_build_config.js

@@ -1,18 +1,18 @@
 const chalk = require('chalk');
+const path = require('path');
+
 const { RWSConfigBuilder } = require('@rws-framework/console')
 const { rwsPath } = require('@rws-framework/console');
 const { _DEFAULT_CONFIG } = require('../../_default.cfg');
 
-async function getBuildConfig(rwsFrontBuildConfig){
-    const BuildConfigurator = new RWSConfigBuilder(rwsPath.findPackageDir(process.cwd()) + '/.rws.json', {..._DEFAULT_CONFIG, ...rwsFrontBuildConfig});
-    const _packageDir = rwsPath.findPackageDir(process.cwd());
-
-    const executionDir = rwsPath.relativize(BuildConfigurator.get('executionDir') || rwsFrontBuildConfig.executionDir || process.cwd(), _packageDir);
+async function getBuildConfig(rwsFrontBuildConfig, _packageDir){
+    const BuildConfigurator = new RWSConfigBuilder(path.join(rwsPath.findPackageDir(process.cwd()), '.rws.json'), {..._DEFAULT_CONFIG, ...rwsFrontBuildConfig});
+    const executionDir = rwsPath.relativize(BuildConfigurator.get('executionDir') || rwsFrontBuildConfig.executionDir || process.env.RWS_APP_ROOT || process.cwd(), _packageDir);
     const isWatcher = process.argv.includes('--watch') || false;  
 
     const isDev = isWatcher ? true : (BuildConfigurator.get('dev', rwsFrontBuildConfig.dev) || false);
-    const isHotReload = BuildConfigurator.get('hot', rwsFrontBuildConfig.hot);
-    const isReport = BuildConfigurator.get('report', rwsFrontBuildConfig.report);
+    const isHotReload = BuildConfigurator.get('hotReload', rwsFrontBuildConfig.hotReload);
+    const isReport = BuildConfigurator.get('pkgReport', rwsFrontBuildConfig.pkgReport);
     const isParted = BuildConfigurator.get('parted', rwsFrontBuildConfig.parted || false);
 
     const partedPrefix = BuildConfigurator.get('partedPrefix', rwsFrontBuildConfig.partedPrefix);
@@ -20,7 +20,7 @@ async function getBuildConfig(rwsFrontBuildConfig){
 
     let partedComponentsLocations = BuildConfigurator.get('partedComponentsLocations', rwsFrontBuildConfig.partedComponentsLocations);
     const customServiceLocations = BuildConfigurator.get('customServiceLocations', rwsFrontBuildConfig.customServiceLocations); //@todo: check if needed
-    const outputDir = rwsPath.relativize(BuildConfigurator.get('outputDir', rwsFrontBuildConfig.outputDir), _packageDir);
+    const outputDir = rwsPath.relativize(BuildConfigurator.get('outputDir', rwsFrontBuildConfig.outputDir), executionDir);
 
     const outputFileName = BuildConfigurator.get('outputFileName') || rwsFrontBuildConfig.outputFileName;
     const publicDir = BuildConfigurator.get('publicDir') || rwsFrontBuildConfig.publicDir;
@@ -37,7 +37,7 @@ async function getBuildConfig(rwsFrontBuildConfig){
 
     const devRouteProxy = BuildConfigurator.get('devRouteProxy') || rwsFrontBuildConfig.devRouteProxy;
 
-    const tsConfigPath = rwsPath.relativize(BuildConfigurator.get('tsConfigPath') || rwsFrontBuildConfig.tsConfigPath, executionDir);
+    const tsConfig = BuildConfigurator.get('tsConfig') || rwsFrontBuildConfig.tsConfig;
 
     const rwsPlugins = {};
 
@@ -67,9 +67,8 @@ async function getBuildConfig(rwsFrontBuildConfig){
         devTools,
         devDebug,
         devRouteProxy,
-        tsConfigPath,
-        rwsPlugins,
-        _packageDir,
+        tsConfig,
+        rwsPlugins,        
         BuildConfigurator
     }
 }

package/cfg/build_steps/webpack/_component_handling.js

@@ -41,7 +41,7 @@ function setComponentsChunks(clientEntry, RWSComponents = [], isParted = false)
 }
 
 function generateRWSInfoFile(outputDir, automatedEntries) {
-    const rwsInfoJson = outputDir + '/rws_info.json'
+    const rwsInfoJson = path.join(outputDir, '/rws_info.json');
     fs.writeFile(rwsInfoJson, JSON.stringify({ components: Object.keys(automatedEntries) }, null, 2), () => {});
 }
 

package/cfg/build_steps/webpack/_env_defines.js

@@ -7,7 +7,7 @@ function processEnvDefines(BuildConfigurator, config, devDebug) {
         'process.env._RWS_BUILD_OVERRIDE': JSON.stringify(BuildConfigurator.exportBuildConfig())
     }
 
-    const rwsDefines = BuildConfigurator.get('rwsDefines') || config.rwsDefines || null;
+    const rwsDefines = BuildConfigurator.get('env') || config.env || null;
 
     if (rwsDefines) {
         _rws_defines = { ..._rws_defines, ...rwsDefines }

package/cfg/build_steps/webpack/_info.js

@@ -1,11 +1,12 @@
 const chalk = require('chalk');
+const util = require('util');
+
+
 
 module.exports = {
-    start: (executionDir, tsConfigPath, outputDir, isDev, publicDir, isParted, partedPrefix, partedDirUrlPrefix, devTools, rwsPlugins) => {
-        console.log(chalk.green('Build started with'))
-        console.log({
-        executionDir,
-        tsConfigPath,
+    start: (executionDir, tsConfig, outputDir, isDev, publicDir, isParted, partedPrefix, partedDirUrlPrefix, devTools, rwsPlugins) => {        
+        console.log(chalk.green('RWS Frontend build started with:'), {
+        executionDir,        
         outputDir,
         dev: isDev,
         publicDir,
@@ -15,5 +16,11 @@ module.exports = {
         devtool: devTools,
         plugins: rwsPlugins
         });
+
+        console.log(chalk.blue('\nTSCONFIG:'), util.inspect(tsConfig, {
+            depth: null,
+            colors: true,
+            maxArrayLength: null
+        }));
     }
 }