further replace require with import, remove index.js hardcoding

zapier · Feb 3, 2025 · 55ecb90 · 55ecb90
1 parent 1d58d09
commit 55ecb90
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 41 deletions.
diff --git a/packages/cli/src/oclif/commands/invoke.js b/packages/cli/src/oclif/commands/invoke.js
@@ -13,7 +13,7 @@ const { DateTime, IANAZone } = require('luxon');
 
 const BaseCommand = require('../ZapierBaseCommand');
 const { buildFlags } = require('../buildFlags');
-const { localAppCommand, getLocalAppHandler } = require('../../utils/local');
+const { localAppCommand } = require('../../utils/local');
 const { startSpinner, endSpinner } = require('../../utils/display');
 
 const ACTION_TYPE_PLURALS = {
@@ -407,10 +407,6 @@ class InvokeCommand extends BaseCommand {
     }
 
     if (!_.isEmpty(env)) {
-      // process.env changed, so we need to reload the modules that have loaded
-      // the old values of process.env
-      getLocalAppHandler({ reload: true });
-
       // Save envs so the user won't have to re-enter them if the command fails
       await appendEnv(env);
       console.warn('CLIENT_ID and CLIENT_SECRET saved to .env file.');

diff --git a/packages/cli/src/utils/local.js b/packages/cli/src/utils/local.js
@@ -1,22 +1,11 @@
-const path = require('path');
-
 const { findCorePackageDir } = require('./misc');
 
-const getLocalAppHandler = ({ reload = false, baseEvent = {} } = {}) => {
-  const entryPath = `${process.cwd()}/index`;
-  const rootPath = path.dirname(require.resolve(entryPath));
+const getLocalAppHandler = async () => {
   const corePackageDir = findCorePackageDir();
-
-  if (reload) {
-    Object.keys(require.cache).forEach((cachePath) => {
-      if (cachePath.startsWith(rootPath)) {
-        delete require.cache[cachePath];
-      }
-    });
-  }
   let appRaw, zapier;
+
   try {
-    appRaw = require(entryPath);
+    appRaw = await import(process.cwd());
     zapier = require(corePackageDir);
   } catch (err) {
     // this err.stack doesn't give a nice traceback at all :-(
@@ -53,6 +42,5 @@ const localAppCommand = async (event) => {
 };
 
 module.exports = {
-  getLocalAppHandler,
   localAppCommand,
 };
diff --git a/packages/core/include/zapierwrapper.js b/packages/core/include/zapierwrapper.js
@@ -1,7 +1,6 @@
 // not intended to be loaded via require() - copied during build step
-import path from 'node:path';
 import zapier from 'zapier-platform-core';
 
-const appPath = path.resolve(process.cwd(), 'index.js');
+const appPath = process.cwd();
 
 export const handler = zapier.createAppHandler(appPath);
diff --git a/packages/core/src/tools/create-lambda-handler.js b/packages/core/src/tools/create-lambda-handler.js
@@ -161,28 +161,30 @@ const getAppRawOverride = (rpc, appRawOverride) => {
 
 // Sometimes tests want to pass in an app object defined directly in the test,
 // so allow for that, and an event.appRawOverride for "buildless" apps.
-const loadApp = (event, rpc, appRawOrPath) => {
-  return new ZapierPromise((resolve, reject) => {
-    const appRaw = _.isString(appRawOrPath)
-      ? require(appRawOrPath)
-      : appRawOrPath;
-
-    if (event && event.appRawOverride) {
-      if (
-        Array.isArray(event.appRawOverride) &&
-        event.appRawOverride.length > 1 &&
-        !event.appRawOverride[0]
-      ) {
-        event.appRawOverride[0] = appRaw;
-      }
+const loadApp = async (event, rpc, appRawOrPath) => {
+  let appRaw;
+  if (typeof appRawOrPath === 'string') {
+    appRaw = await import(appRawOrPath);
+    if (appRaw.default) {
+      appRaw = appRaw.default;
+    }
+  } else {
+    appRaw = appRawOrPath;
+  }
 
-      return getAppRawOverride(rpc, event.appRawOverride)
-        .then((appRawOverride) => resolve(appRawOverride))
-        .catch((err) => reject(err));
+  if (event && event.appRawOverride) {
+    if (
+      Array.isArray(event.appRawOverride) &&
+      event.appRawOverride.length > 1 &&
+      !event.appRawOverride[0]
+    ) {
+      event.appRawOverride[0] = appRaw;
     }
 
-    return resolve(appRaw);
-  });
+    return getAppRawOverride(rpc, event.appRawOverride);
+  }
+
+  return appRaw;
 };
 
 const createLambdaHandler = (appRawOrPath) => {