npm-base: Move cache dir to persistent location

Author: Michael Davis

classes/npm-base.bbclass

@@ -11,7 +11,6 @@ NPM_REGISTRY ?= "https://registry.npmjs.org/"
 NPM_IGNORE = "${WORKDIR}/.npmignore"
 
 NPM ?= "npm"
-NPM_CACHE_DIR = "${TMPDIR}/npm_cache/${PF}"
 NPM_HOME_DIR = "${TMPDIR}/npm_home/${PF}"
 NPM_ARCH ?= "${@nodejs_map_dest_cpu(d.getVar('TARGET_ARCH', True), d)}"
 NPM_LD ?= "${CXX}"
@@ -40,7 +39,13 @@ oe_runnpm() {
 
 	mkdir -p "${NPM_HOME_DIR}"
 
-	export NPM_CONFIG_CACHE="${NPM_CACHE_DIR}"
+	if [ "${NPM_CACHE_DIR}" == "" ]; then
+		NPM_VERSION=`${NPM} -v`
+		export NPM_CONFIG_CACHE="${DL_DIR}/npm_v${NPM_VERSION}_${TARGET_ARCH}_cache/${PF}"
+	else
+		export NPM_CONFIG_CACHE=${NPM_CACHE_DIR}
+	fi
+
 	export NPM_CONFIG_DEV="false"
 
 	bbnote NPM target architecture: ${NPM_ARCH}
@@ -68,7 +73,6 @@ oe_runnpm() {
 # Native npm
 
 NPM_NATIVE ?= "npm"
-NPM_CACHE_DIR_NATIVE = "${TMPDIR}/npm_cache_native/${PF}"
 NPM_HOME_DIR_NATIVE = "${TMPDIR}/npm_home_native/${PF}"
 NPM_ARCH_NATIVE ?= "${@nodejs_map_dest_cpu(d.getVar('BUILD_ARCH', True), d)}"
 NPM_LD_NATIVE ?= "${BUILD_CXX}"
@@ -95,7 +99,13 @@ oe_runnpm_native() {
 
 	mkdir -p "${NPM_HOME_DIR_NATIVE}"
 
-	export NPM_CONFIG_CACHE="${NPM_CACHE_DIR_NATIVE}"
+	if [ "${NPM_CACHE_DIR_NATIVE}" == "" ]; then
+		NPM_VERSION=`${NPM} -v`
+		export NPM_CONFIG_CACHE="${DL_DIR}/npm_v${NPM_VERSION}_${TARGET_ARCH}_native/${PF}"
+	else
+		export NPM_CONFIG_CACHE=${NPM_CACHE_DIR_NATIVE}
+	fi
+
 	export NPM_CONFIG_DEV="false"
 
 	bbnote NPM native architecture: ${NPM_ARCH_NATIVE}