feat: Support Dynamic Import in Webpack Context

.github/workflows/main.yml

@@ -10,11 +10,9 @@ jobs:
       fail-fast: false
       matrix:
         node-version:
-          - 14
-          - 12
-          - 10
-          - 8
-          - 6
+          - 22
+          - 20
+          - 18
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4

heapdump.js

@@ -3,13 +3,13 @@ const heapdump = require('heapdump'); // eslint-disable-line import/no-unresolve
 const importFresh = require('.');
 
 for (let i = 0; i < 100000; i++) {
-	require('./fixture.js')();
+	require('./fixture')();
 }
 
 heapdump.writeSnapshot(`require-${Date.now()}.heapsnapshot`);
 
 for (let i = 0; i < 100000; i++) {
-	importFresh('./fixture.js')();
+	importFresh('./fixture')();
 }
 
 heapdump.writeSnapshot(`import-fresh-${Date.now()}.heapsnapshot`);

index.js

@@ -3,6 +3,9 @@ const path = require('path');
 const resolveFrom = require('resolve-from');
 const parentModule = require('parent-module');
 
+// Use plain require in webpack context for dynamic import
+const requireFunc = typeof __webpack_require__ === 'function' ? __non_webpack_require__ : require; // eslint-disable-line camelcase,no-undef
+
 module.exports = moduleId => {
 	if (typeof moduleId !== 'string') {
 		throw new TypeError('Expected a string');
@@ -13,7 +16,7 @@ module.exports = moduleId => {
 	const cwd = parentPath ? path.dirname(parentPath) : __dirname;
 	const filePath = resolveFrom(cwd, moduleId);
 
-	const oldModule = require.cache[filePath];
+	const oldModule = requireFunc.cache[filePath];
 	// Delete itself from module parent
 	if (oldModule && oldModule.parent) {
 		let i = oldModule.parent.children.length;
@@ -25,9 +28,9 @@ module.exports = moduleId => {
 		}
 	}
 
-	delete require.cache[filePath]; // Delete module from cache
+	delete requireFunc.cache[filePath]; // Delete module from cache
 
-	const parent = require.cache[parentPath]; // If `filePath` and `parentPath` are the same, cache will already be deleted so we won't get a memory leak in next step
+	const parent = requireFunc.cache[parentPath]; // If `filePath` and `parentPath` are the same, cache will already be deleted so we won't get a memory leak in next step
 
-	return parent === undefined ? require(filePath) : parent.require(filePath); // In case cache doesn't have parent, fall back to normal require
+	return parent === undefined ? requireFunc(filePath) : parent.require(filePath); // In case cache doesn't have parent, fall back to normal require
 };

package.json

@@ -16,7 +16,7 @@
 	},
 	"sideEffects": false,
 	"engines": {
-		"node": ">=6"
+		"node": ">=18"
 	},
 	"scripts": {
 		"test": "xo && ava && tsd",
@@ -36,13 +36,13 @@
 		"bypass"
 	],
 	"dependencies": {
-		"parent-module": "^1.0.0",
-		"resolve-from": "^4.0.0"
+		"parent-module": "^2.0.0",
+		"resolve-from": "^5.0.0"
 	},
 	"devDependencies": {
 		"ava": "^1.0.1",
 		"heapdump": "^0.3.12",
-		"tsd": "^0.7.3",
+		"tsd": "^0.31.0",
 		"xo": "^0.23.0"
 	}
 }