fix dynamic requires using .default for es module interop

webpack · Dec 23, 2022 · fd6ceac · fd6ceac
1 parent abceae4
commit fd6ceac
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 12 deletions.
diff --git a/lib/getHashDigest.ts b/lib/getHashDigest.ts
@@ -71,20 +71,20 @@ export default function getHashDigest(buffer: Buffer, algorithm: string | "xxhas
 
   if (algorithm === "xxhash64") {
     if (createXXHash64 === undefined) {
-      createXXHash64 = require("./hash/xxhash64");
+      createXXHash64 = require("./hash/xxhash64").default;
 
       if (BatchedHash === undefined) {
-        BatchedHash = require("./hash/BatchedHash");
+        BatchedHash = require("./hash/BatchedHash").default;
       }
     }
 
     hash = new BatchedHash(createXXHash64() as unknown as Hash);
   } else if (algorithm === "md4") {
     if (createMd4 === undefined) {
-      createMd4 = require("./hash/md4");
+      createMd4 = require("./hash/md4").default;
 
       if (BatchedHash === undefined) {
-        BatchedHash = require("./hash/BatchedHash");
+        BatchedHash = require("./hash/BatchedHash").default;
       }
     }
 
@@ -94,7 +94,7 @@ export default function getHashDigest(buffer: Buffer, algorithm: string | "xxhas
       crypto = require("crypto");
 
       if (BulkUpdateDecorator === undefined) {
-        BulkUpdateDecorator = require("./hash/BulkUpdateDecorator");
+        BulkUpdateDecorator = require("./hash/BulkUpdateDecorator").default;
       }
     }
 
@@ -104,7 +104,7 @@ export default function getHashDigest(buffer: Buffer, algorithm: string | "xxhas
       crypto = require("crypto");
 
       if (BulkUpdateDecorator === undefined) {
-        BulkUpdateDecorator = require("./hash/BulkUpdateDecorator");
+        BulkUpdateDecorator = require("./hash/BulkUpdateDecorator").default;
       }
     }
 

diff --git a/lib/interpolateName.ts b/lib/interpolateName.ts
@@ -104,7 +104,9 @@ export default function interpolateName(loaderContext: LoaderContext<{}>, name:
   }
 
   if (
-    // @ts-ignore
+    // @ts-ignore LoaderContext doesn't even have options defined on it?
+    // If we chagned this to be `loaderContext.getOptions()` it would still not have
+    // the customInterpolateName function defined on it.
     typeof loaderContext.options === "object" &&
     // @ts-ignore
     typeof loaderContext.options.customInterpolateName === "function"

diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
     "typescript": "^4.9.4",
     "webpack": "^5.64.4"
   },
-  "main": "lib/index.js",
+  "main": "dist/index.js",
   "files": [
     "lib"
   ]

diff --git a/test/getHashDigest.test.js b/test/getHashDigest.test.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const loaderUtils = require("../dist");
+const loaderUtils = require("../");
 
 describe("getHashDigest()", () => {
   [

diff --git a/test/interpolateName.test.js b/test/interpolateName.test.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const loaderUtils = require("../dist");
+const loaderUtils = require("../");
 
 describe("interpolateName()", () => {
   function run(tests) {

diff --git a/test/isUrlRequest.test.js b/test/isUrlRequest.test.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const loaderUtils = require("../dist");
+const loaderUtils = require("../");
 
 function ExpectedError(regex) {
   this.regex = regex;

diff --git a/test/urlToRequest.test.js b/test/urlToRequest.test.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const loaderUtils = require("../dist");
+const loaderUtils = require("../");
 
 function ExpectedError(regex) {
   this.regex = regex;