jitsu-cli 2.14.0-beta.5 → 2.14.0-beta.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jitsu-cli",
-  "version": "2.14.0-beta.5",
+  "version": "2.14.0-beta.56",
   "description": "",
   "author": "Jitsu Dev Team <dev@jitsu.com>",
   "publishConfig": {
@@ -11,45 +11,21 @@
   },
   "license": "MIT",
   "private": false,
-  "scripts": {
-    "clean": "rm -rf ./dist",
-    "typecheck": "tsc --noEmit",
-    "build": "tsc -p . && webpack",
-    "run": "pnpm build && node dist/main.js",
-    "login": "pnpm build && node dist/main.js login",
-    "init child": "pnpm build && node dist/main.js init",
-    "build child": "pnpm build && node dist/main.js build",
-    "run child": "pnpm build && node dist/main.js run -e ./data/page.json",
-    "test child": "pnpm build && node dist/main.js test",
-    "deploy child": "pnpm build && node dist/main.js deploy"
-  },
   "dependencies": {
+    "esbuild": "^0.27.0",
     "figlet": "^1.6.0",
     "jest-cli": "^29.7.0",
-    "tslib": "catalog:",
-    "typescript": "catalog:"
+    "tslib": "^2.6.3",
+    "typescript": "^5.6.3"
   },
   "devDependencies": {
-    "@swc-node/register": "catalog:",
-    "swc-loader": "catalog:",
-    "@swc/core": "catalog:",
-    "@jitsu/common-config": "workspace:*",
-    "@jitsu/functions-lib": "workspace:*",
-    "@jitsu/protocols": "workspace:*",
-    "@rollup/plugin-commonjs": "^28.0.2",
-    "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^16.0.0",
-    "@rollup/plugin-terser": "^0.4.3",
-    "@rollup/plugin-typescript": "^11.1.3",
     "@types/chalk": "^2.2.0",
     "@types/commander": "^2.12.2",
     "@types/express": "^4.17.21",
     "@types/inquirer": "^9.0.3",
-    "@types/lodash": "catalog:",
-    "@types/node": "catalog:",
-    "@vitest/ui": "catalog:",
-    "@types/webpack": "^5.28.5",
-    "@webpack-cli/generators": "^3.0.7",
+    "@types/lodash": "^4.17.7",
+    "@types/node": "^18.15.3",
+    "@vitest/ui": "^2.1.8",
     "chalk": "^5.3.0",
     "commander": "^11.0.0",
     "cross-fetch": "^4.0.0",
@@ -58,17 +34,26 @@
     "inquirer": "^9.2.11",
     "jest": "^29.7.0",
     "json5": "^2.2.3",
-    "juava": "workspace:*",
-    "lodash": "catalog:",
-    "node-fetch": "^3.3.2",
-    "node-loader": "^2.0.0",
+    "lodash": "^4.17.21",
     "prismjs": "^1.30.0",
-    "rollup": "^3.29.5",
     "semver": "^7.5.4",
-    "ts-loader": "^9.5.1",
-    "ts-node": "catalog:",
-    "vitest": "catalog:",
-    "webpack": "catalog:",
-    "webpack-cli": "catalog:"
+    "tsx": "^4.21.0",
+    "vitest": "^2.1.8",
+    "@jitsu/functions-lib": "2.14.0-beta.56",
+    "juava": "0.0.0",
+    "@jitsu/protocols": "2.14.0-beta.56",
+    "@jitsu/common-config": "0.0.0"
+  },
+  "scripts": {
+    "clean": "rm -rf ./dist ./compiled",
+    "typecheck": "tsc --noEmit",
+    "build": "tsc && tsx build.mts",
+    "run": "pnpm build && node dist/main.js",
+    "login": "pnpm build && node dist/main.js login",
+    "init child": "pnpm build && node dist/main.js init",
+    "build child": "pnpm build && node dist/main.js build",
+    "run child": "pnpm build && node dist/main.js run -e ./data/page.json",
+    "test child": "pnpm build && node dist/main.js test",
+    "deploy child": "pnpm build && node dist/main.js deploy"
   }
-}
+}

package/src/commands/build.ts

@@ -1,10 +1,6 @@
 import path from "path";
-import { mkdirSync, readdirSync, writeFileSync, existsSync, lstatSync } from "fs";
-import typescript from "@rollup/plugin-typescript";
-import resolve from "@rollup/plugin-node-resolve";
-import commonjs from "@rollup/plugin-commonjs";
-import rollupJson from "@rollup/plugin-json";
-import { ModuleFormat, rollup } from "rollup";
+import { mkdirSync, readdirSync, existsSync, lstatSync } from "fs";
+import * as esbuild from "esbuild";
 import { exec } from "child_process";
 import { loadPackageJson } from "./shared";
 import { b, green, red } from "../lib/chalk-code-highlight";
@@ -89,32 +85,31 @@ async function buildFile(projectDir: string, dir: string, fileName: string) {
   const funcFile = path.resolve(projectDir, "src", path.join(dir, fileName));
   process.chdir(projectDir);
 
-  const rollupPlugins = [
-    typescript(),
-    resolve({ preferBuiltins: false }),
-    commonjs(),
-    rollupJson(),
-    // terser(),
-  ];
+  mkdirSync(path.resolve(projectDir, "dist/" + dir), { recursive: true });
+  const compiledFunctionPath = `dist/${dir}/${fileName.replace(".ts", ".js")}`;
 
-  const bundle = await rollup({
-    input: [funcFile],
-    plugins: rollupPlugins,
+  await esbuild.build({
+    entryPoints: [funcFile],
+    absWorkingDir: projectDir,
+    bundle: true,
+    platform: "neutral",
+    format: "esm",
+    outfile: path.resolve(projectDir, compiledFunctionPath),
     external: ["@jitsu/functions-lib"],
     logLevel: "silent",
+    loader: {
+      ".json": "json",
+    },
+    // Resolve dependencies from the user's project node_modules
+    nodePaths: [path.resolve(projectDir, "node_modules")],
   });
 
-  let format: ModuleFormat = "es";
-  let output = await bundle.generate({
-    dir: projectDir,
-    format: format,
-  });
-
-  mkdirSync(path.resolve(projectDir, "dist/" + dir), { recursive: true });
-  const compiledFunctionPath = `dist/${dir}/${fileName.replace(".ts", ".js")}`;
-  writeFileSync(path.resolve(projectDir, compiledFunctionPath), output.output[0].code);
   //to verify that function is readable
-  const compiledFunction = await getFunctionFromFilePath(path.resolve(projectDir, compiledFunctionPath), "function");
+  const compiledFunction = await getFunctionFromFilePath(
+    projectDir,
+    path.resolve(projectDir, compiledFunctionPath),
+    "function"
+  );
   console.log(
     [`${green(`✓`)} Function ${b(fileName)} compiled successfully`, `  slug = ${b(compiledFunction.meta.slug)}`]
       .filter(Boolean)

package/src/commands/deploy.ts

@@ -3,7 +3,6 @@ import { homedir } from "os";
 import inquirer from "inquirer";
 import { existsSync, readdirSync, readFileSync } from "fs";
 import { loadPackageJson } from "./shared";
-import fetch from "node-fetch";
 import cuid from "cuid";
 import { b, green, red } from "../lib/chalk-code-highlight";
 import { getFunctionFromFilePath } from "../lib/compiled-function";
@@ -151,6 +150,7 @@ async function deployFunctions(
       })`
     );
     await deployFunction(
+      projectDir,
       { host, apikey },
       packageJson,
       workspace,
@@ -162,6 +162,7 @@ async function deployFunctions(
 }
 
 async function deployFunction(
+  projectDir: string,
   { host, apikey }: Args,
   packageJson: any,
   workspace: Workspace,
@@ -171,7 +172,7 @@ async function deployFunction(
 ) {
   const code = readFileSync(file, "utf-8");
 
-  const wrapped = await getFunctionFromFilePath(file, kind, profileBuilders);
+  const wrapped = await getFunctionFromFilePath(projectDir, file, kind, profileBuilders);
   const meta = wrapped.meta;
   if (meta) {
     console.log(`  meta: slug=${meta.slug}, name=${meta.name || "not set"}`);

package/src/lib/compiled-function.ts

@@ -1,7 +1,8 @@
 import { JitsuFunction } from "@jitsu/protocols/functions";
 import fs from "fs";
-import { rollup } from "rollup";
+import * as esbuild from "esbuild";
 import { assertDefined, assertTrue } from "juava";
+import path from "path";
 
 export type CompiledFunction = {
   func: JitsuFunction;
@@ -14,10 +15,11 @@ export type CompiledFunction = {
 };
 
 function getSlug(filePath: string) {
-  return filePath.split("/").pop()?.replace(".ts", "");
+  return filePath.split("/").pop()?.replace(".ts", "").replace(".js", "");
 }
 
 export async function getFunctionFromFilePath(
+  projectDir: string,
   filePath: string,
   kind: "function" | "profile",
   profileBuilders: any[] = []
@@ -28,29 +30,34 @@ export async function getFunctionFromFilePath(
     throw new Error(`Cannot load function from file ${filePath}: path is not a file`);
   }
 
-  const bundle = await rollup({
-    input: [filePath],
-    external: ["@jitsu/functions-lib"],
-    logLevel: "silent",
+  // Transform ESM to CJS without bundling - just convert the module format
+  // This avoids resolving dependencies which may be symlinked
+  const result = await esbuild.transform(fs.readFileSync(filePath, "utf-8"), {
+    loader: filePath.endsWith(".ts") ? "ts" : "js",
+    format: "cjs",
+    platform: "node",
   });
 
-  const output = await bundle.generate({
-    file: filePath,
-    format: "commonjs",
-  });
-
-  const exports: Record<string, any> = {} as Record<string, any>;
-  eval(output.output[0].code);
+  const code = result.code;
+  const module: { exports: Record<string, any> } = { exports: {} };
+  const exports = module.exports;
+  // Provide require stub for external imports that we mock out
+  const require = (id: string) => {
+    // External dependencies are not needed for config extraction
+    return {};
+  };
+  eval(code);
+  // After eval, module.exports contains the actual exports
+  const moduleExports = module.exports;
   assertDefined(
-    exports.default,
-    `Function from ${filePath} doesn't have default export. Exported symbols: ${Object.keys(exports)}`
+    moduleExports.default,
+    `Function from ${filePath} doesn't have default export. Exported symbols: ${Object.keys(moduleExports)}`
   );
-  assertTrue(typeof exports.default === "function", `Default export from ${filePath} is not a function`);
-
-  let name = exports.config?.name || exports.config?.slug || getSlug(filePath);
-  let id = exports.config?.id;
+  assertTrue(typeof moduleExports.default === "function", `Default export from ${filePath} is not a function`);
+  let name = moduleExports.config?.name || moduleExports.config?.slug || getSlug(filePath);
+  let id = moduleExports.config?.id;
   if (kind === "profile") {
-    const profileBuilderId = exports.config?.profileBuilderId;
+    const profileBuilderId = moduleExports.config?.profileBuilderId;
     const profileBuilder = profileBuilders.find(pb => pb.id === profileBuilderId);
     if (!profileBuilder) {
       throw new Error(
@@ -67,12 +74,12 @@ export async function getFunctionFromFilePath(
   }
 
   return {
-    func: exports.default,
+    func: moduleExports.default,
     meta: {
-      slug: exports.config?.slug || getSlug(filePath),
+      slug: moduleExports.config?.slug || getSlug(filePath),
       id: id,
       name: name,
-      description: exports.config?.description,
+      description: moduleExports.config?.description,
     },
   };
 }