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

fixed tests

Browse Source
This commit is contained in:
lotte
2019-04-23 14:35:40 +02:00
committed by Art Lowel
parent 8a32777802
commit cfcf496cc1
4 changed files with 88 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
webpack/helpers.js
View File

@@ -1,13 +1,50 @@
const {
join,
resolve
join,
resolve,
} = require('path');
function root(path) {
return resolve(__dirname, '..', path);
return resolve(__dirname, '..', path);
}
const theme = '';
// const theme = 'mantis';
const globalCSSImports = [
resolve(__dirname, '..', 'src/styles/_variables.scss'),
resolve(__dirname, '..', 'src/styles/_mixins.scss'),
];
const themeReplaceOptions =
{
multiple: [
{
search: '$theme$.',
replace: theme + (theme.length ? '.' : ''),
},
{
search: '$themePath$/',
replace: (theme.length ? 'themes/' : ''),
},
{
search: '$theme$.',
replace: (theme.length ? theme + '.' : ''),
},
{
search: '$themePath$/',
replace: (theme.length ? 'themes/' : ''),
}
]
};
module.exports = {
root: root,
join: join
root: root,
join: join,
theme: theme,
globalCSSImports: globalCSSImports,
themeReplaceOptions: themeReplaceOptions
};

34
webpack/webpack.common.js
View File

@@ -2,40 +2,12 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
const path = require('path');
const {
root,
join
join,
globalCSSImports,
themeReplaceOptions
} = require('./helpers');
// const theme = '';
const theme = 'mantis';
const globalCSSImports = [
path.resolve(__dirname, '..', 'src/styles/_variables.scss'),
path.resolve(__dirname, '..', 'src/styles/_mixins.scss'),
];
const themeReplaceOptions =
{
multiple: [
{
search: '$theme$.',
replace: theme + (theme.length ? '.' : ''),
},
{
search: '$themePath$/',
replace: (theme.length ? 'themes/' : ''),
},
{
search: '$theme$.',
replace: (theme.length ? theme + '.' : ''),
},
{
search: '$themePath$/',
replace: (theme.length ? 'themes/' : ''),
}
]
};
module.exports = {
mode: 'development',
devtool: 'source-map',

5
webpack/webpack.server.js
View File

@@ -1,7 +1,7 @@
var nodeExternals = require('webpack-node-externals');
const {
root
root
} = require('./helpers');
module.exports = {
@@ -12,7 +12,8 @@ module.exports = {
output: {
filename: 'server.js'
},
target: 'node',
module: {rules: []},
target: 'node',
externals: [nodeExternals({
whitelist: [
/@angular/,

76
webpack/webpack.test.js
View File

@@ -1,5 +1,7 @@
const {
root
root,
globalCSSImports,
themeReplaceOptions
} = require('./helpers');
/**
@@ -80,7 +82,11 @@ module.exports = function (options) {
exclude: [/node_modules/],
},
{
test: /\.component.ts$/,
loader: 'string-replace-loader',
options: themeReplaceOptions
},
/**
* Typescript loader support for .ts and Angular 2 async routes via .async.ts
*
@@ -127,7 +133,6 @@ module.exports = function (options) {
}
}
],
exclude: [root('src/index.html')]
},
/**
@@ -136,39 +141,38 @@ module.exports = function (options) {
*
*/
{
test: /\.scss$/,
use: [{
loader: 'to-string-loader',
options: {
sourceMap: true
}
}, {
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
}
},
'webpack-import-glob-loader'
],
exclude: [root('src/index.html')]
test: /\.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
},
{
loader: 'sass-resources-loader',
options: {
resources: globalCSSImports
},
},
'webpack-import-glob-loader'
]
},
/**