From 2008c8bc92a5f408053d39867609985ee8c6e611 Mon Sep 17 00:00:00 2001 From: Art Lowel Date: Thu, 6 Jun 2019 09:28:28 +0200 Subject: [PATCH] Revert "always use forward slashes in relative theme paths" This reverts commit 7fbde900 --- package.json | 1 - webpack/helpers.js | 4 ++-- yarn.lock | 5 ----- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 2dcc639b23..3c7d8912f3 100644 --- a/package.json +++ b/package.json @@ -216,7 +216,6 @@ "rollup-plugin-terser": "^2.0.2", "sass-loader": "7.1.0", "script-ext-html-webpack-plugin": "2.0.1", - "slash": "^3.0.0", "source-map": "0.7.3", "source-map-loader": "0.2.4", "string-replace-loader": "^2.1.1", diff --git a/webpack/helpers.js b/webpack/helpers.js index c6920ea435..c4fcebe152 100644 --- a/webpack/helpers.js +++ b/webpack/helpers.js @@ -1,6 +1,6 @@ const path = require('path'); const fs = require('fs'); -const slash = require('slash'); + const projectRoot = (relativePath) => { return path.resolve(__dirname, '..', relativePath); @@ -68,7 +68,7 @@ const globalCSSImports = (env) => { return [ const getThemedPath = (componentPath, ext) => { const parsedPath = path.parse(componentPath); 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) => { diff --git a/yarn.lock b/yarn.lock index bab6f350f1..3530c41150 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9514,11 +9514,6 @@ slash@^1.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" 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: version "1.1.6" resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"