@rws-framework/client 2.8.4 → 2.9.0

package/webpack/rws_scss_plugin.js

@@ -48,7 +48,9 @@ class RWSScssPlugin {
         importRootPath = path.dirname(importRootPath);
       }      
 
-      imports.push([this.processImportPath(importPath, importRootPath), importLine]);
+      const processedImportPath = this.processImportPath(importPath, importRootPath);
+
+      imports.push([processedImportPath, importLine, path.resolve(processedImportPath)]);
     }
 
     return [imports, fileContent];
@@ -62,9 +64,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];
   }
 
@@ -244,9 +253,6 @@ class RWSScssPlugin {
   }
 
   replaceFontUrlWithBase64(cssContent) {    
-    const urlRegex = /url\(([^)]+)\)/g;
-    let match;
-    
     const fontFaceRegex = /@font-face\s*\{[^}]*\}/g;
     let fontFaces = [...cssContent.matchAll(fontFaceRegex)];
 
@@ -343,6 +349,8 @@ class RWSScssPlugin {
     const _self = this;
     const [scssImports] = this.extractScssImports(scssCode, fileRootDir);
 
+    const dependencies = scssImports.map((item) => item[2]);
+
     if (scssImports && scssImports.length) {
       scssCode = this.replaceImports(this.processImports(scssImports, fileRootDir), scssCode);
     }
@@ -353,18 +361,21 @@ 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;
 
     try {
+      const result = sass.compileString(scssCode, { loadPaths: [fileRootDir]});
 
-      const result = sass.compileString(scssCode, { loadPaths: [fileRootDir], style: minify ? 'compressed' : 'expanded' });
-      let finalCss = result.css;
-
-      return this.replaceFontUrlWithBase64(finalCss);
+      return { code: this.replaceFontUrlWithBase64(result.css.toString()), dependencies};
     } catch (err) {
       console.error('SASS Error in', fileRootDir);
 

package/_rws_externals.js

@@ -1,39 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-const tools = require('./_tools');
-
-const _defaultOpts = { 
-  inc_list_context: [],
-  inc_list: [],
-  not_inc_list: [],
-  not_inc_list_context: ['@rws-framework/client', 'node_modules'],
-  exceptions: [],
-  exceptions_context: [],  
-}
-
-const moduleDir = path.resolve(path.dirname(module.id));    
-const nodeModules = path.resolve(tools.findRootWorkspacePath(process.cwd()), '/node_modules');
-
-
-const externals = (declaredCodeBase, nodeModules, externalOptions = _defaultOpts) => ({context, request}, callback) => {
-    let theOptions = _defaultOpts;
-
-    if(externalOptions !== null){      
-      theOptions = Object.assign(theOptions, externalOptions);
-    }
-
-    const codeBase = path.resolve(declaredCodeBase);  
-    
-    let mergeTarget = true;
-
-    if (mergeTarget) {
-      //merging to output
-      return callback();
-    }
-    
-    //using require from node_modules
-    callback(null, 'commonjs ' + request);
-  }
-
-module.exports = {rwsExternals: externals, _externalsDefaults: _defaultOpts};

package/src/components/_design_system.ts

@@ -1,6 +0,0 @@
-import { DesignSystem } from '@microsoft/fast-foundation';
-
-
-export function provideRWSDesignSystem(element?: HTMLElement): DesignSystem {
-    return DesignSystem.getOrCreate(element);
-}

package/webpack/loaders/rws_fast_html_loader.js

@@ -1,8 +0,0 @@
-
-
-module.exports = async function(content) { 
-    const filePath = this.resourcePath;
-    const isDev = this._compiler.options.mode === 'development';    
-   
-    return content;
-};

package/webpack/loaders/rws_uncomments_loader.js

@@ -1,35 +0,0 @@
-
-
-const path = require('path');
-const Terser = require('terser');
-
-async function removeCommentsFromFile(code, inputSourceMap) {        
-    const callback = this.async();
-    const sourceMap = this.sourceMap;
-    // Configure Terser to remove comments
-    try {
-        const minifyOptions = {
-          format: {
-            comments: false // Remove all comments
-          },
-          sourceMap: sourceMap
-            ? {
-                content: inputSourceMap || false,
-                url: 'out.js.map'
-              }
-            : false
-        };
-    
-        // Minify source code
-        const result = await Terser.minify(code, minifyOptions);
-    
-        // Pass along the source map if enabled
-        callback(null, result.code, result.map || inputSourceMap);
-      } catch (err) {
-        callback(err);
-      }
-}
-
-module.exports = async function (source, inputSourceMap) {    
-    return await removeCommentsFromFile.bind(this)(source, inputSourceMap);
-};