Merge branch 'feature/action-server' of github.com:NASA-AMMOS/aerie into feature/action-server

cohansen · cohansen · commit 934c9d70ee62 · 2025-03-12T11:43:45.000-10:00
diff --git a/action-server/package-lock.json b/action-server/package-lock.json
diff --git a/action-server/package.json b/action-server/package.json
@@ -27,7 +27,7 @@
     "ts-node": "^10.9.2"
   },
   "dependencies": {
-    "aerie-actions": "file:../../aerie-actions",
+    "aerie-actions": "github:NASA-AMMOS/aerie-actions#34262aeb0e519aca04629bb022b083b16608f3b5",
     "pg": "^8.13.3",
     "piscina": "^5.0.0-alpha.0"
   }
diff --git a/action-server/src/utils/codeRunner.ts b/action-server/src/utils/codeRunner.ts
@@ -1,6 +1,6 @@
 import * as vm from "node:vm";
 import { ActionResponse, ActionResults, ConsoleOutput } from "../type/types";
-import { Actions } from "../dist/helpers";
+import { Actions } from "aerie-actions/dist/helpers";
 import { PoolClient } from "pg";
 
 // function getConsoleHandlers(oldConsole: any) {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`"ts-node": "^10.9.2"`
`28`	`28`	`},`
`29`	`29`	`"dependencies": {`
`30`		`- "aerie-actions": "file:../../aerie-actions",`
	`30`	`+ "aerie-actions": "github:NASA-AMMOS/aerie-actions#34262aeb0e519aca04629bb022b083b16608f3b5",`
`31`	`31`	`"pg": "^8.13.3",`
`32`	`32`	`"piscina": "^5.0.0-alpha.0"`
`33`	`33`	`}`