@budibase/server 1.0.200-alpha.3 → 1.0.200

package/nodemon.json

@@ -1,6 +1,6 @@
 {
   "watch": ["src", "../backend-core", "../../../budibase-pro/packages/pro"],
   "ext": "js,ts,json",
-  "ignore": ["src/**/*.spec.ts", "src/**/*.spec.js", "../backend-core/dist/**/*"],
+  "ignore": ["src/**/*.spec.ts", "src/**/*.spec.js"],
   "exec": "ts-node src/index.ts"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.200-alpha.3",
+  "version": "1.0.200",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -9,9 +9,7 @@
     "url": "https://github.com/Budibase/budibase.git"
   },
   "scripts": {
-    "prebuild": "rimraf dist/",
-    "build": "tsc -p tsconfig.build.json && mv dist/src/* dist/ && rimraf dist/src/",
-    "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
+    "build": "rimraf dist/ && tsc -p tsconfig.build.json && mv dist/src/* dist/ && rimraf dist/src/ && yarn postbuild",
     "debug": "yarn build && node --expose-gc --inspect=9222 dist/index.js",
     "postbuild": "copyfiles -u 1 src/**/*.svelte dist/ && copyfiles -u 1 src/**/*.hbs dist/ && copyfiles -u 1 src/**/*.json dist/",
     "test": "jest --coverage --maxWorkers=2",
@@ -39,11 +37,6 @@
   "jest": {
     "preset": "ts-jest",
     "testEnvironment": "node",
-    "moduleNameMapper": {
-      "@budibase/backend-core/(.*)": "<rootDir>/../backend-core/$1",
-      "@budibase/backend-core": "<rootDir>/../backend-core/src",
-      "@budibase/types": "<rootDir>/../types/src"
-    },
     "setupFiles": [
       "./scripts/jestSetup.js"
     ],
@@ -76,123 +69,120 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.0.200-alpha.3",
-    "@budibase/client": "^1.0.200-alpha.3",
-    "@budibase/pro": "1.0.200-alpha.2",
-    "@budibase/string-templates": "^1.0.200-alpha.3",
-    "@bull-board/api": "3.7.0",
-    "@bull-board/koa": "3.9.4",
+    "@apidevtools/swagger-parser": "^10.0.3",
+    "@budibase/backend-core": "^1.0.200",
+    "@budibase/client": "^1.0.200",
+    "@budibase/pro": "1.0.199",
+    "@budibase/string-templates": "^1.0.200",
+    "@bull-board/api": "^3.7.0",
+    "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
-    "@google-cloud/firestore": "5.0.2",
+    "@google-cloud/firestore": "^5.0.2",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
     "@sentry/node": "6.17.7",
+    "@types/global-agent": "^2.1.1",
+    "@types/koa__router": "^8.0.11",
     "airtable": "0.10.1",
     "arangojs": "7.2.0",
-    "aws-sdk": "2.1030.0",
+    "aws-sdk": "^2.767.0",
     "bcryptjs": "2.4.3",
-    "bull": "3.29.3",
+    "bull": "^3.22.4",
     "chmodr": "1.2.0",
     "csvtojson": "2.0.10",
-    "curlconverter": "3.21.0",
+    "curlconverter": "^3.21.0",
     "dotenv": "8.2.0",
     "download": "8.0.0",
     "fix-path": "3.0.0",
-    "form-data": "4.0.0",
+    "form-data": "^4.0.0",
     "fs-extra": "8.1.0",
-    "global-agent": "3.0.0",
-    "google-auth-library": "7.12.0",
-    "google-spreadsheet": "3.2.0",
+    "global-agent": "^3.0.0",
+    "google-auth-library": "^7.11.0",
+    "google-spreadsheet": "^3.2.0",
     "jimp": "0.16.1",
     "joi": "17.2.1",
-    "js-yaml": "4.1.0",
+    "js-yaml": "^4.1.0",
     "jsonschema": "1.4.0",
-    "knex": "0.95.15",
+    "knex": "^0.95.6",
     "koa": "2.7.0",
     "koa-body": "4.2.0",
     "koa-compress": "4.0.1",
-    "koa-connect": "2.1.0",
+    "koa-connect": "^2.1.0",
     "koa-pino-logger": "3.0.0",
     "koa-send": "5.0.0",
     "koa-session": "5.12.0",
     "koa-static": "5.0.0",
-    "koa2-ratelimit": "1.1.0",
+    "koa2-ratelimit": "^1.1.0",
     "lodash": "4.17.21",
-    "memorystream": "0.3.1",
+    "memorystream": "^0.3.1",
     "mongodb": "3.6.3",
     "mssql": "6.2.3",
-    "mysql2": "2.3.3",
+    "mysql2": "^2.3.1",
     "node-fetch": "2.6.7",
-    "open": "8.4.0",
+    "open": "^8.4.0",
     "pg": "8.5.1",
     "pino-pretty": "4.0.0",
-    "posthog-node": "1.3.0",
+    "posthog-node": "^1.1.4",
     "pouchdb": "7.3.0",
-    "pouchdb-adapter-memory": "7.2.2",
+    "pouchdb-adapter-memory": "^7.2.1",
     "pouchdb-all-dbs": "1.0.2",
-    "pouchdb-find": "7.2.2",
+    "pouchdb-find": "^7.2.2",
     "pouchdb-replication-stream": "1.2.9",
     "redis": "4",
     "server-destroy": "1.0.1",
-    "svelte": "3.44.1",
-    "swagger-parser": "10.0.3",
+    "svelte": "^3.38.2",
+    "swagger-parser": "^10.0.3",
     "to-json-schema": "0.2.5",
     "uuid": "3.3.2",
     "validate.js": "0.13.1",
-    "vm2": "3.9.6",
-    "worker-farm": "1.7.0",
-    "xml2js": "0.4.23",
+    "vm2": "^3.9.3",
+    "worker-farm": "^1.7.0",
+    "xml2js": "^0.4.23",
     "yargs": "13.2.4",
     "zlib": "1.0.5"
   },
   "devDependencies": {
-    "@babel/core": "7.17.4",
-    "@babel/preset-env": "7.16.11",
+    "@babel/core": "^7.14.3",
+    "@babel/preset-env": "^7.14.4",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/types": "^1.0.200-alpha.3",
-    "@jest/test-sequencer": "24.9.0",
-    "@types/apidoc": "0.50.0",
-    "@types/bson": "4.2.0",
-    "@types/bull": "3.15.8",
-    "@types/global-agent": "2.1.1",
-    "@types/google-spreadsheet": "3.1.5",
-    "@types/jest": "27.5.1",
-    "@types/koa": "2.13.4",
-    "@types/koa__router": "8.0.0",
+    "@jest/test-sequencer": "^24.8.0",
+    "@types/apidoc": "^0.50.0",
+    "@types/bson": "^4.2.0",
+    "@types/bull": "^3.15.1",
+    "@types/google-spreadsheet": "^3.1.5",
+    "@types/jest": "^27.4.1",
+    "@types/koa": "^2.13.3",
+    "@types/koa-router": "^7.4.2",
     "@types/lodash": "4.14.180",
     "@types/mongodb": "3.6.3",
-    "@types/node": "14.18.20",
-    "@types/node-fetch": "2.6.1",
-    "@types/oracledb": "5.2.2",
-    "@types/redis": "4.0.11",
+    "@types/node": "^15.12.4",
+    "@types/oracledb": "^5.2.1",
+    "@types/redis": "^4.0.11",
     "@typescript-eslint/parser": "5.12.0",
-    "apidoc": "0.50.4",
-    "babel-jest": "27.5.1",
-    "copyfiles": "2.4.1",
-    "docker-compose": "0.23.17",
-    "eslint": "6.8.0",
-    "ioredis-mock": "7.2.0",
-    "is-wsl": "2.2.0",
-    "jest": "27.5.1",
-    "jest-openapi": "0.14.2",
-    "nodemon": "2.0.15",
-    "openapi-types": "9.3.1",
-    "openapi-typescript": "5.2.0",
-    "path-to-regexp": "6.2.0",
-    "prettier": "2.5.1",
-    "rimraf": "3.0.2",
-    "supertest": "4.0.2",
-    "swagger-jsdoc": "6.1.0",
-    "timekeeper": "2.2.0",
-    "ts-jest": "27.1.3",
-    "ts-node": "10.5.0",
-    "tsconfig-paths": "4.0.0",
-    "typescript": "4.6.2",
-    "update-dotenv": "1.1.1"
+    "apidoc": "^0.50.2",
+    "babel-jest": "^27.0.2",
+    "copyfiles": "^2.4.1",
+    "docker-compose": "^0.23.6",
+    "eslint": "^6.8.0",
+    "ioredis-mock": "^7.2.0",
+    "is-wsl": "^2.2.0",
+    "jest": "^27.0.5",
+    "jest-openapi": "^0.14.2",
+    "nodemon": "^2.0.4",
+    "openapi-types": "^9.3.1",
+    "openapi-typescript": "^5.2.0",
+    "path-to-regexp": "^6.2.0",
+    "prettier": "^2.3.1",
+    "rimraf": "^3.0.2",
+    "supertest": "^4.0.2",
+    "swagger-jsdoc": "^6.1.0",
+    "ts-jest": "^27.0.3",
+    "ts-node": "^10.0.0",
+    "typescript": "^4.5.5",
+    "update-dotenv": "^1.1.1"
   },
   "optionalDependencies": {
-    "oracledb": "5.3.0"
+    "oracledb": "^5.3.0"
   },
-  "gitHead": "48dd23473a5d9572c5127cdfa5df65e0f652d0fd"
+  "gitHead": "94c375fdeac1d1252d6bd4f867d7cfce346dd60b"
 }

package/scripts/dev/manage.js

@@ -54,8 +54,6 @@ async function init() {
       DISABLE_ACCOUNT_PORTAL: "",
       MULTI_TENANCY: "",
       DISABLE_THREADING: 1,
-      SERVICE: "app-service",
-      DEPLOYMENT_ENVIRONMENT: "development",
     }
     let envFile = ""
     Object.keys(envFileJson).forEach(key => {

package/scripts/jestSetup.js

@@ -9,11 +9,4 @@ env._set("BUDIBASE_DIR", tmpdir("budibase-unittests"))
 env._set("LOG_LEVEL", "silent")
 env._set("PORT", 0)
 
-const { mocks } = require("@budibase/backend-core/tests")
-
-// mock all dates to 2020-01-01T00:00:00.000Z
-// use tk.reset() to use real dates in individual tests
-const tk = require("timekeeper")
-tk.freeze(mocks.date.MOCK_DATE)
-
 global.console.log = jest.fn() // console.log are ignored in tests

package/scripts/likeCypress.ts

@@ -10,7 +10,7 @@ const WORKER_PORT = "4200"
 
 // @ts-ignore
 process.env.NODE_ENV = "cypress"
-process.env.ENABLE_ANALYTICS = "0"
+process.env.ENABLE_ANALYTICS = "false"
 process.env.JWT_SECRET = "budibase"
 process.env.COUCH_URL = `leveldb://${tmpdir}/.data/`
 process.env.SELF_HOSTED = "1"

package/src/api/controllers/analytics.js

@@ -0,0 +1,39 @@
+const env = require("../../environment")
+const PostHog = require("posthog-node")
+
+let posthogClient
+
+if (env.POSTHOG_TOKEN && env.ENABLE_ANALYTICS && !env.SELF_HOSTED) {
+  posthogClient = new PostHog(env.POSTHOG_TOKEN)
+}
+
+exports.isEnabled = async ctx => {
+  ctx.body = {
+    enabled: !env.SELF_HOSTED && env.ENABLE_ANALYTICS === "true",
+  }
+}
+
+exports.endUserPing = async ctx => {
+  if (!posthogClient) {
+    ctx.body = {
+      ping: false,
+    }
+    return
+  }
+
+  posthogClient.identify({
+    distinctId: ctx.user && ctx.user._id,
+    properties: {},
+  })
+  posthogClient.capture({
+    event: "budibase:end_user_ping",
+    distinctId: ctx.user && ctx.user._id,
+    properties: {
+      appId: ctx.appId,
+    },
+  })
+
+  ctx.body = {
+    ping: true,
+  }
+}

package/src/api/controllers/application.ts

@@ -52,8 +52,7 @@ const {
 } = require("@budibase/backend-core/context")
 import { getUniqueRows } from "../../utilities/usageQuota/rows"
 import { quotas } from "@budibase/pro"
-import { errors, events, migrations } from "@budibase/backend-core"
-import { App, MigrationType } from "@budibase/types"
+import { errors } from "@budibase/backend-core"
 
 const URL_REGEX_SLASH = /\/|\\/g
 
@@ -235,7 +234,7 @@ const performAppCreate = async (ctx: any) => {
   const apps = await getAllApps({ dev: true })
   const name = ctx.request.body.name
   checkAppName(ctx, apps, name)
-  const url = getAppUrl(ctx)
+  const url = exports.getAppUrl(ctx)
   checkAppUrl(ctx, apps, url)
 
   const { useTemplate, templateKey, templateString } = ctx.request.body
@@ -259,7 +258,7 @@ const performAppCreate = async (ctx: any) => {
   } catch (err) {
     // nothing to do
   }
-  const newApplication: App = {
+  const newApplication = {
     _id: DocumentTypes.APP_METADATA,
     _rev,
     appId: instance._id,
@@ -293,42 +292,10 @@ const performAppCreate = async (ctx: any) => {
   return newApplication
 }
 
-const creationEvents = async (request: any, app: App) => {
-  let creationFns: ((app: App) => Promise<void>)[] = []
-
-  const body = request.body
-  if (body.useTemplate === "true") {
-    // from template
-    if (body.templateKey && body.templateKey !== "undefined") {
-      creationFns.push(a => events.app.templateImported(a, body.templateKey))
-    }
-    // from file
-    else if (request.files?.templateFile) {
-      creationFns.push(a => events.app.fileImported(a))
-    }
-    // unknown
-    else {
-      console.error("Could not determine template creation event")
-    }
-  }
-  creationFns.push(a => events.app.created(a))
-
-  for (let fn of creationFns) {
-    await fn(app)
-  }
-}
-
-const appPostCreate = async (ctx: any, app: App) => {
-  const tenantId = getTenantId()
-  await migrations.backPopulateMigrations({
-    type: MigrationType.APP,
-    tenantId,
-    appId: app.appId,
-  })
-  await creationEvents(ctx.request, app)
+const appPostCreate = async (ctx: any, appId: string) => {
   // app import & template creation
   if (ctx.request.body.useTemplate === "true") {
-    const rows = await getUniqueRows([app.appId])
+    const rows = await getUniqueRows([appId])
     const rowCount = rows ? rows.length : 0
     if (rowCount) {
       try {
@@ -338,7 +305,7 @@ const appPostCreate = async (ctx: any, app: App) => {
           // this import resulted in row usage exceeding the quota
           // delete the app
           // skip pre and post steps as no rows have been added to quotas yet
-          ctx.params.appId = app.appId
+          ctx.params.appId = appId
           await destroyApp(ctx)
         }
         throw err
@@ -349,7 +316,7 @@ const appPostCreate = async (ctx: any, app: App) => {
 
 export const create = async (ctx: any) => {
   const newApplication = await quotas.addApp(() => performAppCreate(ctx))
-  await appPostCreate(ctx, newApplication)
+  await appPostCreate(ctx, newApplication.appId)
   await bustCache(CacheKeys.CHECKLIST)
   ctx.body = newApplication
   ctx.status = 200
@@ -364,16 +331,15 @@ export const update = async (ctx: any) => {
   if (name) {
     checkAppName(ctx, apps, name, ctx.params.appId)
   }
-  const url = getAppUrl(ctx)
+  const url = await exports.getAppUrl(ctx)
   if (url) {
     checkAppUrl(ctx, apps, url, ctx.params.appId)
     ctx.request.body.url = url
   }
 
-  const app = await updateAppPackage(ctx.request.body, ctx.params.appId)
-  await events.app.updated(app)
+  const data = await updateAppPackage(ctx.request.body, ctx.params.appId)
   ctx.status = 200
-  ctx.body = app
+  ctx.body = data
 }
 
 export const updateClient = async (ctx: any) => {
@@ -389,15 +355,13 @@ export const updateClient = async (ctx: any) => {
   }
 
   // Update versions in app package
-  const updatedToVersion = packageJson.version
   const appPackageUpdates = {
-    version: updatedToVersion,
+    version: packageJson.version,
     revertableVersion: currentVersion,
   }
-  const app = await updateAppPackage(appPackageUpdates, ctx.params.appId)
-  await events.app.versionUpdated(app, currentVersion, updatedToVersion)
+  const data = await updateAppPackage(appPackageUpdates, ctx.params.appId)
   ctx.status = 200
-  ctx.body = app
+  ctx.body = data
 }
 
 export const revertClient = async (ctx: any) => {
@@ -414,16 +378,13 @@ export const revertClient = async (ctx: any) => {
   }
 
   // Update versions in app package
-  const currentVersion = application.version
-  const revertedToVersion = application.revertableVersion
   const appPackageUpdates = {
-    version: revertedToVersion,
+    version: application.revertableVersion,
     revertableVersion: null,
   }
-  const app = await updateAppPackage(appPackageUpdates, ctx.params.appId)
-  await events.app.versionReverted(app, currentVersion, revertedToVersion)
+  const data = await updateAppPackage(appPackageUpdates, ctx.params.appId)
   ctx.status = 200
-  ctx.body = app
+  ctx.body = data
 }
 
 const destroyApp = async (ctx: any) => {
@@ -435,15 +396,12 @@ const destroyApp = async (ctx: any) => {
   }
 
   const db = isUnpublish ? getProdAppDB() : getAppDB()
-  const app = await db.get(DocumentTypes.APP_METADATA)
   const result = await db.destroy()
 
   if (isUnpublish) {
     await quotas.removePublishedApp()
-    await events.app.unpublished(app)
   } else {
     await quotas.removeApp()
-    await events.app.deleted(app)
   }
 
   /* istanbul ignore next */
@@ -556,10 +514,10 @@ const updateAppPackage = async (appPackage: any, appId: any) => {
   // Redis, shouldn't ever store it
   delete newAppPackage.lockedBy
 
-  await db.put(newAppPackage)
+  const response = await db.put(newAppPackage)
   // remove any cached metadata, so that it will be updated
   await appCache.invalidateAppMetadata(appId)
-  return newAppPackage
+  return response
 }
 
 const createEmptyAppPackage = async (ctx: any, app: any) => {

package/src/api/controllers/automation.js

@@ -10,7 +10,6 @@ const { deleteEntityMetadata } = require("../../utilities")
 const { MetadataTypes } = require("../../constants")
 const { setTestFlag, clearTestFlag } = require("../../utilities/redis")
 const { getAppDB } = require("@budibase/backend-core/context")
-const { events } = require("@budibase/backend-core")
 
 const ACTION_DEFS = removeDeprecated(actions.ACTION_DEFINITIONS)
 const TRIGGER_DEFS = removeDeprecated(triggers.TRIGGER_DEFINITIONS)
@@ -71,10 +70,6 @@ exports.create = async function (ctx) {
     newAuto: automation,
   })
   const response = await db.put(automation)
-  await events.automation.created(automation)
-  for (let step of automation.definition.steps) {
-    await events.automation.stepCreated(automation, step)
-  }
   automation._rev = response.rev
 
   ctx.status = 200
@@ -87,30 +82,6 @@ exports.create = async function (ctx) {
   }
 }
 
-const getNewSteps = (oldAutomation, automation) => {
-  const oldStepIds = oldAutomation.definition.steps.map(s => s.id)
-  return automation.definition.steps.filter(s => !oldStepIds.includes(s.id))
-}
-
-const getDeletedSteps = (oldAutomation, automation) => {
-  const stepIds = automation.definition.steps.map(s => s.id)
-  return oldAutomation.definition.steps.filter(s => !stepIds.includes(s.id))
-}
-
-const handleStepEvents = async (oldAutomation, automation) => {
-  // new steps
-  const newSteps = getNewSteps(oldAutomation, automation)
-  for (let step of newSteps) {
-    await events.automation.stepCreated(automation, step)
-  }
-
-  // old steps
-  const deletedSteps = getDeletedSteps(oldAutomation, automation)
-  for (let step of deletedSteps) {
-    await events.automation.stepDeleted(automation, step)
-  }
-}
-
 exports.update = async function (ctx) {
   const db = getAppDB()
   let automation = ctx.request.body
@@ -127,14 +98,13 @@ exports.update = async function (ctx) {
   const oldAutoTrigger =
     oldAutomation && oldAutomation.definition.trigger
       ? oldAutomation.definition.trigger
-      : undefined
+      : {}
   const newAutoTrigger =
     automation && automation.definition.trigger
       ? automation.definition.trigger
       : {}
   // trigger has been updated, remove the test inputs
-  if (oldAutoTrigger && oldAutoTrigger.id !== newAutoTrigger.id) {
-    await events.automation.triggerUpdated(automation)
+  if (oldAutoTrigger.id !== newAutoTrigger.id) {
     await deleteEntityMetadata(
       ctx.appId,
       MetadataTypes.AUTOMATION_TEST_INPUT,
@@ -142,8 +112,6 @@ exports.update = async function (ctx) {
     )
   }
 
-  await handleStepEvents(oldAutomation, automation)
-
   ctx.status = 200
   ctx.body = {
     message: `Automation ${automation._id} updated successfully.`,
@@ -180,7 +148,6 @@ exports.destroy = async function (ctx) {
   // delete metadata first
   await cleanupAutomationMetadata(automationId)
   ctx.body = await db.remove(automationId, ctx.params.rev)
-  await events.automation.deleted(oldAutomation)
 }
 
 exports.getActionList = async function (ctx) {
@@ -248,5 +215,4 @@ exports.test = async function (ctx) {
   })
   await clearTestFlag(automation._id)
   ctx.body = response
-  await events.automation.tested(automation)
 }

package/src/api/controllers/backup.js

@@ -1,6 +1,4 @@
 const { streamBackup } = require("../../utilities/fileSystem")
-const { events, context } = require("@budibase/backend-core")
-const { DocumentTypes } = require("../../db/utils")
 
 exports.exportAppDump = async function (ctx) {
   const { appId } = ctx.query
@@ -8,10 +6,4 @@ exports.exportAppDump = async function (ctx) {
   const backupIdentifier = `${appName}-export-${new Date().getTime()}.txt`
   ctx.attachment(backupIdentifier)
   ctx.body = await streamBackup(appId)
-
-  await context.doInAppContext(appId, async () => {
-    const appDb = context.getAppDB()
-    const app = await appDb.get(DocumentTypes.APP_METADATA)
-    await events.app.exported(app)
-  })
 }

package/src/api/controllers/datasource.js

@@ -11,7 +11,6 @@ const { integrations } = require("../../integrations")
 const { getDatasourceAndQuery } = require("./row/utils")
 const { invalidateDynamicVariables } = require("../../threads/utils")
 const { getAppDB } = require("@budibase/backend-core/context")
-const { events } = require("@budibase/backend-core")
 
 exports.fetch = async function (ctx) {
   // Get internal tables
@@ -109,7 +108,6 @@ exports.update = async function (ctx) {
   }
 
   const response = await db.put(datasource)
-  await events.datasource.updated(datasource)
   datasource._rev = response.rev
 
   // Drain connection pools when configuration is changed
@@ -144,7 +142,6 @@ exports.save = async function (ctx) {
   }
 
   const dbResp = await db.put(datasource)
-  await events.datasource.created(datasource)
   datasource._rev = dbResp.rev
 
   // Drain connection pools when configuration is changed
@@ -164,11 +161,11 @@ exports.save = async function (ctx) {
 
 exports.destroy = async function (ctx) {
   const db = getAppDB()
-  const datasourceId = ctx.params.datasourceId
 
-  const datasource = await db.get(datasourceId)
   // Delete all queries for the datasource
-  const queries = await db.allDocs(getQueryParams(datasourceId, null))
+  const queries = await db.allDocs(
+    getQueryParams(ctx.params.datasourceId, null)
+  )
   await db.bulkDocs(
     queries.rows.map(row => ({
       _id: row.id,
@@ -178,8 +175,7 @@ exports.destroy = async function (ctx) {
   )
 
   // delete the datasource
-  await db.remove(datasourceId, ctx.params.revId)
-  await events.datasource.deleted(datasource)
+  await db.remove(ctx.params.datasourceId, ctx.params.revId)
 
   ctx.message = `Datasource deleted.`
   ctx.status = 200

package/src/api/controllers/deploy/index.ts

@@ -13,7 +13,6 @@ import {
   getProdAppDB,
 } from "@budibase/backend-core/context"
 import { quotas } from "@budibase/pro"
-import { events } from "@budibase/backend-core"
 
 // the max time we can wait for an invalidation to complete before considering it failed
 const MAX_PENDING_TIME_MS = 30 * 60000
@@ -123,7 +122,6 @@ async function deployApp(deployment: any) {
     console.log("Deployed app initialised, setting deployment to successful")
     deployment.setStatus(DeploymentStatus.SUCCESS)
     await storeDeploymentHistory(deployment)
-    return appDoc
   } catch (err: any) {
     deployment.setStatus(DeploymentStatus.FAILURE, err.message)
     await storeDeploymentHistory(deployment)
@@ -188,14 +186,12 @@ const _deployApp = async function (ctx: any) {
 
   console.log("Deploying app...")
 
-  let app
   if (await isFirstDeploy()) {
-    app = await quotas.addPublishedApp(() => deployApp(deployment))
+    await quotas.addPublishedApp(() => deployApp(deployment))
   } else {
-    app = await deployApp(deployment)
+    await deployApp(deployment)
   }
 
-  await events.app.published(app)
   ctx.body = deployment
 }