update zapierwrapper to mjs

zapier · Feb 22, 2025 · ee0b284 · ee0b284
1 parent da76631
commit ee0b284
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 31 deletions.
diff --git a/packages/cli/src/tests/utils/build.js b/packages/cli/src/tests/utils/build.js
@@ -111,8 +111,9 @@ describe('build (runs slowly)', function () {
     const tmpIndexPath = path.join(tmpProjectDir, 'index.js');
 
     fs.outputFileSync(
-      path.join(tmpProjectDir, 'zapierwrapper.js'),
-      "console.log('hello!')",
+      path.join(tmpProjectDir, 'zapierwrapper.mjs'),
+      `console.log('hello!');
+      export const appPath = '${tmpProjectDir}/index.js';`,
     );
     fs.outputFileSync(tmpIndexPath, "console.log('hello!')");
     fs.chmodSync(tmpIndexPath, 0o700);
@@ -153,8 +154,9 @@ describe('build (runs slowly)', function () {
     const tmpIndexPath = path.join(tmpProjectDir, 'index.js');
 
     fs.outputFileSync(
-      path.join(tmpProjectDir, 'zapierwrapper.js'),
-      "console.log('hello!')",
+      path.join(tmpProjectDir, 'zapierwrapper.mjs'),
+      `console.log('hello!')
+      export const appPath = '${tmpProjectDir}/index.js';`,
     );
     fs.outputFileSync(tmpIndexPath, "console.log('hello!')");
     fs.chmodSync(tmpIndexPath, 0o700);
@@ -196,8 +198,9 @@ describe('build (runs slowly)', function () {
     const tmpZapierAppPath = path.join(tmpProjectDir, '.zapierapprc');
 
     fs.outputFileSync(
-      path.join(tmpProjectDir, 'zapierwrapper.js'),
-      "console.log('hello!')",
+      path.join(tmpProjectDir, 'zapierwrapper.mjs'),
+      `console.log('hello!')
+      export const appPath = '${tmpProjectDir}/index.js';`,
     );
     fs.outputFileSync(tmpIndexPath, "console.log('hello!')");
     fs.outputFileSync(tmpReadmePath, 'README');
@@ -251,8 +254,9 @@ describe('build (runs slowly)', function () {
     const tmpEnvironmentPath = path.join(tmpProjectDir, '.environment');
 
     fs.outputFileSync(
-      path.join(tmpProjectDir, 'zapierwrapper.js'),
-      "console.log('hello!')",
+      path.join(tmpProjectDir, 'zapierwrapper.mjs'),
+      `console.log('hello!')
+      export const appPath = '${tmpProjectDir}/index.js';`,
     );
     fs.outputFileSync(tmpIndexPath, "console.log('hello!')");
     fs.chmodSync(tmpIndexPath, 0o700);

diff --git a/packages/cli/src/utils/build.js b/packages/cli/src/utils/build.js
@@ -64,6 +64,7 @@ const requiredFiles = async ({ cwd, entryPoints }) => {
     metafile: true,
     logLevel: 'warning',
     external: ['../test/userapp'],
+    format: 'esm',
   });
 
   return Object.keys(result.metafile.inputs).map((path) =>
@@ -160,11 +161,8 @@ const writeZipFromPaths = (dir, zipPath, paths) => {
 };
 
 const makeZip = async (dir, zipPath, disableDependencyDetection) => {
-  const entryPoints = [
-    path.resolve(dir, 'zapierwrapper.js'),
-    // TODO do not hardcode index.js here!
-    path.resolve(dir, 'index.js'),
-  ];
+  const { appPath } = await import(`${dir}/zapierwrapper.mjs`);
+  const entryPoints = [path.resolve(dir, 'zapierwrapper.mjs'), appPath];
 
   let paths;
 
@@ -202,9 +200,9 @@ const makeSourceZip = async (dir, zipPath) => {
 };
 
 // Similar to utils.appCommand, but given a ready to go app
-// with a different location and ready to go zapierwrapper.js.
+// with a different location and ready to go zapierwrapper.mjs.
 const _appCommandZapierWrapper = async (dir, event) => {
-  const app = await import(`${dir}/zapierwrapper.js`);
+  const app = await import(`${dir}/zapierwrapper.mjs`);
   event = { ...event, calledFromCli: true };
   return new Promise((resolve, reject) => {
     app.handler(event, {}, (err, resp) => {
@@ -382,7 +380,7 @@ const _buildFunc = async ({
 
   if (printProgress) {
     endSpinner();
-    startSpinner('Applying entry point file');
+    startSpinner('Applying entry point files');
   }
 
   // TODO: should this routine for include exist elsewhere?
@@ -392,20 +390,14 @@ const _buildFunc = async ({
       'node_modules',
       constants.PLATFORM_PACKAGE,
       'include',
-      'zapierwrapper.js',
+      'zapierwrapper.mjs',
     ),
   );
   await writeFile(
-    path.join(tmpDir, 'zapierwrapper.js'),
+    path.join(tmpDir, 'zapierwrapper.mjs'),
     zapierWrapperBuf.toString(),
   );
 
-  // copy root directory to node_modules, excluding root directory itself
-  // this allows the import in _appCommandZapierWrapper to succeed
-  await copyDir(wdir, path.join(tmpDir, 'node_modules', path.basename(wdir)), {
-    filter: (src) => src !== wdir,
-  });
-
   if (printProgress) {
     endSpinner();
     startSpinner('Building app definition.json');

diff --git a/packages/core/include/zapierwrapper.js b/packages/core/include/zapierwrapper.js
diff --git a/packages/core/include/zapierwrapper.mjs b/packages/core/include/zapierwrapper.mjs
@@ -0,0 +1,22 @@
+// not intended to be loaded via require() - copied during build step
+import { createRequire } from 'module';
+import path from 'node:path';
+import zapier from 'zapier-platform-core';
+
+const require = createRequire(import.meta.url);
+let appPath;
+
+try {
+    appPath = require.resolve(process.cwd());
+} catch (e) {
+    // if it failed, try to resolve the app path with self-referencing
+    // in case index.js is not in the root directory
+    try {
+        appPath = require.resolve(path.basename(process.cwd()));
+    } catch (e2) {
+        throw new Error("Failed to resolve app path - make sure you have a package.json in the root directory");
+    }
+}
+
+export { appPath };
+export const handler = zapier.createAppHandler(appPath);