@rws-framework/client 2.5.1 → 2.5.3

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,7 +332,7 @@ function getAllFilesInFolder(folderPath, ignoreFilenames = [], recursive = false
   return files;
 }
 
-function setupTsConfig(tsConfigPath)
+function setupTsConfig(tsConfigPath, executionDir)
 {
   
   if(!fs.existsSync(tsConfigPath)){
@@ -344,26 +346,36 @@ function setupTsConfig(tsConfigPath)
 
     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 = md5(fs.readFileSync(testsPath, 'utf-8'));
   
+    const included = [];
+
     let changed = false;  
   
     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(!tsConfig['include'].includes(declarationsPath) && !included.includes(declarationsPathMD5)){
       console.log(chalk.blueBright('[RWS TS CONFIG]'), 'adding RWS typescript declarations to project tsconfig.json');
       tsConfig['include'].push(declarationsPath);
+      included.push(md5(fs.readFileSync(declarationsPath, 'utf-8')));
       changed = true;
     }
+    
   
-    if(!tsConfig['exclude'].includes(testsPath)){
+    if(!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);
+      included.push();
+
       changed = true;
     }
   

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rws-framework/client",
   "private": false,
-  "version": "2.5.1",
+  "version": "2.5.3",
   "main": "src/index.ts",
   "scripts": {
     "docs": "typedoc --tsconfig ./tsconfig.json"
@@ -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

@@ -218,7 +218,7 @@ const RWSWebpackWrapper = (config) => {
     }
   }
 
-  const tsValidated = tools.setupTsConfig(path.resolve(config.tsConfigPath));
+  const tsValidated = tools.setupTsConfig(path.resolve(config.tsConfigPath, executionDir));
 
   if(!tsValidated){
     throw new Error('RWS Webpack build failed.');