hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 01:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix exposed_variables issue with AoT build

Browse Source
This commit is contained in:
Art Lowel
2019-05-31 13:24:04 +02:00
parent d93173e8d2
commit 50effd3b70
3 changed files with 47 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/styles/_exposed_variables.scss
View File

@@ -1,3 +1,5 @@
@import '_variables.scss';
:export {
xlMin: map-get($grid-breakpoints, xl);
mdMin: map-get($grid-breakpoints, md);

37
webpack/helpers.js
View File

@@ -74,6 +74,41 @@ const themedUse = (resource, extension) => {
]
};
const cssLoaders = [
{
loader: 'raw-loader',
options: {
sourceMap: true
}
},
{
loader: 'postcss-loader',
options: {
sourceMap: true
}
},
{
loader: 'resolve-url-loader',
options: {
sourceMap: true
}
},
];
const scssLoaders = [
...cssLoaders,
{
loader: 'sass-loader',
options: {
sourceMap: true
}
},
{
loader: 'string-replace-loader',
options: themeReplaceOptions
}
];
module.exports = {
projectRoot,
buildRoot,
@@ -81,6 +116,8 @@ module.exports = {
getThemedPath,
themedTest,
themedUse,
cssLoaders,
scssLoaders,
globalCSSImports,
themeReplaceOptions
};

69
webpack/webpack.common.js
View File

@@ -3,7 +3,8 @@ const path = require('path');
const {
projectRoot,
globalCSSImports,
themeReplaceOptions,
cssLoaders,
scssLoaders,
themedTest,
themedUse
} = require('./helpers');
@@ -40,55 +41,16 @@ module.exports = {
},
{
test: /\.css$/,
use: [{
loader: 'to-string-loader',
options: {
sourceMap: true
}
},
{
loader: 'css-loader',
options: {
sourceMap: true,
modules: true
}
},
{
loader: 'postcss-loader',
options: {
sourceMap: true
}
}
]
use: cssLoaders
},
{
test: /\.scss$/,
exclude: [/node_modules/,
path.resolve(__dirname, '..', 'src/styles/_exposed_variables.scss')
path.resolve(__dirname, '..', 'src/styles/_exposed_variables.scss'),
path.resolve(__dirname, '..', 'src/styles/_variables.scss')
],
use: [
{
loader: 'raw-loader',
options: {
sourceMap: true
}
},
{
loader: 'resolve-url-loader',
options: {
sourceMap: true
}
},
{
loader: 'sass-loader',
options: {
sourceMap: true
}
},
{
loader: 'string-replace-loader',
options: themeReplaceOptions
},
...scssLoaders,
{
loader: 'sass-resources-loader',
options: {
@@ -98,24 +60,9 @@ module.exports = {
]
},
{
test: /_exposed_variables.scss$/,
test: /^(_exposed)?_variables.scss$/,
exclude: /node_modules/,
use: [{
loader: "css-loader" // translates CSS into CommonJS
}, {
loader: "sass-loader" // compiles Sass to CSS
},
{
loader: 'string-replace-loader',
options: themeReplaceOptions
},
{
loader: 'sass-resources-loader',
options: {
resources: globalCSSImports
},
}
]
use: scssLoaders
},
{
test: /\.html$/,