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

Revert "always use forward slashes in relative theme paths"

Browse Source 
This reverts commit 7fbde900
This commit is contained in:
Art Lowel
2019-06-06 09:28:28 +02:00
parent 7fbde90095
commit 2008c8bc92
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@@ -216,7 +216,6 @@
"rollup-plugin-terser": "^2.0.2", "rollup-plugin-terser": "^2.0.2",
"sass-loader": "7.1.0", "sass-loader": "7.1.0",
"script-ext-html-webpack-plugin": "2.0.1", "script-ext-html-webpack-plugin": "2.0.1",
"slash": "^3.0.0",
"source-map": "0.7.3", "source-map": "0.7.3",
"source-map-loader": "0.2.4", "source-map-loader": "0.2.4",
"string-replace-loader": "^2.1.1", "string-replace-loader": "^2.1.1",

4
webpack/helpers.js
View File

@@ -1,6 +1,6 @@
const path = require('path'); const path = require('path');
const fs = require('fs'); const fs = require('fs');
const slash = require('slash');
const projectRoot = (relativePath) => { const projectRoot = (relativePath) => {
return path.resolve(__dirname, '..', relativePath); return path.resolve(__dirname, '..', relativePath);
@@ -68,7 +68,7 @@ const globalCSSImports = (env) => { return [
const getThemedPath = (componentPath, ext) => { const getThemedPath = (componentPath, ext) => {
const parsedPath = path.parse(componentPath); const parsedPath = path.parse(componentPath);
const relativePath = path.relative(srcPath, parsedPath.dir); const relativePath = path.relative(srcPath, parsedPath.dir);
return slash(path.join(relativeThemePath, relativePath, `${parsedPath.name}.${ext}`)); return path.join(relativeThemePath, relativePath, `${parsedPath.name}.${ext}`);
}; };
const themedTest = (origPath, extension) => { const themedTest = (origPath, extension) => {

5
yarn.lock
View File

@@ -9514,11 +9514,6 @@ slash@^1.0.0:
resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU= integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
slash@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
slide@^1.1.3: slide@^1.1.3:
version "1.1.6" version "1.1.6"
resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"