Avoid more uses of fs.exists and fs.existsSync.

Ben Newman · Ben Newman · commit d5695290b114 · 2016-05-10T16:56:47.000-04:00
Part of meteor#6921.
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.512.0"
+  version: "2.512.1"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/stylus/plugin/compile-stylus.js b/packages/stylus/plugin/compile-stylus.js
@@ -93,8 +93,9 @@ class StylusCompiler extends MultiFileCachingCompiler {
           // if it is not a custom syntax path, it could be a lookup in a folder
           for (let i = paths.length - 1; i >= 0; i--) {
             const joined = path.join(paths[i], importPath);
-            if (fs.exists(joined))
+            if (statOrNull(joined)) {
               return [joined];
+            }
           }
         }
 
@@ -177,3 +178,11 @@ class StylusCompiler extends MultiFileCachingCompiler {
     });
   }
 }
+
+function statOrNull(path) {
+  try {
+    return fs.statSync(path);
+  } catch (e) {
+    return null;
+  }
+}
diff --git a/tools/fs/files.js b/tools/fs/files.js
@@ -1429,7 +1429,11 @@ wrapFsFunc("rename", [0, 1]);
 
 // The fs.exists method is deprecated in Node v4:
 // https://nodejs.org/api/fs.html#fs_fs_exists_path_callback
-files.exists = function (path) {
+files.exists =
+files.existsSync = function (path, callback) {
+  if (typeof callback === "function") {
+    throw new Error("Passing a callback to files.exists is no longer supported");
+  }
   return !! files.statOrNull(path);
 };
 
diff --git a/tools/static-assets/server/boot.js b/tools/static-assets/server/boot.js
@@ -150,6 +150,14 @@ Fiber(function () {
       });
     }
 
+    function statOrNull(path) {
+      try {
+        return fs.statSync(path);
+      } catch (e) {
+        return null;
+      }
+    }
+
     var Npm = {
       /**
        * @summary Require a package that was specified using
@@ -171,7 +179,7 @@ Fiber(function () {
             name.split("/", 1)[0]
           ));
 
-          if (fs.existsSync(packageBase)) {
+          if (statOrNull(packageBase)) {
             return fullPath = files.convertToOSPath(
               files.pathResolve(nodeModuleBase, name)
             );
diff --git a/tools/static-assets/server/npm-require.js b/tools/static-assets/server/npm-require.js
@@ -6,9 +6,17 @@ var files = require('./mini-files.js');
 var serverJson = require("./server-json.js");
 var topLevelIdPattern = /^[^./]/;
 
+function statOrNull(path) {
+  try {
+    return fs.statSync(path);
+  } catch (e) {
+    return null;
+  }
+}
+
 function findAppDirHelper(absOSPath) {
   if (fs.statSync(absOSPath).isDirectory() &&
-      fs.existsSync(path.join(absOSPath, ".meteor"))) {
+      statOrNull(path.join(absOSPath, ".meteor"))) {
     return absOSPath;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -93,8 +93,9 @@ class StylusCompiler extends MultiFileCachingCompiler {`
`93`	`93`	`// if it is not a custom syntax path, it could be a lookup in a folder`
`94`	`94`	`for (let i = paths.length - 1; i >= 0; i--) {`
`95`	`95`	`const joined = path.join(paths[i], importPath);`
`96`		`- if (fs.exists(joined))`
	`96`	`+ if (statOrNull(joined)) {`
`97`	`97`	`return [joined];`
	`98`	`+ }`
`98`	`99`	`}`
`99`	`100`	`}`
`100`	`101`
`@@ -177,3 +178,11 @@ class StylusCompiler extends MultiFileCachingCompiler {`
`177`	`178`	`});`
`178`	`179`	`}`
`179`	`180`	`}`
	`181`	`+`
	`182`	`+function statOrNull(path) {`
	`183`	`+ try {`
	`184`	`+ return fs.statSync(path);`
	`185`	`+ } catch (e) {`
	`186`	`+ return null;`
	`187`	`+ }`
	`188`	`+}`