@rws-framework/client 2.5.1 → 2.5.4

package/_tools.js

@@ -3,7 +3,9 @@ const fs = require('fs');
 const ts = require('typescript');
 const { spawn } = require('child_process');
 const JSON5 = require('json5');
+const md5 = require('md5');
 const chalk = require('chalk');
+const { rwsPath } = require('@rws-framework/console');
 
 function findRootWorkspacePath(currentPath) {        
   const parentPackageJsonPath = path.join(currentPath + '/..', 'package.json');        
@@ -330,40 +332,53 @@ function getAllFilesInFolder(folderPath, ignoreFilenames = [], recursive = false
   return files;
 }
 
-function setupTsConfig(tsConfigPath)
+function setupTsConfig(tsConfigPath, executionDir)
 {
   
   if(!fs.existsSync(tsConfigPath)){
     throw new Error(`Typescript config file "${tsConfigPath}" does not exist`);
   }  
 
+  console.log('tspath', tsConfigPath);
+
   const tsConfigContents = fs.readFileSync(tsConfigPath, 'utf-8');  
 
   try{
-    const tsConfig = JSON.parse(tsConfigContents);  
+    let tsConfig = JSON.parse(tsConfigContents);  
 
     const declarationsPath = path.resolve(__dirname, 'types') + '/declarations.d.ts';
     const testsPath = path.resolve(__dirname, 'tests');
+    const declarationsPathMD5 = md5(fs.readFileSync(declarationsPath, 'utf-8'));
+    const testsPathMD5 =  fs.existsSync(testsPath) ? md5(fs.readFileSync(testsPath, 'utf-8')) : null;
   
+    const includedMD5 = [];
+
     let changed = false;  
+
+    const included = [];
   
     if(!Object.keys(tsConfig).includes('include')){
       tsConfig['include'] = [];
+    }else{
+      tsConfig['include'] = tsConfig['include'].map((inc) => fs.existsSync(rwsPath.relativize(tsConfig['include'], executionDir)))
     }
   
     if(!Object.keys(tsConfig).includes('exclude')){
       tsConfig['exclude'] = [];
     }
   
-    if(!tsConfig['include'].includes(declarationsPath)){
+    if(!included.includes(declarationsPath) && !includedMD5.includes(declarationsPathMD5)){
       console.log(chalk.blueBright('[RWS TS CONFIG]'), 'adding RWS typescript declarations to project tsconfig.json');
-      tsConfig['include'].push(declarationsPath);
+      included.push(declarationsPath);
+      includedMD5.push(md5(fs.readFileSync(declarationsPath, 'utf-8')));
       changed = true;
     }
   
-    if(!tsConfig['exclude'].includes(testsPath)){
+    tsConfig['include'] = included;
+  
+    if(testsPathMD5 && (!tsConfig['exclude'].includes(testsPath) && !included.includes(testsPathMD5))){
       console.log(chalk.blueBright('[RWS TS CONFIG]'), 'adding RWS typescript exclusions to project tsconfig.json');
-      tsConfig['exclude'].push(testsPath);
+      tsConfig['exclude'].push(testsPath);      
       changed = true;
     }
   

package/cfg/_default.cfg.js

@@ -7,6 +7,7 @@ const _DEFAULT_CONFIG_VARS = {
     publicIndex: 'index.html',      
     outputFileName: 'client.rws.js',
     outputDir: './build',
+    tsConfigPath: './tsconfig.json',
     //Frontend RWS client configs  
     backendUrl: null,
     wsUrl: null,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rws-framework/client",
   "private": false,
-  "version": "2.5.1",
+  "version": "2.5.4",
   "main": "src/index.ts",
   "scripts": {
     "docs": "typedoc --tsconfig ./tsconfig.json"
@@ -28,7 +28,7 @@
   "dependencies": {
     "@microsoft/fast-element": "^1.12.0",
     "@microsoft/fast-foundation": "^2.46.2",
-    "@rws-framework/console": "^0.3.0",
+    "@rws-framework/console": "^0.3.1",
     "@types/moment": "^2.13.0",
     "dragula": "^3.7.3",
     "he": "^1.2.0",
@@ -52,16 +52,16 @@
   },
   "devDependencies": {
     "@types/dragula": "^3.7.4",
+    "@types/eslint": "^6.0.0",
     "@types/express-fileupload": "^1.4.4",
     "@types/glob": "^8.1.0",
-    "@types/he": "^1.2.3",    
-    "@types/sanitize-html": "^2.11.0",    
+    "@types/he": "^1.2.3",
+    "@types/sanitize-html": "^2.11.0",
     "@types/uuid": "^9.0.7",
-    "@types/eslint": "^6.0.0",
     "@typescript-eslint/parser": "^5.0.0",
     "clean-webpack-plugin": "^4.0.0",
     "css-loader": "^6.8.1",
-    "css-minimizer-webpack-plugin": "^5.0.1",    
+    "css-minimizer-webpack-plugin": "^5.0.1",
     "eslint": "^6.0.0",
     "file-loader": "^6.2.0",
     "html-webpack-plugin": "^5.5.3",

package/rws.webpack.config.js

@@ -16,6 +16,7 @@ const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const JsMinimizerPlugin = require('terser-webpack-plugin');
 
 const json5 = require('json5');
+const { rwsPath } = require('@rws-framework/console');
 
 
 const RWSWebpackWrapper = (config) => {  
@@ -43,7 +44,9 @@ const RWSWebpackWrapper = (config) => {
 
   const publicIndex = BuildConfigurator.get('publicIndex') || config.publicIndex;
 
-
+  
+  const tsConfigPath = rwsPath.relativize(BuildConfigurator.get('tsConfigPath') || config.tsConfigPath, executionDir);  
+  
   let WEBPACK_PLUGINS = [
     new webpack.DefinePlugin({
       'process.env._RWS_DEFAULTS': JSON.stringify(BuildConfigurator.exportDefaultConfig()),
@@ -218,7 +221,7 @@ const RWSWebpackWrapper = (config) => {
     }
   }
 
-  const tsValidated = tools.setupTsConfig(path.resolve(config.tsConfigPath));
+  const tsValidated = tools.setupTsConfig(tsConfigPath, executionDir);
 
   if(!tsValidated){
     throw new Error('RWS Webpack build failed.');
@@ -276,7 +279,7 @@ const RWSWebpackWrapper = (config) => {
               loader: 'ts-loader',
               options: {
                 allowTsInNodeModules: true,
-                configFile: path.resolve(config.tsConfigPath)             
+                configFile: path.resolve(tsConfigPath)             
               }
             },
             {