@certik/skynet 0.25.1 → 0.25.3

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.25.3
+
+- Add `getDeployBin` function to `cli` library to run ts files via bun so Nomad/Doppler don't try to exec the file directly.
+
+## 0.25.2
+
+- Update deploy command to check for bun.lock file.
+- Use --production flag when installing packages.
+
 ## 0.25.1
 
 - Updated README.md for deployment instructions
@@ -64,6 +73,7 @@
 ## 0.20.0
 
 - Fix databricks with bun (extra step needed for projects using the lib):
+
   - Copy the patch file `patches/@databricks%2Fsql@1.9.0.patch`
   - Add the following configs to your `package.json`:
 

package/dist/app.js

@@ -637,6 +637,9 @@ function detectBin() {
   const wd = detectDirectory(process.argv[1], "package.json");
   return process.argv[1].slice(wd.length + path.sep.length).replace(path.sep, "/");
 }
+function getDeployBin(bin) {
+  return bin.endsWith(".ts") ? `bun ${bin}` : bin;
+}
 // src/indexer.ts
 import meow from "meow";
 var STATE_TABLE_NAME = "skynet-" + getEnvironment() + "-indexer-state";
@@ -1174,7 +1177,7 @@ var genConfig = ({
         command = "sh"
         args = [
           "-c",
-          "cd \${meta.skynet_code_path}/${workingDirectory} && if [ -e bun.lockb ]; then bun install --silent; else yarn install --silent; fi && exec ${cmd}"
+          "cd \${meta.skynet_code_path}/${workingDirectory} && if [ -e bun.lockb ] || [ -e bun.lock ]; then bun install --production --silent; else yarn install --production --silent; fi && exec ${cmd}"
         ]
       }
 
@@ -1834,12 +1837,13 @@ function indexer({
     },
     onDeploy: () => {
       const bin = detectBin();
+      const runBin = getDeployBin(bin);
       const needDoppler = Object.values(env).some((v) => v === SENSITIVE_VALUE);
       const { deploy } = createDeploy({
         binaryName: `${getBinaryName()} deploy`,
         name,
         workingDirectory: detectWorkingDirectory(),
-        bin: needDoppler ? `doppler run -- ${bin} run` : `${bin} run`,
+        bin: needDoppler ? `doppler run -- ${runBin} run` : `${runBin} run`,
         selector,
         region,
         env,
@@ -1917,12 +1921,13 @@ function modeIndexer({
     },
     onDeploy: () => {
       const bin = detectBin();
+      const runBin = getDeployBin(bin);
       const needDoppler = Object.values(env).some((v) => v === SENSITIVE_VALUE);
       const { deploy } = createModeDeploy({
         binaryName: `${getBinaryName()} deploy`,
         name,
         workingDirectory: detectWorkingDirectory(),
-        bin: needDoppler ? `doppler run -- ${bin} run` : `${bin} run`,
+        bin: needDoppler ? `doppler run -- ${runBin} run` : `${runBin} run`,
         selector,
         region,
         env,
@@ -2012,12 +2017,13 @@ function api({
     },
     onDeploy: () => {
       const bin = detectBin();
+      const runBin = getDeployBin(bin);
       const needDoppler = Object.values(env).some((v) => v === SENSITIVE_VALUE);
       const { deploy } = createDeploy({
         binaryName: `${getBinaryName()} deploy`,
         name,
         workingDirectory: detectWorkingDirectory(),
-        bin: needDoppler ? `doppler run -- ${bin} run` : `${bin} run`,
+        bin: needDoppler ? `doppler run -- ${runBin} run` : `${runBin} run`,
         selector,
         region,
         env,

package/dist/cli.d.ts

@@ -2,4 +2,5 @@ declare function getBinaryName(): string;
 declare function detectSkynetDirectory(): string;
 declare function detectWorkingDirectory(): string;
 declare function detectBin(): string;
-export { getBinaryName, detectSkynetDirectory, detectWorkingDirectory, detectBin };
+declare function getDeployBin(bin: string): string;
+export { getBinaryName, detectSkynetDirectory, detectWorkingDirectory, detectBin, getDeployBin };

package/dist/cli.js

@@ -33,7 +33,11 @@ function detectBin() {
   const wd = detectDirectory(process.argv[1], "package.json");
   return process.argv[1].slice(wd.length + path.sep.length).replace(path.sep, "/");
 }
+function getDeployBin(bin) {
+  return bin.endsWith(".ts") ? `bun ${bin}` : bin;
+}
 export {
+  getDeployBin,
   getBinaryName,
   detectWorkingDirectory,
   detectSkynetDirectory,

package/dist/deploy.js

@@ -90,6 +90,9 @@ function detectBin() {
   const wd = detectDirectory(process.argv[1], "package.json");
   return process.argv[1].slice(wd.length + path.sep.length).replace(path.sep, "/");
 }
+function getDeployBin(bin) {
+  return bin.endsWith(".ts") ? `bun ${bin}` : bin;
+}
 // src/deploy.ts
 import fs2 from "fs/promises";
 import fso from "fs";
@@ -172,7 +175,7 @@ var genConfig = ({
         command = "sh"
         args = [
           "-c",
-          "cd \${meta.skynet_code_path}/${workingDirectory} && if [ -e bun.lockb ]; then bun install --silent; else yarn install --silent; fi && exec ${cmd}"
+          "cd \${meta.skynet_code_path}/${workingDirectory} && if [ -e bun.lockb ] || [ -e bun.lock ]; then bun install --production --silent; else yarn install --production --silent; fi && exec ${cmd}"
         ]
       }
 

package/dist/indexer.js

@@ -637,6 +637,9 @@ function detectBin() {
   const wd = detectDirectory(process.argv[1], "package.json");
   return process.argv[1].slice(wd.length + path.sep.length).replace(path.sep, "/");
 }
+function getDeployBin(bin) {
+  return bin.endsWith(".ts") ? `bun ${bin}` : bin;
+}
 // src/indexer.ts
 import meow from "meow";
 var STATE_TABLE_NAME = "skynet-" + getEnvironment() + "-indexer-state";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certik/skynet",
-  "version": "0.25.1",
+  "version": "0.25.3",
   "description": "Skynet Shared JS library",
   "type": "module",
   "exports": {

package/src/app.ts

@@ -5,7 +5,7 @@ import { createDeploy, createModeDeploy } from "./deploy";
 import type { Env } from "./deploy";
 import { startApiApp } from "./api.js";
 import type { Middleware } from "./api";
-import { getBinaryName, detectBin, detectWorkingDirectory } from "./cli.js";
+import { getBinaryName, detectBin, detectWorkingDirectory, getDeployBin } from "./cli.js";
 import type { Selector } from "./selector";
 import type { Request, Response, Application } from "express";
 
@@ -203,13 +203,14 @@ function indexer<TSelector extends Selector>({
     },
     onDeploy: () => {
       const bin = detectBin();
+      const runBin = getDeployBin(bin);
       const needDoppler = Object.values(env).some((v) => v === SENSITIVE_VALUE);
 
       const { deploy } = createDeploy({
         binaryName: `${getBinaryName()} deploy`,
         name,
         workingDirectory: detectWorkingDirectory(),
-        bin: needDoppler ? `doppler run -- ${bin} run` : `${bin} run`,
+        bin: needDoppler ? `doppler run -- ${runBin} run` : `${runBin} run`,
         selector,
         region,
         env,
@@ -313,13 +314,14 @@ function modeIndexer<T extends IndexerStateValue, TSelector extends Selector>({
     },
     onDeploy: () => {
       const bin = detectBin();
+      const runBin = getDeployBin(bin);
       const needDoppler = Object.values(env).some((v) => v === SENSITIVE_VALUE);
 
       const { deploy } = createModeDeploy({
         binaryName: `${getBinaryName()} deploy`,
         name,
         workingDirectory: detectWorkingDirectory(),
-        bin: needDoppler ? `doppler run -- ${bin} run` : `${bin} run`,
+        bin: needDoppler ? `doppler run -- ${runBin} run` : `${runBin} run`,
         selector,
         region,
         env,
@@ -437,13 +439,14 @@ function api({
     },
     onDeploy: () => {
       const bin = detectBin();
+      const runBin = getDeployBin(bin);
       const needDoppler = Object.values(env).some((v) => v === SENSITIVE_VALUE);
 
       const { deploy } = createDeploy({
         binaryName: `${getBinaryName()} deploy`,
         name,
         workingDirectory: detectWorkingDirectory(),
-        bin: needDoppler ? `doppler run -- ${bin} run` : `${bin} run`,
+        bin: needDoppler ? `doppler run -- ${runBin} run` : `${runBin} run`,
         selector,
         region,
         env,

package/src/cli.ts

@@ -45,4 +45,9 @@ function detectBin() {
   return process.argv[1].slice(wd.length + path.sep.length).replace(path.sep, "/");
 }
 
-export { getBinaryName, detectSkynetDirectory, detectWorkingDirectory, detectBin };
+// Run ts files via bun so Nomad/Doppler don't try to exec the file directly.
+function getDeployBin(bin: string): string {
+  return bin.endsWith(".ts") ? `bun ${bin}` : bin;
+}
+
+export { getBinaryName, detectSkynetDirectory, detectWorkingDirectory, detectBin, getDeployBin };

package/src/deploy.ts

@@ -143,7 +143,7 @@ const genConfig = ({
         command = "sh"
         args = [
           "-c",
-          "cd \${meta.skynet_code_path}/${workingDirectory} && if [ -e bun.lockb ]; then bun install --silent; else yarn install --silent; fi && exec ${cmd}"
+          "cd \${meta.skynet_code_path}/${workingDirectory} && if [ -e bun.lockb ] || [ -e bun.lock ]; then bun install --production --silent; else yarn install --production --silent; fi && exec ${cmd}"
         ]
       }