@rws-framework/client 2.19.0 → 2.19.1

package/builder/webpack/loaders/rws_fast_scss_loader.js

@@ -11,7 +11,8 @@ module.exports = async function(content) {
     const plugin = new RWSScssPlugin({
         appRootDir: this.query?.appRootDir,
         rwsWorkspaceDir: this.query?.rwsWorkspaceDir,
-        publicDir: this.query?.publicDir
+        publicDir: this.query?.publicDir,
+        cssDir: this.query?.cssDir
     }); 
     let fromTs = false;    
 

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

@@ -36,6 +36,7 @@ const RWSWebpackWrapper = async (appRoot, rwsFrontendConfig,  _packageDir) => {
     outputDir,
     outputFileName,
     publicDir,
+    cssDir,
     serviceWorkerPath,
     publicIndex,
     devTools,
@@ -137,6 +138,7 @@ const RWSWebpackWrapper = async (appRoot, rwsFrontendConfig,  _packageDir) => {
     hotReload,
     hotReloadPort,
     publicDir,
+    cssDir,
     loaderIgnoreExceptions
 });  
 

package/builder/webpack/rws_scss_plugin.js

@@ -19,6 +19,7 @@ class RWSScssPlugin {
     appRootDir: null,
     rwsWorkspaceDir: null,
     publicDir: null,
+    cssDir: null,
     autoCompile: []
   }) {
     this.node_modules_dir = (fileDir) => path.relative(fileDir, path.join(this.getRWSRootDir(), '/node_modules'))
@@ -27,6 +28,7 @@ class RWSScssPlugin {
     _scss_compiler = _scss_compiler_builder(this);
 
     this.pubDir = params.publicDir;
+    this.cssDir = params.cssDir;    
 
     if(!params.rwsWorkspaceDir){      
       throw new Error('Pass "rwsWorkspaceDir" to the "@rws-framework/client/builder/webpack/loaders/rws_fast_ts_loader.js" loader.');
@@ -65,7 +67,7 @@ class RWSScssPlugin {
   }
 
   writeCssFile(scssFilePath, cssContent){
-    return _scss_fs.writeCssFile(scssFilePath, cssContent);
+    return _scss_fs.writeCssFile(scssFilePath, cssContent, this.getRWSWorkspaceDir(), this.getCssDir());
   }
 
   getRWSWorkspaceDir() {
@@ -76,6 +78,10 @@ class RWSScssPlugin {
     return this.appRootDir;
   }
 
+  getCssDir() {
+    return this.cssDir;
+  }
+
   getPubDir() {
     return this.pubDir;
   }

package/builder/webpack/scss/_fs.js

@@ -5,19 +5,29 @@ let _scss_import = null;
 const _COMPILE_DIR_NAME = 'compiled';
 
 
-function writeCssFile(scssFilePath, cssContent) {
+function writeCssFile(scssFilePath, cssContent, workspaceDir, finalCssDirOverride = null) {
     const cssFilePath = scssFilePath.replace('.scss', '.css');
-    let endCssFilePath = cssFilePath.split('/');
+    let endCssFilePath = cssFilePath.split(path.sep);
     let endCssDir = [...endCssFilePath];
     endCssDir[endCssDir.length - 1] = `${_COMPILE_DIR_NAME}`;
-    endCssDir = endCssDir.join('/');
+    endCssDir = endCssDir.join(path.sep);
+    const fileName = endCssFilePath[endCssFilePath.length - 1];
 
-    if (!fs.existsSync(endCssDir)) {
-      fs.mkdirSync(endCssDir);
-    }
+    if(!finalCssDirOverride){
+      if (!fs.existsSync(endCssDir)) {
+        fs.mkdirSync(endCssDir);
+      }
 
-    endCssFilePath[endCssFilePath.length - 1] = `${_COMPILE_DIR_NAME}/` + endCssFilePath[endCssFilePath.length - 1];
-    endCssFilePath = endCssFilePath.join('/');
+      endCssFilePath[endCssFilePath.length - 1] = `${_COMPILE_DIR_NAME}${path.sep}` + fileName;
+      endCssFilePath = endCssFilePath.join(path.sep);
+    }else{
+      const cssDirPath = path.join(workspaceDir, finalCssDirOverride);
+      if(!fs.existsSync(cssDirPath)){
+        fs.mkdirSync(cssDirPath);
+      }
+
+      endCssFilePath = path.join(cssDirPath, fileName);
+    }
 
     fs.writeFile(endCssFilePath, cssContent, () => {});
     console.log('Saved external CSS file in: ' + endCssFilePath);

package/cfg/build_steps/webpack/_build_config.js

@@ -26,6 +26,8 @@ async function getBuildConfig(rwsFrontBuildConfig, _packageDir){
 
     const outputFileName = BuildConfigurator.get('outputFileName') || rwsFrontBuildConfig.outputFileName;
     const publicDir = BuildConfigurator.get('publicDir') || rwsFrontBuildConfig.publicDir;
+    const cssDir = BuildConfigurator.get('cssDir') || rwsFrontBuildConfig.cssDir;
+
     const serviceWorkerPath = BuildConfigurator.get('serviceWorker') || rwsFrontBuildConfig.serviceWorker;
 
     const publicIndex = BuildConfigurator.get('publicIndex') || rwsFrontBuildConfig.publicIndex;
@@ -65,6 +67,7 @@ async function getBuildConfig(rwsFrontBuildConfig, _packageDir){
         outputDir,
         outputFileName,
         publicDir,
+        cssDir,
         serviceWorkerPath,
         publicIndex,
         devTools,

package/cfg/build_steps/webpack/_loaders.js

@@ -10,7 +10,7 @@ const { timingCounterStart, timingCounterStop } = require('./_timing');
 const { rwsRuntimeHelper, rwsPath } = require('@rws-framework/console');
 
 
-function getRWSLoaders(packageDir, executionDir, tsConfigData, appRootDir, entrypoint, loaderIgnoreExceptions, publicDir) {
+function getRWSLoaders(packageDir, executionDir, tsConfigData, appRootDir, entrypoint, loaderIgnoreExceptions, publicDir, cssDir) {
   const scssLoader = path.join(packageDir, 'builder/webpack/loaders/rws_fast_scss_loader.js');
   const tsLoader = path.join(packageDir, 'builder/webpack/loaders/rws_fast_ts_loader.js');
   const htmlLoader = path.join(packageDir, 'builder/webpack/loaders/rws_fast_html_loader.js');
@@ -100,7 +100,8 @@ function getRWSLoaders(packageDir, executionDir, tsConfigData, appRootDir, entry
           options: {
             rwsWorkspaceDir: executionDir,
             appRootDir,
-            publicDir
+            publicDir,
+            cssDir
           }
         },
       ],

package/cfg/build_steps/webpack/_webpack_config.js

@@ -25,6 +25,7 @@ async function createWebpackConfig({
     hotReload,
     hotReloadPort,
     publicDir = null,
+    cssDir = null,
     loaderIgnoreExceptions
 }) { 
 
@@ -59,7 +60,7 @@ async function createWebpackConfig({
         },
         devServer: hotReload ? getRWSHotReloadSetup(hotReloadPort, outputDir) : false,
         module: {            
-            rules: getRWSLoaders(_packageDir, executionDir, tsConfig, appRootDir, entrypoint, loaderIgnoreExceptions, publicDir),
+            rules: getRWSLoaders(_packageDir, executionDir, tsConfig, appRootDir, entrypoint, loaderIgnoreExceptions, publicDir, cssDir),
         },
         plugins: WEBPACK_PLUGINS,
         // externals: rwsExternals(_packageDir, executionDir, modules_setup, automatedChunks, {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@rws-framework/client",
     "private": false,
-    "version": "2.19.0",
+    "version": "2.19.1",
     "main": "src/index.ts",
     "scripts": {
         "docs": "typedoc --tsconfig ./tsconfig.json"