refactor: Isolate import invocations

serverless · Dec 8, 2022 · fe62096 · fe62096
1 parent ac1e0db
commit fe62096
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/lib/plugins/aws/invoke-local/index.js b/lib/plugins/aws/invoke-local/index.js
@@ -836,7 +836,7 @@ class AwsInvokeLocal {
         return require(modulePath);
       } catch (error) {
         if (error.code === 'ERR_REQUIRE_ESM') {
-          return await import(`file:///${modulePath}.js`);
+          return await require('../../../utils/import-esm')(`${modulePath}.js`);
         } else if (error.code === 'MODULE_NOT_FOUND') {
           // Attempt to require handler with `.cjs` extension
           pathToHandler = `${pathToHandler}.cjs`;

diff --git a/lib/utils/import-esm.js b/lib/utils/import-esm.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = async (modPath) => import(`file:///${modPath}`);
diff --git a/lib/utils/require-with-import-fallback.js b/lib/utils/require-with-import-fallback.js
@@ -6,7 +6,7 @@ module.exports = async (modPath) => {
   } catch (error) {
     // Fallback to import() if the runtime supports native ESM
     if (error.code === 'ERR_REQUIRE_ESM') {
-      return (await import(`file:///${modPath}`)).default;
+      return (await require('./import-esm')(modPath)).default;
     }
     throw error;
   }

diff --git a/package.json b/package.json
@@ -132,8 +132,7 @@
       },
       {
         "files": [
-          "lib/utils/require-with-import-fallback.js",
-          "lib/plugins/aws/invoke-local/index.js"
+          "lib/utils/import-esm.js"
         ],
         "parserOptions": {
           "ecmaVersion": 2020