@rws-framework/client 2.10.9 → 2.10.11

package/cfg/build_steps/webpack/_actions.js

@@ -71,9 +71,9 @@ function devActions(WEBPACK_AFTER_ACTIONS, executionDir, devDebug){
         WEBPACK_AFTER_ACTIONS.push({
           type: 'custom',
           actionHandler: () => {        
-            fs.writeFileSync(path.join(debugDir, 'in_vendors.json'), JSON.stringify(devExternalsVars.ignored, null, 2));
-            fs.writeFileSync(path.join(debugDir, 'rws_processed.json'), JSON.stringify(devExternalsVars.packed, null, 2));
-            fs.writeFileSync(path.join(debugDir, 'requestcache.json'), JSON.stringify(devExternalsVars.frontendRequestContextCache, null, 2));
+            fs.writeFile(path.join(debugDir, 'in_vendors.json'), JSON.stringify(devExternalsVars.ignored, null, 2));
+            fs.writeFile(path.join(debugDir, 'rws_processed.json'), JSON.stringify(devExternalsVars.packed, null, 2));
+            fs.writeFile(path.join(debugDir, 'requestcache.json'), JSON.stringify(devExternalsVars.frontendRequestContextCache, null, 2));
     
             console.log(chalk.yellow('[RWS BUILD] (after)'), `packaging debug saved in: ${debugDir}`);
           }

package/cfg/build_steps/webpack/_aliases.js

@@ -1,13 +1,8 @@
 const path = require('path');
 
-function loadAliases(packageDir, nodeModulesPath){
+function loadAliases(packageDir, nodeModulesPath, srcDir){    
     return {
-        fs: false,
-        path: false,
-        http: false,
-        https: false,
-        os: false,
-        stream: false,
+        'src': srcDir + '/src',        
         '@rws-framework/foundation': path.resolve(packageDir, 'foundation', 'rws-foundation.js')
     }
 }

package/cfg/build_steps/webpack/_build_config.js

@@ -30,7 +30,7 @@ async function getBuildConfig(rwsFrontBuildConfig){
 
     const devTools = isDev ? (BuildConfigurator.get('devtool') || 'source-map') : false;
 
-    const _DEFAULT_DEV_DEBUG = { build: false, timing: false, rwsCache: false };
+    const _DEFAULT_DEV_DEBUG = { build: false, timing: false, rwsCache: false, profiling: false };
 
     let devDebug = isDev ? (BuildConfigurator.get('devDebug') || rwsFrontBuildConfig.devDebug || {}) : {};
     devDebug = {..._DEFAULT_DEV_DEBUG, ...devDebug}

package/cfg/build_steps/webpack/_component_handling.js

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

package/cfg/build_steps/webpack/_loaders.js

@@ -1,5 +1,7 @@
 const path = require('path');
 const fs = require('fs');
+const os = require('os');
+
 const RWSCssPlugin = require("../../../webpack/rws_scss_plugin");
 const plugin = new RWSCssPlugin();
 const JSON5 = require('json5');
@@ -12,6 +14,7 @@ function getRWSLoaders(packageDir, nodeModulesPath, tsConfigPath, devDebug) {
   const tsLoader = packageDir + '/webpack/loaders/rws_fast_ts_loader.js';
   const htmlLoader = packageDir + '/webpack/loaders/rws_fast_html_loader.js';
 
+
   return [
     {
       test: /\.html$/,
@@ -27,6 +30,7 @@ function getRWSLoaders(packageDir, nodeModulesPath, tsConfigPath, devDebug) {
         {
           loader: 'ts-loader',
           options: {
+            transpileOnly: true,
             allowTsInNodeModules: true,
             configFile: path.resolve(tsConfigPath)            
           }
@@ -35,7 +39,7 @@ function getRWSLoaders(packageDir, nodeModulesPath, tsConfigPath, devDebug) {
           loader: tsLoader,
         }
       ],
-      exclude: [
+      exclude: [        
         /node_modules\/(?!\@rws-framework\/[A-Z0-9a-z])/,
         /\.debug\.ts$/,
         /\.d\.ts$/,

package/cfg/build_steps/webpack/_plugins.js

@@ -1,8 +1,8 @@
 const webpack = require('webpack')
-const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 const { processEnvDefines } = require('./_env_defines');
+const path = require('path');
 
 const RWS_WEBPACK_PLUGINS_BAG = {
     _plugins: [],
@@ -48,22 +48,24 @@ function getDefinesPlugins(BuildConfigurator, rwsFrontendConfig, devDebug) {
     ]
 }
 
-function getBuilderOptimPlugins(BuildConfigurator, rwsFrontendConfig, tsConfigPath) {
-    const tsFork =  new ForkTsCheckerWebpackPlugin({
-        async: false,
-        typescript: {
-            configFile: tsConfigPath,
-            diagnosticOptions: {
-                semantic: true,
-                syntactic: true,
-            },
-        },
-    });
+function getBuilderDevPlugins(BuildConfigurator, rwsFrontendConfig, tsConfigPath, devDebug) {    
+    if(!devDebug?.profiling){
+        return [];
+    }
 
+    const profiling =  new webpack.debug.ProfilingPlugin({
+        outputPath: path.join(BuildConfigurator.get('outputDir') || rwsFrontendConfig.outputDir, '.profiling/profileEvents.json'),
+    });
 
     
     return [
-       
+        profiling
+    ]
+}
+
+function getBuilderOptimPlugins(BuildConfigurator, rwsFrontendConfig, tsConfigPath) {
+    return [
+        
     ]
 }
 
@@ -71,6 +73,7 @@ function addStartPlugins(rwsFrontendConfig, BuildConfigurator, devDebug, isHotRe
 
     RWS_WEBPACK_PLUGINS_BAG.add([
         ...getDefinesPlugins(BuildConfigurator, rwsFrontendConfig, devDebug),
+        ...getBuilderDevPlugins(BuildConfigurator, rwsFrontendConfig, tsConfigPath, devDebug),
         ...getBuilderOptimPlugins(BuildConfigurator, rwsFrontendConfig, tsConfigPath),
         ...getPackageModPlugins()
     ]);

package/cfg/tsconfigSetup.js

@@ -5,7 +5,7 @@ const { rwsPath } = require('@rws-framework/console');
 const path = require('path');
 const fs = require('fs');
 
-function setupTsConfig(tsConfigPath, executionDir) {
+function setupTsConfig(tsConfigPath, executionDir, userAliases = {}) {
 
     if (!fs.existsSync(tsConfigPath)) {
         throw new Error(`Typescript config file "${tsConfigPath}" does not exist`);
@@ -27,36 +27,37 @@ function setupTsConfig(tsConfigPath, executionDir) {
 
 
         const includedMD5 = [];
+        const srcPath = 'src/index.ts';
 
-        let changed = false; 
+        let changed = false;
 
         if (!Object.keys(tsConfig).includes('include')) {
             tsConfig['include'] = [];
         } else {
             tsConfig['include'] = tsConfig['include'].filter((inc) => {
-                 if(inc === 'src/index.ts'){
+                if (inc === srcPath) {
                     return true;
-                 }
+                }
 
-                 return fs.existsSync(rwsPath.relativize(inc, executionDir))
+                return fs.existsSync(rwsPath.relativize(inc, executionDir));
             })
-        }    
-        
-        
-        if (!tsConfig['include'].includes('src/index.ts')) {
+        }
+
+
+        if (!tsConfig['include'].includes(srcPath)) {
             console.log(chalk.blueBright('[RWS TS CONFIG]'), 'adding RWS project typescript code to project tsconfig.json');
-            tsConfig['include'].unshift('src/index.ts');
+            tsConfig['include'].unshift(srcPath);
             changed = true;
-        }  
+        }
 
         if (!Object.keys(tsConfig).includes('exclude')) {
-            tsConfig['exclude'] = [];            
+            tsConfig['exclude'] = [];
             changed = true;
-        }      
-        
+        }
+
         const excludeString = '**/*.debug.ts';
 
-        if(!tsConfig['exclude'].includes(excludeString)){
+        if (!tsConfig['exclude'].includes(excludeString)) {
             tsConfig['exclude'].push(excludeString);
             changed = true;
         }
@@ -64,28 +65,49 @@ function setupTsConfig(tsConfigPath, executionDir) {
         let probablyLinked = false;
 
         tsConfig['include'].forEach(element => {
-            if(element !== 'src' && element.indexOf('declarations.d.ts') > -1 && md5(fs.readFileSync(rwsPath.relativize(element, executionDir), 'utf-8')) === md5(fs.readFileSync(declarationsPath, 'utf-8'))){
+            if (element !== 'src' && element.indexOf('declarations.d.ts') > -1 && md5(fs.readFileSync(rwsPath.relativize(element, executionDir), 'utf-8')) === md5(fs.readFileSync(declarationsPath, 'utf-8'))) {
                 probablyLinked = true;
-            }            
-        }); 
+            }
+        });
 
         if (!tsConfig['include'].includes(relativeDeclarationsPath) && !probablyLinked) {
             console.log(chalk.blueBright('[RWS TS CONFIG]'), 'adding RWS typescript declarations to project tsconfig.json');
             tsConfig['include'].push(relativeDeclarationsPath);
             includedMD5.push(md5(fs.readFileSync(declarationsPath, 'utf-8')));
             changed = true;
-        }      
+        }
 
+        if(!tsConfig.compilerOptions){
+            throw new Error(`${tsConfigPath} needs "compilerOptions" section`)
+        }
+
+        if (Object.keys(userAliases).length) {
+            const tsPaths = tsConfig.compilerOptions?.paths || {};
+
+            // console.log({tsPaths})            
+            let changedPaths = false;
+
+            Object.keys(userAliases).forEach((alias) => {
+                const aliasPath = userAliases[alias];
+                if(!tsPaths[alias]){
+        
+                    tsPaths[alias] = [path.relative(executionDir, aliasPath)];
 
-        // if(!Object.keys(tsConfig['compilerOptions']).includes('paths')){
-        //     tsConfig['compilerOptions']['paths'] = {};
-        //     changed = true;
-        // }
+                    console.log({alias, x: tsPaths[alias]});
+
+                    changedPaths = true;                    
+                }
+            });
+
+            if(changedPaths){
+                console.log('tspaths', tsPaths);
+                console.log(chalk.blueBright('[RWS TS CONFIG]'), 'adding user aliases as paths to project tsconfig.json');
+
+                tsConfig.compilerOptions.paths = tsPaths;
+                changed = true;
+            }
+        }
 
-        // if(!Object.keys(tsConfig['compilerOptions']['paths']).includes('@rws-framework/foundation')){
-        //     tsConfig['compilerOptions']['paths']['@rws-framework/foundation'] = [relativeFoundationPath];
-        // }
-    
 
         if (changed) {
             fs.writeFileSync(tsConfigPath, JSON.stringify(tsConfig, null, 2));
@@ -95,13 +117,13 @@ function setupTsConfig(tsConfigPath, executionDir) {
         return true;
     } catch (e) {
         const tsConfigFileContent = fs.readFileSync(tsConfigPath, 'utf-8');
-        try{            
+        try {
             console.log(chalk.blueBright('TSConfig (parsed)'), JSON.parse(tsConfigFileContent));
-        } catch (e){
+        } catch (e) {
             console.log(chalk.yellow('TSConfig (unparsed)'), tsConfigFileContent);
 
         }
-        console.log(chalk.redBright('Error in tsconfig.json:'));        
+        console.log(chalk.redBright('Error in tsconfig.json:'));
         console.error(chalk.red(e.stack));
 
         return false;

package/console.js

@@ -56,18 +56,18 @@ async function initCmd(){
     if(workspaced){    
       if(!fs.existsSync(`${executionDir}/.eslintrc.json`)){
         const rcjs = fs.readFileSync(`${moduleDir}/.setup/.eslintrc.json`, 'utf-8');
-        fs.writeFileSync(`${executionDir}/.eslintrc.json`, rcjs.replace('{{frontend_dir}}', executionDir));
+        fs.writeFile(`${executionDir}/.eslintrc.json`, rcjs.replace('{{frontend_dir}}', executionDir));
         console.log(chalk.green('RWS CLI'), 'Installed eslint base workspace config file.');
       }
     }else{
       if(!fs.existsSync(`${executionDir}/.eslintrc.json`)){
-        fs.copyFileSync(`${moduleDir}/.eslintrc.json`, `${executionDir}/.eslintrc.json`);
+        fs.copyFile(`${moduleDir}/.eslintrc.json`, `${executionDir}/.eslintrc.json`);
         console.log(chalk.green('[RWS Client]'), 'Installed eslint config file.');
       }        
     }
 
     if(!fs.existsSync(`${executionDir}/tsconfig.json`)){
-      fs.copyFileSync(`${moduleDir}/.setup/tsconfig.json`, `${executionDir}/tsconfig.json`);
+      fs.copyFile(`${moduleDir}/.setup/tsconfig.json`, `${executionDir}/tsconfig.json`);
       console.log(chalk.green('[RWS Client]'), 'Installed tsconfig.');
     }   
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@rws-framework/client",
     "private": false,
-    "version": "2.10.9",
+    "version": "2.10.11",
     "main": "src/index.ts",
     "scripts": {
         "docs": "typedoc --tsconfig ./tsconfig.json"
@@ -61,14 +61,13 @@
         "@types/he": "^1.2.3",
         "@types/sanitize-html": "^2.11.0",
         "@types/uuid": "^9.0.7",
-        "@typescript-eslint/parser": "^5.0.0",
-        "fork-ts-checker-webpack-plugin": "^9.0.2",
+        "@typescript-eslint/parser": "^5.0.0",        
         "browser-sync": "^2.29.3",
         "clean-webpack-plugin": "^4.0.0",
         "css-loader": "^6.8.1",
         "css-minimizer-webpack-plugin": "^5.0.1",
         "eslint": "^6.0.0",
-        "file-loader": "^6.2.0",
+        "file-loader": "^6.2.0",        
         "html-webpack-plugin": "^5.5.3",
         "loader-utils": "^3.2.1",
         "mini-css-extract-plugin": "^2.7.6",
@@ -77,6 +76,7 @@
         "raw-loader": "^4.0.2",
         "sass-loader": "^13.3.2",
         "source-map": "^0.7.4",
+        "speed-measure-webpack-plugin": "^1.5.0",
         "style-loader": "^3.3.3",
         "terser-webpack-plugin": "^5.3.9",
         "ts-loader": "^9.4.4",

package/rws.webpack.config.js

@@ -52,10 +52,9 @@ const RWSWebpackWrapper = async (rwsFrontendConfig) => {
 
   if (devDebug?.timing) {
     timingStart('build config');
-  }
-
-  //rwsPath.removeDirectory(outputDir, true);
+  }  
 
+  rwsPath.removeDirectory(outputDir, true);
   buildInfo.start(executionDir, tsConfigPath, outputDir, isDev, publicDir, isParted, partedPrefix, partedDirUrlPrefix, devTools, rwsFrontendConfig.rwsPlugins);
 
   // #SECTION INIT PLUGINS && ENV VARS DEFINES
@@ -67,9 +66,9 @@ const RWSWebpackWrapper = async (rwsFrontendConfig) => {
   const modules_setup = ['node_modules'];
 
   let optimConfig = null;
-  let aliases = rwsFrontendConfig.aliases = {};
+  let aliases = rwsFrontendConfig.aliases || {};
 
-  aliases = { ...aliases, ...loadAliases(__dirname, path.resolve(_MAIN_PACKAGE, 'node_modules')) }  
+  aliases = { ...aliases, ...loadAliases(__dirname, path.resolve(_MAIN_PACKAGE, 'node_modules'), executionDir) }  
 
   // #SECTION PLUGIN STARTING HOOKS
 
@@ -91,7 +90,7 @@ const RWSWebpackWrapper = async (rwsFrontendConfig) => {
 
 
   // #SECTION TSCONFIG VALIDATION/SETUP
-  const tsValidated = tools.setupTsConfig(tsConfigPath, executionDir);
+  const tsValidated = tools.setupTsConfig(tsConfigPath, executionDir, rwsFrontendConfig.aliases);
 
   if (!tsValidated) {
     throw new Error('RWS Webpack build failed.');
@@ -156,7 +155,7 @@ const RWSWebpackWrapper = async (rwsFrontendConfig) => {
   if (isDev) {
     // #SECTION RWS DEV SERVERS
     webpackDevServer(BuildConfigurator, rwsFrontendConfig, cfgExport);
-  }
+  }  
 
   return cfgExport;
 }

package/webpack/loaders/rws_fast_html_loader.js

@@ -7,7 +7,11 @@ module.exports = function(content){
     const componentPath = path.resolve(componentDir, 'component.ts');
 
     if(fs.existsSync(componentPath)){
-        fs.writeFileSync(componentPath, fs.readFileSync(componentPath, 'utf-8'))  
+        const fileCnt = fs.readFileSync(componentPath, 'utf-8');
+
+        if(fileCnt){
+            fs.writeFile(componentPath, fileCnt, () => {})  
+        }    
     }
     
     return '';

package/webpack/loaders/rws_fast_scss_loader.js

@@ -1,7 +1,6 @@
 const path = require('path');
 const fs = require('fs');
 const RWSScssPlugin = require('../rws_scss_plugin');
-const { timingStart, timingStop } = require('../../cfg/build_steps/webpack/_timing');
 
 module.exports = async function(content) {      
     const filePath = this.resourcePath;
@@ -13,10 +12,8 @@ module.exports = async function(content) {
     let fromTs = false;    
 
     if(saveFile){
-        try {
-            timingStart('CSS Compilation of ' + filePath);
-            const codeData = await plugin.compileScssCode(content, path.dirname(filePath), null, filePath, !isDev);                    
-            const endTime = timingStop('CSS Compilation of ' + filePath);
+        try {        
+            const codeData = await plugin.compileScssCode(content, path.dirname(filePath), null, filePath, !isDev);                                
 
             const code = codeData.code;
             const deps = codeData.dependencies;        
@@ -35,7 +32,11 @@ module.exports = async function(content) {
     }
 
     if(fs.existsSync(componentPath)){
-        fs.writeFileSync(componentPath, fs.readFileSync(componentPath, 'utf-8'))  
+        const fileCnt = fs.readFileSync(componentPath, 'utf-8');
+
+        if(fileCnt){
+            fs.writeFile(componentPath, fileCnt, () => {})  
+        }        
     }
     
     return '';   

package/webpack/loaders/rws_fast_ts_loader.js

@@ -90,7 +90,7 @@ module.exports = async function(content) {
 
         if(isDebugged){
             console.log(chalk.red('[RWS BUILD] Debugging into: ' + debugTsPath));
-            fs.writeFileSync(debugTsPath, processedContent); //for final RWS TS preview.
+            fs.writeFile(debugTsPath, processedContent, () => {}); //for final RWS TS preview.
         }
       
         _scss_cache.cache(customCompilationOptions).cacheItem(filePath, processedContent, cachedCode);

package/webpack/scss/_fs.js

@@ -19,7 +19,7 @@ function writeCssFile(scssFilePath, cssContent) {
     endCssFilePath[endCssFilePath.length - 1] = `${_COMPILE_DIR_NAME}/` + endCssFilePath[endCssFilePath.length - 1];
     endCssFilePath = endCssFilePath.join('/');
 
-    fs.writeFileSync(endCssFilePath, cssContent);
+    fs.writeFile(endCssFilePath, cssContent, () => {});
     console.log('Saved external CSS file in: ' + endCssFilePath);
 }