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

Merge branch 'develop' of github.com:Budibase/budibase into labday/backups

pull/6584/head
mike12345567 4 years ago
parent
5dd754f314 0e10e6a6b3
commit
d6bb6582b4
16 changed files with 986 additions and 65 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. 4
      packages/backend-core/package.json
  3. 4
      packages/bbui/package.json
  4. 943
      packages/bbui/yarn.lock
  5. 10
      packages/builder/cypress/integration/createApp.spec.js
  6. 14
      packages/builder/cypress/support/commands.js
  7. 10
      packages/builder/package.json
  8. 2
      packages/cli/package.json
  9. 8
      packages/client/package.json
  10. 4
      packages/frontend-core/package.json
  11. 18
      packages/frontend-core/yarn.lock
  12. 12
      packages/server/package.json
  13. 2
      packages/string-templates/package.json
  14. 2
      packages/types/package.json
  15. 10
      packages/worker/package.json
  16. 6
      yarn.lock

2
lerna.json
View File

@ -1,5 +1,5 @@
{
"version": "1.1.14",
"version": "1.1.15-alpha.1",
"npmClient": "yarn",
"packages": [
"packages/*"

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

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "1.1.14",
"version": "1.1.15-alpha.1",
"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.1.14",
"@budibase/types": "^1.1.15-alpha.1",
"@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.1.14",
"version": "1.1.15-alpha.1",
"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.1.14",
"@budibase/string-templates": "^1.1.15-alpha.1",
"@spectrum-css/actionbutton": "^1.0.1",
"@spectrum-css/actiongroup": "^1.0.1",
"@spectrum-css/avatar": "^3.0.2",

943
packages/bbui/yarn.lock
View File

File diff suppressed because it is too large

10
packages/builder/cypress/integration/createApp.spec.js
View File

@ -100,24 +100,18 @@ filterTests(['smoke', 'all'], () => {
})
it("should create the first application from scratch, using the users first name as the default app name", () => {
cy.visit(`${Cypress.config().baseUrl}/builder`)
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
cy.updateUserInformation("Ted", "Userman")
cy.createApp("", false)
cy.visit(`${Cypress.config().baseUrl}/builder`)
cy.applicationInAppTable("Teds app")
cy.deleteApp("Teds app")
//Accomodate names that end in 'S'
// Accomodate names that end in 'S'
cy.updateUserInformation("Chris", "Userman")
cy.createApp("", false)
cy.visit(`${Cypress.config().baseUrl}/builder`)
cy.applicationInAppTable("Chris app")
cy.deleteApp("Chris app")

14
packages/builder/cypress/support/commands.js
View File

@ -4,7 +4,7 @@ Cypress.on("uncaught:exception", () => {
// ACCOUNTS & USERS
Cypress.Commands.add("login", (email, password) => {
cy.visit(`${Cypress.config().baseUrl}/builder`)
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
cy.wait(2000)
cy.url().then(url => {
if (url.includes("builder/admin")) {
@ -139,7 +139,9 @@ Cypress.Commands.add("createApp", (name, addDefaultTable) => {
cy.get(`[data-cy="create-app-btn"]`, { timeout: 5000 }).click({ force: true })
// If apps already exist
cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`, {
timeout: 5000,
})
.its("body")
.then(val => {
if (val.length > 0) {
@ -223,9 +225,11 @@ Cypress.Commands.add("deleteApp", name => {
})
Cypress.Commands.add("deleteAllApps", () => {
cy.visit(`${Cypress.config().baseUrl}/builder`)
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
cy.wait(500)
cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`, {
timeout: 5000,
})
.its("body")
.then(val => {
for (let i = 0; i < val.length; i++) {
@ -377,7 +381,7 @@ Cypress.Commands.add("searchForApplication", appName => {
// Assumes there are no others
Cypress.Commands.add("applicationInAppTable", appName => {
cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 10000 })
cy.get(".appTable", { timeout: 2000 }).within(() => {
cy.get(".appTable", { timeout: 5000 }).within(() => {
cy.get(".title").contains(appName).should("exist")
})
})

10
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/builder",
"version": "1.1.14",
"version": "1.1.15-alpha.1",
"license": "GPL-3.0",
"private": true,
"scripts": {
@ -69,10 +69,10 @@
}
},
"dependencies": {
"@budibase/bbui": "^1.1.14",
"@budibase/client": "^1.1.14",
"@budibase/frontend-core": "^1.1.14",
"@budibase/string-templates": "^1.1.14",
"@budibase/bbui": "^1.1.15-alpha.1",
"@budibase/client": "^1.1.15-alpha.1",
"@budibase/frontend-core": "^1.1.15-alpha.1",
"@budibase/string-templates": "^1.1.15-alpha.1",
"@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.1.14",
"version": "1.1.15-alpha.1",
"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.1.14",
"version": "1.1.15-alpha.1",
"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.1.14",
"@budibase/frontend-core": "^1.1.14",
"@budibase/string-templates": "^1.1.14",
"@budibase/bbui": "^1.1.15-alpha.1",
"@budibase/frontend-core": "^1.1.15-alpha.1",
"@budibase/string-templates": "^1.1.15-alpha.1",
"@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.1.14",
"version": "1.1.15-alpha.1",
"description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase",
"license": "MPL-2.0",
"svelte": "src/index.js",
"dependencies": {
"@budibase/bbui": "^1.1.14",
"@budibase/bbui": "^1.1.15-alpha.1",
"lodash": "^4.17.21",
"svelte": "^3.46.2"
}

18
packages/frontend-core/yarn.lock
View File

@ -7,13 +7,13 @@
resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.5.4.tgz#0e09ff519c36139176c3ba3ce617a995c9032f67"
integrity sha512-sZ19YOLGw5xTZzCEkVXPjf53lXVzo063KmDTJjpSjy/XLVsF+RaX0b436SfSM4hsIUZ7n27+UsbOvzFaFjcYXw==
"@budibase/bbui@^1.1.10-alpha.3":
version "1.1.11"
resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.1.11.tgz#513e4fd496fb25660e9edd970c2638c8ad54efc4"
integrity sha512-iRToMtMyfW3atUtNYYtec59tTw6mFFvv4DKcUBWfGqxbeh2+mR5Iy3jmW9eGOFqd8yU/7ml6o7F6cI6J75WGUw==
"@budibase/bbui@^1.1.15-alpha.1":
version "1.1.15"
resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.1.15.tgz#043ece1537e0810a3c71ab5fd13382f74c88181d"
integrity sha512-Cta9kVmgbd3PBxu3HiCthovpx08IotdYv5tVQutqsRKOh4xhCArdk9u2xYSI8iXQoi7U+2aevpH/U4XGAg6huA==
dependencies:
"@adobe/spectrum-css-workflow-icons" "^1.2.1"
"@budibase/string-templates" "^1.1.11"
"@budibase/string-templates" "^1.1.15"
"@spectrum-css/actionbutton" "^1.0.1"
"@spectrum-css/actiongroup" "^1.0.1"
"@spectrum-css/avatar" "^3.0.2"
@ -85,10 +85,10 @@
to-gfm-code-block "^0.1.1"
year "^0.2.1"
"@budibase/string-templates@^1.1.11":
version "1.1.11"
resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-1.1.11.tgz#7466b7e10f96e4eb45ccf39bafd4a511abba2e49"
integrity sha512-yDj4rkmzWs0yn8r3cUYEkpJX3yqK2zHrBw0cNN7L3cUwX+MJsOgLAt9J7sub0nUmQJR2+ookjP3bysYc7N7v3Q==
"@budibase/string-templates@^1.1.15":
version "1.1.15"
resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-1.1.15.tgz#14e7e0c84f08c091049fa6bed1cd527b8c199975"
integrity sha512-hXMIohvVlpj/l/jrWIlNb1Hqyjmbi95yvOiFigTq9Js6xfV7ugmuP0c4IOQB8hb4zYhud4A+WqhxC5WVUebYiA==
dependencies:
"@budibase/handlebars-helpers" "^0.11.8"
dayjs "^1.10.4"

12
packages/server/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "1.1.14",
"version": "1.1.15-alpha.1",
"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.1.14",
"@budibase/client": "^1.1.14",
"@budibase/pro": "1.1.14",
"@budibase/string-templates": "^1.1.14",
"@budibase/types": "^1.1.14",
"@budibase/backend-core": "^1.1.15-alpha.1",
"@budibase/client": "^1.1.15-alpha.1",
"@budibase/pro": "1.1.15-alpha.1",
"@budibase/string-templates": "^1.1.15-alpha.1",
"@budibase/types": "^1.1.15-alpha.1",
"@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.1.14",
"version": "1.1.15-alpha.1",
"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.1.14",
"version": "1.1.15-alpha.1",
"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.1.14",
"version": "1.1.15-alpha.1",
"description": "Budibase background service",
"main": "src/index.ts",
"repository": {
@ -35,10 +35,10 @@
"author": "Budibase",
"license": "GPL-3.0",
"dependencies": {
"@budibase/backend-core": "^1.1.14",
"@budibase/pro": "1.1.14",
"@budibase/string-templates": "^1.1.14",
"@budibase/types": "^1.1.14",
"@budibase/backend-core": "^1.1.15-alpha.1",
"@budibase/pro": "1.1.15-alpha.1",
"@budibase/string-templates": "^1.1.15-alpha.1",
"@budibase/types": "^1.1.15-alpha.1",
"@koa/router": "8.0.8",
"@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "0.3.2",

6
yarn.lock
View File

@ -5770,9 +5770,9 @@ supports-preserve-symlinks-flag@^1.0.0:
integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
svelte@^3.38.2:
version "3.46.4"
resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.46.4.tgz#0c46bc4a3e20a2617a1b7dc43a722f9d6c084a38"
integrity sha512-qKJzw6DpA33CIa+C/rGp4AUdSfii0DOTCzj/2YpSKKayw5WGSS624Et9L1nU1k2OVRS9vaENQXp2CVZNU+xvIg==
version "3.49.0"
resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.49.0.tgz#5baee3c672306de1070c3b7888fc2204e36a4029"
integrity sha512-+lmjic1pApJWDfPCpUUTc1m8azDqYCG1JN9YEngrx/hUyIcFJo6VZhj0A1Ai0wqoHcEIuQy+e9tk+4uDgdtsFA==
table@^6.0.9:
version "6.8.0"

Write Preview
Loading…
Cancel
Save