pr suggestions + another external

mongodb-js · Mar 4, 2024 · ab71a9d · ab71a9d
1 parent fda6c2c
commit ab71a9d
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 20 deletions.
diff --git a/config/webpack.base.config.js b/config/webpack.base.config.js
@@ -29,6 +29,7 @@ module.exports = {
     "node:crypto": "commonjs2 crypto",
     "node:http": "commonjs2 http",
     "node:https": "commonjs2 https",
+    "node:zlib": "commonjs2 zlib",
     electron: "commonjs2 electron" // optional dep of the OIDC plugin
   },
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/import-node-fetch/package.json b/packages/import-node-fetch/package.json
@@ -34,13 +34,15 @@
   "mongosh": {
     "unitTestsOnly": true
   },
+  "dependencies": {
+    "node-fetch": "^3.3.2"
+  },
   "devDependencies": {
     "@mongodb-js/eslint-config-mongosh": "^1.0.0",
     "@mongodb-js/prettier-config-devtools": "^1.0.1",
     "@mongodb-js/tsconfig-mongosh": "^1.0.0",
     "depcheck": "^1.4.3",
     "eslint": "^7.25.0",
-    "prettier": "^2.8.8",
-    "node-fetch": "^3.3.2"
+    "prettier": "^2.8.8"
   }
 }
diff --git a/packages/import-node-fetch/src/global.d.ts b/packages/import-node-fetch/src/global.d.ts
@@ -0,0 +1 @@
+declare const __webpack_require__: unknown;
diff --git a/packages/import-node-fetch/src/index.spec.ts b/packages/import-node-fetch/src/index.spec.ts
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import importNodeFetch from './';
 
-describe('makeMultilineJSIntoSingleLine', function () {
+describe('import-node-fetch', function () {
   it('Fails to import node-fetch normally', async function () {
     let failed = false;
     try {

diff --git a/packages/import-node-fetch/src/index.ts b/packages/import-node-fetch/src/index.ts
@@ -15,7 +15,8 @@ export default async function importNodeFetch(): Promise<TNodeFetch> {
       err &&
       typeof err === 'object' &&
       'code' in err &&
-      err.code === 'ERR_REQUIRE_ESM'
+      err.code === 'ERR_REQUIRE_ESM' &&
+      typeof __webpack_require__ === 'undefined'
     ) {
       // This means that the import() above was transpiled to require()
       // and that that require() called failed because it saw actual on-disk ESM.