Merge branch 'master' of github.com:Budibase/budibase into fix/9886
This commit is contained in:
mike12345567
commit
ddaafe6379
2
.github/workflows/deploy-cloud.yaml
vendored
2
.github/workflows/deploy-cloud.yaml
vendored
|
|
@ -22,7 +22,7 @@ jobs:
|
|||
|
||||
- name: Pull values.yaml from budibase-infra
|
||||
run: |
|
||||
curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \
|
||||
curl -H "Authorization: token ${{ secrets.GH_ACCESS_TOKEN }}" \
|
||||
-H 'Accept: application/vnd.github.v3.raw' \
|
||||
-o values.production.yaml \
|
||||
-L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/values.yaml
|
||||
|
|
|
|||
25
.github/workflows/deploy-preprod.yml
vendored
25
.github/workflows/deploy-preprod.yml
vendored
|
|
@ -1,6 +1,10 @@
|
|||
name: "deploy-preprod"
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
description: Budibase release version. For example - 1.0.0
|
||||
required: false
|
||||
workflow_call:
|
||||
|
||||
jobs:
|
||||
|
|
@ -8,9 +12,16 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: 'Get Previous tag'
|
||||
id: previoustag
|
||||
uses: "WyriHaximus/github-action-get-previous-tag@v1"
|
||||
|
||||
- name: Get the latest budibase release version
|
||||
id: version
|
||||
run: |
|
||||
if [ -z "${{ github.event.inputs.version }}" ]; then
|
||||
release_version=$(cat lerna.json | jq -r '.version')
|
||||
else
|
||||
release_version=${{ github.event.inputs.version }}
|
||||
fi
|
||||
echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
|
||||
|
||||
- name: Configure AWS Credentials
|
||||
uses: aws-actions/configure-aws-credentials@v1
|
||||
|
|
@ -21,7 +32,7 @@ jobs:
|
|||
|
||||
- name: Pull values.yaml from budibase-infra
|
||||
run: |
|
||||
curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \
|
||||
curl -H "Authorization: token ${{ secrets.GH_ACCESS_TOKEN }}" \
|
||||
-H 'Accept: application/vnd.github.v3.raw' \
|
||||
-o values.preprod.yaml \
|
||||
-L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/budibase-preprod/values.yaml
|
||||
|
|
@ -37,7 +48,7 @@ jobs:
|
|||
helm: helm3
|
||||
values: |
|
||||
globals:
|
||||
appVersion: ${{ steps.previoustag.outputs.tag }}
|
||||
appVersion: v${{ env.RELEASE_VERSION }}
|
||||
ingress:
|
||||
enabled: true
|
||||
nginx: true
|
||||
|
|
@ -52,5 +63,5 @@ jobs:
|
|||
uses: tsickert/discord-webhook@v4.0.0
|
||||
with:
|
||||
webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }}
|
||||
content: "Preprod Deployment Complete: ${{ steps.previoustag.outputs.tag }} deployed to Budibase Pre-prod."
|
||||
embed-title: ${{ steps.previoustag.outputs.tag }}
|
||||
content: "Preprod Deployment Complete: ${{ env.RELEASE_VERSION }} deployed to Budibase Pre-prod."
|
||||
embed-title: ${{ env.RELEASE_VERSION }}
|
||||
21
.github/workflows/release-master.yml
vendored
21
.github/workflows/release-master.yml
vendored
|
|
@ -91,9 +91,11 @@ jobs:
|
|||
uses: azure/setup-helm@v1
|
||||
id: helm-install
|
||||
|
||||
- name: 'Get Previous tag'
|
||||
id: previoustag
|
||||
uses: "WyriHaximus/github-action-get-previous-tag@v1"
|
||||
- name: Get the latest budibase release version
|
||||
id: version
|
||||
run: |
|
||||
release_version=$(cat lerna.json | jq -r '.version')
|
||||
echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
|
||||
|
||||
# due to helm repo index issue: https://github.com/helm/helm/issues/7363
|
||||
# we need to create new package in a different dir, merge the index and move the package back
|
||||
|
|
@ -116,8 +118,6 @@ jobs:
|
|||
git add -A
|
||||
git commit -m "Helm Release: ${{ env.RELEASE_VERSION }}"
|
||||
git push
|
||||
env:
|
||||
RELEASE_VERSION: ${{ steps.previoustag.outputs.tag }}
|
||||
|
||||
deploy-to-legacy-preprod-env:
|
||||
needs: [release-images]
|
||||
|
|
@ -130,13 +130,16 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: 'Get Previous tag'
|
||||
id: previoustag
|
||||
uses: "WyriHaximus/github-action-get-previous-tag@v1"
|
||||
|
||||
- name: Get the latest budibase release version
|
||||
id: version
|
||||
run: |
|
||||
release_version=$(cat lerna.json | jq -r '.version')
|
||||
echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
|
||||
|
||||
- uses: passeidireto/trigger-external-workflow-action@main
|
||||
env:
|
||||
PAYLOAD_VERSION: ${{ steps.previoustag.outputs.tag }}
|
||||
PAYLOAD_VERSION: ${{ env.RELEASE_VERSION }}
|
||||
with:
|
||||
repository: budibase/budibase-deploys
|
||||
event: budicloud-preprod-deploy
|
||||
|
|
|
|||
|
|
@ -125,9 +125,9 @@ spec:
|
|||
- name: SELF_HOSTED
|
||||
value: {{ .Values.globals.selfHosted | quote }}
|
||||
- name: SENTRY_DSN
|
||||
value: {{ .Values.globals.sentryDSN }}
|
||||
value: {{ .Values.globals.sentryDSN | quote }}
|
||||
- name: POSTHOG_TOKEN
|
||||
value: {{ .Values.globals.posthogToken }}
|
||||
value: {{ .Values.globals.posthogToken | quote }}
|
||||
- name: WORKER_URL
|
||||
value: http://worker-service:{{ .Values.services.worker.port }}
|
||||
- name: PLATFORM_URL
|
||||
|
|
@ -198,8 +198,6 @@ spec:
|
|||
- name: GLOBAL_AGENT_NO_PROXY
|
||||
value: {{ .Values.globals.globalAgentNoProxy | quote }}
|
||||
{{ end }}
|
||||
- name: CDN_URL
|
||||
value: {{ .Values.globals.cdnUrl }}
|
||||
{{ if .Values.services.tlsRejectUnauthorized }}
|
||||
- name: NODE_TLS_REJECT_UNAUTHORIZED
|
||||
value: {{ .Values.services.tlsRejectUnauthorized }}
|
||||
|
|
|
|||
|
|
@ -188,8 +188,6 @@ spec:
|
|||
- name: GLOBAL_AGENT_NO_PROXY
|
||||
value: {{ .Values.globals.globalAgentNoProxy | quote }}
|
||||
{{ end }}
|
||||
- name: CDN_URL
|
||||
value: {{ .Values.globals.cdnUrl }}
|
||||
{{ if .Values.services.tlsRejectUnauthorized }}
|
||||
- name: NODE_TLS_REJECT_UNAUTHORIZED
|
||||
value: {{ .Values.services.tlsRejectUnauthorized }}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"version": "2.4.11",
|
||||
"version": "2.4.16",
|
||||
"npmClient": "yarn",
|
||||
"packages": [
|
||||
"packages/*"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/backend-core",
|
||||
"version": "2.4.11",
|
||||
"version": "2.4.16",
|
||||
"description": "Budibase backend core libraries used in server and worker",
|
||||
"main": "dist/src/index.js",
|
||||
"types": "dist/src/index.d.ts",
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
"dependencies": {
|
||||
"@budibase/nano": "10.1.2",
|
||||
"@budibase/pouchdb-replication-stream": "1.2.10",
|
||||
"@budibase/types": "^2.4.11",
|
||||
"@budibase/types": "^2.4.16",
|
||||
"@shopify/jest-koa-mocks": "5.0.1",
|
||||
"@techpass/passport-openidconnect": "0.3.2",
|
||||
"aws-cloudfront-sign": "2.2.0",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "@budibase/bbui",
|
||||
"description": "A UI solution used in the different Budibase projects.",
|
||||
"version": "2.4.11",
|
||||
"version": "2.4.16",
|
||||
"license": "MPL-2.0",
|
||||
"svelte": "src/index.js",
|
||||
"module": "dist/bbui.es.js",
|
||||
|
|
@ -38,8 +38,8 @@
|
|||
],
|
||||
"dependencies": {
|
||||
"@adobe/spectrum-css-workflow-icons": "1.2.1",
|
||||
"@budibase/shared-core": "2.4.11",
|
||||
"@budibase/string-templates": "2.4.11",
|
||||
"@budibase/shared-core": "2.4.16",
|
||||
"@budibase/string-templates": "2.4.16",
|
||||
"@spectrum-css/accordion": "3.0.24",
|
||||
"@spectrum-css/actionbutton": "1.0.1",
|
||||
"@spectrum-css/actiongroup": "1.0.1",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/builder",
|
||||
"version": "2.4.11",
|
||||
"version": "2.4.16",
|
||||
"license": "GPL-3.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
|
|
@ -58,11 +58,11 @@
|
|||
}
|
||||
},
|
||||
"dependencies": {
|
||||
"@budibase/bbui": "2.4.11",
|
||||
"@budibase/client": "2.4.11",
|
||||
"@budibase/frontend-core": "2.4.11",
|
||||
"@budibase/shared-core": "2.4.11",
|
||||
"@budibase/string-templates": "2.4.11",
|
||||
"@budibase/bbui": "2.4.16",
|
||||
"@budibase/client": "2.4.16",
|
||||
"@budibase/frontend-core": "2.4.16",
|
||||
"@budibase/shared-core": "2.4.16",
|
||||
"@budibase/string-templates": "2.4.16",
|
||||
"@fortawesome/fontawesome-svg-core": "^6.2.1",
|
||||
"@fortawesome/free-brands-svg-icons": "^6.2.1",
|
||||
"@fortawesome/free-solid-svg-icons": "^6.2.1",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/cli",
|
||||
"version": "2.4.11",
|
||||
"version": "2.4.16",
|
||||
"description": "Budibase CLI, for developers, self hosting and migrations.",
|
||||
"main": "dist/index.js",
|
||||
"bin": {
|
||||
|
|
@ -29,9 +29,9 @@
|
|||
"outputPath": "build"
|
||||
},
|
||||
"dependencies": {
|
||||
"@budibase/backend-core": "^2.4.11",
|
||||
"@budibase/string-templates": "^2.4.11",
|
||||
"@budibase/types": "^2.4.11",
|
||||
"@budibase/backend-core": "^2.4.16",
|
||||
"@budibase/string-templates": "^2.4.16",
|
||||
"@budibase/types": "^2.4.16",
|
||||
"axios": "0.21.2",
|
||||
"chalk": "4.1.0",
|
||||
"cli-progress": "3.11.2",
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ import {
|
|||
downloadDockerCompose,
|
||||
handleError,
|
||||
getServices,
|
||||
getServiceImage,
|
||||
setServiceImage,
|
||||
} from "./utils"
|
||||
import { confirmation } from "../questions"
|
||||
import compose from "docker-compose"
|
||||
|
|
@ -23,7 +25,11 @@ export async function update() {
|
|||
!isSingle &&
|
||||
(await confirmation("Do you wish to update you docker-compose.yaml?"))
|
||||
) {
|
||||
// get current MinIO image
|
||||
const image = await getServiceImage("minio")
|
||||
await downloadDockerCompose()
|
||||
// replace MinIO image
|
||||
setServiceImage("minio", image)
|
||||
}
|
||||
await handleError(async () => {
|
||||
const status = await compose.ps()
|
||||
|
|
|
|||
|
|
@ -9,10 +9,44 @@ const ERROR_FILE = "docker-error.log"
|
|||
const COMPOSE_URL =
|
||||
"https://raw.githubusercontent.com/Budibase/budibase/master/hosting/docker-compose.yaml"
|
||||
|
||||
export async function downloadDockerCompose() {
|
||||
const fileName = COMPOSE_URL.split("/").slice(-1)[0]
|
||||
function composeFilename() {
|
||||
return COMPOSE_URL.split("/").slice(-1)[0]
|
||||
}
|
||||
|
||||
export function getServiceImage(service: string) {
|
||||
const filename = composeFilename()
|
||||
try {
|
||||
await downloadFile(COMPOSE_URL, `./${fileName}`)
|
||||
const { services } = getServices(filename)
|
||||
const serviceKey = Object.keys(services).find(name =>
|
||||
name.includes(service)
|
||||
)
|
||||
if (serviceKey) {
|
||||
return services[serviceKey].image
|
||||
} else {
|
||||
return null
|
||||
}
|
||||
} catch (err) {
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
export function setServiceImage(service: string, image: string) {
|
||||
const filename = composeFilename()
|
||||
if (!fs.existsSync(filename)) {
|
||||
throw new Error(
|
||||
`File ${filename} not found, cannot update ${service} image.`
|
||||
)
|
||||
}
|
||||
const current = getServiceImage(service)!
|
||||
let contents = fs.readFileSync(filename, "utf8")
|
||||
contents = contents.replace(`image: ${current}`, `image: ${image}`)
|
||||
fs.writeFileSync(filename, contents)
|
||||
}
|
||||
|
||||
export async function downloadDockerCompose() {
|
||||
const filename = composeFilename()
|
||||
try {
|
||||
await downloadFile(COMPOSE_URL, `./${filename}`)
|
||||
} catch (err) {
|
||||
console.error(error(`Failed to retrieve compose file - ${err}`))
|
||||
}
|
||||
|
|
@ -49,6 +83,9 @@ export async function handleError(func: Function) {
|
|||
}
|
||||
|
||||
export function getServices(path: string) {
|
||||
if (!fs.existsSync(path)) {
|
||||
throw new Error(`No yaml found at path: ${path}`)
|
||||
}
|
||||
const dockerYaml = fs.readFileSync(path, "utf8")
|
||||
const parsedYaml = yaml.parse(dockerYaml)
|
||||
return { yaml: parsedYaml, services: parsedYaml.services }
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/client",
|
||||
"version": "2.4.11",
|
||||
"version": "2.4.16",
|
||||
"license": "MPL-2.0",
|
||||
"module": "dist/budibase-client.js",
|
||||
"main": "dist/budibase-client.js",
|
||||
|
|
@ -19,11 +19,11 @@
|
|||
"dev:builder": "rollup -cw"
|
||||
},
|
||||
"dependencies": {
|
||||
"@budibase/bbui": "2.4.11",
|
||||
"@budibase/frontend-core": "2.4.11",
|
||||
"@budibase/shared-core": "2.4.11",
|
||||
"@budibase/string-templates": "2.4.11",
|
||||
"@budibase/types": "2.4.11",
|
||||
"@budibase/bbui": "2.4.16",
|
||||
"@budibase/frontend-core": "2.4.16",
|
||||
"@budibase/shared-core": "2.4.16",
|
||||
"@budibase/string-templates": "2.4.16",
|
||||
"@budibase/types": "2.4.16",
|
||||
"@spectrum-css/button": "^3.0.3",
|
||||
"@spectrum-css/card": "^3.0.3",
|
||||
"@spectrum-css/divider": "^1.0.3",
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{
|
||||
"name": "@budibase/frontend-core",
|
||||
"version": "2.4.11",
|
||||
"version": "2.4.16",
|
||||
"description": "Budibase frontend core libraries used in builder and client",
|
||||
"author": "Budibase",
|
||||
"license": "MPL-2.0",
|
||||
"svelte": "src/index.js",
|
||||
"dependencies": {
|
||||
"@budibase/bbui": "2.4.11",
|
||||
"@budibase/shared-core": "2.4.11",
|
||||
"@budibase/bbui": "2.4.16",
|
||||
"@budibase/shared-core": "2.4.16",
|
||||
"lodash": "^4.17.21",
|
||||
"svelte": "^3.46.2"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/sdk",
|
||||
"version": "2.4.11",
|
||||
"version": "2.4.16",
|
||||
"description": "Budibase Public API SDK",
|
||||
"author": "Budibase",
|
||||
"license": "MPL-2.0",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "@budibase/server",
|
||||
"email": "hi@budibase.com",
|
||||
"version": "2.4.11",
|
||||
"version": "2.4.16",
|
||||
"description": "Budibase Web Server",
|
||||
"main": "src/index.ts",
|
||||
"repository": {
|
||||
|
|
@ -43,12 +43,12 @@
|
|||
"license": "GPL-3.0",
|
||||
"dependencies": {
|
||||
"@apidevtools/swagger-parser": "10.0.3",
|
||||
"@budibase/backend-core": "2.4.11",
|
||||
"@budibase/client": "2.4.11",
|
||||
"@budibase/pro": "2.4.11",
|
||||
"@budibase/shared-core": "2.4.11",
|
||||
"@budibase/string-templates": "2.4.11",
|
||||
"@budibase/types": "2.4.11",
|
||||
"@budibase/backend-core": "2.4.16",
|
||||
"@budibase/client": "2.4.16",
|
||||
"@budibase/pro": "2.4.16",
|
||||
"@budibase/shared-core": "2.4.16",
|
||||
"@budibase/string-templates": "2.4.16",
|
||||
"@budibase/types": "2.4.16",
|
||||
"@bull-board/api": "3.7.0",
|
||||
"@bull-board/koa": "3.9.4",
|
||||
"@elastic/elasticsearch": "7.10.0",
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@ const environment = {
|
|||
AWS_REGION: process.env.AWS_REGION,
|
||||
MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
|
||||
MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
|
||||
CDN_URL: process.env.CDN_URL || "https://cdn.budi.live",
|
||||
REDIS_URL: process.env.REDIS_URL,
|
||||
REDIS_PASSWORD: process.env.REDIS_PASSWORD,
|
||||
INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
|
||||
|
|
|
|||
|
|
@ -1278,14 +1278,14 @@
|
|||
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
|
||||
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
|
||||
|
||||
"@budibase/backend-core@2.4.11":
|
||||
version "2.4.11"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.11.tgz#df8a5667ffd8d51157559c4883e6e11aa21d18a4"
|
||||
integrity sha512-f9Fojnsvp9e/LneTxj4p5zPb5XAlh5UhizhgZHAo5oBQJgpeTVaPDRBm9jEvBNG1k/kRi1wpkiwiU6Jxrmbw/A==
|
||||
"@budibase/backend-core@2.4.16":
|
||||
version "2.4.16"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.16.tgz#8bd00c484bdf22df56c11b00dc5a6800b1f4523c"
|
||||
integrity sha512-jypbZHF7UUGNz/2VIhfsSpp/Jmd4rhouEwrmRys0kTugYguJeepTbnjBYKysF+TtdHbCWVzlLFbhTYJbU3NbFA==
|
||||
dependencies:
|
||||
"@budibase/nano" "10.1.2"
|
||||
"@budibase/pouchdb-replication-stream" "1.2.10"
|
||||
"@budibase/types" "^2.4.11"
|
||||
"@budibase/types" "^2.4.16"
|
||||
"@shopify/jest-koa-mocks" "5.0.1"
|
||||
"@techpass/passport-openidconnect" "0.3.2"
|
||||
aws-cloudfront-sign "2.2.0"
|
||||
|
|
@ -1417,14 +1417,14 @@
|
|||
pouchdb-promise "^6.0.4"
|
||||
through2 "^2.0.0"
|
||||
|
||||
"@budibase/pro@2.4.11":
|
||||
version "2.4.11"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.11.tgz#6b554b68f4641d972b96f4677e6ede635a401f8a"
|
||||
integrity sha512-RWzPSg+8S8nqJ/DCtgsRf/h+V8ARAjnCpllsYD/1pfzupLbsr2PE3DDBsNkFY8nUPxk00NMa7aZ0kK4/UiCpFg==
|
||||
"@budibase/pro@2.4.16":
|
||||
version "2.4.16"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.16.tgz#c10ee6fd9a3b7f3774d4cce3b58ebdf9e9bc22fd"
|
||||
integrity sha512-M3LLxcrLDYuFrOSQIWQU8tqnlDm26h3vr8OXJ+VMsxJ6Y+Hy6Ep75Cx2AIUjtr8kpBAyq09SWlc4dAKXq5M3bg==
|
||||
dependencies:
|
||||
"@budibase/backend-core" "2.4.11"
|
||||
"@budibase/backend-core" "2.4.16"
|
||||
"@budibase/string-templates" "2.3.20"
|
||||
"@budibase/types" "2.4.11"
|
||||
"@budibase/types" "2.4.16"
|
||||
"@koa/router" "8.0.8"
|
||||
bull "4.10.1"
|
||||
joi "17.6.0"
|
||||
|
|
@ -1463,10 +1463,10 @@
|
|||
lodash "^4.17.20"
|
||||
vm2 "^3.9.4"
|
||||
|
||||
"@budibase/types@2.4.11", "@budibase/types@^2.4.11":
|
||||
version "2.4.11"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.11.tgz#6f4793403fbe02f122fb59b488b54255ceaf0104"
|
||||
integrity sha512-16PQ7EHVZx+6HlFjr4+RaEjkCXWVNLpSaVH1GuYDko5i+LTQ3aPt3l9u31XoFRZwGDSCMJk97wVuSMrh1zg1Og==
|
||||
"@budibase/types@2.4.16", "@budibase/types@^2.4.16":
|
||||
version "2.4.16"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.16.tgz#76b4e558282c090cbd0902dc500250d67cb09ca5"
|
||||
integrity sha512-z2OjOaE7H4fyE9RCES/xHnbIDvYwsT6eiLXswAhT0ko7tY+LQwGzAY3uaQSchRCMFw4TAuvR1A+dzXglPGEjYw==
|
||||
|
||||
"@bull-board/api@3.7.0":
|
||||
version "3.7.0"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/shared-core",
|
||||
"version": "2.4.11",
|
||||
"version": "2.4.16",
|
||||
"description": "Shared data utils",
|
||||
"main": "dist/cjs/src/index.js",
|
||||
"types": "dist/mjs/src/index.d.ts",
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ export const getValidOperatorsForType = (
|
|||
|
||||
// Only allow equal/not equal for _id in SQL tables
|
||||
if (field === "_id" && externalTable) {
|
||||
ops = [Op.Equals, Op.NotEquals]
|
||||
ops = [Op.Equals, Op.NotEquals, Op.In]
|
||||
}
|
||||
|
||||
return ops
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/string-templates",
|
||||
"version": "2.4.11",
|
||||
"version": "2.4.16",
|
||||
"description": "Handlebars wrapper for Budibase templating.",
|
||||
"main": "src/index.cjs",
|
||||
"module": "dist/bundle.mjs",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/types",
|
||||
"version": "2.4.11",
|
||||
"version": "2.4.16",
|
||||
"description": "Budibase types",
|
||||
"main": "dist/cjs/index.js",
|
||||
"types": "dist/mjs/index.d.ts",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "@budibase/worker",
|
||||
"email": "hi@budibase.com",
|
||||
"version": "2.4.11",
|
||||
"version": "2.4.16",
|
||||
"description": "Budibase background service",
|
||||
"main": "src/index.ts",
|
||||
"repository": {
|
||||
|
|
@ -36,10 +36,10 @@
|
|||
"author": "Budibase",
|
||||
"license": "GPL-3.0",
|
||||
"dependencies": {
|
||||
"@budibase/backend-core": "^2.4.11",
|
||||
"@budibase/pro": "2.4.11",
|
||||
"@budibase/string-templates": "^2.4.11",
|
||||
"@budibase/types": "^2.4.11",
|
||||
"@budibase/backend-core": "^2.4.16",
|
||||
"@budibase/pro": "2.4.16",
|
||||
"@budibase/string-templates": "^2.4.16",
|
||||
"@budibase/types": "^2.4.16",
|
||||
"@koa/router": "8.0.8",
|
||||
"@sentry/node": "6.17.7",
|
||||
"@techpass/passport-openidconnect": "0.3.2",
|
||||
|
|
|
|||
|
|
@ -42,7 +42,6 @@ const environment = {
|
|||
ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL,
|
||||
PLATFORM_URL: process.env.PLATFORM_URL,
|
||||
APPS_URL: process.env.APPS_URL,
|
||||
CDN_URL: process.env.CDN_URL || "https://tenants.cdn.budi.live",
|
||||
// ports
|
||||
// prefer worker port to generic port
|
||||
PORT: process.env.WORKER_PORT || process.env.PORT,
|
||||
|
|
|
|||
|
|
@ -475,14 +475,14 @@
|
|||
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
|
||||
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
|
||||
|
||||
"@budibase/backend-core@2.4.11":
|
||||
version "2.4.11"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.11.tgz#df8a5667ffd8d51157559c4883e6e11aa21d18a4"
|
||||
integrity sha512-f9Fojnsvp9e/LneTxj4p5zPb5XAlh5UhizhgZHAo5oBQJgpeTVaPDRBm9jEvBNG1k/kRi1wpkiwiU6Jxrmbw/A==
|
||||
"@budibase/backend-core@2.4.16":
|
||||
version "2.4.16"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.16.tgz#8bd00c484bdf22df56c11b00dc5a6800b1f4523c"
|
||||
integrity sha512-jypbZHF7UUGNz/2VIhfsSpp/Jmd4rhouEwrmRys0kTugYguJeepTbnjBYKysF+TtdHbCWVzlLFbhTYJbU3NbFA==
|
||||
dependencies:
|
||||
"@budibase/nano" "10.1.2"
|
||||
"@budibase/pouchdb-replication-stream" "1.2.10"
|
||||
"@budibase/types" "^2.4.11"
|
||||
"@budibase/types" "^2.4.16"
|
||||
"@shopify/jest-koa-mocks" "5.0.1"
|
||||
"@techpass/passport-openidconnect" "0.3.2"
|
||||
aws-cloudfront-sign "2.2.0"
|
||||
|
|
@ -564,14 +564,14 @@
|
|||
pouchdb-promise "^6.0.4"
|
||||
through2 "^2.0.0"
|
||||
|
||||
"@budibase/pro@2.4.11":
|
||||
version "2.4.11"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.11.tgz#6b554b68f4641d972b96f4677e6ede635a401f8a"
|
||||
integrity sha512-RWzPSg+8S8nqJ/DCtgsRf/h+V8ARAjnCpllsYD/1pfzupLbsr2PE3DDBsNkFY8nUPxk00NMa7aZ0kK4/UiCpFg==
|
||||
"@budibase/pro@2.4.16":
|
||||
version "2.4.16"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.16.tgz#c10ee6fd9a3b7f3774d4cce3b58ebdf9e9bc22fd"
|
||||
integrity sha512-M3LLxcrLDYuFrOSQIWQU8tqnlDm26h3vr8OXJ+VMsxJ6Y+Hy6Ep75Cx2AIUjtr8kpBAyq09SWlc4dAKXq5M3bg==
|
||||
dependencies:
|
||||
"@budibase/backend-core" "2.4.11"
|
||||
"@budibase/backend-core" "2.4.16"
|
||||
"@budibase/string-templates" "2.3.20"
|
||||
"@budibase/types" "2.4.11"
|
||||
"@budibase/types" "2.4.16"
|
||||
"@koa/router" "8.0.8"
|
||||
bull "4.10.1"
|
||||
joi "17.6.0"
|
||||
|
|
@ -592,10 +592,10 @@
|
|||
lodash "^4.17.20"
|
||||
vm2 "^3.9.4"
|
||||
|
||||
"@budibase/types@2.4.11", "@budibase/types@^2.4.11":
|
||||
version "2.4.11"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.11.tgz#6f4793403fbe02f122fb59b488b54255ceaf0104"
|
||||
integrity sha512-16PQ7EHVZx+6HlFjr4+RaEjkCXWVNLpSaVH1GuYDko5i+LTQ3aPt3l9u31XoFRZwGDSCMJk97wVuSMrh1zg1Og==
|
||||
"@budibase/types@2.4.16", "@budibase/types@^2.4.16":
|
||||
version "2.4.16"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.16.tgz#76b4e558282c090cbd0902dc500250d67cb09ca5"
|
||||
integrity sha512-z2OjOaE7H4fyE9RCES/xHnbIDvYwsT6eiLXswAhT0ko7tY+LQwGzAY3uaQSchRCMFw4TAuvR1A+dzXglPGEjYw==
|
||||
|
||||
"@cspotcode/source-map-support@^0.8.0":
|
||||
version "0.8.1"
|
||||
|
|
|
|||
Loading…
Reference in a new issue