Merge pull request #639 from dustinsoftware/fix-windows

Fix `yarn build` on Windows
Shopify · Nov 20, 2018 · 4076145 · 4076145
2 parents 9c1c398 + 61f66fa
commit 4076145
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -39,8 +39,8 @@
     "check": "npm-run-all lint ts test",
     "check:ci": "npm-run-all lint ts test:ci",
     "depcruise-validate": "depcruise src --validate",
-    "clean": "rimraf build build-esnext esnext styles types docs 'build-intermediate' 'index.*' './src/styles/polaris-tokens' './tophat/build' 'styles.{css,scss}'",
-    "clean:build": "rimraf 'build/!(cache|coverage)' build-esnext esnext styles types docs 'build-intermediate' 'index.*' './src/styles/polaris-tokens' './tophat/build' 'styles.{css,scss}'",
+    "clean": "rimraf build build-esnext esnext styles types docs \"build-intermediate\" \"index.*\" \"./src/styles/polaris-tokens\" \"./tophat/build\" \"styles.{css,scss}\"",
+    "clean:build": "rimraf \"build/!(cache|coverage)\" build-esnext esnext styles types docs \"build-intermediate\" \"index.*\" \"./src/styles/polaris-tokens\" \"./tophat/build\" \"styles.{css,scss}\"",
     "optimize": "node ./scripts/optimize.js",
     "prebuild": "npm-run-all clean:build optimize copy-polaris-tokens",
     "build": "babel-node ./scripts/build.js",

diff --git a/scripts/sass-build.js b/scripts/sass-build.js
@@ -46,7 +46,7 @@ export default function generateSassBuild(destinationDir) {
     const regex = /:global\s*\(([^)]+)\)|:global\s*{\s*([^}]+)\s*}\s*/;
 
     glob.sync(join(srcDir, '/**/*.scss')).forEach((srcFile) => {
-      const sassFile = srcFile.replace(srcDir, '');
+      const sassFile = srcFile.replace(srcDir.replace(/\\/g, '/'), '');
       let file = readFileSync(srcFile, 'utf8');
       file = file.replace(new RegExp(regex, 'g'), '$1$2');
       outputFileSync(join(destDir, sassFile), file);