diff --git a/packages/server/src/automations/triggers.ts b/packages/server/src/automations/triggers.ts index a9317772d9..bfd1b5c47f 100644 --- a/packages/server/src/automations/triggers.ts +++ b/packages/server/src/automations/triggers.ts @@ -1,7 +1,7 @@ import emitter from "../events/index" import { getAutomationParams, isDevAppID } from "../db/utils" import { coerce } from "../utilities/rowProcessor" -import { definitions } from "./triggerInfo" +import { definitions } from "../../../shared-core/src/automations/triggers" // need this to call directly, so we can get a response import { automationQueue } from "./bullboard" import { checkTestFlag } from "../utilities/redis" diff --git a/packages/server/src/automations/utils.ts b/packages/server/src/automations/utils.ts index 292b288a70..74cc64a95e 100644 --- a/packages/server/src/automations/utils.ts +++ b/packages/server/src/automations/utils.ts @@ -1,5 +1,5 @@ import { Thread, ThreadType } from "../threads" -import { definitions } from "./triggerInfo" +import { definitions } from "../../../shared-core/src/automations/triggers" import { automationQueue } from "./bullboard" import { updateEntityMetadata } from "../utilities" import { context, db as dbCore, utils } from "@budibase/backend-core" diff --git a/packages/server/src/sdk/app/automations/crud.ts b/packages/server/src/sdk/app/automations/crud.ts index d16ae2d042..487f93cfa6 100644 --- a/packages/server/src/sdk/app/automations/crud.ts +++ b/packages/server/src/sdk/app/automations/crud.ts @@ -13,7 +13,7 @@ import { HTTPError, db as dbCore, } from "@budibase/backend-core" -import { definitions } from "../../../automations/triggerInfo" +import { definitions } from "../../../../../shared-core/src/automations/triggers" import automations from "." export interface PersistedAutomation extends Automation { diff --git a/packages/server/src/sdk/app/rowActions/crud.ts b/packages/server/src/sdk/app/rowActions/crud.ts index 1153677685..ca6f7b8f1a 100644 --- a/packages/server/src/sdk/app/rowActions/crud.ts +++ b/packages/server/src/sdk/app/rowActions/crud.ts @@ -9,7 +9,7 @@ import { } from "@budibase/types" import { generateRowActionsID } from "../../../db/utils" import automations from "../automations" -import { definitions as TRIGGER_DEFINITIONS } from "../../../automations/triggerInfo" +import { definitions as TRIGGER_DEFINITIONS } from "../../../../../shared-core/src/automations/triggers" import * as triggers from "../../../automations/triggers" import sdk from "../.." diff --git a/packages/server/src/threads/automation.ts b/packages/server/src/threads/automation.ts index 2790d8fda6..1a56139e52 100644 --- a/packages/server/src/threads/automation.ts +++ b/packages/server/src/threads/automation.ts @@ -11,7 +11,7 @@ import { replaceFakeBindings } from "../automations/loopUtils" import { dataFilters, helpers, utils } from "@budibase/shared-core" import { default as AutomationEmitter } from "../events/AutomationEmitter" import { generateAutomationMetadataID, isProdAppID } from "../db/utils" -import { definitions as triggerDefs } from "../automations/triggerInfo" +import { definitions as triggerDefs } from "../../../shared-core/src/automations/triggers" import { AutomationErrors, MAX_AUTOMATION_RECURRING_ERRORS } from "../constants" import { storeLog } from "../automations/logging" import { diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json index c962785810..475f0b3e2d 100644 --- a/packages/server/tsconfig.json +++ b/packages/server/tsconfig.json @@ -4,6 +4,18 @@ "require": ["tsconfig-paths/register"], "swc": true }, - "include": ["src/**/*", "specs", "__mocks__"], + "include": [ + "src/**/*", + "specs", + "__mocks__", + "../shared-core/src/automations/triggers/app.ts", + "../shared-core/src/automations/triggers/cron.ts", + "../shared-core/src/automations/triggers/index.ts", + "../shared-core/src/automations/triggers/rowAction.ts", + "../shared-core/src/automations/triggers/rowDeleted.ts", + "../shared-core/src/automations/triggers/rowSaved.ts", + "../shared-core/src/automations/triggers/rowUpdated.ts", + "../shared-core/src/automations/triggers/webhook.ts" + ], "exclude": ["node_modules", "dist"] } diff --git a/packages/shared-core/src/automations/index.ts b/packages/shared-core/src/automations/index.ts index 064796845e..db38233494 100644 --- a/packages/shared-core/src/automations/index.ts +++ b/packages/shared-core/src/automations/index.ts @@ -1 +1,2 @@ export * as steps from "./steps/index" +export * as triggers from "./triggers/index" diff --git a/packages/server/src/automations/triggerInfo/app.ts b/packages/shared-core/src/automations/triggers/app.ts similarity index 100% rename from packages/server/src/automations/triggerInfo/app.ts rename to packages/shared-core/src/automations/triggers/app.ts diff --git a/packages/server/src/automations/triggerInfo/cron.ts b/packages/shared-core/src/automations/triggers/cron.ts similarity index 100% rename from packages/server/src/automations/triggerInfo/cron.ts rename to packages/shared-core/src/automations/triggers/cron.ts diff --git a/packages/server/src/automations/triggerInfo/index.ts b/packages/shared-core/src/automations/triggers/index.ts similarity index 100% rename from packages/server/src/automations/triggerInfo/index.ts rename to packages/shared-core/src/automations/triggers/index.ts diff --git a/packages/server/src/automations/triggerInfo/rowAction.ts b/packages/shared-core/src/automations/triggers/rowAction.ts similarity index 100% rename from packages/server/src/automations/triggerInfo/rowAction.ts rename to packages/shared-core/src/automations/triggers/rowAction.ts diff --git a/packages/server/src/automations/triggerInfo/rowDeleted.ts b/packages/shared-core/src/automations/triggers/rowDeleted.ts similarity index 100% rename from packages/server/src/automations/triggerInfo/rowDeleted.ts rename to packages/shared-core/src/automations/triggers/rowDeleted.ts diff --git a/packages/server/src/automations/triggerInfo/rowSaved.ts b/packages/shared-core/src/automations/triggers/rowSaved.ts similarity index 100% rename from packages/server/src/automations/triggerInfo/rowSaved.ts rename to packages/shared-core/src/automations/triggers/rowSaved.ts diff --git a/packages/server/src/automations/triggerInfo/rowUpdated.ts b/packages/shared-core/src/automations/triggers/rowUpdated.ts similarity index 100% rename from packages/server/src/automations/triggerInfo/rowUpdated.ts rename to packages/shared-core/src/automations/triggers/rowUpdated.ts diff --git a/packages/server/src/automations/triggerInfo/webhook.ts b/packages/shared-core/src/automations/triggers/webhook.ts similarity index 100% rename from packages/server/src/automations/triggerInfo/webhook.ts rename to packages/shared-core/src/automations/triggers/webhook.ts