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

Merge branch 'develop' of github.com:Budibase/budibase into feature/portal-usage

This commit is contained in:
mike12345567 2022-05-19 21:25:41 +01:00
parent 8ccc340a81 cd2139673f
commit e261011697
13 changed files with 30 additions and 28 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": "1.0.167-alpha.3",
"version": "1.0.167-alpha.4",
"npmClient": "yarn",
"packages": [
"packages/*"

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

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "1.0.167-alpha.3",
"version": "1.0.167-alpha.4",
"description": "Budibase backend core libraries used in server and worker",
"main": "src/index.js",
"author": "Budibase",

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.167-alpha.3",
"version": "1.0.167-alpha.4",
"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.167-alpha.3",
"@budibase/string-templates": "^1.0.167-alpha.4",
"@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.167-alpha.3",
"version": "1.0.167-alpha.4",
"license": "GPL-3.0",
"private": true,
"scripts": {
@ -67,10 +67,10 @@
}
},
"dependencies": {
"@budibase/bbui": "^1.0.167-alpha.3",
"@budibase/client": "^1.0.167-alpha.3",
"@budibase/frontend-core": "^1.0.167-alpha.3",
"@budibase/string-templates": "^1.0.167-alpha.3",
"@budibase/bbui": "^1.0.167-alpha.4",
"@budibase/client": "^1.0.167-alpha.4",
"@budibase/frontend-core": "^1.0.167-alpha.4",
"@budibase/string-templates": "^1.0.167-alpha.4",
"@sentry/browser": "5.19.1",
"@spectrum-css/page": "^3.0.1",
"@spectrum-css/vars": "^3.0.1",

2
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/cli",
"version": "1.0.167-alpha.3",
"version": "1.0.167-alpha.4",
"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.167-alpha.3",
"version": "1.0.167-alpha.4",
"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.167-alpha.3",
"@budibase/frontend-core": "^1.0.167-alpha.3",
"@budibase/string-templates": "^1.0.167-alpha.3",
"@budibase/bbui": "^1.0.167-alpha.4",
"@budibase/frontend-core": "^1.0.167-alpha.4",
"@budibase/string-templates": "^1.0.167-alpha.4",
"@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.167-alpha.3",
"version": "1.0.167-alpha.4",
"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.167-alpha.3",
"@budibase/bbui": "^1.0.167-alpha.4",
"lodash": "^4.17.21",
"svelte": "^3.46.2"
}

2
packages/frontend-core/src/api/templates.js
View File

@ -29,7 +29,7 @@ export const buildTemplateEndpoints = API => ({
*/
getAppTemplates: async () => {
return await API.get({
url: "/api/templates?type=app",
url: "/api/templates",
})
},
})

10
packages/server/package.json
View File

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

3
packages/server/src/api/controllers/templates.js
View File

@ -1,12 +1,13 @@
const fetch = require("node-fetch")
const { downloadTemplate } = require("../../utilities/fileSystem")
const env = require("../../environment")
// development flag, can be used to test against templates exported locally
const DEFAULT_TEMPLATES_BUCKET =
"prod-budi-templates.s3-eu-west-1.amazonaws.com"
exports.fetch = async function (ctx) {
const { type = "app" } = ctx.query
let type = env.TEMPLATE_REPOSITORY
let response,
error = false
try {

1
packages/server/src/environment.js
View File

@ -54,6 +54,7 @@ module.exports = {
JEST_WORKER_ID: process.env.JEST_WORKER_ID,
BUDIBASE_ENVIRONMENT: process.env.BUDIBASE_ENVIRONMENT,
DISABLE_ACCOUNT_PORTAL: process.env.DISABLE_ACCOUNT_PORTAL,
TEMPLATE_REPOSITORY: process.env.TEMPLATE_REPOSITORY || "app",
// minor
SALT_ROUNDS: process.env.SALT_ROUNDS,
LOGGER: process.env.LOGGER,

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

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

8
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/worker",
"email": "hi@budibase.com",
"version": "1.0.167-alpha.3",
"version": "1.0.167-alpha.4",
"description": "Budibase background service",
"main": "src/index.ts",
"repository": {
@ -31,9 +31,9 @@
"author": "Budibase",
"license": "GPL-3.0",
"dependencies": {
"@budibase/backend-core": "^1.0.167-alpha.3",
"@budibase/pro": "1.0.167-alpha.3",
"@budibase/string-templates": "^1.0.167-alpha.3",
"@budibase/backend-core": "^1.0.167-alpha.4",
"@budibase/pro": "1.0.167-alpha.4",
"@budibase/string-templates": "^1.0.167-alpha.4",
"@koa/router": "^8.0.0",
"@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "^0.3.0",