Browse Source
Merge pull request #6610 from Budibase/fix/reapply-quotas
Re-apply quota restrictions
master
Rory Powell
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
19 additions and
11 deletions
-
package.json
-
packages/backend-core/src/environment.ts
-
packages/server/yarn.lock
-
scripts/pro/test.sh
|
|
|
@ -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", |
|
|
|
|
|
|
|
@ -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, |
|
|
|
|
|
|
|
@ -1028,10 +1028,10 @@ |
|
|
|
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" |
|
|
|
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== |
|
|
|
|
|
|
|
"@budibase/backend-core@1.0.216": |
|
|
|
version "1.0.216" |
|
|
|
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.216.tgz#f97caefffcc5b5bfa23740178b3f7efc945ef226" |
|
|
|
integrity sha512-mGbevDtnyCJu/M1U3mnu8Ynxx0hMAlZg1RUX71eizvENuBRWFA7mEXlN0ay1uC0xiROllJCWI0zucYXkTxuu0w== |
|
|
|
"@budibase/backend-core@1.0.218": |
|
|
|
version "1.0.218" |
|
|
|
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.218.tgz#be101c8baf220fa3fc55d63071bb38fc6c8cf4d8" |
|
|
|
integrity sha512-v9+bvQ2+OsK7eGyDHzMuPawTu2LovRCsuArFeMnaG/AbexkqnbB74w+h3vh/2npuHzrnk8RZkM2c4pp/ycqfKw== |
|
|
|
dependencies: |
|
|
|
"@techpass/passport-openidconnect" "0.3.2" |
|
|
|
aws-sdk "2.1030.0" |
|
|
|
@ -1109,12 +1109,12 @@ |
|
|
|
svelte-flatpickr "^3.2.3" |
|
|
|
svelte-portal "^1.0.0" |
|
|
|
|
|
|
|
"@budibase/pro@1.0.216": |
|
|
|
version "1.0.216" |
|
|
|
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.216.tgz#bf4b2851d8bff3ada05deb0ec3e2ae3eadf998a2" |
|
|
|
integrity sha512-YL9fpZCMBrwpJEk86slwegGEtrX2isW77E2A0Z9ZPKQehghdEBcOp2HIZJPhKXmo0TePbW8SHblC8LnrSbaMdg== |
|
|
|
"@budibase/pro@1.0.218": |
|
|
|
version "1.0.218" |
|
|
|
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.218.tgz#b9e5bb95cca996dc1f7f783a3a02e51cbbf3df55" |
|
|
|
integrity sha512-LJpV4rYPP9DzMNkL2Y0euZplkubBKBE+gc5JBTMt1l9Fwn2Sri/Y5bQ+U8fjczjmHxYnZLrFwH+o6LCnk/QJow== |
|
|
|
dependencies: |
|
|
|
"@budibase/backend-core" "1.0.216" |
|
|
|
"@budibase/backend-core" "1.0.218" |
|
|
|
node-fetch "^2.6.1" |
|
|
|
|
|
|
|
"@budibase/standard-components@^0.9.139": |
|
|
|
|
|
|
|
@ -0,0 +1,7 @@ |
|
|
|
#!/bin/bash |
|
|
|
cd ../ |
|
|
|
if [[ -d "budibase-pro" ]]; then |
|
|
|
cd budibase-pro |
|
|
|
yarn test |
|
|
|
cd ../budibase |
|
|
|
fi |
