Merge pull request #101 from govau/develop

Reverted location pathing, corrected changelog
govau · Feb 22, 2019 · 937a4e5 · 937a4e5
2 parents f703ce4 + 8c800f6
commit 937a4e5
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/packages/pancake-sass/CHANGELOG.md b/packages/pancake-sass/CHANGELOG.md
@@ -5,8 +5,9 @@ Pancake Sass plugin
 
 
 ## Versions
-
-* [v2.2.0  - Multiple organisations](v220)
+* [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)
+* [v2.1.2  - Multiple organisations](v212)
 * [v2.1.1  - Update dependencies](v211)
 * [v2.1.0  - Replace sass with node-sass](v210)
 * [v2.0.1  - Update dependencies](v201)
@@ -30,11 +31,26 @@ Pancake Sass plugin
 
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-## v2.2.0
+## v2.1.4
+
+- Reverted pathing issue with pancake-sass, corrected changelog
+
+
+## v2.1.3
+
+- Added cross-platform path seperator for org replace function
+
+
+## v2.1.2
 
 - Multiple organisations
 
 
+## v2.1.1
+
+- Update dependencies
+
+
 ## v2.1.0
 
 - Replace `sass` with `node-sass`

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.1.4 - Reverted pathing issue with pancake-sass, corrected changelog
 * v2.1.3 - Added cross-platform path seperator for org replace function
 * v2.1.2 - Multiple organisations
 * v2.1.1 - Update dependencies

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.1.3",
+	"version": "2.1.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 @@ export const GetPath = ( module, modules, baseLocation, npmOrg ) => {
 	let location;
 	npmOrgs.forEach( org => {
 		if( baseLocation.includes( org ) ){
-			location = baseLocation.replace( `${ org }${ Path.sep }`, '' );
+			location = baseLocation.replace( `${ org }/`, '' );
 		}
 	});