Merge pull request #1575 from NativeScript/cankov/symlink-change-detect

Gulp fails miserably with symlinks in node_modules, use glob and stat instead

Author: PanayotCankov

lib/tools/broccoli/builder.ts

@@ -5,10 +5,9 @@ import * as constants from "../../../lib/constants";
 import * as path from "path";
 import Future = require("fibers/future");
 import * as destCopyLib from "./node-modules-dest-copy";
+import * as fiberBootstrap from "../../common/fiber-bootstrap";
 
-let gulp = require("gulp");
-let vinylFilterSince = require("vinyl-filter-since");
-let through = require("through2");
+let glob = require("glob");
 
 export class Builder implements IBroccoliBuilder {
 	constructor(
@@ -28,30 +27,50 @@ export class Builder implements IBroccoliBuilder {
 			let nodeModulesPath = path.join(projectDir, constants.NODE_MODULES_FOLDER_NAME);
 			let nodeModules: any = {};
 
-			if(lastModifiedTime) {
-				let pipeline = gulp.src(path.join(projectDir, "node_modules/**"))
-				.pipe(vinylFilterSince(lastModifiedTime))
-				.pipe(through.obj( (chunk: any, enc: any, cb: Function) => {
-					if(chunk.path === nodeModulesPath) {
-						isNodeModulesModified = true;
-					}
-
-					if(!isNodeModulesModified) {
-						let rootModuleName = chunk.path.split(nodeModulesPath)[1].split(path.sep)[1];
-						let rootModuleFullPath = path.join(nodeModulesPath, rootModuleName);
-						nodeModules[rootModuleFullPath] = rootModuleFullPath;
-					}
-
-					cb(null);
-				}))
-				.pipe(gulp.dest(absoluteOutputPath));
-
-				let future = new Future<void>();
-
-				pipeline.on('end', (err: Error, data: any) => {
-					if(err) {
-						future.throw(err);
-					} else {
+			if (lastModifiedTime) {
+				let future = new Future();
+
+				let match = new glob.Glob("node_modules/**", {
+					cwd: projectDir,
+					follow: true,
+					stat: true
+				}, (er: Error, files: string[]) => {
+					fiberBootstrap.run(() => {
+						if (er) {
+							if (!future.isResolved()) {
+								future.throw(er);
+							}
+							match.abort();
+							return;
+						}
+						for (let i = 0, l = files.length; i < l; i++) {
+							let file = files[i],
+								resolvedPath = path.join(projectDir, file),
+								relativePath = path.relative(projectDir, resolvedPath);
+							let stat = match.statCache[resolvedPath] || match.statCache[relativePath];
+							if (!stat) {
+								match.statCache[resolvedPath] = stat = this.$fs.getFsStats(resolvedPath).wait();
+							}
+
+							if (stat.mtime <= lastModifiedTime) {
+								continue;
+							}
+							if (file === constants.NODE_MODULES_FOLDER_NAME) {
+								isNodeModulesModified = true;
+								match.abort();
+								if (!future.isResolved()) {
+									future.return();
+								}
+								return;
+							}
+							let rootModuleName = path.normalize(file).split(path.sep)[1];
+							let rootModuleFullPath = path.join(nodeModulesPath, rootModuleName);
+							nodeModules[rootModuleFullPath] = rootModuleFullPath;
+						}
+					});
+				});
+				match.on("end", () => {
+					if (!future.isResolved()) {
 						future.return();
 					}
 				});

package.json

@@ -40,7 +40,7 @@
     "fibers": "https://github.com/icenium/node-fibers/tarball/v1.0.6.3",
     "filesize": "3.1.2",
     "gaze": "0.5.2",
-    "gulp": "3.9.0",
+    "glob": "^7.0.3",
     "iconv-lite": "0.4.11",
     "inquirer": "0.9.0",
     "ios-sim-portable": "~1.0.20",
@@ -69,9 +69,7 @@
     "shelljs": "0.5.3",
     "tabtab": "https://github.com/Icenium/node-tabtab/tarball/master",
     "temp": "0.8.3",
-    "through2": "2.0.0",
     "utf-8-validate": "https://github.com/telerik/utf-8-validate/tarball/v1.0.1.1",
-    "vinyl-filter-since": "2.0.2",
     "winreg": "0.0.17",
     "ws": "0.7.1",
     "xcode": "https://github.com/NativeScript/node-xcode/archive/1.4.0.tar.gz",