@rws-framework/client 2.7.0 → 2.7.1

package/package.json

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

package/rws.webpack.config.js

@@ -220,7 +220,8 @@ const RWSWebpackWrapper = (config) => {
     throw new Error('RWS Webpack build failed.');
   }
 
-  const cfgExport = {    
+  const cfgExport = {  
+    context: executionDir,  
     entry: {
       client: config.entry,
       ...automatedEntries
@@ -233,7 +234,7 @@ const RWSWebpackWrapper = (config) => {
       filename: isParted ? (partedPrefix || 'rws') + '.[name].js' : outputFileName,
       sourceMapFilename: '[file].map',
     },
-    resolve: {
+    resolve: {      
       extensions: ['.ts', '.js'],
       modules: modules_setup,
       alias: {

package/webpack/rws_scss_plugin.js

@@ -44,7 +44,11 @@ class RWSScssPlugin {
       const importPath = match[1];
       const importLine = match[0];
 
-      imports.push([this.processImportPath(importPath, path.dirname(importRootPath)), importLine]);
+      if(fs.statSync(importRootPath).isFile()){        
+        importRootPath = path.dirname(importRootPath);
+      }      
+
+      imports.push([this.processImportPath(importPath, importRootPath), importLine]);
     }
 
     return [imports, fileContent];
@@ -155,7 +159,7 @@ class RWSScssPlugin {
     filePath = filePath.replace('//', '/');
 
     if (!fs.existsSync(filePath)) {
-      const processedImportPath = this.processImportPath(filePath, path.dirname(filePath));
+      const processedImportPath = this.processImportPath(filePath, path.dirname(filePath));      
 
       if (!fs.existsSync(processedImportPath)) {
         throw new Error(`SCSS loader: File path "${filePath}" was not found.`);
@@ -209,9 +213,8 @@ class RWSScssPlugin {
     imports.forEach(importData => {
       const originalImportPath = importData[0];
       let importPath = this.processImportPath(originalImportPath, fileRootDir);
-
       let replacedScssContent = getStorage(importPath, this.getCodeFromFile(importPath).replace(/\/\*[\s\S]*?\*\//g, ''));
-
+      
       const recursiveImports = this.extractScssImports(replacedScssContent, importPath)[0];
 
       if (recursiveImports.length) {
@@ -286,18 +289,18 @@ class RWSScssPlugin {
       return this.fillSCSSExt(importPath, noext);
     }
 
-    if(fileRootDir){
+    if(fileRootDir){   
+      const relativized = path.resolve(fileRootDir) + '/' + importPath;
+
       if (importPath.split('')[0] === '.') {
-        return this.fillSCSSExt(path.resolve(fileRootDir, importPath), noext);
+        return this.fillSCSSExt(relativized, noext);
       }
 
-      const relativized = path.resolve(fileRootDir) + '/' + importPath;
-
       if (!fs.existsSync(relativized)) {
         const partSplit = relativized.split('/');
         partSplit[partSplit.length - 1] = '_' + partSplit[partSplit.length - 1] + '.scss';
 
-        const newPath = this.underscorePath(relativized);
+        const newPath = this.underscorePath(relativized);        
 
         if (fs.existsSync(newPath)) {
           return newPath;