MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/form-block-ux-updates

This commit is contained in:
Dean 2023-08-15 09:05:44 +01:00
parent a2d4efbafd 6436aefa33
commit 1d4de9b084
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "2.9.24-alpha.4", "version": "2.9.26-alpha.0",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*" "packages/*"

4
qa-core/src/integrations/validators/dynamodb.integration.spec.ts
View File

@ -28,8 +28,8 @@ describe("datasource validators", () => {
8000 8000
)}`, )}`,
} }
env._set("AWS_ACCESS_KEY_ID", "mocked_key") env._set("AWS_ACCESS_KEY_ID", "mockedkey")
env._set("AWS_SECRET_ACCESS_KEY", "mocked_secret") env._set("AWS_SECRET_ACCESS_KEY", "mockedsecret")
}) })
it("test valid connection string", async () => { it("test valid connection string", async () => {

4
scripts/build.js
View File

@ -25,10 +25,10 @@ function runBuild(entry, outfile) {
if (!fs.existsSync("../pro/src")) { if (!fs.existsSync("../pro/src")) {
// If we don't have pro, we cannot bundle backend-core. // If we don't have pro, we cannot bundle backend-core.
// Otherwise, the main context will not be shared between libraries // Otherwise, the main context will not be shared between libraries
delete tsconfigPathPluginContent.compilerOptions.paths[ delete tsconfigPathPluginContent?.compilerOptions?.paths?.[
"@budibase/backend-core" "@budibase/backend-core"
] ]
delete tsconfigPathPluginContent.compilerOptions.paths[ delete tsconfigPathPluginContent?.compilerOptions?.paths?.[
"@budibase/backend-core/*" "@budibase/backend-core/*"
] ]
} }