TASK: Add node as dependency and remove nvmrc

neos · Feb 13, 2018 · 699e4d3 · 699e4d3
1 parent 88bf868
commit 699e4d3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/.nvmrc b/.nvmrc
diff --git a/Makefile b/Makefile
@@ -30,11 +30,11 @@
 
 
 # Add node_modules and composer binaries to $PATH
-export PATH := $(PATH):./node_modules/.bin:./bin
+export PATH := ./node_modules/.bin:./bin:$(PATH)
 
 # Expected and used node version
 EXPECTED_NODE_VERSION = v8.9.4
-CURRENT_NODE_VERSION = $(shell node -v)
+CURRENT_NODE_VERSION = $(shell ./node_modules/.bin/node -v)
 
 
 ################################################################################
@@ -48,7 +48,7 @@ ifneq ($(CURRENT_NODE_VERSION),$(EXPECTED_NODE_VERSION))
 	@echo We expect $(EXPECTED_NODE_VERSION) \
 		and you are using $(CURRENT_NODE_VERSION)
 	@echo Please install the correct node version.
-	@echo consider using nvm: https://github.com/creationix/nvm
+	@echo you can do so by running `make install`
 	@false
 endif
 

diff --git a/package.json b/package.json
@@ -89,6 +89,7 @@
     "mime-types": "^2.1.10",
     "moment": "^2.20.1",
     "monet": "^0.8.10",
+    "node": "8.9.4",
     "normalize.css": "^7.0.0",
     "plow-js": "^2.1.0",
     "prop-types": "^15.5.10",

diff --git a/yarn.lock b/yarn.lock
@@ -7501,6 +7501,10 @@ netrc@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/netrc/-/netrc-0.1.4.tgz#6be94fcaca8d77ade0a9670dc460914c94472444"
 
+node-bin-setup@^1.0.0:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/node-bin-setup/-/node-bin-setup-1.0.6.tgz#4b5c9bb937ece702d7069b36ca78af4684677528"
+
 node-dir@^0.1.10:
   version "0.1.17"
   resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5"
@@ -7591,6 +7595,12 @@ node-version@1.1.0, node-version@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/node-version/-/node-version-1.1.0.tgz#f437d7ba407e65e2c4eaef8887b1718ba523d4f0"
 
+node@8.9.4:
+  version "8.9.4"
+  resolved "https://registry.yarnpkg.com/node/-/node-8.9.4.tgz#5ab1e5ec49067a25e007e361b5f80de9dc0460fc"
+  dependencies:
+    node-bin-setup "^1.0.0"
+
 nomnom@~1.6.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.6.2.tgz#84a66a260174408fc5b77a18f888eccc44fb6971"