jitsu-cli 2.14.0-beta.6 → 2.14.0-beta.60

package/build.mts

@@ -0,0 +1,39 @@
+import * as esbuild from "esbuild";
+import { mkdirSync } from "fs";
+
+// Ensure dist directory exists
+mkdirSync("./dist", { recursive: true });
+
+// External modules that should not be bundled
+// These are either native modules or need to be loaded at runtime
+const externalModules = [
+  // Native/binary modules
+  "figlet", // ASCII art library with data files
+  "fsevents", // macOS-only native file system events
+  "esbuild", // esbuild has native binaries, used at runtime to build user functions
+
+  // Large runtime dependencies
+  "typescript", // TypeScript compiler (large, used at runtime)
+  "jest-cli", // Jest test runner
+];
+
+// Bundle the CLI
+esbuild
+  .build({
+    entryPoints: ["./src/index.ts"],
+    bundle: true,
+    platform: "node",
+    target: "node20",
+    format: "cjs",
+    outfile: "./dist/main.js",
+    sourcemap: true,
+    minify: false,
+    external: externalModules,
+    logLevel: "info",
+    loader: {
+      ".json": "json",
+    },
+  })
+  .then(() => {
+    console.log("\nBuild complete!");
+  });

package/compiled/package.json

@@ -1,6 +1,11 @@
 {
     "name": "jitsu-cli",
-    "version": "2.14.0-beta.6",
+    "version": "2.14.0-beta.60",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/jitsucom/jitsu",
+        "directory": "cli/jitsu-cli"
+    },
     "description": "",
     "author": "Jitsu Dev Team <dev@jitsu.com>",
     "publishConfig": {
@@ -12,9 +17,9 @@
     "license": "MIT",
     "private": false,
     "scripts": {
-        "clean": "rm -rf ./dist",
+        "clean": "rm -rf ./dist ./compiled",
         "typecheck": "tsc --noEmit",
-        "build": "tsc -p . && webpack",
+        "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",
@@ -24,23 +29,16 @@
         "deploy child": "pnpm build && node dist/main.js deploy"
     },
     "dependencies": {
+        "esbuild": "catalog:",
         "figlet": "^1.6.0",
         "jest-cli": "^29.7.0",
         "tslib": "catalog:",
         "typescript": "catalog:"
     },
     "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",
@@ -48,8 +46,6 @@
         "@types/lodash": "catalog:",
         "@types/node": "catalog:",
         "@vitest/ui": "catalog:",
-        "@types/webpack": "^5.28.5",
-        "@webpack-cli/generators": "^3.0.7",
         "chalk": "^5.3.0",
         "commander": "^11.0.0",
         "cross-fetch": "^4.0.0",
@@ -60,15 +56,9 @@
         "json5": "^2.2.3",
         "juava": "workspace:*",
         "lodash": "catalog:",
-        "node-fetch": "^3.3.2",
-        "node-loader": "^2.0.0",
         "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": "catalog:",
+        "vitest": "catalog:"
     }
 }

package/compiled/src/commands/build.js

@@ -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 { 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";
@@ -80,27 +76,23 @@ async function buildFiles(projectDir, dir = "") {
 async function buildFile(projectDir, dir, fileName) {
     const funcFile = path.resolve(projectDir, "src", path.join(dir, fileName));
     process.chdir(projectDir);
-    const rollupPlugins = [
-        typescript(),
-        resolve({ preferBuiltins: false }),
-        commonjs(),
-        rollupJson(),
-    ];
-    const bundle = await rollup({
-        input: [funcFile],
-        plugins: rollupPlugins,
+    mkdirSync(path.resolve(projectDir, "dist/" + dir), { recursive: true });
+    const compiledFunctionPath = `dist/${dir}/${fileName.replace(".ts", ".js")}`;
+    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",
+        },
+        nodePaths: [path.resolve(projectDir, "node_modules")],
     });
-    let format = "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);
-    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)
         .join("\n"));

package/compiled/src/commands/deploy.js

@@ -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";
@@ -105,12 +104,12 @@ async function deployFunctions({ host, apikey, name: names }, projectDir, packag
     }
     for (const file of selectedFiles) {
         console.log(`${b(`𝑓`)} Deploying function ${b(path.basename(file))} to workspace ${workspace.name} (${host}/${workspace.slug || workspace.id})`);
-        await deployFunction({ host, apikey }, packageJson, workspace, kind, path.resolve(functionsDir, file), profileBuilders);
+        await deployFunction(projectDir, { host, apikey }, packageJson, workspace, kind, path.resolve(functionsDir, file), profileBuilders);
     }
 }
-async function deployFunction({ host, apikey }, packageJson, workspace, kind, file, profileBuilders = []) {
+async function deployFunction(projectDir, { host, apikey }, packageJson, workspace, kind, file, profileBuilders = []) {
     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/compiled/src/lib/compiled-function.js

@@ -1,33 +1,35 @@
 import fs from "fs";
-import { rollup } from "rollup";
+import * as esbuild from "esbuild";
 import { assertDefined, assertTrue } from "juava";
 function getSlug(filePath) {
-    return filePath.split("/").pop()?.replace(".ts", "");
+    return filePath.split("/").pop()?.replace(".ts", "").replace(".js", "");
 }
-export async function getFunctionFromFilePath(filePath, kind, profileBuilders = []) {
+export async function getFunctionFromFilePath(projectDir, filePath, kind, profileBuilders = []) {
     if (!fs.existsSync(filePath)) {
         throw new Error(`Cannot load function from file ${filePath}: file doesn't exist`);
     }
     else if (!fs.statSync(filePath).isFile()) {
         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",
+    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 = {};
-    eval(output.output[0].code);
-    assertDefined(exports.default, `Function from ${filePath} doesn't have default export. Exported symbols: ${Object.keys(exports)}`);
-    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;
+    const code = result.code;
+    const module = { exports: {} };
+    const exports = module.exports;
+    const require = (id) => {
+        return {};
+    };
+    eval(code);
+    const moduleExports = module.exports;
+    assertDefined(moduleExports.default, `Function from ${filePath} doesn't have default export. Exported symbols: ${Object.keys(moduleExports)}`);
+    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(`Cannot find profile builder with id ${profileBuilderId} for profile function ${filePath}. Please setup Profile Builder in UI first.`);
@@ -39,12 +41,12 @@ export async function getFunctionFromFilePath(filePath, kind, profileBuilders =
         }
     }
     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,
         },
     };
 }