Skip to content

Commit 89524ae

Browse files
committed
use memfs instead of memory-fs
1 parent 8e54af2 commit 89524ae

File tree

4 files changed

+29
-5
lines changed

4 files changed

+29
-5
lines changed

lib/fs.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22

33
const fs = require('fs');
44
const path = require('path');
5-
const MemoryFileSystem = require('memory-fs');
5+
const { fs: memfs } = require('memfs');
6+
// borrow join and normalize from memory-fs
7+
memfs.join = require('memory-fs/lib/join');
8+
memfs.normalize = require('memory-fs/lib/normalize');
69
const { colors } = require('webpack-log');
710
const NodeOutputFileSystem = require('webpack/lib/node/NodeOutputFileSystem');
811
const DevMiddlewareError = require('./DevMiddlewareError');
912

1013
const { mkdirp } = new NodeOutputFileSystem();
1114

15+
1216
module.exports = {
1317
toDisk(context) {
1418
const compilers = context.compiler.compilers || [context.compiler];
@@ -60,12 +64,12 @@ module.exports = {
6064

6165
let fileSystem;
6266
// store our files in memory
63-
const isMemoryFs = !compiler.compilers && compiler.outputFileSystem instanceof MemoryFileSystem;
67+
const isMemoryFs = !compiler.compilers && compiler.outputFileSystem === memfs;
6468

6569
if (isMemoryFs) {
6670
fileSystem = compiler.outputFileSystem;
6771
} else {
68-
fileSystem = new MemoryFileSystem();
72+
fileSystem = memfs;
6973
compiler.outputFileSystem = fileSystem;
7074
}
7175

package-lock.json

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"release": "standard-version"
1717
},
1818
"dependencies": {
19+
"memfs": "^2.15.0",
1920
"memory-fs": "~0.4.1",
2021
"mime": "^2.3.1",
2122
"range-parser": "^1.0.3",

test/tests/server.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ describe('Server', () => {
2222
const logLevel = 'error';
2323

2424
function listenShorthand(done) {
25-
return app.listen(8000, '127.0.0.1', (err) => {
25+
return app.listen(3000, '127.0.0.1', (err) => {
2626
if (err) done(err);
2727
done();
2828
});
@@ -390,7 +390,7 @@ describe('Server', () => {
390390
});
391391

392392
it('request to non-public path', (done) => {
393-
request(app).get('/').expect(404, done);
393+
request(app).get('/nonpublic/').expect(404, done);
394394
});
395395
});
396396

0 commit comments

Comments
 (0)