1
0
Fork 0
mirror of synced 2024-06-26 18:10:51 +12:00

Merge branch 'develop' of github.com:Budibase/budibase into fix/datasource-rename

This commit is contained in:
mike12345567 2022-09-14 14:06:38 +01:00
commit 01f115cd6b
21 changed files with 142 additions and 91 deletions

View file

@ -1,5 +1,5 @@
{ {
"version": "1.3.15-alpha.6", "version": "1.3.15-alpha.7",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*" "packages/*"

View file

@ -1,6 +1,6 @@
{ {
"name": "@budibase/backend-core", "name": "@budibase/backend-core",
"version": "1.3.15-alpha.6", "version": "1.3.15-alpha.7",
"description": "Budibase backend core libraries used in server and worker", "description": "Budibase backend core libraries used in server and worker",
"main": "dist/src/index.js", "main": "dist/src/index.js",
"types": "dist/src/index.d.ts", "types": "dist/src/index.d.ts",
@ -20,11 +20,12 @@
"test:watch": "jest --watchAll" "test:watch": "jest --watchAll"
}, },
"dependencies": { "dependencies": {
"@budibase/types": "1.3.15-alpha.6", "@budibase/types": "1.3.15-alpha.7",
"@shopify/jest-koa-mocks": "5.0.1", "@shopify/jest-koa-mocks": "5.0.1",
"@techpass/passport-openidconnect": "0.3.2", "@techpass/passport-openidconnect": "0.3.2",
"aws-sdk": "2.1030.0", "aws-sdk": "2.1030.0",
"bcrypt": "5.0.1", "bcrypt": "5.0.1",
"bcryptjs": "2.4.3",
"dotenv": "16.0.1", "dotenv": "16.0.1",
"emitter-listener": "1.1.2", "emitter-listener": "1.1.2",
"ioredis": "4.28.0", "ioredis": "4.28.0",

View file

@ -19,6 +19,7 @@ if (!LOADED && isDev() && !isTest()) {
const env = { const env = {
isTest, isTest,
isDev, isDev,
JS_BCRYPT: process.env.JS_BCRYPT,
JWT_SECRET: process.env.JWT_SECRET, JWT_SECRET: process.env.JWT_SECRET,
COUCH_DB_URL: process.env.COUCH_DB_URL || "http://localhost:4005", COUCH_DB_URL: process.env.COUCH_DB_URL || "http://localhost:4005",
COUCH_DB_USERNAME: process.env.COUCH_DB_USER, COUCH_DB_USERNAME: process.env.COUCH_DB_USER,

View file

@ -1,5 +1,5 @@
const bcrypt = require("bcrypt")
const env = require("./environment") const env = require("./environment")
const bcrypt = env.JS_BCRYPT ? require("bcryptjs") : require("bcrypt")
const { v4 } = require("uuid") const { v4 } = require("uuid")
const SALT_ROUNDS = env.SALT_ROUNDS || 10 const SALT_ROUNDS = env.SALT_ROUNDS || 10

View file

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

View file

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

View file

@ -1,6 +1,6 @@
{ {
"name": "@budibase/cli", "name": "@budibase/cli",
"version": "1.3.15-alpha.6", "version": "1.3.15-alpha.7",
"description": "Budibase CLI, for developers, self hosting and migrations.", "description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js", "main": "src/index.js",
"bin": { "bin": {
@ -26,9 +26,9 @@
"outputPath": "build" "outputPath": "build"
}, },
"dependencies": { "dependencies": {
"@budibase/backend-core": "1.3.15-alpha.6", "@budibase/backend-core": "1.3.15-alpha.7",
"@budibase/string-templates": "1.3.15-alpha.6", "@budibase/string-templates": "1.3.15-alpha.7",
"@budibase/types": "1.3.15-alpha.6", "@budibase/types": "1.3.15-alpha.7",
"axios": "0.21.2", "axios": "0.21.2",
"chalk": "4.1.0", "chalk": "4.1.0",
"cli-progress": "3.11.2", "cli-progress": "3.11.2",

View file

@ -1 +1,2 @@
process.env.NO_JS = "1" process.env.NO_JS = "1"
process.env.JS_BCRYPT = "1"

View file

@ -7,7 +7,7 @@ const { PLUGIN_TYPE_ARR } = require("@budibase/types")
const { validate } = require("@budibase/backend-core/plugins") const { validate } = require("@budibase/backend-core/plugins")
const { runPkgCommand } = require("../exec") const { runPkgCommand } = require("../exec")
const { join } = require("path") const { join } = require("path")
const { success, error, info } = require("../utils") const { success, error, info, moveDirectory } = require("../utils")
function checkInPlugin() { function checkInPlugin() {
if (!fs.existsSync("package.json")) { if (!fs.existsSync("package.json")) {
@ -22,6 +22,24 @@ function checkInPlugin() {
} }
} }
async function askAboutTopLevel(name) {
const files = fs.readdirSync(process.cwd())
// we are in an empty git repo, don't ask
if (files.find(file => file === ".git")) {
return false
} else {
console.log(
info(`By default the plugin will be created in the directory "${name}"`)
)
console.log(
info(
"if you are already in an empty directory, such as a new Git repo, you can disable this functionality."
)
)
return questions.confirmation("Create top level directory?")
}
}
async function init(opts) { async function init(opts) {
const type = opts["init"] || opts const type = opts["init"] || opts
if (!type || !PLUGIN_TYPE_ARR.includes(type)) { if (!type || !PLUGIN_TYPE_ARR.includes(type)) {
@ -45,13 +63,20 @@ async function init(opts) {
`An amazing Budibase ${type}!` `An amazing Budibase ${type}!`
) )
const version = await questions.string("Version", "1.0.0") const version = await questions.string("Version", "1.0.0")
const topLevel = await askAboutTopLevel(name)
// get the skeleton // get the skeleton
console.log(info("Retrieving project...")) console.log(info("Retrieving project..."))
await getSkeleton(type, name) await getSkeleton(type, name)
await fleshOutSkeleton(type, name, desc, version) await fleshOutSkeleton(type, name, desc, version)
console.log(info("Installing dependencies...")) console.log(info("Installing dependencies..."))
await runPkgCommand("install", join(process.cwd(), name)) await runPkgCommand("install", join(process.cwd(), name))
console.log(info(`Plugin created in directory "${name}"`)) // if no parent directory desired move to cwd
if (!topLevel) {
moveDirectory(name, process.cwd())
console.log(info(`Plugin created in current directory.`))
} else {
console.log(info(`Plugin created in directory "${name}"`))
}
} }
async function verify() { async function verify() {

View file

@ -27,7 +27,10 @@ function checkForBinaries() {
} }
function cleanup(evt) { function cleanup(evt) {
if (evt && evt.errno) { if (!isNaN(evt)) {
return
}
if (evt) {
console.error( console.error(
error( error(
"Failed to run CLI command - please report with the following message:" "Failed to run CLI command - please report with the following message:"

View file

@ -3,6 +3,7 @@ const fs = require("fs")
const axios = require("axios") const axios = require("axios")
const path = require("path") const path = require("path")
const progress = require("cli-progress") const progress = require("cli-progress")
const { join } = require("path")
exports.downloadFile = async (url, filePath) => { exports.downloadFile = async (url, filePath) => {
filePath = path.resolve(filePath) filePath = path.resolve(filePath)
@ -67,3 +68,19 @@ exports.progressBar = total => {
exports.checkSlashesInUrl = url => { exports.checkSlashesInUrl = url => {
return url.replace(/(https?:\/\/)|(\/)+/g, "$1$2") return url.replace(/(https?:\/\/)|(\/)+/g, "$1$2")
} }
exports.moveDirectory = (oldPath, newPath) => {
const files = fs.readdirSync(oldPath)
// check any file exists already
for (let file of files) {
if (fs.existsSync(join(newPath, file))) {
throw new Error(
"Unable to remove top level directory - some skeleton files already exist."
)
}
}
for (let file of files) {
fs.renameSync(join(oldPath, file), join(newPath, file))
}
fs.rmdirSync(oldPath)
}

View file

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

View file

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

View file

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

View file

@ -33,26 +33,23 @@ exports.fetchAppComponentDefinitions = async function (ctx) {
} }
} }
// for now custom components only supported in self-host // Add custom components
if (env.SELF_HOSTED) { const globalDB = getGlobalDB()
// Add custom components const response = await globalDB.allDocs(
const globalDB = getGlobalDB() getPluginParams(null, {
const response = await globalDB.allDocs( include_docs: true,
getPluginParams(null, { })
include_docs: true, )
}) response.rows
) .map(row => row.doc)
response.rows .filter(plugin => plugin.schema.type === "component")
.map(row => row.doc) .forEach(plugin => {
.filter(plugin => plugin.schema.type === "component") const fullComponentName = `plugin/${plugin.name}`
.forEach(plugin => { definitions[fullComponentName] = {
const fullComponentName = `plugin/${plugin.name}` component: fullComponentName,
definitions[fullComponentName] = { ...plugin.schema.schema,
component: fullComponentName, }
...plugin.schema.schema, })
}
})
}
ctx.body = definitions ctx.body = definitions
} catch (err) { } catch (err) {

View file

@ -53,10 +53,6 @@ export async function upload(ctx: any) {
export async function create(ctx: any) { export async function create(ctx: any) {
const { source, url, headers, githubToken } = ctx.request.body const { source, url, headers, githubToken } = ctx.request.body
if (!env.SELF_HOSTED) {
ctx.throw(400, "Plugins not supported outside of self-host.")
}
try { try {
let metadata let metadata
let directory let directory
@ -87,6 +83,13 @@ export async function create(ctx: any) {
validate(metadata?.schema) validate(metadata?.schema)
// Only allow components in cloud
if (!env.SELF_HOSTED && metadata?.schema?.type !== PluginType.COMPONENT) {
throw new Error(
"Only component plugins are supported outside of self-host"
)
}
const doc = await storePlugin(metadata, directory, source) const doc = await storePlugin(metadata, directory, source)
ctx.body = { ctx.body = {
@ -198,6 +201,7 @@ export async function storePlugin(
export async function processPlugin(plugin: FileType, source?: string) { export async function processPlugin(plugin: FileType, source?: string) {
const { metadata, directory } = await fileUpload(plugin) const { metadata, directory } = await fileUpload(plugin)
validate(metadata?.schema)
// Only allow components in cloud // Only allow components in cloud
if (!env.SELF_HOSTED && metadata?.schema?.type !== PluginType.COMPONENT) { if (!env.SELF_HOSTED && metadata?.schema?.type !== PluginType.COMPONENT) {

View file

@ -1094,16 +1094,17 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.3.15-alpha.6": "@budibase/backend-core@1.3.15-alpha.7":
version "1.3.15-alpha.6" version "1.3.15-alpha.7"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.15-alpha.6.tgz#c540ee4fcb9ef6fa61ea34724766ffe46aa0a04b" resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.15-alpha.7.tgz#322e842c9371c807f89b71ee2aed4ab4479b6d27"
integrity sha512-IuA1M+Fk8RGckQG8eivM7R90QO9V/Pexnww7WE2YvWozKR2HGmlLhyAmr+oydNksU6iGQnG++aWpDKHmKmEweQ== integrity sha512-eymmLjHhEzBQEztmVRqLpAw4YzZ4xDBAtA1lnJ50AZs/ZlHE+W4BR6LX2jGvIhYK2QDGbNQtXDzkut+0Sacj0w==
dependencies: dependencies:
"@budibase/types" "1.3.15-alpha.6" "@budibase/types" "1.3.15-alpha.7"
"@shopify/jest-koa-mocks" "5.0.1" "@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2" "@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0" aws-sdk "2.1030.0"
bcrypt "5.0.1" bcrypt "5.0.1"
bcryptjs "2.4.3"
dotenv "16.0.1" dotenv "16.0.1"
emitter-listener "1.1.2" emitter-listener "1.1.2"
ioredis "4.28.0" ioredis "4.28.0"
@ -1179,13 +1180,13 @@
svelte-flatpickr "^3.2.3" svelte-flatpickr "^3.2.3"
svelte-portal "^1.0.0" svelte-portal "^1.0.0"
"@budibase/pro@1.3.15-alpha.6": "@budibase/pro@1.3.15-alpha.7":
version "1.3.15-alpha.6" version "1.3.15-alpha.7"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.15-alpha.6.tgz#9bc14bec005357cf173b865f740cf3c7756cfb13" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.15-alpha.7.tgz#3743a26fb99d58070c8ab2741ee912a4d973baf7"
integrity sha512-C+TYR0Jv6o/N3vclf1xHUfPTFOJID9ujjVbU+SPvgTtwTTjrRIKJ5IzTm9ijCE7f7N7m1328tkW8XTTyXomb1g== integrity sha512-RerlV0A6wSU3mSOtY5ET4WR5Qaga1WNfUeG8Lqzx3z09vC23YuB0qvpadpKoUKUanzCyprrU4zBrLED8973stQ==
dependencies: dependencies:
"@budibase/backend-core" "1.3.15-alpha.6" "@budibase/backend-core" "1.3.15-alpha.7"
"@budibase/types" "1.3.15-alpha.6" "@budibase/types" "1.3.15-alpha.7"
"@koa/router" "8.0.8" "@koa/router" "8.0.8"
joi "17.6.0" joi "17.6.0"
node-fetch "^2.6.1" node-fetch "^2.6.1"
@ -1208,10 +1209,10 @@
svelte-apexcharts "^1.0.2" svelte-apexcharts "^1.0.2"
svelte-flatpickr "^3.1.0" svelte-flatpickr "^3.1.0"
"@budibase/types@1.3.15-alpha.6": "@budibase/types@1.3.15-alpha.7":
version "1.3.15-alpha.6" version "1.3.15-alpha.7"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.15-alpha.6.tgz#52f93873283fc586a97db1048a0f4da0099ad842" resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.15-alpha.7.tgz#c69a38194786ea66a2c6137aa961292902472ee9"
integrity sha512-/eY96Zp2J3uXJ9sJgH92LnrieisFhuH2f6pB0WV5xOo/6gavxewAzioze+vAVwHTuQpetYvYpqM9LaovB6gWxg== integrity sha512-9XW5Qr0FxXRO5rC1SlwS8dcDDPYGEG5+tJcrQ0gzk+5uzQfYIB/crhB0z++9vAwkBEm09XKbjBvdf4w5haEi2w==
"@bull-board/api@3.7.0": "@bull-board/api@3.7.0":
version "3.7.0" version "3.7.0"

View file

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

View file

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

View file

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

View file

@ -291,16 +291,17 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.3.15-alpha.6": "@budibase/backend-core@1.3.15-alpha.7":
version "1.3.15-alpha.6" version "1.3.15-alpha.7"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.15-alpha.6.tgz#c540ee4fcb9ef6fa61ea34724766ffe46aa0a04b" resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.15-alpha.7.tgz#322e842c9371c807f89b71ee2aed4ab4479b6d27"
integrity sha512-IuA1M+Fk8RGckQG8eivM7R90QO9V/Pexnww7WE2YvWozKR2HGmlLhyAmr+oydNksU6iGQnG++aWpDKHmKmEweQ== integrity sha512-eymmLjHhEzBQEztmVRqLpAw4YzZ4xDBAtA1lnJ50AZs/ZlHE+W4BR6LX2jGvIhYK2QDGbNQtXDzkut+0Sacj0w==
dependencies: dependencies:
"@budibase/types" "1.3.15-alpha.6" "@budibase/types" "1.3.15-alpha.7"
"@shopify/jest-koa-mocks" "5.0.1" "@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2" "@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0" aws-sdk "2.1030.0"
bcrypt "5.0.1" bcrypt "5.0.1"
bcryptjs "2.4.3"
dotenv "16.0.1" dotenv "16.0.1"
emitter-listener "1.1.2" emitter-listener "1.1.2"
ioredis "4.28.0" ioredis "4.28.0"
@ -326,21 +327,21 @@
uuid "8.3.2" uuid "8.3.2"
zlib "1.0.5" zlib "1.0.5"
"@budibase/pro@1.3.15-alpha.6": "@budibase/pro@1.3.15-alpha.7":
version "1.3.15-alpha.6" version "1.3.15-alpha.7"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.15-alpha.6.tgz#9bc14bec005357cf173b865f740cf3c7756cfb13" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.15-alpha.7.tgz#3743a26fb99d58070c8ab2741ee912a4d973baf7"
integrity sha512-C+TYR0Jv6o/N3vclf1xHUfPTFOJID9ujjVbU+SPvgTtwTTjrRIKJ5IzTm9ijCE7f7N7m1328tkW8XTTyXomb1g== integrity sha512-RerlV0A6wSU3mSOtY5ET4WR5Qaga1WNfUeG8Lqzx3z09vC23YuB0qvpadpKoUKUanzCyprrU4zBrLED8973stQ==
dependencies: dependencies:
"@budibase/backend-core" "1.3.15-alpha.6" "@budibase/backend-core" "1.3.15-alpha.7"
"@budibase/types" "1.3.15-alpha.6" "@budibase/types" "1.3.15-alpha.7"
"@koa/router" "8.0.8" "@koa/router" "8.0.8"
joi "17.6.0" joi "17.6.0"
node-fetch "^2.6.1" node-fetch "^2.6.1"
"@budibase/types@1.3.15-alpha.6": "@budibase/types@1.3.15-alpha.7":
version "1.3.15-alpha.6" version "1.3.15-alpha.7"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.15-alpha.6.tgz#52f93873283fc586a97db1048a0f4da0099ad842" resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.15-alpha.7.tgz#c69a38194786ea66a2c6137aa961292902472ee9"
integrity sha512-/eY96Zp2J3uXJ9sJgH92LnrieisFhuH2f6pB0WV5xOo/6gavxewAzioze+vAVwHTuQpetYvYpqM9LaovB6gWxg== integrity sha512-9XW5Qr0FxXRO5rC1SlwS8dcDDPYGEG5+tJcrQ0gzk+5uzQfYIB/crhB0z++9vAwkBEm09XKbjBvdf4w5haEi2w==
"@cspotcode/source-map-consumer@0.8.0": "@cspotcode/source-map-consumer@0.8.0":
version "0.8.0" version "0.8.0"