Framework: Pass global npm root to require semver

Since `semver` is not default to node but is included in any npm installation
Automattic · Dec 8, 2015 · 9f8d852 · 9f8d852
1 parent 697a9ef
commit 9f8d852
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -57,7 +57,7 @@ run: welcome githooks-commit install build
 	@$(NODE) build/bundle-$(CALYPSO_ENV).js
 
 node-version:
-	@$(BIN)/check-node-version
+	@NPM_GLOBAL_ROOT=$(shell $(NPM) -g root) $(BIN)/check-node-version
 
 # a helper rule to ensure that a specific module is installed,
 # without relying on a generic `npm install` command

diff --git a/bin/check-node-version b/bin/check-node-version
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 const requiredVersion = require( '../package' ).engines.node,
-	semver = require( 'semver' );
+	semver = require( process.env.NPM_GLOBAL_ROOT + '/npm/node_modules/semver' );
 
 if ( ! semver.satisfies( process.version, requiredVersion ) ) {
 	console.error( 'wp-calypso requires node ' + requiredVersion + '. Please upgrade! See https://nodejs.org for instructions.' );