remove fs-plus

Author: sertonix

lib/snippet-body-parser.js

@@ -3,7 +3,7 @@ try {
   parser = require('./snippet-body')
 } catch (error) {
   const {allowUnsafeEval} = require('loophole')
-  const fs = require('fs-plus')
+  const fs = require('fs')
   const PEG = require('pegjs')
 
   const grammarSrc = fs.readFileSync(require.resolve('./snippet-body.pegjs'), 'utf8')

lib/snippets.js

@@ -3,7 +3,7 @@ const {Emitter, Disposable, CompositeDisposable, File} = require('atom')
 const _ = require('underscore-plus')
 const async = require('async')
 const CSON = require('season')
-const fs = require('fs-plus')
+const fs = require('fs')
 const ScopedPropertyStore = require('scoped-property-store')
 
 const Snippet = require('./snippet')
@@ -273,8 +273,9 @@ module.exports = {
   },
 
   loadSnippetsDirectory (snippetsDirPath, callback) {
-    fs.isDirectory(snippetsDirPath, isDirectory => {
-      if (!isDirectory) { return callback(null, {}) }
+    fs.stat(snippetsDirPath, (error, stat) => {
+      if (error) return callback(null, {});
+      if (!stat.isDirectory()) return callback(null, {});
 
       fs.readdir(snippetsDirPath, (error, entries) => {
         if (error) {

package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "async": "~0.2.6",
     "atom-select-list": "^0.7.0",
-    "fs-plus": "^3.0.0",
     "loophole": "^1",
+    "mkdirp": "~0.5.1",
     "pegjs": "~0.8.0",
     "scoped-property-store": "^0.17.0",
     "season": "^6.0.2",

spec/snippet-loading-spec.js

@@ -1,5 +1,6 @@
 const path = require('path');
-const fs = require('fs-plus');
+const fs = require('fs');
+const mkdirp = require('mkdirp');
 const temp = require('temp').track();
 
 describe("Snippet Loading", () => {
@@ -126,6 +127,7 @@ describe("Snippet Loading", () => {
 
   describe("when ~/.atom/snippets.json exists", () => {
     beforeEach(() => {
+      mkdirp.sync(configDirPath);
       fs.writeFileSync(path.join(configDirPath, 'snippets.json'), `\
 {
   ".foo": {
@@ -154,6 +156,7 @@ describe("Snippet Loading", () => {
 
     describe("when that file changes", () => {
       it("reloads the snippets", () => {
+        mkdirp.sync(configDirPath);
         fs.writeFileSync(path.join(configDirPath, 'snippets.json'), `\
 {
 ".foo": {
@@ -172,6 +175,7 @@ describe("Snippet Loading", () => {
         });
 
         runs(() => {
+          mkdirp.sync(configDirPath);
           fs.writeFileSync(path.join(configDirPath, 'snippets.json'), "");
         });
 
@@ -182,6 +186,7 @@ describe("Snippet Loading", () => {
 
   describe("when ~/.atom/snippets.cson exists", () => {
     beforeEach(() => {
+      mkdirp.sync(configDirPath);
       fs.writeFileSync(path.join(configDirPath, 'snippets.cson'), `\
 ".foo":
   "foo snippet":
@@ -206,6 +211,7 @@ describe("Snippet Loading", () => {
 
     describe("when that file changes", () => {
       it("reloads the snippets", () => {
+        mkdirp.sync(configDirPath);
         fs.writeFileSync(path.join(configDirPath, 'snippets.cson'), `\
 ".foo":
   "foo snippet":
@@ -220,6 +226,7 @@ describe("Snippet Loading", () => {
         });
 
         runs(() => {
+          mkdirp.sync(configDirPath);
           fs.writeFileSync(path.join(configDirPath, 'snippets.cson'), "");
         });