feat: remove cjs wrapper

webpack · Dec 16, 2021 · 3c6c6dc · 3c6c6dc
1 parent 5bb33a9
commit 3c6c6dc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/utils/setupOutputFileSystem.js b/src/utils/setupOutputFileSystem.js
@@ -1,6 +1,5 @@
 const path = require("path");
-
-const { createFsFromVolume, Volume } = require("memfs");
+const memfs = require("memfs");
 
 /** @typedef {import("webpack").MultiCompiler} MultiCompiler */
 /** @typedef {import("../index.js").IncomingMessage} IncomingMessage */
@@ -34,7 +33,7 @@ function setupOutputFileSystem(context) {
 
     outputFileSystem = outputFileSystemFromOptions;
   } else {
-    outputFileSystem = createFsFromVolume(new Volume());
+    outputFileSystem = memfs.createFsFromVolume(new memfs.Volume());
     // TODO: remove when we drop webpack@4 support
     // @ts-ignore
     outputFileSystem.join = path.join.bind(path);

diff --git a/test/helpers/runner.js b/test/helpers/runner.js
@@ -4,7 +4,7 @@ const express = require("express");
 const webpack = require("webpack");
 const merge = require("deepmerge");
 
-const middleware = require("../../dist").default;
+const middleware = require("../../dist");
 const defaultConfig = require("../fixtures/webpack.config");
 
 const configEntries = [];

diff --git a/test/utils/setupOutputFileSystem.test.js b/test/utils/setupOutputFileSystem.test.js
@@ -20,7 +20,9 @@ describe("setupOutputFileSystem", () => {
       compiler: {},
       options: {},
     };
+
     setupOutputFileSystem(context);
+
     // make sure that this is the default fs created
     expect(context.compiler.outputFileSystem.testFs).toBeTruthy();
     expect(context.outputFileSystem.testFs).toBeTruthy();
@@ -36,7 +38,9 @@ describe("setupOutputFileSystem", () => {
       },
       options: {},
     };
+
     setupOutputFileSystem(context);
+
     context.compiler.compilers.forEach((comp) => {
       expect(comp.outputFileSystem).toBeTruthy();
     });
@@ -49,6 +53,7 @@ describe("setupOutputFileSystem", () => {
         outputFileSystem: {},
       },
     };
+
     expect(() => {
       setupOutputFileSystem(context);
     }).toThrow(/join/);
@@ -63,6 +68,7 @@ describe("setupOutputFileSystem", () => {
         },
       },
     };
+
     expect(() => {
       setupOutputFileSystem(context);
     }).toThrow(/mkdirp/);
@@ -78,7 +84,9 @@ describe("setupOutputFileSystem", () => {
         },
       },
     };
+
     setupOutputFileSystem(context);
+
     expect(context.outputFileSystem).toEqual(context.options.outputFileSystem);
   });
 });