Merge pull request #112 from govau/develop

Corrected find and replace path separator for Windows
govau · Mar 19, 2019 · d19776e · d19776e
2 parents 31d3c90 + 7129435
commit d19776e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/packages/pancake-sass/CHANGELOG.md b/packages/pancake-sass/CHANGELOG.md
@@ -6,6 +6,7 @@ Pancake Sass plugin
 
 ## Versions
 
+* [v2.3.4  - Added cross-platform path seperator for org replace function](v234)
 * [v2.2.4  - Upgrade dependencies](v224)
 * [v2.1.4  - Reverted pathing issue with pancake-sass, corrected changelog](v214)
 * [v2.1.3  - Added cross-platform path seperator for org replace function](v213)
@@ -33,6 +34,11 @@ Pancake Sass plugin
 
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------
 
+## v2.3.4
+
+- Added cross-platform path seperator for org replace function
+
+
 ## v2.2.4
 
 - Upgrade dependencies

diff --git a/packages/pancake-sass/README.md b/packages/pancake-sass/README.md
@@ -58,6 +58,7 @@ To run the tests make sure you go to the monorepo this package came from and clo
 
 ## Release History
 
+* v2.3.4 - Added cross-platform path seperator for org replace function
 * v2.2.4 - Upgrade dependencies
 * v2.1.4 - Reverted pathing issue with pancake-sass, corrected changelog
 * v2.1.3 - Added cross-platform path seperator for org replace function

diff --git a/packages/pancake-sass/package.json b/packages/pancake-sass/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@gov.au/pancake-sass",
-	"version": "2.2.4",
+	"version": "2.3.4",
 	"description": "A Pancake plugin to compile sass files.",
 	"keywords": [
 		"npm",

diff --git a/packages/pancake-sass/src/sass.js b/packages/pancake-sass/src/sass.js
@@ -45,7 +45,7 @@ const GetPath = ( module, modules, baseLocation, npmOrg ) => {
 	let location;
 	npmOrgs.forEach( org => {
 		if( baseLocation.includes( org ) ){
-			location = baseLocation.replace( `${ org }/`, '' );
+			location = baseLocation.replace( `${ org }${ Path.sep }`, '' );
 		}
 	});