try to get rid of top-level await

i18next · Nov 21, 2024 · dd21d68 · dd21d68
1 parent 2f975d7
commit dd21d68
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 3.0.1
+
+- try to get rid of top-level await
+
 ### 3.0.0
 
 - fix for Deno 2 and removal of unnecessary .cjs file

diff --git a/lib/request.js b/lib/request.js
@@ -31,7 +31,11 @@ if (typeof fetchApi !== 'function') fetchApi = undefined
 
 if (!fetchApi && !XmlHttpRequestApi && !ActiveXObjectApi) {
   try {
-    fetchApi = (await import('cross-fetch')).default
+    // top-level await is not available on everywhere
+    // fetchApi = (await import('cross-fetch')).default
+    import('cross-fetch').then((mod) => {
+      fetchApi = mod.default
+    }).catch(() => {})
   } catch (e) {}
 }
 

diff --git a/package.json b/package.json
@@ -72,7 +72,7 @@
   },
   "license": "MIT",
   "config": {
-    "fixcjs": "fs.writeFileSync('cjs/request.js', fs.readFileSync('cjs/request.js').toString().replace(`(await Promise.resolve().then(function () {\n      return _interopRequireWildcard(require('cross-fetch'));\n    })).default`, `require('cross-fetch')`))"
+    "fixcjs": "fs.writeFileSync('cjs/request.js', fs.readFileSync('cjs/request.js').toString().replace(`Promise.resolve().then(function () {\n      return _interopRequireWildcard(require('cross-fetch'));\n    }).then(function (mod) {\n      fetchApi = mod.default;\n    }).catch(function () {});`, `fetchApi = require('cross-fetch');`))"
   },
   "scripts": {
     "lint": "eslint .",