@budibase/server 2.6.8-alpha.2 → 2.6.8
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/builder/assets/{index.31d4e3c2.js → index.821e6877.js} +3 -3
- package/builder/index.html +1 -1
- package/dist/api/routes/public/index.js +7 -2
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/jest.config.ts +3 -3
- package/nodemon.json +3 -7
- package/package.json +8 -8
- package/src/api/routes/public/index.ts +7 -3
- package/tsconfig.json +1 -1
package/jest.config.ts
CHANGED
|
@@ -20,9 +20,9 @@ const baseConfig: Config.InitialProjectOptions = {
|
|
|
20
20
|
}
|
|
21
21
|
|
|
22
22
|
// add pro sources if they exist
|
|
23
|
-
if (fs.existsSync("
|
|
24
|
-
baseConfig.moduleNameMapper
|
|
25
|
-
"<rootDir
|
|
23
|
+
if (fs.existsSync("../../../budibase-pro")) {
|
|
24
|
+
baseConfig.moduleNameMapper["@budibase/pro"] =
|
|
25
|
+
"<rootDir>/../../../budibase-pro/packages/pro/src"
|
|
26
26
|
}
|
|
27
27
|
|
|
28
28
|
const config: Config.InitialOptions = {
|
package/nodemon.json
CHANGED
|
@@ -1,10 +1,6 @@
|
|
|
1
1
|
{
|
|
2
|
-
"watch": ["src", "../backend-core", "
|
|
2
|
+
"watch": ["src", "../backend-core", "../../../budibase-pro/packages/pro"],
|
|
3
3
|
"ext": "js,ts,json",
|
|
4
|
-
"ignore": [
|
|
5
|
-
"src/**/*.spec.ts",
|
|
6
|
-
"src/**/*.spec.js",
|
|
7
|
-
"../backend-core/dist/**/*"
|
|
8
|
-
],
|
|
4
|
+
"ignore": ["src/**/*.spec.ts", "src/**/*.spec.js", "../backend-core/dist/**/*"],
|
|
9
5
|
"exec": "ts-node src/index.ts"
|
|
10
|
-
}
|
|
6
|
+
}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/server",
|
|
3
3
|
"email": "hi@budibase.com",
|
|
4
|
-
"version": "2.6.8
|
|
4
|
+
"version": "2.6.8",
|
|
5
5
|
"description": "Budibase Web Server",
|
|
6
6
|
"main": "src/index.ts",
|
|
7
7
|
"repository": {
|
|
@@ -45,12 +45,12 @@
|
|
|
45
45
|
"license": "GPL-3.0",
|
|
46
46
|
"dependencies": {
|
|
47
47
|
"@apidevtools/swagger-parser": "10.0.3",
|
|
48
|
-
"@budibase/backend-core": "2.6.8
|
|
49
|
-
"@budibase/client": "2.6.8
|
|
50
|
-
"@budibase/pro": "2.6.
|
|
51
|
-
"@budibase/shared-core": "2.6.8
|
|
52
|
-
"@budibase/string-templates": "2.6.8
|
|
53
|
-
"@budibase/types": "2.6.8
|
|
48
|
+
"@budibase/backend-core": "^2.6.8",
|
|
49
|
+
"@budibase/client": "^2.6.8",
|
|
50
|
+
"@budibase/pro": "2.6.7",
|
|
51
|
+
"@budibase/shared-core": "^2.6.8",
|
|
52
|
+
"@budibase/string-templates": "^2.6.8",
|
|
53
|
+
"@budibase/types": "^2.6.8",
|
|
54
54
|
"@bull-board/api": "3.7.0",
|
|
55
55
|
"@bull-board/koa": "3.9.4",
|
|
56
56
|
"@elastic/elasticsearch": "7.10.0",
|
|
@@ -176,5 +176,5 @@
|
|
|
176
176
|
"optionalDependencies": {
|
|
177
177
|
"oracledb": "5.3.0"
|
|
178
178
|
},
|
|
179
|
-
"gitHead": "
|
|
179
|
+
"gitHead": "174f633017eef74e6a84c077c59d8f040e92c2fc"
|
|
180
180
|
}
|
|
@@ -42,13 +42,17 @@ if (!env.isTest()) {
|
|
|
42
42
|
host: REDIS_OPTS.host,
|
|
43
43
|
port: REDIS_OPTS.port,
|
|
44
44
|
},
|
|
45
|
-
|
|
46
|
-
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
if (REDIS_OPTS.opts?.password || REDIS_OPTS.opts.redisOptions?.password) {
|
|
48
|
+
// @ts-ignore
|
|
49
|
+
options.password =
|
|
50
|
+
REDIS_OPTS.opts.password || REDIS_OPTS.opts.redisOptions.password
|
|
47
51
|
}
|
|
48
52
|
|
|
49
53
|
if (!env.REDIS_CLUSTERED) {
|
|
50
|
-
// Can't set direct redis db in clustered env
|
|
51
54
|
// @ts-ignore
|
|
55
|
+
// Can't set direct redis db in clustered env
|
|
52
56
|
options.database = 1
|
|
53
57
|
}
|
|
54
58
|
}
|
package/tsconfig.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"@budibase/backend-core": ["../backend-core/src"],
|
|
12
12
|
"@budibase/backend-core/*": ["../backend-core/*"],
|
|
13
13
|
"@budibase/shared-core": ["../shared-core/src"],
|
|
14
|
-
"@budibase/pro": ["
|
|
14
|
+
"@budibase/pro": ["../../../budibase-pro/packages/pro/src"]
|
|
15
15
|
}
|
|
16
16
|
},
|
|
17
17
|
"ts-node": {
|