use memfs instead of memory-fs

webpack · Feb 9, 2019 · b6853ac · b6853ac
1 parent 8e54af2
commit b6853ac
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/lib/fs.js b/lib/fs.js
@@ -2,7 +2,10 @@
 
 const fs = require('fs');
 const path = require('path');
-const MemoryFileSystem = require('memory-fs');
+const { fs: memfs } = require('memfs');
+// borrow join and normalize from memory-fs
+memfs.join = require('memory-fs/lib/join');
+memfs.normalize = require('memory-fs/lib/normalize');
 const { colors } = require('webpack-log');
 const NodeOutputFileSystem = require('webpack/lib/node/NodeOutputFileSystem');
 const DevMiddlewareError = require('./DevMiddlewareError');
@@ -60,12 +63,12 @@ module.exports = {
 
     let fileSystem;
     // store our files in memory
-    const isMemoryFs = !compiler.compilers && compiler.outputFileSystem instanceof MemoryFileSystem;
+    const isMemoryFs = !compiler.compilers && compiler.outputFileSystem === memfs;
 
     if (isMemoryFs) {
       fileSystem = compiler.outputFileSystem;
     } else {
-      fileSystem = new MemoryFileSystem();
+      fileSystem = memfs;
       compiler.outputFileSystem = fileSystem;
     }
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,6 +16,7 @@
     "release": "standard-version"
   },
   "dependencies": {
+    "memfs": "^2.15.0",
     "memory-fs": "~0.4.1",
     "mime": "^2.3.1",
     "range-parser": "^1.0.3",

diff --git a/test/tests/server.js b/test/tests/server.js
@@ -390,7 +390,7 @@ describe('Server', () => {
     });
 
     it('request to non-public path', (done) => {
-      request(app).get('/').expect(404, done);
+      request(app).get('/nonpublic/').expect(404, done);
     });
   });