diff --git a/lerna.json b/lerna.json index 703de112a8..938bdf0f6b 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.219-alpha.17", + "version": "1.0.219", "npmClient": "yarn", "packages": [ "packages/*" @@ -15,4 +15,4 @@ ] } } -} +} \ No newline at end of file diff --git a/package.json b/package.json index 9c35af497f..a1a63fa0b2 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,8 @@ "dev": "yarn run kill-all && lerna link && lerna run --parallel dev:builder --concurrency 1", "dev:noserver": "yarn run kill-builder && lerna link && lerna run dev:stack:up && lerna run --parallel dev:builder --concurrency 1 --ignore @budibase/backend-core --ignore @budibase/server --ignore @budibase/worker", "dev:server": "yarn run kill-server && lerna run --parallel dev:builder --concurrency 1 --scope @budibase/backend-core --scope @budibase/worker --scope @budibase/server", - "test": "lerna run test", + "test": "lerna run test && yarn test:pro", + "test:pro": "bash scripts/pro/test.sh", "lint:eslint": "eslint packages", "lint:prettier": "prettier --check \"packages/**/*.{js,ts,svelte}\"", "lint": "yarn run lint:eslint && yarn run lint:prettier", diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 3db22f6f1e..49e82205e5 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.219-alpha.17", + "version": "1.0.219", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -59,6 +59,7 @@ ] }, "devDependencies": { + "@budibase/types": "^1.0.219", "@shopify/jest-koa-mocks": "3.1.5", "@types/jest": "27.5.1", "@types/koa": "2.0.52", @@ -79,4 +80,4 @@ "typescript": "4.7.3" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} +} \ No newline at end of file diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts index 0a17c82873..845504fdc9 100644 --- a/packages/backend-core/src/environment.ts +++ b/packages/backend-core/src/environment.ts @@ -40,7 +40,7 @@ const env = { DISABLE_ACCOUNT_PORTAL: process.env.DISABLE_ACCOUNT_PORTAL, SELF_HOSTED: !!parseInt(process.env.SELF_HOSTED || ""), COOKIE_DOMAIN: process.env.COOKIE_DOMAIN, - PLATFORM_URL: process.env.PLATFORM_URL, + PLATFORM_URL: process.env.PLATFORM_URL || "", POSTHOG_TOKEN: process.env.POSTHOG_TOKEN, ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS, TENANT_FEATURE_FLAGS: process.env.TENANT_FEATURE_FLAGS, diff --git a/packages/bbui/package.json b/packages/bbui/package.json index b8fa39aced..037e739520 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.219-alpha.17", + "version": "1.0.219", "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.17", + "@budibase/string-templates": "^1.0.219", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", @@ -85,4 +85,4 @@ "svelte-portal": "^1.0.0" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} +} \ No newline at end of file diff --git a/packages/builder/package.json b/packages/builder/package.json index 109fd6db0e..ecd40cc3fa 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.219-alpha.17", + "version": "1.0.219", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@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", + "@budibase/bbui": "^1.0.219", + "@budibase/client": "^1.0.219", + "@budibase/frontend-core": "^1.0.219", + "@budibase/string-templates": "^1.0.219", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", @@ -121,4 +121,4 @@ "vite": "^2.1.5" }, "gitHead": "115189f72a850bfb52b65ec61d932531bf327072" -} +} \ No newline at end of file diff --git a/packages/cli/package.json b/packages/cli/package.json index 4258723937..5b7eb5ebb1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.219-alpha.17", + "version": "1.0.219", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -33,4 +33,4 @@ "devDependencies": { "eslint": "^7.20.0" } -} +} \ No newline at end of file diff --git a/packages/client/package.json b/packages/client/package.json index 2d464b2b52..12ac6c02be 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.219-alpha.17", + "version": "1.0.219", "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.17", - "@budibase/frontend-core": "^1.0.219-alpha.17", - "@budibase/string-templates": "^1.0.219-alpha.17", + "@budibase/bbui": "^1.0.219", + "@budibase/frontend-core": "^1.0.219", + "@budibase/string-templates": "^1.0.219", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", @@ -58,4 +58,4 @@ "rollup-plugin-visualizer": "^5.5.4" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} +} \ No newline at end of file diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index c456e5a13d..d6aea634f6 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "1.0.219-alpha.17", + "version": "1.0.219", "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.17", + "@budibase/bbui": "^1.0.219", "lodash": "^4.17.21", "svelte": "^3.46.2" } -} +} \ No newline at end of file diff --git a/packages/server/package.json b/packages/server/package.json index 4aed34e61c..7952a4731a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.219-alpha.17", + "version": "1.0.219", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@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", + "@budibase/backend-core": "^1.0.219", + "@budibase/client": "^1.0.219", + "@budibase/pro": "1.0.219", + "@budibase/string-templates": "^1.0.219", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", @@ -152,6 +151,7 @@ "@babel/core": "7.17.4", "@babel/preset-env": "7.16.11", "@budibase/standard-components": "^0.9.139", + "@budibase/types": "^1.0.219", "@jest/test-sequencer": "24.9.0", "@types/apidoc": "0.50.0", "@types/bson": "4.2.0", @@ -196,4 +196,4 @@ "oracledb": "5.3.0" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} +} \ No newline at end of file diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index b4846dc51d..7c7a225e02 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1080,12 +1080,11 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.0.219-alpha.17": - version "1.0.219-alpha.17" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.219-alpha.17.tgz#eacb5feb851f6a20771d9505d38f123398e5dc06" - integrity sha512-cR0MLkXOuVht/1cqXspFaduGeaEroe/JfIkidss1OVvi2E5YjcUjDgZIYvlNiUTnh1ggGv7ql4AI4CZDk5LaHw== +"@budibase/backend-core@1.0.219": + version "1.0.219" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.219.tgz#430d23f25c9c6b275d3448f6d88a26a8c6196e3e" + integrity sha512-nU1nAkW7Pi8LLx9UfTff+kgDUV/IC64+iurVoQ7WKPI580M5RDCdHjig8R03OStRSCdcP1xRdUb1Ge2IpByfMg== dependencies: - "@budibase/types" "^1.0.219-alpha.17" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1101,7 +1100,6 @@ passport-google-oauth "2.0.0" passport-jwt "4.0.0" passport-local "1.0.0" - passport-oauth2-refresh "^2.1.0" posthog-node "1.3.0" pouchdb "7.3.0" pouchdb-find "7.2.2" @@ -1162,13 +1160,12 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.0.219-alpha.17": - version "1.0.219-alpha.17" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.219-alpha.17.tgz#bedf4b9e84e8225855e22526b0b1dcc760c6ccfe" - integrity sha512-bQGkeqzZL+fzQ69oFYnEIwGJ3v8kCXxl6jlMqLEW3r2MQQlsS53c7Z4keRQ0bSOclTLg7eYTj6lDvy+0UI0Wpg== +"@budibase/pro@1.0.219": + version "1.0.219" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.219.tgz#a8406aaf7137db43c290f0a3eb005650330ca6fb" + integrity sha512-BH7sBHuGEz9UP6bCt/a22pZskvvyk/lqMdLYSKGAEcoj7AnJB6MW2QKSIXPmLpT1OmdrYGM+49X0wtm9qWx/Lg== dependencies: - "@budibase/backend-core" "1.0.219-alpha.17" - "@budibase/types" "1.0.219-alpha.17" + "@budibase/backend-core" "1.0.219" node-fetch "^2.6.1" "@budibase/standard-components@^0.9.139": @@ -1189,16 +1186,6 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.0.219-alpha.17": - version "1.0.219-alpha.17" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.0.219-alpha.17.tgz#f91c820e8be9bbc7a588fb5ede22f0494012947e" - integrity sha512-pWXdKMINgtb5usaKnTPZ5EdE0e8jiegF0zg1460ULVFuYH4Ibs94N1VVyHT/UuqEeTjQXhrGGIcRFUQF88KvBQ== - -"@budibase/types@^1.0.219-alpha.17": - version "1.0.219" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.0.219.tgz#817fd90f0604048c222b9a0a1059acf3407c88ff" - integrity sha512-aPYpwEBsP60oKZzz1gP4j+SaiVxebUe/ZExQqdnhzl9qAj8PzXVD8dKR/oozXqZHJ37hgkgai7i83eXDqeU/qQ== - "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" @@ -10577,11 +10564,6 @@ passport-oauth1@1.x.x: passport-strategy "1.x.x" utils-merge "1.x.x" -passport-oauth2-refresh@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/passport-oauth2-refresh/-/passport-oauth2-refresh-2.1.0.tgz#c31cd133826383f5539d16ad8ab4f35ca73ce4a4" - integrity sha512-4ML7ooCESCqiTgdDBzNUFTBcPR8zQq9iM6eppEUGMMvLdsjqRL93jKwWm4Az3OJcI+Q2eIVyI8sVRcPFvxcF/A== - passport-oauth2@1.x.x: version "1.6.1" resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.1.tgz#c5aee8f849ce8bd436c7f81d904a3cd1666f181b" diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 76c3d6ba2d..a00779c20e 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.219-alpha.17", + "version": "1.0.219", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", @@ -46,4 +46,4 @@ "typescript": "^4.5.5" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} +} \ No newline at end of file diff --git a/packages/types/package.json b/packages/types/package.json index 8e0f2a183e..c6075feca2 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.219-alpha.17", + "version": "1.0.219", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -17,4 +17,4 @@ "rimraf": "3.0.2", "typescript": "4.7.3" } -} +} \ No newline at end of file diff --git a/packages/worker/package.json b/packages/worker/package.json index a726956c6b..a4dacbcf78 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.219-alpha.17", + "version": "1.0.219", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@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", + "@budibase/backend-core": "^1.0.219", + "@budibase/pro": "1.0.219", + "@budibase/string-templates": "^1.0.219", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", @@ -67,6 +66,7 @@ "server-destroy": "1.0.1" }, "devDependencies": { + "@budibase/types": "^1.0.219", "@types/jest": "26.0.23", "@types/koa": "2.13.4", "@types/koa-router": "7.4.4", @@ -101,4 +101,4 @@ ] }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} +} \ No newline at end of file diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index fc16075fb9..e17e01b30e 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -293,12 +293,11 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.0.219-alpha.17": - version "1.0.219-alpha.17" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.219-alpha.17.tgz#eacb5feb851f6a20771d9505d38f123398e5dc06" - integrity sha512-cR0MLkXOuVht/1cqXspFaduGeaEroe/JfIkidss1OVvi2E5YjcUjDgZIYvlNiUTnh1ggGv7ql4AI4CZDk5LaHw== +"@budibase/backend-core@1.0.219": + version "1.0.219" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.219.tgz#430d23f25c9c6b275d3448f6d88a26a8c6196e3e" + integrity sha512-nU1nAkW7Pi8LLx9UfTff+kgDUV/IC64+iurVoQ7WKPI580M5RDCdHjig8R03OStRSCdcP1xRdUb1Ge2IpByfMg== dependencies: - "@budibase/types" "^1.0.219-alpha.17" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -314,7 +313,6 @@ passport-google-oauth "2.0.0" passport-jwt "4.0.0" passport-local "1.0.0" - passport-oauth2-refresh "^2.1.0" posthog-node "1.3.0" pouchdb "7.3.0" pouchdb-find "7.2.2" @@ -326,24 +324,13 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.0.219-alpha.17": - version "1.0.219-alpha.17" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.219-alpha.17.tgz#bedf4b9e84e8225855e22526b0b1dcc760c6ccfe" - integrity sha512-bQGkeqzZL+fzQ69oFYnEIwGJ3v8kCXxl6jlMqLEW3r2MQQlsS53c7Z4keRQ0bSOclTLg7eYTj6lDvy+0UI0Wpg== - dependencies: - "@budibase/backend-core" "1.0.219-alpha.17" - "@budibase/types" "1.0.219-alpha.17" - node-fetch "^2.6.1" - -"@budibase/types@1.0.219-alpha.17": - version "1.0.219-alpha.17" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.0.219-alpha.17.tgz#f91c820e8be9bbc7a588fb5ede22f0494012947e" - integrity sha512-pWXdKMINgtb5usaKnTPZ5EdE0e8jiegF0zg1460ULVFuYH4Ibs94N1VVyHT/UuqEeTjQXhrGGIcRFUQF88KvBQ== - -"@budibase/types@^1.0.219-alpha.17": +"@budibase/pro@1.0.219": version "1.0.219" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.0.219.tgz#817fd90f0604048c222b9a0a1059acf3407c88ff" - integrity sha512-aPYpwEBsP60oKZzz1gP4j+SaiVxebUe/ZExQqdnhzl9qAj8PzXVD8dKR/oozXqZHJ37hgkgai7i83eXDqeU/qQ== + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.219.tgz#a8406aaf7137db43c290f0a3eb005650330ca6fb" + integrity sha512-BH7sBHuGEz9UP6bCt/a22pZskvvyk/lqMdLYSKGAEcoj7AnJB6MW2QKSIXPmLpT1OmdrYGM+49X0wtm9qWx/Lg== + dependencies: + "@budibase/backend-core" "1.0.219" + node-fetch "^2.6.1" "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" @@ -4988,11 +4975,6 @@ passport-oauth1@1.x.x: passport-strategy "1.x.x" utils-merge "1.x.x" -passport-oauth2-refresh@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/passport-oauth2-refresh/-/passport-oauth2-refresh-2.1.0.tgz#c31cd133826383f5539d16ad8ab4f35ca73ce4a4" - integrity sha512-4ML7ooCESCqiTgdDBzNUFTBcPR8zQq9iM6eppEUGMMvLdsjqRL93jKwWm4Az3OJcI+Q2eIVyI8sVRcPFvxcF/A== - passport-oauth2@1.x.x: version "1.6.1" resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.1.tgz#c5aee8f849ce8bd436c7f81d904a3cd1666f181b" diff --git a/scripts/pro/test.sh b/scripts/pro/test.sh new file mode 100755 index 0000000000..f4252265c2 --- /dev/null +++ b/scripts/pro/test.sh @@ -0,0 +1,7 @@ +#!/bin/bash +cd ../ +if [[ -d "budibase-pro" ]]; then + cd budibase-pro + yarn test + cd ../budibase +fi \ No newline at end of file