From 4af09224d78306a66815148668c3d65b4aad265e Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Sat, 24 Nov 2018 23:22:50 +0000
Subject: [PATCH] Update node-sass build script for Windows

---
 scripts/build-node-sass-win32.bat             | 13 ++++++++
 ...uild-node-sass.bat => build-node-sass.bat} | 30 +++----------------
 scripts/build-node-sass.js                    |  2 +-
 3 files changed, 18 insertions(+), 27 deletions(-)
 create mode 100644 scripts/build-node-sass-win32.bat
 rename scripts/{rebuild-node-sass.bat => build-node-sass.bat} (51%)

diff --git a/scripts/build-node-sass-win32.bat b/scripts/build-node-sass-win32.bat
new file mode 100644
index 00000000..c4a599fc
--- /dev/null
+++ b/scripts/build-node-sass-win32.bat
@@ -0,0 +1,13 @@
+set "PLATFORM=win32"
+
+set "NODE_API_VERSION=53"
+set "ELECTRON_VERSION=1.6.15"
+
+call ./scripts/build-node-sass.bat %PLATFORM% ia32 %NODE_API_VERSION% %ELECTRON_VERSION%
+call ./scripts/build-node-sass.bat %PLATFORM% x64 %NODE_API_VERSION% %ELECTRON_VERSION%
+
+set "NODE_API_VERSION=64"
+set "ELECTRON_VERSION=4.0.0-beta.7"
+
+call ./scripts/build-node-sass.bat %PLATFORM% ia32 %NODE_API_VERSION% %ELECTRON_VERSION%
+call ./scripts/build-node-sass.bat %PLATFORM% x64 %NODE_API_VERSION% %ELECTRON_VERSION%
diff --git a/scripts/rebuild-node-sass.bat b/scripts/build-node-sass.bat
similarity index 51%
rename from scripts/rebuild-node-sass.bat
rename to scripts/build-node-sass.bat
index 38ac7c7b..ca70c304 100644
--- a/scripts/rebuild-node-sass.bat
+++ b/scripts/build-node-sass.bat
@@ -1,9 +1,9 @@
 @echo off
 
-set "ELECTRON=1.6.15"
-set "PLATFORM=win32"
-set "ARCH=ia32"
-set "VER=53"
+set "ELECTRON=%4"
+set "PLATFORM=%1"
+set "ARCH=%2"
+set "VER=%3"
 set "VENDOR_PATH=.\node_modules\node-sass\vendor"
 set "BUILD_PATH=.\node_modules\node-sass\build\Release\binding.node"
 
@@ -26,25 +26,3 @@ if not exist %BUILD_PATH% (
     echo Copying %BUILD_PATH% to %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER%
     copy %BUILD_PATH% %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER%
 )
-
-set "ARCH=x64"
-
-echo Building %PLATFORM%-%ARCH% bindings
-call ./node_modules/.bin/electron-rebuild -v=%ELECTRON% -a=%ARCH% -m ./node_modules/node-sass
-
-if exist %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER%\binding.node (
-    echo Deleting old %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER%\binding.node
-    del /S /Q %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER%\*
-)
-
-if not exist %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER% (
-    echo Dir %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER% does not exist, creating.
-    mkdir %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER%
-)
-
-if not exist %BUILD_PATH% (
-    echo %BUILD_PATH% Does not exist
-) else (
-    echo Copying %BUILD_PATH% to %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER%
-    copy %BUILD_PATH% %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER%
-)
diff --git a/scripts/build-node-sass.js b/scripts/build-node-sass.js
index aa18a53a..1c21abc6 100644
--- a/scripts/build-node-sass.js
+++ b/scripts/build-node-sass.js
@@ -9,7 +9,7 @@ switch (process.platform) {
         });
         break;
     case 'win32':
-        child_process.execSync(`scripts/rebuild-node-sass.bat`, {
+        child_process.execSync(`scripts/build-node-sass-win32.bat`, {
             stdio: 'inherit'
         });
         break;