@griddo/ax 1.73.20 → 1.73.21

package/config/webpack.config.js

@@ -22,10 +22,12 @@ const ModuleNotFoundPlugin = require("react-dev-utils/ModuleNotFoundPlugin");
 const ForkTsCheckerWebpackPlugin = require("react-dev-utils/ForkTsCheckerWebpackPlugin");
 const typescriptFormatter = require("react-dev-utils/typescriptFormatter");
 const ReactRefreshWebpackPlugin = require("@pmmmwh/react-refresh-webpack-plugin");
-const { resolveComponentsPath } = require("../config/griddo-config");
+const SassAlias = require("sass-alias");
 
 const postcssNormalize = require("postcss-normalize");
 
+const { resolveComponentsPath, projectAliases } = require("../config/griddo-config");
+
 //
 // PostCSS config file from components
 //
@@ -45,8 +47,6 @@ if (fs.existsSync(postcssConfigPath)) {
   postcssConfigPlugins = postcssConfig.plugins || [];
 }
 
-const { projectAliases } = require("./griddo-config");
-
 const appPackageJson = require(paths.appPackageJson);
 
 // Source maps are resource heavy and can cause out of memory issue for large source files.
@@ -105,7 +105,7 @@ module.exports = function (webpackEnv) {
   const shouldUseReactRefresh = env.raw.FAST_REFRESH;
 
   // common function to get style loaders
-  const getStyleLoaders = (cssOptions, preProcessor) => {
+  const getStyleLoaders = (cssOptions, preProcessor, preProcessorOptions = {}) => {
     const loaders = [
       isEnvDevelopment && require.resolve("style-loader"),
       isEnvProduction && {
@@ -148,6 +148,7 @@ module.exports = function (webpackEnv) {
         },
       },
     ].filter(Boolean);
+
     if (preProcessor) {
       loaders.push(
         {
@@ -161,6 +162,7 @@ module.exports = function (webpackEnv) {
           loader: require.resolve(preProcessor),
           options: {
             sourceMap: true,
+            ...preProcessorOptions,
           },
         }
       );
@@ -489,7 +491,14 @@ module.exports = function (webpackEnv) {
                   importLoaders: 3,
                   sourceMap: isEnvProduction ? shouldUseSourceMap : isEnvDevelopment,
                 },
-                "sass-loader"
+                "sass-loader",
+                {
+                  sassOptions: {
+                    importer: new SassAlias({
+                      ...projectAliases,
+                    }).getImporter(),
+                  },
+                }
               ),
               // Don't consider CSS imports dead code even if the
               // containing package claims to have no side effects.
@@ -509,7 +518,14 @@ module.exports = function (webpackEnv) {
                     getLocalIdent: getCSSModuleLocalIdent,
                   },
                 },
-                "sass-loader"
+                "sass-loader",
+                {
+                  sassOptions: {
+                    importer: new SassAlias({
+                      ...projectAliases,
+                    }).getImporter(),
+                  },
+                }
               ),
             },
             {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "1.73.20",
+  "version": "1.73.21",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -138,7 +138,9 @@
     "reflect-metadata": "0.1.13",
     "resolve": "^1.20.0",
     "resolve-url-loader": "^4.0.0",
-    "sass-loader": "^8.0.2",
+    "sass": "^1.55.0",
+    "sass-alias": "^1.0.5",
+    "sass-loader": "^10.0.0",
     "semver": "^7.3.5",
     "source-map-loader": "^1.1.2",
     "string-replace-loader": "^3.0.1",
@@ -226,5 +228,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2bca5a92a304e728dc1e4e1a220cefa9c0b5742e"
+  "gitHead": "68c40e730af694eea2892dfa5410081a0ca8eb26"
 }