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 dev build

Browse Source
This commit is contained in:
Art Lowel
2019-06-03 17:22:55 +02:00
parent 50effd3b70
commit 8bccdac99d
9 changed files with 102 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
webpack/helpers.js
View File

@@ -20,18 +20,13 @@ const theme = 'mantis';
const themePath = path.normalize(path.join(__dirname, '..', 'themes', theme));
const globalCSSImports = [
path.resolve(__dirname, '..', 'src/styles/_variables.scss'),
path.resolve(__dirname, '..', 'src/styles/_mixins.scss'),
buildRoot('styles/_variables.scss'),
buildRoot('styles/_mixins.scss'),
];
const themeReplaceOptions =
{
multiple: [
{
search: '$themePath$/',
replace: (themePath.length ? themePath + '/' : ''),
flags: 'g'
},
{
search: '@import \'~/',
replace: '@import \'' + projectRoot('./') + '/',
@@ -62,7 +57,6 @@ const themedUse = (resource, extension) => {
const themedPath = getThemedPath(resource, extension);
return [
//'debug-loader',
{
loader: 'string-replace-loader',
options: {
@@ -74,50 +68,14 @@ 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,
theme,
themePath,
getThemedPath,
themedTest,
themedUse,
cssLoaders,
scssLoaders,
globalCSSImports,
themeReplaceOptions
};

102
webpack/webpack.common.js
View File

@@ -2,9 +2,10 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
const path = require('path');
const {
projectRoot,
buildRoot,
globalCSSImports,
cssLoaders,
scssLoaders,
themeReplaceOptions,
themePath,
themedTest,
themedUse
} = require('./helpers');
@@ -41,28 +42,109 @@ module.exports = {
},
{
test: /\.css$/,
use: cssLoaders
use: [
{
loader: 'to-string-loader',
options: {
sourceMap: true
}
},
{
loader: 'css-loader',
options: {
sourceMap: true,
modules: true
}
},
{
loader: 'postcss-loader',
options: {
sourceMap: true
}
}
]
},
{
test: /\.scss$/,
exclude: [/node_modules/,
path.resolve(__dirname, '..', 'src/styles/_exposed_variables.scss'),
path.resolve(__dirname, '..', 'src/styles/_variables.scss')
exclude: [
/node_modules/,
buildRoot('styles/_exposed_variables.scss'),
buildRoot('styles/_variables.scss')
],
use: [
...scssLoaders,
{
loader: 'raw-loader',
options: {
sourceMap: true
}
},
{
loader: 'postcss-loader',
options: {
sourceMap: true
}
},
{
loader: 'resolve-url-loader',
options: {
sourceMap: true
}
},
{
loader: 'sass-loader',
options: {
sourceMap: true,
includePaths: [path.join(themePath, 'styles')]
}
},
'debug-loader',
{
loader: 'sass-resources-loader',
options: {
resources: globalCSSImports
},
},
{
loader: 'string-replace-loader',
options: themeReplaceOptions
}
]
},
{
test: /^(_exposed)?_variables.scss$/,
exclude: /node_modules/,
use: scssLoaders
test: /(_exposed)?_variables.scss$/,
exclude: [/node_modules/],
use: [
{
loader: 'css-loader',
options: {
sourceMap: true,
modules: true
}
},
{
loader: 'postcss-loader',
options: {
sourceMap: true
}
},
{
loader: 'resolve-url-loader',
options: {
sourceMap: true
}
},
{
loader: 'sass-loader',
options: {
sourceMap: true,
includePaths: [path.join(themePath, 'styles')]
}
},
{
loader: 'string-replace-loader',
options: themeReplaceOptions
}
]
},
{
test: /\.html$/,