@rws-framework/client 2.18.14 → 2.18.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/builder/webpack/scss/_compiler.js +1 -1
  2. package/builder/webpack/scss/_import.js +5 -5
  3. package/package.json +1 -1
package/builder/webpack/scss/_compiler.js CHANGED
@@ -17,7 +17,7 @@ function compileScssCode(scssCode, fileRootDir, rwsWorkspaceDir, appRoot) {
17
17
  const dependencies = scssImports.map((item) => item[2]);
18
18
 
19
19
  if (scssImports && scssImports.length) {
20
- scssCode = _scss_import.replaceImports(_scss_import.processImports(scssImports, rwsWorkspaceDir, fileRootDir), scssCode);
20
+ scssCode = _scss_import.replaceImports(_scss_import.processImports(scssImports, rwsWorkspaceDir, fileRootDir), scssCode);
21
21
  }
22
22
 
23
23
  const uses = _scss_import.extractScssUses(scssCode)[0];
package/builder/webpack/scss/_import.js CHANGED
@@ -18,8 +18,8 @@ function processImportPath(importPath, rwsWorkspaceDir, appRootDir, fileRootDir
18
18
  return fillSCSSExt(replaceWithNodeModules(importPath, appRoot, null, true), noext);
19
19
  }
20
20
 
21
- if (importPath.indexOf('@rws-mixins') === 0) {
22
- return path.resolve(rwsPath.findPackageDir(workspaceDir), 'src', 'styles', 'includes.scss');
21
+ if (importPath.indexOf('@rws-mixins') === 0) {
22
+ return path.resolve(rwsPath.findPackageDir(__dirname), 'src', 'styles', 'includes.scss');
23
23
  }
24
24
 
25
25
  if (importPath.indexOf('@cwd') === 0) {
@@ -163,8 +163,8 @@ function processImports(imports, fileRootDir, rwsWorkspaceDir, importStorage = {
163
163
  const workspaceDir = this.getRWSWorkspaceDir ? this.getRWSWorkspaceDir() : importData[3];
164
164
  const appRoot = this.getRWSWorkspaceDir ? this.getRWSRootDir() : importData[4];
165
165
 
166
- let importPath = processImportPath(originalImportPath, workspaceDir, appRoot, fileRootDir);
167
-
166
+ let importPath = processImportPath(originalImportPath, workspaceDir, appRoot, fileRootDir);
167
+
168
168
  let replacedScssContent = getStorage(importPath, _scss_fs.getCodeFromFile(importPath, workspaceDir, appRoot).replace(/\/\*[\s\S]*?\*\//g, ''));
169
169
 
170
170
  const recursiveImports = extractScssImports(replacedScssContent, workspaceDir, appRoot, importPath)[0];
@@ -172,7 +172,7 @@ function processImports(imports, fileRootDir, rwsWorkspaceDir, importStorage = {
172
172
  if (recursiveImports.length) {
173
173
  replacedScssContent = replaceImports(processImports(recursiveImports, path.dirname(importPath), workspaceDir, importStorage, true), replacedScssContent);
174
174
  }
175
-
175
+
176
176
  importResults.push({
177
177
  line: importData[1],
178
178
  code: replacedScssContent
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@rws-framework/client",
3
3
  "private": false,
4
- "version": "2.18.14",
4
+ "version": "2.18.15",
5
5
  "main": "src/index.ts",
6
6
  "scripts": {
7
7
  "docs": "typedoc --tsconfig ./tsconfig.json"