hazza/yel-dspace-angular
1
0
Fork 0
forked from hazza/dspace-angular
Code Pull Requests Activity

add projectroot to sass includedPaths instead of using replace to fix the paths during build

Browse Source
This commit is contained in:
Art Lowel
2019-06-05 17:14:22 +02:00
parent 56b2ee1f0d
commit 743be6a2cd
18 changed files with 21 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
webpack/webpack.common.js
View File

@@ -4,7 +4,6 @@ const {
projectRoot,
buildRoot,
globalCSSImports,
themeReplaceOptions,
themePath,
themedTest,
themedUse
@@ -95,7 +94,7 @@ module.exports = (env) => {
loader: 'sass-loader',
options: {
sourceMap: true,
includePaths: [path.join(themePath, 'styles')]
includePaths: [projectRoot('./'), path.join(themePath, 'styles')]
}
},
{
@@ -103,10 +102,6 @@ module.exports = (env) => {
options: {
resources: globalCSSImports(env)
},
},
{
loader: 'string-replace-loader',
options: themeReplaceOptions
}
]
},
@@ -137,12 +132,8 @@ module.exports = (env) => {
loader: 'sass-loader',
options: {
sourceMap: true,
includePaths: [path.join(themePath, 'styles')]
includePaths: [projectRoot('./'), path.join(themePath, 'styles')]
}
},
{
loader: 'string-replace-loader',
options: themeReplaceOptions
}
]
},