Revert "LPS-91967 Use liferay-binaries-cache-2017 to cache Yarn packa…

…ges"

This reverts commit a35f675.

build-common.xml

@@ -1907,7 +1907,6 @@ rerun your task.
 					<propertyref name="aspectj.configuration" />
 					<propertyref name="baseline.jar.report.level" />
 					<propertyref name="baseline.jar.report.only.dirty.packages" />
-					<propertyref name="build.binaries.cache.dir" />
 					<propertyref name="git.working.branch.name" />
 					<propertyref name="jacoco.agent.configuration" />
 					<propertyref name="jacoco.agent.jar" />

modules/util.gradle

@@ -38,6 +38,8 @@ task wrapper(type: Wrapper)
 task wrapperSubrepo(type: Wrapper)
 
 FileTree libDependenciesFileTree = fileTree(dir: "../lib", include: "*/dependencies.properties")
+File nodeModulesCacheDir = new File(rootDir, "node_modules_cache")
+File userNodeModulesCacheDir = new File(System.getProperty("user.home"), ".liferay/node-modules-cache/" + Integer.toHexString(rootDir.canonicalPath.hashCode()))
 
 Map<File, Properties> libDependenciesMap = libDependenciesFileTree.collectEntries {
 	Properties properties = GUtil.loadProperties(it)
@@ -91,37 +93,41 @@ repositories {
 }
 
 setUpYarn {
+	File userNodeModulesCacheYarnLockFile = new File(userNodeModulesCacheDir, "yarn.lock")
+	File yarnLockFile = new File(rootDir, "yarn.lock")
+
 	args "install"
 	args "--frozen-lockfile"
 
 	scriptFile = new File(projectDir, "yarn-1.13.0.js")
 
 	doFirst {
-		String cacheDir = project.findProperty("build.binaries.cache.dir")
-
-		if (cacheDir) {
-			File yarnCacheDir = new File(rootDir.parentFile, cacheDir + "/.yarn")
+		String registry = project.findProperty("nodejs.npm.ci.registry")
 
-			if (yarnCacheDir.parentFile.exists()) {
-				logger.lifecycle "Using cache {}", yarnCacheDir
+		if (yarnLockFile.exists() && registry) {
+			logger.lifecycle "Using registry {}", registry
 
-				args "--cache-folder"
-				args yarnCacheDir
-			}
+			yarnLockFile.text = yarnLockFile.text.replaceAll("https://registry.yarnpkg.com", registry)
 		}
 
-		String registry = project.findProperty("nodejs.npm.ci.registry")
+		if (userNodeModulesCacheYarnLockFile.exists() && yarnLockFile.exists() && (userNodeModulesCacheYarnLockFile.text == yarnLockFile.text)) {
+			logger.lifecycle "Restoring node_modules_cache from {}", userNodeModulesCacheDir
 
-		if (registry) {
-			File yarnLockFile = new File(rootDir, "yarn.lock")
+			FileUtil.syncDir(project, userNodeModulesCacheDir, nodeModulesCacheDir, true)
 
-			if (yarnLockFile.exists()) {
-				logger.lifecycle "Using registry {}", registry
+			logger.lifecycle "Running Yarn install in offline mode"
 
-				yarnLockFile.text = yarnLockFile.text.replaceAll("https://registry.yarnpkg.com", registry)
-			}
+			args "--offline"
 		}
 	}
+
+	doLast {
+		logger.lifecycle "Caching node_modules_cache in {}", userNodeModulesCacheDir
+
+		FileUtil.syncDir(project, nodeModulesCacheDir, userNodeModulesCacheDir, true)
+
+		userNodeModulesCacheYarnLockFile.text = yarnLockFile.text
+	}
 }
 
 wrapper {