@budibase/worker 2.9.40-alpha.0 → 2.9.40-alpha.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/worker",
|
|
3
3
|
"email": "hi@budibase.com",
|
|
4
|
-
"version": "2.9.40-alpha.
|
|
4
|
+
"version": "2.9.40-alpha.1",
|
|
5
5
|
"description": "Budibase background service",
|
|
6
6
|
"main": "src/index.ts",
|
|
7
7
|
"repository": {
|
|
@@ -38,10 +38,10 @@
|
|
|
38
38
|
"author": "Budibase",
|
|
39
39
|
"license": "GPL-3.0",
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@budibase/backend-core": "2.9.40-alpha.
|
|
42
|
-
"@budibase/pro": "2.9.40-alpha.
|
|
43
|
-
"@budibase/string-templates": "2.9.40-alpha.
|
|
44
|
-
"@budibase/types": "2.9.40-alpha.
|
|
41
|
+
"@budibase/backend-core": "2.9.40-alpha.1",
|
|
42
|
+
"@budibase/pro": "2.9.40-alpha.1",
|
|
43
|
+
"@budibase/string-templates": "2.9.40-alpha.1",
|
|
44
|
+
"@budibase/types": "2.9.40-alpha.1",
|
|
45
45
|
"@koa/router": "8.0.8",
|
|
46
46
|
"@sentry/node": "6.17.7",
|
|
47
47
|
"@techpass/passport-openidconnect": "0.3.2",
|
|
@@ -118,5 +118,5 @@
|
|
|
118
118
|
}
|
|
119
119
|
}
|
|
120
120
|
},
|
|
121
|
-
"gitHead": "
|
|
121
|
+
"gitHead": "7b8a8508fdebfdde35fe80415b19e2f89647ab32"
|
|
122
122
|
}
|
|
@@ -10,7 +10,6 @@ export const fetch = async (ctx: Ctx) => {
|
|
|
10
10
|
accountPortalUrl: env.ACCOUNT_PORTAL_URL,
|
|
11
11
|
disableAccountPortal: env.DISABLE_ACCOUNT_PORTAL,
|
|
12
12
|
baseUrl: env.PLATFORM_URL,
|
|
13
|
-
// in test need to pretend its in production for the UI (Cypress)
|
|
14
13
|
isDev: env.isDev() && !env.isTest(),
|
|
15
14
|
}
|
|
16
15
|
}
|
package/src/environment.ts
CHANGED
|
@@ -4,20 +4,8 @@ import { join } from "path"
|
|
|
4
4
|
|
|
5
5
|
coreEnv._set("SERVICE_TYPE", ServiceType.WORKER)
|
|
6
6
|
|
|
7
|
-
function isDev() {
|
|
8
|
-
return process.env.NODE_ENV !== "production"
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
function isTest() {
|
|
12
|
-
return (
|
|
13
|
-
process.env.NODE_ENV === "jest" ||
|
|
14
|
-
process.env.NODE_ENV === "cypress" ||
|
|
15
|
-
process.env.JEST_WORKER_ID != null
|
|
16
|
-
)
|
|
17
|
-
}
|
|
18
|
-
|
|
19
7
|
let LOADED = false
|
|
20
|
-
if (!LOADED && isDev() && !isTest()) {
|
|
8
|
+
if (!LOADED && coreEnv.isDev() && !coreEnv.isTest()) {
|
|
21
9
|
require("dotenv").config({
|
|
22
10
|
path: join(__dirname, "..", ".env"),
|
|
23
11
|
})
|
|
@@ -85,16 +73,16 @@ const environment = {
|
|
|
85
73
|
// @ts-ignore
|
|
86
74
|
environment[key] = value
|
|
87
75
|
},
|
|
88
|
-
isDev,
|
|
89
|
-
isTest,
|
|
76
|
+
isDev: coreEnv.isDev,
|
|
77
|
+
isTest: coreEnv.isTest,
|
|
90
78
|
isProd: () => {
|
|
91
|
-
return !isDev()
|
|
79
|
+
return !coreEnv.isDev()
|
|
92
80
|
},
|
|
93
81
|
}
|
|
94
82
|
|
|
95
83
|
// if some var haven't been set, define them
|
|
96
84
|
if (!environment.APPS_URL) {
|
|
97
|
-
environment.APPS_URL = isDev()
|
|
85
|
+
environment.APPS_URL = coreEnv.isDev()
|
|
98
86
|
? "http://localhost:4001"
|
|
99
87
|
: "http://app-service:4002"
|
|
100
88
|
}
|