@rws-framework/client 2.8.4 → 2.8.5

package/cfg/_default.cfg.js

@@ -17,6 +17,7 @@ const _DEFAULT_CONFIG_VARS = {
     //Universal configs
     transports: ['websocket'],    
     parted: false,        
+    plugins: []
 }
 
 const _DEFAULT_CONFIG = Object.freeze(_DEFAULT_CONFIG_VARS);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@rws-framework/client",
     "private": false,
-    "version": "2.8.4",
+    "version": "2.8.5",
     "main": "src/index.ts",
     "scripts": {
         "docs": "typedoc --tsconfig ./tsconfig.json"
@@ -49,6 +49,7 @@
         "url-router": "^13.0.0",
         "uuid": "^9.0.1",
         "v4": "^0.0.1"
+        
     },
     "devDependencies": {
         "@types/dragula": "^3.7.4",

package/rws.webpack.config.js

@@ -134,17 +134,17 @@ const RWSWebpackWrapper = async (config) => {
 
   const optimConfig = {};
 
-  if(!isDev){
-    optimConfig.minimize = true;
-    optimConfig.minimizer = [
+  // if(!isDev){
+    optimConfig.minimize = !isDev;
+    optimConfig.minimizer = !isDev ? [
       new TerserPlugin({
         terserOptions: {
           keep_classnames: true, // Prevent mangling of class names
           mangle: false, //@error breaks FAST view stuff if enabled for all assets             
-          compress: {
+          compress: !isDev ? {
             dead_code: true,
             pure_funcs: ['console.log', 'console.info', 'console.warn']
-          },
+          } : null,
           output: {
             comments: false
           },
@@ -152,9 +152,21 @@ const RWSWebpackWrapper = async (config) => {
         extractComments: false,
         parallel: true,
       }),
-      new CssMinimizerPlugin(),
-    ];
-  }
+      new CssMinimizerPlugin()      
+    ] : [
+      new TerserPlugin({
+        terserOptions: {
+          keep_classnames: true, // Prevent mangling of class names
+          mangle: false, //@error breaks FAST view stuff if enabled for all assets            
+          output: {
+            comments: false
+          },
+        },
+        extractComments: false,
+        parallel: false,
+      })
+    ]
+  // }
   
 
   if (isParted) {
@@ -258,7 +270,7 @@ const RWSWebpackWrapper = async (config) => {
         },        
         {
           test: /\.scss$/,
-          use: [            
+          use: [                                    
             path.resolve(__dirname, './webpack/loaders/rws_fast_scss_loader.js'),
           ],
         },
@@ -277,7 +289,7 @@ const RWSWebpackWrapper = async (config) => {
             }            
           ],
           exclude: [
-            /node_modules\/(?!\@rws-framework\/client)/,
+            /node_modules\/(?!\@rws-framework\/[A-Z0-9a-z])/,
             /\.debug\.ts$/,  
           ],
         }
@@ -288,12 +300,12 @@ const RWSWebpackWrapper = async (config) => {
   }
 
   // if(isDev){
-    cfgExport.module.rules.push({
-      test: /\.js$/,
-      use: [
-        path.resolve(__dirname, './webpack/loaders/rws_uncomments_loader.js'),                 
-      ],
-    })
+    // cfgExport.module.rules.push({
+    //   test: /\.js$/,
+    //   use: [
+    //     path.resolve(__dirname, './webpack/loaders/rws_uncomments_loader.js'),                 
+    //   ],
+    // })
   // }
 
   if (isHotReload) {

package/src/client.ts

@@ -65,6 +65,7 @@ class RWSClient {
         
         this.loadServices();
 
+        this.config.plugins = [];
         this.pushDataToServiceWorker('SET_WS_URL', { url: this.appConfig.get('wsUrl') }, 'ws_url');
 
         if (this.user) {

package/src/components/loader/styles/layout.scss

@@ -1,5 +1,5 @@
 //loader
-
+//save
 $loader-color: var(--primary-color, #eb7b13);
 $loader-size: 56px;
 $loader-height: 20px;
@@ -7,8 +7,8 @@ $loader-border-size: 8px;
 $loader-gap: 12px;
 $loader-animation-duration: 1s;
 
-@import "~/scss-loading-animations/src/loaders";
+// @import "~/scss-loading-animations/src/loaders";
 
-.loader {
-  @include loader01;
-}
+// .loader {
+//   @include loader01;
+// }

package/src/services/ConfigService.ts

@@ -117,9 +117,7 @@ class ConfigService extends TheService {
     mergeConfig(config: IRWSConfig) {
         const unloaded = ConfigService.isLoaded;     
 
-        if(!Object.keys(this.data).includes('plugins')){
-            this.data.plugins = [];
-        }
+        this.data.plugins = [];
         
         this.data = Object.assign(this.data, config);
 

package/types/declarations.d.ts

@@ -1,5 +1,5 @@
 declare module '*.scss' {
-    const content: import('@microsoft/fast-element').ElementStyles;
+    const content: string;
     export default content;
 }
 

package/webpack/loaders/rws_fast_scss_loader.js

@@ -21,34 +21,26 @@ module.exports = function(content) {
     try {
         const code = plugin.compileScssCode(content, path.dirname(filePath), null, filePath, !isDev);        
 
-        if (fromTs) {
-            if (saveFile && code) {
-                plugin.writeCssFile(filePath, code); 
-                
-                const newContext = this;
-
-                // Properly setup the context for css-loader
-                const loaderContext = {
-                    ...newContext,                              
-                    query: { sourceMap: isDev }, 
-                    async: () => (err, output) => {
-                        if (err) {
-                            callback(err);
-                            return;
-                        }
-                        callback(null, output);
-                    }
-                };
-
-                // Execute css-loader
-                cssLoader.call(loaderContext, code);
-            } else {
-                const tsCode = `import { css } from '@microsoft/fast-element';\nexport default css\`${code}\`;`;
-                callback(null, tsCode);
-            }
-        } else {
-            callback(null, code);
+        if (fromTs && saveFile && code) {
+            plugin.writeCssFile(filePath, code);
         }
+
+        // Properly setup the context for css-loader
+        const loaderContext = {
+            ...this,
+            query: { sourceMap: isDev },
+            async: () => (err, output) => {
+                if (err) {
+                    callback(err);
+                    return;
+                }
+                callback(null, output);
+            }
+        };
+
+        // Execute css-loader with the generated CSS code
+        cssLoader.call(loaderContext, code);
+
     } catch (e) {
         console.error(e);
         callback(e);

package/webpack/loaders/rws_fast_ts_loader.js

@@ -74,7 +74,8 @@ module.exports = async function(content) {
             let styles = 'const styles: null = null;'
 
             if(fs.existsSync(path.dirname(filePath) + '/styles')){
-                styles = `import styles from './${stylesPath}';`;
+                styles = `import componentCSS from './${stylesPath}';\n`;
+                styles += `const styles = T.css\`\${componentCSS}\`;`;
             }
             
             const templateName = 'template';

package/webpack/rws_scss_plugin.js

@@ -62,9 +62,16 @@ class RWSScssPlugin {
       const usesPath = match[1];
       const usesLine = match[0];
 
-      uses.push([usesPath, usesLine]);
+      if(!uses.find((item) => { 
+        console.log(item);
+        return item[0] == usesPath
+      }) && !usesPath !== 'sass:math'){
+        uses.push([usesPath, usesLine]);
+      }      
     }
 
+    // console.log(uses);
+
     return [uses];
   }
 
@@ -353,8 +360,13 @@ class RWSScssPlugin {
 
     uses.forEach(scssUse => {
       const useLine = scssUse[1];
-      scssUses += useLine + '\n';
-      scssCode = scssCode.replace(useLine, '');
+      if(scssCode.indexOf(useLine) === -1){        
+        console.log(scssCode);      
+        scssUses += useLine + '\n';
+        scssCode = scssCode.replace(useLine + '\n', '');
+      }else{
+        console.log('ommiting @use. detected in:', fileRootDir, scssUse)
+      }
     });
 
     scssCode = scssUses + scssCode;
@@ -362,7 +374,7 @@ class RWSScssPlugin {
     try {
 
       const result = sass.compileString(scssCode, { loadPaths: [fileRootDir], style: minify ? 'compressed' : 'expanded' });
-      let finalCss = result.css;
+      let finalCss = result.css.toString();
 
       return this.replaceFontUrlWithBase64(finalCss);
     } catch (err) {