Merge pull request #1111 from aspnet/rel/2.0.0

Complete the lstat patching for #1101
dotnet · Jul 12, 2017 · a0a710a · a0a710a
2 parents d5f5ad7 + 576e3de
commit a0a710a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js b/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js
@@ -149,7 +149,7 @@
 	var path = __webpack_require__(3);
 	var startsWith = function (str, prefix) { return str.substring(0, prefix.length) === prefix; };
 	var appRootDir = process.cwd();
-	function patchedLStat(pathToStatLong) {
+	function patchedLStat(pathToStatLong, fsReqWrap) {
 	    try {
 	        // If the lstat completes without errors, we don't modify its behavior at all
 	        return origLStat.apply(this, arguments);
@@ -165,7 +165,7 @@
 	            // ancestor directories are symlinks or not. If there's a genuine file
 	            // permissions issue, it will still surface later when Node actually
 	            // tries to read the file.
-	            return origLStat.call(this, appRootDir);
+	            return origLStat.call(this, appRootDir, fsReqWrap);
 	        }
 	        else {
 	            // In any other case, preserve the original error

diff --git a/src/Microsoft.AspNetCore.NodeServices/TypeScript/Util/PatchModuleResolutionLStat.ts b/src/Microsoft.AspNetCore.NodeServices/TypeScript/Util/PatchModuleResolutionLStat.ts
@@ -2,7 +2,7 @@ import * as path from 'path';
 const startsWith = (str: string, prefix: string) => str.substring(0, prefix.length) === prefix;
 const appRootDir = process.cwd();
 
-function patchedLStat(pathToStatLong: string) {
+function patchedLStat(pathToStatLong: string, fsReqWrap?: any) {
     try {
         // If the lstat completes without errors, we don't modify its behavior at all
         return origLStat.apply(this, arguments);
@@ -19,7 +19,7 @@ function patchedLStat(pathToStatLong: string) {
             // ancestor directories are symlinks or not. If there's a genuine file
             // permissions issue, it will still surface later when Node actually
             // tries to read the file.
-            return origLStat.call(this, appRootDir);
+            return origLStat.call(this, appRootDir, fsReqWrap);
         } else {
             // In any other case, preserve the original error
             throw ex;