diff --git a/lerna.json b/lerna.json index 3c3b56bf83..5965a54b80 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.105-alpha.30", + "version": "1.0.105-alpha.32", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/package.json b/package.json index b605c419ff..3e6290e40b 100644 --- a/package.json +++ b/package.json @@ -25,8 +25,8 @@ "build": "lerna run build", "release": "lerna publish patch --yes --force-publish && yarn release:pro", "release:develop": "lerna publish prerelease --yes --force-publish --dist-tag develop && yarn release:pro:develop", - "release:pro": "sh scripts/pro/release.sh", - "release:pro:develop": "sh scripts/pro/release.sh develop", + "release:pro": "bash scripts/pro/release.sh", + "release:pro:develop": "bash scripts/pro/release.sh develop", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", @@ -74,6 +74,6 @@ "mode:account": "yarn mode:cloud && yarn env:account:enable", "security:audit": "node scripts/audit.js", "postinstall": "husky install", - "install:pro": "sh ./scripts/pro/install.sh" + "install:pro": "bash scripts/pro/install.sh" } } diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 6fdafea9de..66a5a9d95b 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.105-alpha.30", + "version": "1.0.105-alpha.32", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 5e8c431855..f23cad9217 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.105-alpha.30", + "version": "1.0.105-alpha.32", "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.105-alpha.30", + "@budibase/string-templates": "^1.0.105-alpha.32", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index d56f60405d..3c218b85e7 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.105-alpha.30", + "version": "1.0.105-alpha.32", "license": "GPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.105-alpha.30", - "@budibase/client": "^1.0.105-alpha.30", - "@budibase/frontend-core": "^1.0.105-alpha.30", - "@budibase/string-templates": "^1.0.105-alpha.30", + "@budibase/bbui": "^1.0.105-alpha.32", + "@budibase/client": "^1.0.105-alpha.32", + "@budibase/frontend-core": "^1.0.105-alpha.32", + "@budibase/string-templates": "^1.0.105-alpha.32", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 2abdee2bb2..46dbcdf91b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.105-alpha.30", + "version": "1.0.105-alpha.32", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 06ed092726..8f47119898 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.105-alpha.30", + "version": "1.0.105-alpha.32", "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.105-alpha.30", - "@budibase/frontend-core": "^1.0.105-alpha.30", - "@budibase/string-templates": "^1.0.105-alpha.30", + "@budibase/bbui": "^1.0.105-alpha.32", + "@budibase/frontend-core": "^1.0.105-alpha.32", + "@budibase/string-templates": "^1.0.105-alpha.32", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index c99add81d6..727318fc50 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.105-alpha.30", + "version": "1.0.105-alpha.32", "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.105-alpha.30", + "@budibase/bbui": "^1.0.105-alpha.32", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index d27d179c3a..b569026e57 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,19 +1,85 @@ { + "name": "@budibase/server", + "email": "hi@budibase.com", + "version": "1.0.105-alpha.29", + "description": "Budibase Web Server", + "main": "src/index.ts", + "repository": { + "type": "git", + "url": "https://github.com/Budibase/budibase.git" + }, + "scripts": { + "build": "rimraf dist/ && tsc -p tsconfig.build.json && mv dist/src/* dist/ && rimraf dist/src/ && yarn postbuild", + "postbuild": "copyfiles -u 1 src/**/*.svelte dist/ && copyfiles -u 1 src/**/*.hbs dist/ && copyfiles -u 1 src/**/*.json dist/", + "test": "jest --coverage --maxWorkers=2", + "test:watch": "jest --watch", + "predocker": "copyfiles -f ../client/dist/budibase-client.js ../client/manifest.json client", + "build:docker": "yarn run predocker && docker build . -t app-service --label version=$BUDIBASE_RELEASE_VERSION", + "build:docs": "node ./scripts/docs/generate.js open", + "run:docker": "node dist/index.js", + "dev:stack:up": "node scripts/dev/manage.js up", + "dev:stack:down": "node scripts/dev/manage.js down", + "dev:stack:nuke": "node scripts/dev/manage.js nuke", + "dev:builder": "yarn run dev:stack:up && nodemon", + "specs": "node specs/generate.js && openapi-typescript specs/openapi.yaml --output src/definitions/openapi.ts", + "initialise": "node scripts/initialise.js", + "env:multi:enable": "node scripts/multiTenancy.js enable", + "env:multi:disable": "node scripts/multiTenancy.js disable", + "env:selfhost:enable": "node scripts/selfhost.js enable", + "env:selfhost:disable": "node scripts/selfhost.js disable", + "env:localdomain:enable": "node scripts/localdomain.js enable", + "env:localdomain:disable": "node scripts/localdomain.js disable", + "env:account:enable": "node scripts/account.js enable", + "env:account:disable": "node scripts/account.js disable" + }, + "jest": { + "preset": "ts-jest", + "testEnvironment": "node", + "setupFiles": [ + "./scripts/jestSetup.js" + ], + "collectCoverageFrom": [ + "src/**/*.js", + "!**/node_modules/**", + "!src/db/views/*.js", + "!src/api/controllers/deploy/**/*.js", + "!src/*.js", + "!src/api/controllers/static/**/*", + "!src/db/dynamoClient.js", + "!src/utilities/usageQuota.js", + "!src/api/routes/tests/**/*", + "!src/db/tests/**/*", + "!src/tests/**/*", + "!src/automations/tests/**/*", + "!src/utilities/fileProcessor.js", + "!src/utilities/fileSystem/**/*", + "!src/utilities/redis.js" + ], + "coverageReporters": [ + "lcov", + "json", + "clover" + ] + }, + "keywords": [ + "budibase" + ], "author": "Budibase", + "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.105-alpha.30", - "@budibase/client": "^1.0.105-alpha.30", + "@budibase/backend-core": "^1.0.105-alpha.29", + "@budibase/client": "^1.0.105-alpha.29", "@budibase/pro": "^1.0.0", - "@budibase/string-templates": "^1.0.105-alpha.30", + "@budibase/string-templates": "^1.0.105-alpha.29", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", "@google-cloud/firestore": "^5.0.2", "@koa/router": "8.0.0", "@sendgrid/mail": "7.1.1", - "@sentry/node": "6.17.7", "@types/global-agent": "^2.1.1", + "@sentry/node": "6.17.7", "@types/koa__router": "^8.0.11", "airtable": "0.10.1", "arangojs": "7.2.0", @@ -73,7 +139,6 @@ "yargs": "13.2.4", "zlib": "1.0.5" }, - "description": "Budibase Web Server", "devDependencies": { "@babel/core": "^7.14.3", "@babel/preset-env": "^7.14.4", @@ -111,70 +176,8 @@ "typescript": "^4.5.5", "update-dotenv": "^1.1.1" }, - "email": "hi@budibase.com", - "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc", - "jest": { - "collectCoverageFrom": [ - "src/**/*.js", - "!**/node_modules/**", - "!src/db/views/*.js", - "!src/api/controllers/deploy/**/*.js", - "!src/*.js", - "!src/api/controllers/static/**/*", - "!src/db/dynamoClient.js", - "!src/utilities/usageQuota.js", - "!src/api/routes/tests/**/*", - "!src/db/tests/**/*", - "!src/tests/**/*", - "!src/automations/tests/**/*", - "!src/utilities/fileProcessor.js", - "!src/utilities/fileSystem/**/*", - "!src/utilities/redis.js" - ], - "coverageReporters": [ - "lcov", - "json", - "clover" - ], - "preset": "ts-jest", - "setupFiles": [ - "./scripts/jestSetup.js" - ], - "testEnvironment": "node" + "optionalDependencies": { + "oracledb": "^5.3.0" }, - "keywords": [ - "budibase" - ], - "license": "GPL-3.0", - "main": "src/index.ts", - "name": "@budibase/server", - "repository": { - "type": "git", - "url": "https://github.com/Budibase/budibase.git" - }, - "scripts": { - "build": "rimraf dist/ && tsc -p tsconfig.build.json && mv dist/src/* dist/ && rimraf dist/src/ && yarn postbuild", - "build:docker": "yarn run predocker && docker build . -t app-service --label version=$BUDIBASE_RELEASE_VERSION", - "build:docs": "node ./scripts/docs/generate.js open", - "dev:builder": "yarn run dev:stack:up && nodemon", - "dev:stack:down": "node scripts/dev/manage.js down", - "dev:stack:nuke": "node scripts/dev/manage.js nuke", - "dev:stack:up": "node scripts/dev/manage.js up", - "env:account:disable": "node scripts/account.js disable", - "env:account:enable": "node scripts/account.js enable", - "env:localdomain:disable": "node scripts/localdomain.js disable", - "env:localdomain:enable": "node scripts/localdomain.js enable", - "env:multi:disable": "node scripts/multiTenancy.js disable", - "env:multi:enable": "node scripts/multiTenancy.js enable", - "env:selfhost:disable": "node scripts/selfhost.js disable", - "env:selfhost:enable": "node scripts/selfhost.js enable", - "initialise": "node scripts/initialise.js", - "postbuild": "copyfiles -u 1 src/**/*.svelte dist/ && copyfiles -u 1 src/**/*.hbs dist/ && copyfiles -u 1 src/**/*.json dist/", - "predocker": "copyfiles -f ../client/dist/budibase-client.js ../client/manifest.json client", - "run:docker": "node dist/index.js", - "specs": "node specs/generate.js && openapi-typescript specs/openapi.yaml --output src/definitions/openapi.ts", - "test": "jest --coverage --maxWorkers=2", - "test:watch": "jest --watch" - }, - "version": "1.0.105-alpha.30" -} \ No newline at end of file + "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" +} diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 9ad7d25bf7..2739a0e37e 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.105-alpha.30", + "version": "1.0.105-alpha.32", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index 59b306a57d..a4dc662652 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.105-alpha.30", + "version": "1.0.105-alpha.32", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -31,9 +31,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.105-alpha.30", + "@budibase/backend-core": "^1.0.105-alpha.32", "@budibase/pro": "^1.0.0", - "@budibase/string-templates": "^1.0.105-alpha.30", + "@budibase/string-templates": "^1.0.105-alpha.32", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", diff --git a/scripts/pro/install.sh b/scripts/pro/install.sh index ffa123a821..cd1682d651 100755 --- a/scripts/pro/install.sh +++ b/scripts/pro/install.sh @@ -11,14 +11,20 @@ BASE_BRANCH=$2 cd ../ echo "Cloning pro repo..." git clone https://$PERSONAL_ACCESS_TOKEN@github.com/Budibase/budibase-pro.git -cd budibase-pro -# Try to checkout the matching pro branch -git checkout $BRANCH -# Try to checkout the matching pro base (master or develop) branch -git checkout $BASE_BRANCH -# If neither branch exists continue with default branch 'develop' -git pull +# Community forks won't be able to clone the pro repo as they can't access secrets +# Skip the rest of the installation and rely on npm version instead +# This should be ok as forks will not rely on pro changes +if [[ -d "budibase-pro" ]]; then + cd budibase-pro -echo "Initializing pro repo..." -yarn setup + # Try to checkout the matching pro branch + git checkout $BRANCH + # Try to checkout the matching pro base (master or develop) branch + git checkout $BASE_BRANCH + # If neither branch exists continue with default branch 'develop' + git pull + + echo "Initializing pro repo..." + yarn setup +fi \ No newline at end of file diff --git a/scripts/pro/release.sh b/scripts/pro/release.sh index 6023de7f16..d4a471727b 100755 --- a/scripts/pro/release.sh +++ b/scripts/pro/release.sh @@ -29,6 +29,14 @@ echo "Releasing version $VERSION" echo "Releasing tag $TAG" lerna publish $VERSION --yes --force-publish --dist-tag $TAG +# reset main and types to point to src for dev +cd packages/pro +jq '.main = "src/index.ts" | .types = "src/index.ts"' package.json > package.json.tmp && mv package.json.tmp package.json +cd ../../ +git add packages/pro/package.json +git commit -m 'Prep dev' +git push + cd - if [[ $COMMAND == "develop" ]]; then