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

Merge remote-tracking branch 'origin/develop' into feature/app-action-ui-updates

pull/6676/head
Dean 4 years ago
parent
b994320ab2 a2c2763565
commit
e26f7bcd28
14 changed files with 37 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      lerna.json
  2. 1
      packages/backend-core/cache.js
  3. 4
      packages/backend-core/package.json
  4. 4
      packages/bbui/package.json
  5. 10
      packages/builder/package.json
  6. 5
      packages/builder/src/pages/builder/portal/manage/email/index.svelte
  7. 2
      packages/cli/package.json
  8. 8
      packages/client/package.json
  9. 4
      packages/frontend-core/package.json
  10. 12
      packages/server/package.json
  11. 2
      packages/string-templates/package.json
  12. 2
      packages/types/package.json
  13. 10
      packages/worker/package.json
  14. 3
      packages/worker/src/api/controllers/global/configs.js

2
lerna.json
View File

@ -1,5 +1,5 @@
{
"version": "1.0.219-alpha.16",
"version": "1.0.219-alpha.17",
"npmClient": "yarn",
"packages": [
"packages/*"

1
packages/backend-core/cache.js
View File

@ -5,4 +5,5 @@ module.exports = {
app: require("./src/cache/appMetadata"),
writethrough: require("./src/cache/writethrough"),
...generic,
cache: generic,
}

4
packages/backend-core/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "1.0.219-alpha.16",
"version": "1.0.219-alpha.17",
"description": "Budibase backend core libraries used in server and worker",
"main": "dist/src/index.js",
"types": "dist/src/index.d.ts",
@ -20,7 +20,7 @@
"test:watch": "jest --watchAll"
},
"dependencies": {
"@budibase/types": "^1.0.219-alpha.16",
"@budibase/types": "^1.0.219-alpha.17",
"@techpass/passport-openidconnect": "0.3.2",
"aws-sdk": "2.1030.0",
"bcrypt": "5.0.1",

4
packages/bbui/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.",
"version": "1.0.219-alpha.16",
"version": "1.0.219-alpha.17",
"license": "MPL-2.0",
"svelte": "src/index.js",
"module": "dist/bbui.es.js",
@ -38,7 +38,7 @@
],
"dependencies": {
"@adobe/spectrum-css-workflow-icons": "^1.2.1",
"@budibase/string-templates": "^1.0.219-alpha.16",
"@budibase/string-templates": "^1.0.219-alpha.17",
"@spectrum-css/actionbutton": "^1.0.1",
"@spectrum-css/actiongroup": "^1.0.1",
"@spectrum-css/avatar": "^3.0.2",

10
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/builder",
"version": "1.0.219-alpha.16",
"version": "1.0.219-alpha.17",
"license": "GPL-3.0",
"private": true,
"scripts": {
@ -69,10 +69,10 @@
}
},
"dependencies": {
"@budibase/bbui": "^1.0.219-alpha.16",
"@budibase/client": "^1.0.219-alpha.16",
"@budibase/frontend-core": "^1.0.219-alpha.16",
"@budibase/string-templates": "^1.0.219-alpha.16",
"@budibase/bbui": "^1.0.219-alpha.17",
"@budibase/client": "^1.0.219-alpha.17",
"@budibase/frontend-core": "^1.0.219-alpha.17",
"@budibase/string-templates": "^1.0.219-alpha.17",
"@sentry/browser": "5.19.1",
"@spectrum-css/page": "^3.0.1",
"@spectrum-css/vars": "^3.0.1",

5
packages/builder/src/pages/builder/portal/manage/email/index.svelte
View File

@ -74,7 +74,10 @@
rev: smtpConfig._rev,
})
smtpConfig = {
config: {},
type: ConfigTypes.SMTP,
config: {
secure: true,
},
}
await admin.getChecklist()
notifications.success(`Settings cleared`)

2
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/cli",
"version": "1.0.219-alpha.16",
"version": "1.0.219-alpha.17",
"description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js",
"bin": {

8
packages/client/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/client",
"version": "1.0.219-alpha.16",
"version": "1.0.219-alpha.17",
"license": "MPL-2.0",
"module": "dist/budibase-client.js",
"main": "dist/budibase-client.js",
@ -19,9 +19,9 @@
"dev:builder": "rollup -cw"
},
"dependencies": {
"@budibase/bbui": "^1.0.219-alpha.16",
"@budibase/frontend-core": "^1.0.219-alpha.16",
"@budibase/string-templates": "^1.0.219-alpha.16",
"@budibase/bbui": "^1.0.219-alpha.17",
"@budibase/frontend-core": "^1.0.219-alpha.17",
"@budibase/string-templates": "^1.0.219-alpha.17",
"@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3",

4
packages/frontend-core/package.json
View File

@ -1,12 +1,12 @@
{
"name": "@budibase/frontend-core",
"version": "1.0.219-alpha.16",
"version": "1.0.219-alpha.17",
"description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase",
"license": "MPL-2.0",
"svelte": "src/index.js",
"dependencies": {
"@budibase/bbui": "^1.0.219-alpha.16",
"@budibase/bbui": "^1.0.219-alpha.17",
"lodash": "^4.17.21",
"svelte": "^3.46.2"
}

12
packages/server/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "1.0.219-alpha.16",
"version": "1.0.219-alpha.17",
"description": "Budibase Web Server",
"main": "src/index.ts",
"repository": {
@ -77,11 +77,11 @@
"license": "GPL-3.0",
"dependencies": {
"@apidevtools/swagger-parser": "10.0.3",
"@budibase/backend-core": "^1.0.219-alpha.16",
"@budibase/client": "^1.0.219-alpha.16",
"@budibase/pro": "1.0.219-alpha.16",
"@budibase/string-templates": "^1.0.219-alpha.16",
"@budibase/types": "^1.0.219-alpha.16",
"@budibase/backend-core": "^1.0.219-alpha.17",
"@budibase/client": "^1.0.219-alpha.17",
"@budibase/pro": "1.0.219-alpha.17",
"@budibase/string-templates": "^1.0.219-alpha.17",
"@budibase/types": "^1.0.219-alpha.17",
"@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0",

2
packages/string-templates/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/string-templates",
"version": "1.0.219-alpha.16",
"version": "1.0.219-alpha.17",
"description": "Handlebars wrapper for Budibase templating.",
"main": "src/index.cjs",
"module": "dist/bundle.mjs",

2
packages/types/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/types",
"version": "1.0.219-alpha.16",
"version": "1.0.219-alpha.17",
"description": "Budibase types",
"main": "dist/index.js",
"types": "dist/index.d.ts",

10
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/worker",
"email": "hi@budibase.com",
"version": "1.0.219-alpha.16",
"version": "1.0.219-alpha.17",
"description": "Budibase background service",
"main": "src/index.ts",
"repository": {
@ -34,10 +34,10 @@
"author": "Budibase",
"license": "GPL-3.0",
"dependencies": {
"@budibase/backend-core": "^1.0.219-alpha.16",
"@budibase/pro": "1.0.219-alpha.16",
"@budibase/string-templates": "^1.0.219-alpha.16",
"@budibase/types": "^1.0.219-alpha.16",
"@budibase/backend-core": "^1.0.219-alpha.17",
"@budibase/pro": "1.0.219-alpha.17",
"@budibase/string-templates": "^1.0.219-alpha.17",
"@budibase/types": "^1.0.219-alpha.17",
"@koa/router": "8.0.8",
"@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "0.3.2",

3
packages/worker/src/api/controllers/global/configs.js
View File

@ -17,6 +17,7 @@ const {
withCache,
CacheKeys,
bustCache,
cache,
} = require("@budibase/backend-core/cache")
const { events } = require("@budibase/backend-core")
const { checkAnyUserExists } = require("../../../utilities/users")
@ -365,9 +366,9 @@ exports.upload = async function (ctx) {
exports.destroy = async function (ctx) {
const db = getGlobalDB()
const { id, rev } = ctx.params
try {
await db.remove(id, rev)
await cache.delete(CacheKeys.CHECKLIST)
ctx.body = { message: "Config deleted successfully" }
} catch (err) {
ctx.throw(err.status, err)

Write Preview
Loading…
Cancel
Save