fixed themes loader error (#1552)

geosolutions-it · Mar 14, 2017 · b694b05 · b694b05
1 parent 0a0fbf9
commit b694b05
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/themes.js b/themes.js
@@ -12,7 +12,7 @@ const themeEntries = () => {
     var files = glob.sync(globPath);
     return files.reduce((res, curr) => {
         var finalRes = res || {};
-        finalRes["themes/" + path.basename(curr, path.extname(curr))] = `${curr}/theme.less`;
+        finalRes["themes/" + path.basename(curr, path.extname(curr))] = path.join(__dirname, "web", "client", "themes", `${path.basename(curr, path.extname(curr))}`, "theme.less");
         return finalRes;
     }, {});
 

diff --git a/webpack.config.js b/webpack.config.js
@@ -53,7 +53,7 @@ module.exports = {
             },
             {
                 test: /\.less$/,
-                exclude: /themes\/.+\.less$/,
+                exclude: /themes[\\\/]?.+\.less$/,
                 use: [{
                     loader: 'style-loader'
                 }, {
@@ -63,7 +63,7 @@ module.exports = {
                 }]
             },
             {
-                test: /themes\/.+\.less$/,
+                test: /themes[\\\/]?.+\.less$/,
                 use: extractThemesPlugin.extract({
                         fallback: 'style-loader',
                         use: ['css-loader', 'less-loader']