hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-08 02:24:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix issues with path separators in windows

Browse Source
This commit is contained in:
Art Lowel
2021-03-24 14:44:10 +01:00
parent 60d917bb8a
commit cbee776fa4
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/styles/_mixins.scss
View File

@@ -1,4 +1,3 @@
@import '../../node_modules/bootstrap/scss/functions.scss';
@import '../../node_modules/bootstrap/scss/mixins.scss'; @import '../../node_modules/bootstrap/scss/mixins.scss';
@mixin word-wrap() { @mixin word-wrap() {

4
webpack/helpers.ts
View File

@@ -6,8 +6,8 @@ export const projectRoot = (relativePath) => {
export const globalCSSImports = () => { export const globalCSSImports = () => {
return [ return [
projectRoot('src/styles/_variables.scss'), projectRoot(path.join('src', 'styles', '_variables.scss')),
projectRoot('src/styles/_mixins.scss'), projectRoot(path.join('src', 'styles', '_mixins.scss')),
]; ];
}; };

8
webpack/webpack.common.ts
View File

@@ -17,7 +17,9 @@ export const copyWebpackOptions = {
to: 'assets', to: 'assets',
}, },
{ {
from: path.join(__dirname, '..', 'src', 'themes', '*', 'assets', '**', '*'), // replace(/\\/g, '/') because glob patterns need forward slashes, even on windows:
// https://github.com/mrmlnc/fast-glob#how-to-write-patterns-on-windows
from: path.join(__dirname, '..', 'src', 'themes', '*', 'assets', '**', '*').replace(/\\/g, '/'),
to: 'assets', to: 'assets',
noErrorOnMissing: true, noErrorOnMissing: true,
transformPath(targetPath, absolutePath) { transformPath(targetPath, absolutePath) {
@@ -77,7 +79,7 @@ export const commonExports = {
test: /\.scss$/, test: /\.scss$/,
exclude: [ exclude: [
/node_modules/, /node_modules/,
/(_exposed)?_variables.scss$|\/src\/themes\/[^/]+\/styles\/.+.scss$/ /(_exposed)?_variables.scss$|[\/|\\]src[\/|\\]themes[\/|\\].+?[\/|\\]styles[\/|\\].+\.scss$/
], ],
use: [ use: [
...SCSS_LOADERS, ...SCSS_LOADERS,
@@ -90,7 +92,7 @@ export const commonExports = {
] ]
}, },
{ {
test: /(_exposed)?_variables.scss$|\/src\/themes\/[^/]+\/styles\/.+.scss$/, test: /(_exposed)?_variables.scss$|[\/|\\]src[\/|\\]themes[\/|\\].+?[\/|\\]styles[\/|\\].+\.scss$/,
exclude: [/node_modules/], exclude: [/node_modules/],
use: [ use: [
...SCSS_LOADERS, ...SCSS_LOADERS,