@budibase/worker 2.9.40-alpha.6 → 2.10.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.9.40-alpha.6",
+  "version": "2.10.1",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -22,7 +22,7 @@
     "predocker": "yarn build && cp ../../yarn.lock ./dist/",
     "build:docker": "yarn predocker && docker build . -t worker-service --label version=$BUDIBASE_RELEASE_VERSION",
     "dev:stack:init": "node ./scripts/dev/manage.js init",
-    "dev:builder": "npm run dev:stack:init && nodemon",
+    "dev:builder": "npm run dev:stack:init && rimraf dist/ && nodemon",
     "dev:built": "yarn run dev:stack:init && yarn run run:docker",
     "test": "bash scripts/test.sh",
     "test:watch": "jest --watch",
@@ -38,10 +38,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.9.40-alpha.6",
-    "@budibase/pro": "2.9.40-alpha.6",
-    "@budibase/string-templates": "2.9.40-alpha.6",
-    "@budibase/types": "2.9.40-alpha.6",
+    "@budibase/backend-core": "2.10.1",
+    "@budibase/pro": "2.10.1",
+    "@budibase/string-templates": "2.10.1",
+    "@budibase/types": "2.10.1",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -82,8 +82,8 @@
     "@types/koa": "2.13.4",
     "@types/koa__router": "8.0.8",
     "@types/lodash": "^4.14.191",
-    "@types/node": "18.17.0",
-    "@types/node-fetch": "2.6.4",
+    "@types/node": "14.18.20",
+    "@types/node-fetch": "2.6.1",
     "@types/pouchdb": "6.4.0",
     "@types/server-destroy": "1.0.1",
     "@types/supertest": "2.0.12",
@@ -118,5 +118,5 @@
       }
     }
   },
-  "gitHead": "c12bc9b18283092a1fdf3a8e60919592c4d9666d"
+  "gitHead": "8f5a104e9d1e6edc2ed58bf0ca16a2aec8980be8"
 }

package/src/api/controllers/system/environment.ts

@@ -10,6 +10,7 @@ export const fetch = async (ctx: Ctx) => {
     accountPortalUrl: env.ACCOUNT_PORTAL_URL,
     disableAccountPortal: env.DISABLE_ACCOUNT_PORTAL,
     baseUrl: env.PLATFORM_URL,
+    // in test need to pretend its in production for the UI (Cypress)
     isDev: env.isDev() && !env.isTest(),
   }
 }

package/src/environment.ts

@@ -4,8 +4,20 @@ import { join } from "path"
 
 coreEnv._set("SERVICE_TYPE", ServiceType.WORKER)
 
+function isDev() {
+  return process.env.NODE_ENV !== "production"
+}
+
+function isTest() {
+  return (
+    process.env.NODE_ENV === "jest" ||
+    process.env.NODE_ENV === "cypress" ||
+    process.env.JEST_WORKER_ID != null
+  )
+}
+
 let LOADED = false
-if (!LOADED && coreEnv.isDev() && !coreEnv.isTest()) {
+if (!LOADED && isDev() && !isTest()) {
   require("dotenv").config({
     path: join(__dirname, "..", ".env"),
   })
@@ -73,16 +85,16 @@ const environment = {
     // @ts-ignore
     environment[key] = value
   },
-  isDev: coreEnv.isDev,
-  isTest: coreEnv.isTest,
+  isDev,
+  isTest,
   isProd: () => {
-    return !coreEnv.isDev()
+    return !isDev()
   },
 }
 
 // if some var haven't been set, define them
 if (!environment.APPS_URL) {
-  environment.APPS_URL = coreEnv.isDev()
+  environment.APPS_URL = isDev()
     ? "http://localhost:4001"
     : "http://app-service:4002"
 }