@catladder/cli 0.0.0-main-e965db8c → 0.0.0-main-4f40fed0

package/dist/pipeline/src/config/readConfig.js

@@ -5,23 +5,21 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.readConfig = void 0;
 const fs_1 = require("fs");
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-const tsx = require("tsx/cjs/api");
+const jiti_1 = require("jiti");
 const yaml_1 = require("yaml");
-// allows us to load ts files
 const fullPath = (directory, ext) => directory + "/catladder." + ext;
 const readConfigInternal = async (directory = process.cwd()) => {
   const found = ["ts", "js", "yml", "yaml"].find(extension => (0, fs_1.existsSync)(fullPath(directory, extension)));
   if (found) {
     const filePath = fullPath(directory, found);
     if (found === "ts" || found === "js") {
-      const result = await tsx.require(filePath, directory);
-      // 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 jiti = (0, jiti_1.createJiti)(directory);
+      const result = await jiti.import(filePath);
+      const config = result.default || result;
       return {
         path: filePath,
         ext: found,
-        config
+        config: config
       };
     } else {
       return {
@@ -43,9 +41,8 @@ const readConfig = async (directory = process.cwd()) => {
     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/dist/pipeline/src/config/readConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"readConfig.js","sourceRoot":"","sources":["../../../../../pipeline/src/config/readConfig.ts"],"names":[],"mappings":";;;AAAA,2BAA8C;AAE9C,iEAAiE;AACjE,MAAM,GAAG,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAEnC,+BAA6B;AAG7B,6BAA6B;AAE7B,MAAM,QAAQ,GAAG,CAAC,SAAiB,EAAE,GAAW,EAAE,EAAE,CAClD,SAAS,GAAG,aAAa,GAAG,GAAG,CAAC;AAElC,MAAM,kBAAkB,GAAG,KAAK,EAC9B,YAAoB,OAAO,CAAC,GAAG,EAAE,EAC8B,EAAE;IACjE,MAAM,KAAK,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAC3D,IAAA,eAAU,EAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAC3C,CAAC;IAEF,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC5C,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YAEtD,yHAAyH;YACzH,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC;YACxD,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,GAAG,EAAE,KAAK;gBACV,MAAM;aACP,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,GAAG,EAAE,KAAK;gBACV,MAAM,EAAE,IAAA,YAAK,EAAC,IAAA,iBAAY,EAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAW;aACvE,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEK,MAAM,UAAU,GAAG,KAAK,EAC7B,YAAoB,OAAO,CAAC,GAAG,EAAE,EAC8B,EAAE;IACjE,IAAI,CAAC;QACH,OAAO,MAAM,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC7C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,2BAA2B,SAAS,GAAG,EAAE,KAAK,CAAC,CAAC;QAC9D,OAAO,CAAC,KAAK,CAAC;;;;;;;;CAQjB,CAAC,CAAC;QACC,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAlBW,QAAA,UAAU,cAkBrB"}
+{"version":3,"file":"readConfig.js","sourceRoot":"","sources":["../../../../../pipeline/src/config/readConfig.ts"],"names":[],"mappings":";;;AAAA,2BAA8C;AAC9C,+BAAkC;AAElC,+BAA6B;AAG7B,MAAM,QAAQ,GAAG,CAAC,SAAiB,EAAE,GAAW,EAAE,EAAE,CAClD,SAAS,GAAG,aAAa,GAAG,GAAG,CAAC;AAElC,MAAM,kBAAkB,GAAG,KAAK,EAC9B,YAAoB,OAAO,CAAC,GAAG,EAAE,EAC8B,EAAE;IACjE,MAAM,KAAK,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAC3D,IAAA,eAAU,EAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAC3C,CAAC;IAEF,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC5C,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACrC,MAAM,IAAI,GAAG,IAAA,iBAAU,EAAC,SAAS,CAAC,CAAC;YACnC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAE3C,MAAM,MAAM,GAAI,MAAc,CAAC,OAAO,IAAI,MAAM,CAAC;YACjD,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,GAAG,EAAE,KAAK;gBACV,MAAM,EAAE,MAAgB;aACzB,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,GAAG,EAAE,KAAK;gBACV,MAAM,EAAE,IAAA,YAAK,EAAC,IAAA,iBAAY,EAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAW;aACvE,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEK,MAAM,UAAU,GAAG,KAAK,EAC7B,YAAoB,OAAO,CAAC,GAAG,EAAE,EAC8B,EAAE;IACjE,IAAI,CAAC;QACH,OAAO,MAAM,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC7C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,2BAA2B,SAAS,GAAG,EAAE,KAAK,CAAC,CAAC;QAC9D,OAAO,CAAC,KAAK,CAAC;;;;;;;CAOjB,CAAC,CAAC;QACC,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAjBW,QAAA,UAAU,cAiBrB"}

package/dist/pipeline/src/constants.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-e965db8c" || "latest";
+exports.PIPELINE_IMAGE_TAG = "main-4f40fed0" || "latest";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";