@catladder/pipeline 4.2.1 → 4.2.2

package/dist/utils/index.js

@@ -35,13 +35,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.mergeWithMergingArrays = exports.ensureArray = exports.ensureArrayOrNull = exports.notNil = void 0;
-var lodash_1 = require("lodash");
+var lodash_es_1 = require("lodash-es");
 function notNil(value) {
   return value !== null && value !== undefined;
 }
 exports.notNil = notNil;
 var ensureArrayOrNull = function (s) {
-  return (0, lodash_1.isNil)(s) ? null : Array.isArray(s) ? s : [s];
+  return (0, lodash_es_1.isNil)(s) ? null : Array.isArray(s) ? s : [s];
 };
 exports.ensureArrayOrNull = ensureArrayOrNull;
 var ensureArray = function (s) {
@@ -51,7 +51,7 @@ var ensureArray = function (s) {
 exports.ensureArray = ensureArray;
 // see https://github.com/lodash/lodash/issues/5384
 var mergeWithMergingArrays = function (obj1, obj2) {
-  return (0, lodash_1.mergeWith)({}, obj1, obj2, function (prop1, prop2) {
+  return (0, lodash_es_1.mergeWith)({}, obj1, obj2, function (prop1, prop2) {
     return Array.isArray(prop1) && Array.isArray(prop2) ? __spreadArray(__spreadArray([], __read(prop1), false), __read(prop2), false) : undefined;
   });
 };

package/examples/rails-k8s-with-worker-dockerfile.test.ts

@@ -1,7 +1,7 @@
 import { mkdir, rm, writeFile } from "fs/promises";
 import { createYamlLocalPipeline } from "./__utils__/helpers";
 import config from "./rails-k8s-with-worker";
-import { merge } from "lodash";
+import { merge } from "lodash-es";
 import { join } from "path";
 
 it("matches snapshot with a Dockerfile", async () => {

package/package.json

@@ -53,7 +53,7 @@
     }
   ],
   "license": "MIT",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "scripts": {
     "build:tsc": "yarn tsc",
     "build": "yarn build:compile && yarn build:inline-variables",
@@ -63,7 +63,7 @@
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",
     "generate:gitlab-ci-yml-types": "ts-node ./scripts/generate-gitlab-ci-types.ts",
-    "generate:examples-test": "tsx scripts/generate-examples-test.ts"
+    "generate:examples-test": "jiti scripts/generate-examples-test.ts"
   },
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
@@ -74,20 +74,18 @@
     "@babel/plugin-syntax-typescript": "^7.25.4",
     "@babel/preset-typescript": "^7.24.7",
     "@types/child-process-promise": "^2.2.6",
-    "@types/lodash": "^4.17.7",
+    "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.5.1",
     "babel-plugin-transform-inline-environment-variables": "^0.4.3",
     "child-process-promise": "^2.2.1",
     "glob": "^11.0.0",
+    "jiti": "^2",
     "json-schema-to-typescript": "^13.0.2",
-    "lodash": "^4.17.21",
+    "lodash-es": "^4.18.1",
     "memoizee": "^0.4.17",
     "path-equal": "1.2.5",
     "slugify": "^1.6.6",
     "typescript": "^5.4.5",
     "yaml": "^2.5.0"
-  },
-  "dependencies": {
-    "tsx": "^4.21.0"
   }
 }

package/src/bash/getInjectVarsScript.ts

@@ -1,5 +1,5 @@
 import type { UnspecifiedEnvVars } from "../types";
-import { isNil } from "lodash";
+import { isNil } from "lodash-es";
 import { bashEscape } from "./bashEscape";
 
 export const getInjectVarsScript = (vars?: UnspecifiedEnvVars) => {

package/src/build/artifacts/createBuildJobArtifact.ts

@@ -5,7 +5,7 @@ import {
   type Context,
 } from "../../types";
 import type { CatladderJob } from "../../types/jobs";
-import { uniq } from "lodash";
+import { uniq } from "lodash-es";
 import { componentContextNeedsBuildTimeDotEnv } from "../base/writeDotEnv";
 
 const uniqueAndAlphabeticalSort = (arr: string[]): string[] => {

package/src/build/base/createAppBuildJob.ts

@@ -1,4 +1,4 @@
-import { merge } from "lodash";
+import { merge } from "lodash-es";
 import type {
   BuildContextStandalone,
   ComponentContext,

package/src/build/base/writeDotEnv.ts

@@ -1,4 +1,4 @@
-import { isNil } from "lodash";
+import { isNil } from "lodash-es";
 import { escapeForDotEnv } from "../../bash/bashEscape";
 import { ALL_BUILD_VARIABLES } from "../../context/getBuildInfoVariables";
 import type { ComponentContext } from "../../types";

package/src/build/docker.ts

@@ -1,5 +1,5 @@
 import { existsSync } from "fs";
-import { merge } from "lodash";
+import { merge } from "lodash-es";
 import path from "path";
 import type { BuildConfig, BuildConfigDocker } from ".";
 import { isOfDeployType } from "../deploy";

package/src/build/node/cache.ts

@@ -1,4 +1,4 @@
-import { uniq } from "lodash";
+import { uniq } from "lodash-es";
 import { join } from "path";
 import slugify from "slugify";
 

package/src/config/readConfig.ts

@@ -1,13 +1,9 @@
 import { existsSync, readFileSync } from "fs";
-
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-const tsx = require("tsx/cjs/api");
+import { createJiti } from "jiti";
 
 import { parse } from "yaml";
 import type { Config } from "../types";
 
-// allows us to load ts files
-
 const fullPath = (directory: string, ext: string) =>
   directory + "/catladder." + ext;
 
@@ -21,14 +17,14 @@ const readConfigInternal = async (
   if (found) {
     const filePath = fullPath(directory, found);
     if (found === "ts" || found === "js") {
-      const result = await tsx.require(filePath, directory);
+      const jiti = createJiti(directory);
+      const result = await jiti.import(filePath);
 
-      // weird: if target project is esm, result is under result.default, but if its commonjs, its under result.default.default
-      const config = result.default.default || result.default;
+      const config = (result as any).default || result;
       return {
         path: filePath,
         ext: found,
-        config,
+        config: config as Config,
       };
     } else {
       return {
@@ -51,9 +47,8 @@ export const readConfig = async (
     console.error(`
 This may happen due to various reasons:
   - Syntax errors in your catladder.ts file
-  - tsx (the TypeScript loader used by catladder) needs to understand the syntax in your project.
-    If your project uses newer TypeScript/JavaScript syntax, you may need to update catladder
-    to get a newer version of tsx that supports it.
+  - The TypeScript loader (jiti) used by catladder needs to understand the syntax in your project.
+    If your project uses newer TypeScript/JavaScript syntax, you may need to update catladder.
   - Missing or incorrect dependencies in your project
   - TypeScript configuration issues in your tsconfig.json
 `);

package/src/context/createComponentContext.ts

@@ -1,4 +1,4 @@
-import { isFunction } from "lodash";
+import { isFunction } from "lodash-es";
 import { BUILD_TYPES, isStandaloneBuildConfig } from "../build";
 import type { BuildConfig } from "../build/types";
 import { DEPLOY_TYPES } from "../deploy";

package/src/context/createWorkspaceContext.ts

@@ -7,7 +7,7 @@ import {
 } from "..";
 import { getPackageManagerInfoBase } from "../pipeline/packageManager";
 import { mergeWithMergingArrays } from "../utils";
-import { uniq } from "lodash";
+import { uniq } from "lodash-es";
 
 export async function createWorkspaceContext({
   env,

package/src/context/getEnvConfig.ts

@@ -1,4 +1,4 @@
-import { cloneDeep, mergeWith } from "lodash";
+import { cloneDeep, mergeWith } from "lodash-es";
 import type { Config, EnvConfigWithComponent } from "../types/config";
 
 export const getEnvConfig = (

package/src/context/utils/envVars.ts

@@ -1,4 +1,4 @@
-import { isObject } from "lodash";
+import { isObject } from "lodash-es";
 import type { SecretEnvVar } from "../getEnvironmentVariables";
 import { getSecretVarName } from "../getEnvironmentVariables";
 import { getBashVariable } from "../../bash/BashExpression";

package/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.ts

@@ -1,4 +1,4 @@
-import { omit } from "lodash";
+import { omit } from "lodash-es";
 import type { ComponentContext } from "../../../types/context";
 import { collapseableSection } from "../../../utils/gitlab";
 

package/src/deploy/cloudRun/utils/createArgsString.ts

@@ -1,4 +1,4 @@
-import { isNil } from "lodash";
+import { isNil } from "lodash-es";
 import type { BashExpression } from "../../../bash/BashExpression";
 
 /**

package/src/deploy/kubernetes/kubeValues.ts

@@ -1,4 +1,4 @@
-import { merge } from "lodash";
+import { merge } from "lodash-es";
 
 import type {
   BuildContextComponent,

package/src/deploy/kubernetes/mongodb.ts

@@ -1,4 +1,4 @@
-import { range } from "lodash";
+import { range } from "lodash-es";
 import { getSecretVarNameForContext } from "../../context/getEnvironmentVariables";
 import type { ComponentContext } from "../../types/context";
 import { isOfDeployType } from "../types";

package/src/pipeline/gitlab/createGitlabJobs.ts

@@ -1,4 +1,4 @@
-import { isEmpty, isObject, merge } from "lodash";
+import { isEmpty, isObject, merge } from "lodash-es";
 import { getInjectVarsScript } from "../../bash/getInjectVarsScript";
 import { BASE_RETRY } from "../../defaults";
 import type {

package/src/utils/index.ts

@@ -1,4 +1,4 @@
-import { isNil, mergeWith } from "lodash";
+import { isNil, mergeWith } from "lodash-es";
 
 export function notNil<TValue>(
   value: TValue | null | undefined,