Fix detection of npm folder

.gitignore

@@ -63,3 +63,4 @@ OurUmbraco.Site/[Aa]ssets/js/app.min.js
 OurUmbraco.Site/App_Data/migrations/*.txt
 OurUmbraco.Site/apidocs/
 OurUmbraco.Site/App_Data/Documentation/
+build/tools/node*

OurUmbraco.Client/gulpfile.js

@@ -10,7 +10,7 @@ var gulp         = require('gulp'),
     imageMin     = require('gulp-imagemin'),
     clean        = require('gulp-clean'),
     svgmin       = require('gulp-svgmin'),
-    cmq          = require('gulp-combine-media-queries');
+    cmq          = require('gulp-group-css-media-queries');
 	rename       = require('gulp-rename');
 
 var settings = {

OurUmbraco.Client/package.json

@@ -4,25 +4,25 @@
   "description": "Umbraco Our gulpjs config",
   "main": "gulpfile.js",
   "private": true,
-  "dependencies": {
+  "dependencies": {},
-  },
   "devDependencies": {
-    "gulp": "3.8.x",
+    "gulp": "^3.9.1",
-    "gulp-util": "2.2.x",
+    "gulp-autoprefixer": "^3.1.0",
-    "gulp-watch": "0.6.x",
+    "gulp-clean": "*",
-    "gulp-minify-css": "1.1.x",
+    "gulp-concat": "^2.6.0",
-    "node-sass": "3.2.x",
+    "gulp-group-css-media-queries": "^1.1.0",
-    "gulp-sass": "2.0.x",
+    "gulp-imagemin": "^3.0.2",
-    "gulp-combine-media-queries": "0.1.x",
+    "gulp-jshint": "^2.0.1",
-    "gulp-imagemin": "0.6.x",
+    "gulp-minify-css": "^1.2.4",
-    "gulp-autoprefixer": "2.3.1",
+    "gulp-rename": "*",
-    "gulp-uglify": "0.3.x",
+    "gulp-sass": "^2.3.2",
-    "gulp-jshint": "1.6.x",
+    "gulp-svgmin": "^1.2.2",
-    "gulp-concat": "2.2.x",
+    "gulp-uglify": "^2.0.0",
-    "jshint-stylish": "0.2.x",
+    "gulp-util": "^3.0.7",
-    "gulp-clean": "0.3.x",
+    "gulp-watch": "^4.3.9",
-    "gulp-svgmin": "0.4.x",
+    "jshint": "^2.9.2",
-    "gulp-rename": "1.2.x"
+    "jshint-stylish": "^2.2.0",
+    "node-sass": "^3.8.0"
   },
   "scripts": {
     "test": "gulp build --verbose"

OurUmbraco.Site/Assets/images/down.svg

@@ -1 +1 @@
-<svg height="50" viewBox="0 0 50 50" width="50" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M0 0h50v50H0z"/><path fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2" d="M35.89 30.054L25 40.944l-10.89-10.89M25 9v31.445"/></svg>
+<svg height="50" viewBox="0 0 50 50" width="50" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M0 0h50v50H0z"/><path fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2" d="M35.891 30.054L25 40.943l-10.89-10.89M25 9v31.445"/></svg>

OurUmbraco.Site/Assets/images/selectdown.svg

@@ -1 +1 @@
-<svg height="512" viewBox="0 0 512 512" width="512" xmlns="http://www.w3.org/2000/svg"><path d="M396.6 160l19.4 20.7L256 352 96 180.7l19.3-20.7L256 310.5"/></svg>
+<svg height="512" viewBox="0 0 512 512" width="512" xmlns="http://www.w3.org/2000/svg"><path d="M396.6 160l19.4 20.7L256 352 96 180.7l19.3-20.7L256 310.5z"/></svg>

OurUmbraco.Site/Assets/images/selectdown_our.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-281 286 36 30"><path fill="#98D768" d="M-267 316l8-5v-8l14-17h-36l14 17"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-281 286 36 30"><path fill="#98D768" d="M-267 316l8-5v-8l14-17h-36l14 17z"/></svg>

OurUmbraco.Site/Assets/images/selectdown_unfocus.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-281 286 36 30"><path fill="#191919" d="M-267 316l8-5v-8l14-17h-36l14 17"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-281 286 36 30"><path fill="#191919" d="M-267 316l8-5v-8l14-17h-36l14 17z"/></svg>

build/BuildClientFiles.bat

@@ -3,32 +3,47 @@ SETLOCAL
 	:: SETLOCAL is on, so changes to the path not persist to the actual user's path
 	
 SET release=%1
-ECHO Installing Npm NuGet Package
+SET toolsFolder=%CD%\tools\
-
-SET nuGetFolder=%CD%\..\packages\
-ECHO Configured packages folder: %nuGetFolder%
 ECHO Current folder: %CD%
 
-%CD%\..\.nuget\NuGet.exe install Npm.js -OutputDirectory %nuGetFolder%  -Verbosity quiet
+SET nodeFileName=node-v4.5.0-win-x86.7z
+SET nodeExtractFolder=%toolsFolder%node.js.450
+IF NOT EXIST %nodeExtractFolder% (
+	ECHO Downloading node.js
+	powershell -Command "(New-Object Net.WebClient).DownloadFile('http://nodejs.org/dist/v4.5.0/%nodeFileName%', '%toolsFolder%\%nodeFileName%')"
+	ECHO Extracting node.js
+	%toolsFolder%\7za.exe x %toolsFolder%\%nodeFileName% -o%nodeExtractFolder% -aos > nul
+)
+FOR /f "delims=" %%A in ('dir %nodeExtractFolder%\node* /b') DO SET "nodePath=%nodeExtractFolder%\%%A"
 
-for /f "delims=" %%A in ('dir %nuGetFolder%node.js.* /b') do set "nodePath=%nuGetFolder%%%A\"
+SET nuGetFolder=%CD%\..\packages\
-for /f "delims=" %%A in ('dir %nuGetFolder%npm.js.* /b') do set "npmPath=%nuGetFolder%%%A\tools\"
+FOR /f "delims=" %%A in ('dir %nuGetFolder%npm.js.* /b') DO SET "npmPath=%nuGetFolder%%%A\tools\"
+IF [%npmPath%] == [] GOTO :installnpm 
+IF NOT [%npmPath%] == [] GOTO :build
 
-REM Ensures that we look for the just downloaded NPM, not whatever the user has installed on their machine
+:installnpm
-path=%npmPath%;%nodePath%
+	ECHO Downloading npm
+	ECHO Configured packages folder: %nuGetFolder%	
+	ECHO Installing Npm NuGet Package
+	%CD%\..\.nuget\NuGet.exe install Npm.js -OutputDirectory %nuGetFolder%  -Verbosity quiet
+	REM Ensures that we look for the just downloaded NPM, not whatever the user has installed on their machine
+	FOR /f "delims=" %%A in ('dir %nuGetFolder%npm.js.* /b') DO SET "npmPath=%nuGetFolder%%%A\tools\"
+	GOTO :build
 
-ECHO %path%
+:build
+	PATH=%npmPath%;%nodePath%
+	SET buildFolder=%CD%
 
-SET buildFolder=%CD%
+	ECHO Change directory to %CD%\..\OurUmbraco.Client\
+	CD %CD%\..\OurUmbraco.Client\
 
-ECHO Change directory to %CD%\..\OurUmbraco.Client\
+	ECHO Do npm install and the gulp build
-CD %CD%\..\OurUmbraco.Client\
+	SET npm="%nodePath%\node.exe" "%npmPath%node_modules\npm\bin\npm-cli.js" %*
+	%npm% cache clean
+	%npm% install
+	%npm% install -g install gulp -g
+	gulp build
 
-ECHO Do npm install and the gulp build
+	ECHO Move back to the build folder
-call npm cache clean
+	CD %buildFolder% 
-call npm install
+	GOTO :EOF
-call npm install -g install gulp -g --quiet
-call gulp build
-
-ECHO Move back to the build folder
-CD %buildFolder% 

build/RunGulp.bat

@@ -1,33 +1,49 @@
 @ECHO OFF
 SETLOCAL
 	:: SETLOCAL is on, so changes to the path not persist to the actual user's path
-
+	
 SET release=%1
-ECHO Installing Npm NuGet Package
+SET toolsFolder=%CD%\tools\
-
-SET nuGetFolder=%CD%\..\packages\
-ECHO Configured packages folder: %nuGetFolder%
 ECHO Current folder: %CD%
 
-%CD%\..\.nuget\NuGet.exe install Npm.js -OutputDirectory %nuGetFolder%  -Verbosity quiet
+SET nodeFileName=node-v4.5.0-win-x86.7z
+SET nodeExtractFolder=%toolsFolder%node.js.450
+IF NOT EXIST %nodeExtractFolder% (
+	ECHO Downloading node.js
+	powershell -Command "(New-Object Net.WebClient).DownloadFile('http://nodejs.org/dist/v4.5.0/%nodeFileName%', '%toolsFolder%\%nodeFileName%')"
+	ECHO Extracting node.js
+	%toolsFolder%\7za.exe x %toolsFolder%\%nodeFileName% -o%nodeExtractFolder% -aos > nul
+)
+FOR /f "delims=" %%A in ('dir %nodeExtractFolder%\node* /b') DO SET "nodePath=%nodeExtractFolder%\%%A"
 
-for /f "delims=" %%A in ('dir %nuGetFolder%node.js.* /b') do set "nodePath=%nuGetFolder%%%A\"
+SET nuGetFolder=%CD%\..\packages\
-for /f "delims=" %%A in ('dir %nuGetFolder%npm.js.* /b') do set "npmPath=%nuGetFolder%%%A\tools\"
+FOR /f "delims=" %%A in ('dir %nuGetFolder%npm.js.* /b') DO SET "npmPath=%nuGetFolder%%%A\tools\"
+IF [%npmPath%] == [] GOTO :installnpm 
+IF NOT [%npmPath%] == [] GOTO :build
 
-REM Ensures that we look for the just downloaded NPM, not whatever the user has installed on their machine
+:installnpm
-path=%npmPath%;%nodePath%
+	ECHO Downloading npm
+	ECHO Configured packages folder: %nuGetFolder%	
+	ECHO Installing Npm NuGet Package
+	%CD%\..\.nuget\NuGet.exe install Npm.js -OutputDirectory %nuGetFolder%  -Verbosity quiet
+	REM Ensures that we look for the just downloaded NPM, not whatever the user has installed on their machine
+	FOR /f "delims=" %%A in ('dir %nuGetFolder%npm.js.* /b') DO SET "npmPath=%nuGetFolder%%%A\tools\"
+	GOTO :build
 
-ECHO %path%
+:build
+	PATH=%npmPath%;%nodePath%
+	SET buildFolder=%CD%
 
-SET buildFolder=%CD%
+	ECHO Change directory to %CD%\..\OurUmbraco.Client\
+	CD %CD%\..\OurUmbraco.Client\
 
-ECHO Change directory to %CD%\..\OurUmbraco.Client\
+	ECHO Do npm install and the gulp build
-CD %CD%\..\OurUmbraco.Client\
+	SET npm="%nodePath%\node.exe" "%npmPath%node_modules\npm\bin\npm-cli.js" %*
+	%npm% cache clean
+	%npm% install
+	%npm% install -g install gulp -g
+	gulp
 
-ECHO Do npm install and the gulp build
+	ECHO Move back to the build folder
-call npm install
+	CD %buildFolder% 
-call npm install -g install gulp -g --quiet
+	GOTO :EOF
-call gulp
-
-ECHO Move back to the build folder
-CD %buildFolder%