fix exposed_variables issue with AoT build

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

View File

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

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 = { module.exports = {
projectRoot, projectRoot,
buildRoot, buildRoot,
@@ -81,6 +116,8 @@ module.exports = {
getThemedPath, getThemedPath,
themedTest, themedTest,
themedUse, themedUse,
cssLoaders,
scssLoaders,
globalCSSImports, globalCSSImports,
themeReplaceOptions themeReplaceOptions
}; };

View File

@@ -3,7 +3,8 @@ const path = require('path');
const { const {
projectRoot, projectRoot,
globalCSSImports, globalCSSImports,
themeReplaceOptions, cssLoaders,
scssLoaders,
themedTest, themedTest,
themedUse themedUse
} = require('./helpers'); } = require('./helpers');
@@ -40,55 +41,16 @@ module.exports = {
}, },
{ {
test: /\.css$/, test: /\.css$/,
use: [{ use: cssLoaders
loader: 'to-string-loader',
options: {
sourceMap: true
}
},
{
loader: 'css-loader',
options: {
sourceMap: true,
modules: true
}
},
{
loader: 'postcss-loader',
options: {
sourceMap: true
}
}
]
}, },
{ {
test: /\.scss$/, test: /\.scss$/,
exclude: [/node_modules/, 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: [ use: [
{ ...scssLoaders,
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
},
{ {
loader: 'sass-resources-loader', loader: 'sass-resources-loader',
options: { options: {
@@ -98,24 +60,9 @@ module.exports = {
] ]
}, },
{ {
test: /_exposed_variables.scss$/, test: /^(_exposed)?_variables.scss$/,
exclude: /node_modules/, exclude: /node_modules/,
use: [{ use: scssLoaders
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
},
}
]
}, },
{ {
test: /\.html$/, test: /\.html$/,