From afc5c99c6f3c67631ed243cf1e73745252d00b59 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 19:30:48 +0100 Subject: [PATCH 01/83] Revert "Merge pull request #10367 from Budibase/revert-10267-chore/pro_as_submodule" This reverts commit df18119b56fe7cf9154d371cbd9af25e8c509bff, reversing changes made to 676b85dbd847fb35e17b651c6de4cbfaca843d7b. --- .github/workflows/budibase_ci.yml | 87 ++++++++++++++++--------- .github/workflows/release-develop.yml | 46 ++++++------- .github/workflows/release-master.yml | 60 ++++++++--------- .gitmodules | 3 + .husky/post-checkout | 4 ++ docs/DEV-SETUP-DEBIAN.md | 13 +++- docs/DEV-SETUP-MACOSX.md | 12 +++- docs/DEV-SETUP-WINDOWS.md | 17 ++++- lerna.json | 16 ++++- package.json | 30 ++++++--- packages/backend-core/package.json | 2 - packages/backend-core/tsconfig.json | 11 +--- packages/builder/tsconfig.json | 8 +-- packages/cli/tsconfig.json | 19 ++---- packages/pro | 1 + packages/server/jest.config.ts | 6 +- packages/server/nodemon.json | 10 ++- packages/server/tsconfig.json | 8 +-- packages/shared-core/tsconfig.json | 3 +- packages/worker/jest.config.ts | 10 +-- packages/worker/nodemon.json | 8 ++- packages/worker/tsconfig.json | 18 ++--- qa-core/tsconfig.json | 18 ++--- scripts/bootstrap.sh | 7 ++ scripts/link-dependencies.sh | 32 +++------ scripts/pro/build.sh | 15 ----- scripts/pro/install.sh | 39 ----------- scripts/pro/release.sh | 94 --------------------------- scripts/pro/test.sh | 11 ---- tsconfig.json | 9 --- yarn.lock | 92 +++++++++++++++++++++++--- 31 files changed, 327 insertions(+), 382 deletions(-) create mode 100755 .husky/post-checkout create mode 160000 packages/pro create mode 100755 scripts/bootstrap.sh delete mode 100755 scripts/pro/build.sh delete mode 100755 scripts/pro/install.sh delete mode 100755 scripts/pro/release.sh delete mode 100755 scripts/pro/test.sh delete mode 100644 tsconfig.json diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 65e6529678..f4e0ddbd87 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -1,36 +1,25 @@ name: Budibase CI -on: - # Trigger the workflow on push or pull request, - # but only for the master branch - push: - branches: - - master - - develop - pull_request: +on: + # Trigger the workflow on push or pull request, + # but only for the master branch + push: branches: - master - develop - workflow_dispatch: + pull_request: + branches: + - master + - develop + workflow_dispatch: env: BRANCH: ${{ github.event.pull_request.head.ref }} BASE_BRANCH: ${{ github.event.pull_request.base.ref}} - PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }} + PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} jobs: lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Use Node.js 14.x - uses: actions/setup-node@v1 - with: - node-version: 14.x - - run: yarn - - run: yarn lint - - build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -38,8 +27,20 @@ jobs: uses: actions/setup-node@v1 with: node-version: 14.x - - name: Install Pro - run: yarn install:pro $BRANCH $BASE_BRANCH + - run: yarn + - run: yarn lint + + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + submodules: true + token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} + - name: Use Node.js 14.x + uses: actions/setup-node@v1 + with: + node-version: 14.x - run: yarn - run: yarn bootstrap - run: yarn build @@ -48,16 +49,17 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + with: + submodules: true + token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - name: Use Node.js 14.x uses: actions/setup-node@v1 with: node-version: 14.x - - name: Install Pro - run: yarn install:pro $BRANCH $BASE_BRANCH - run: yarn - run: yarn bootstrap - run: yarn build - - run: yarn test + - run: yarn test --ignore=@budibase/pro - uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos @@ -68,26 +70,28 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + with: + submodules: true + token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - name: Use Node.js 14.x uses: actions/setup-node@v1 with: node-version: 14.x - - name: Install Pro - run: yarn install:pro $BRANCH $BASE_BRANCH - run: yarn - run: yarn bootstrap - - run: yarn test:pro + - run: yarn test --scope=@budibase/pro integration-test: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + with: + submodules: true + token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - name: Use Node.js 14.x uses: actions/setup-node@v1 with: node-version: 14.x - - name: Install Pro - run: yarn install:pro $BRANCH $BASE_BRANCH - run: yarn && yarn bootstrap && yarn build - run: | cd qa-core @@ -96,3 +100,24 @@ jobs: env: BB_ADMIN_USER_EMAIL: admin BB_ADMIN_USER_PASSWORD: admin + + check-pro-submodule: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + with: + submodules: true + token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} + fetch-depth: 0 + - name: Check submodule + run: | + cd packages/pro + git fetch + if ! git merge-base --is-ancestor $(git log -n 1 --pretty=format:%H) origin/develop; then + echo "Current commit has not been merged to develop" + echo "Refer to the pro repo to merge your changes: https://github.com/Budibase/budibase-pro/blob/develop/docs/getting_started.md" + exit 1 + else + echo "All good, the submodule had been merged!" + fi diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 46e82e6efc..07ff0b20c7 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -1,21 +1,21 @@ name: Budibase Prerelease concurrency: release-prerelease -on: - push: +on: + push: branches: - develop paths: - - '.aws/**' - - '.github/**' - - 'charts/**' - - 'packages/**' - - 'scripts/**' - - 'package.json' - - 'yarn.lock' - - 'package.json' - - 'yarn.lock' - workflow_dispatch: + - ".aws/**" + - ".github/**" + - "charts/**" + - "packages/**" + - "scripts/**" + - "package.json" + - "yarn.lock" + - "package.json" + - "yarn.lock" + workflow_dispatch: env: # Posthog token used by ui at build time @@ -24,35 +24,35 @@ env: INTERCOM_TOKEN: ${{ secrets.INTERCOM_TOKEN }} PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} FEATURE_PREVIEW_URL: https://budirelease.live - + jobs: release-images: - runs-on: ubuntu-latest + runs-on: ubuntu-latest steps: - name: Fail if branch is not develop - if: github.ref != 'refs/heads/develop' - run: | + if: github.ref != 'refs/heads/develop' + run: | echo "Ref is not develop, you must run this job from develop." exit 1 - uses: actions/checkout@v2 + with: + submodules: true + token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - uses: actions/setup-node@v1 with: node-version: 14.x - - name: Install Pro - run: yarn install:pro develop - - - run: yarn + - run: yarn - run: yarn bootstrap - run: yarn build - run: yarn build:sdk -# - run: yarn test + # - run: yarn test - name: Publish budibase packages to NPM env: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - run: | + run: | # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" @@ -60,7 +60,7 @@ jobs: yarn release:develop - name: Build/release Docker images - run: | + run: | docker login -u $DOCKER_USER -p $DOCKER_PASSWORD yarn build:docker:develop env: diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index ab0771def5..e88fbbf0b8 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -2,55 +2,55 @@ name: Budibase Release concurrency: release on: - push: + push: branches: - master paths: - - '.aws/**' - - '.github/**' - - 'charts/**' - - 'packages/**' - - 'scripts/**' - - 'package.json' - - 'yarn.lock' - - 'package.json' - - 'yarn.lock' - workflow_dispatch: - inputs: - versioning: - type: choice - description: "Versioning type: patch, minor, major" - default: patch - options: - - patch - - minor - - major - required: true + - ".aws/**" + - ".github/**" + - "charts/**" + - "packages/**" + - "scripts/**" + - "package.json" + - "yarn.lock" + - "package.json" + - "yarn.lock" + workflow_dispatch: + inputs: + versioning: + type: choice + description: "Versioning type: patch, minor, major" + default: patch + options: + - patch + - minor + - major + required: true env: - # Posthog token used by ui at build time + # Posthog token used by ui at build time POSTHOG_TOKEN: phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU INTERCOM_TOKEN: ${{ secrets.INTERCOM_TOKEN }} SENTRY_DSN: ${{ secrets.SENTRY_DSN }} - PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }} + PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} jobs: release-images: runs-on: ubuntu-latest steps: - name: Fail if branch is not master - if: github.ref != 'refs/heads/master' - run: | + if: github.ref != 'refs/heads/master' + run: | echo "Ref is not master, you must run this job from master." exit 1 - uses: actions/checkout@v2 + with: + submodules: true + token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - uses: actions/setup-node@v1 with: node-version: 14.x - - name: Install Pro - run: yarn install:pro master - - run: yarn - run: yarn bootstrap - run: yarn lint @@ -68,12 +68,12 @@ jobs: echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc yarn release - - name: 'Get Previous tag' + - name: "Get Previous tag" id: previoustag uses: "WyriHaximus/github-action-get-previous-tag@v1" - name: Build/release Docker images - run: | + run: | docker login -u $DOCKER_USER -p $DOCKER_PASSWORD yarn build yarn build:docker diff --git a/.gitmodules b/.gitmodules index e69de29bb2..2dd6ea53f2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "packages/pro"] + path = packages/pro + url = git@github.com:Budibase/budibase-pro.git diff --git a/.husky/post-checkout b/.husky/post-checkout new file mode 100755 index 0000000000..506b8bf5af --- /dev/null +++ b/.husky/post-checkout @@ -0,0 +1,4 @@ +# .husky/post-checkout +# ... + +git config submodule.recurse true \ No newline at end of file diff --git a/docs/DEV-SETUP-DEBIAN.md b/docs/DEV-SETUP-DEBIAN.md index cfd7eebf47..a8b1e3dce4 100644 --- a/docs/DEV-SETUP-DEBIAN.md +++ b/docs/DEV-SETUP-DEBIAN.md @@ -1,13 +1,17 @@ ## Dev Environment on Debian 11 ### Install NVM & Node 14 + NVM documentation: https://github.com/nvm-sh/nvm#installing-and-updating Install NVM + ``` curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash ``` + Install Node 14 + ``` nvm install 14 ``` @@ -17,13 +21,16 @@ nvm install 14 ``` npm install -g yarn jest lerna ``` + ### Install Docker and Docker Compose ``` apt install docker.io pip3 install docker-compose ``` + ### Clone the repo + ``` git clone https://github.com/Budibase/budibase.git ``` @@ -44,10 +51,13 @@ This setup process was tested on Debian 11 (bullseye) with version numbers show cd budibase yarn setup ``` + The yarn setup command runs several build steps i.e. + ``` node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev ``` + So this command will actually run the application in dev mode. It creates .env files under `./packages/server` and `./packages/worker` and runs docker containers for each service via docker-compose. The dev version will be available on port 10000 i.e. @@ -55,6 +65,7 @@ The dev version will be available on port 10000 i.e. http://127.0.0.1:10000/builder/admin ### File descriptor issues with Vite and Chrome in Linux + If your dev environment stalls forever, with some network requests stuck in flight, it's likely that Chrome is trying to open more file descriptors than your system allows. To fix this, apply the following tweaks. @@ -62,4 +73,4 @@ Debian based distros: Add `* - nofile 65536` to `/etc/security/limits.conf`. Arch: -Add `DefaultLimitNOFILE=65536` to `/etc/systemd/system.conf`. \ No newline at end of file +Add `DefaultLimitNOFILE=65536` to `/etc/systemd/system.conf`. diff --git a/docs/DEV-SETUP-MACOSX.md b/docs/DEV-SETUP-MACOSX.md index 67eb5506ff..94ed3fc1ee 100644 --- a/docs/DEV-SETUP-MACOSX.md +++ b/docs/DEV-SETUP-MACOSX.md @@ -4,14 +4,14 @@ Install instructions [here](https://brew.sh/) -| **NOTE**: If you are working on a M1 Apple Silicon which is running Z shell, you could need to add -`eval $(/opt/homebrew/bin/brew shellenv)` line to your `.zshrc`. This will make your zsh to find the apps you install +| **NOTE**: If you are working on a M1 Apple Silicon which is running Z shell, you could need to add +`eval $(/opt/homebrew/bin/brew shellenv)` line to your `.zshrc`. This will make your zsh to find the apps you install through brew. - ### Install Node Budibase requires a recent version of node 14: + ``` brew install node npm node -v @@ -22,12 +22,15 @@ node -v ``` npm install -g yarn jest lerna ``` + ### Install Docker and Docker Compose ``` brew install docker docker-compose ``` + ### Clone the repo + ``` git clone https://github.com/Budibase/budibase.git ``` @@ -48,10 +51,13 @@ This setup process was tested on Mac OSX 12 (Monterey) with version numbers show cd budibase yarn setup ``` + The yarn setup command runs several build steps i.e. + ``` node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev ``` + So this command will actually run the application in dev mode. It creates .env files under `./packages/server` and `./packages/worker` and runs docker containers for each service via docker-compose. The dev version will be available on port 10000 i.e. diff --git a/docs/DEV-SETUP-WINDOWS.md b/docs/DEV-SETUP-WINDOWS.md index c5608b7567..176e0700d7 100644 --- a/docs/DEV-SETUP-WINDOWS.md +++ b/docs/DEV-SETUP-WINDOWS.md @@ -1,13 +1,15 @@ ## Dev Environment on Windows 10/11 (WSL2) - ### Install WSL with Ubuntu LTS Enable WSL 2 on Windows 10/11 for docker support. + ``` wsl --set-default-version 2 ``` + Install Ubuntu LTS. + ``` wsl --install Ubuntu ``` @@ -16,6 +18,7 @@ Or follow the instruction here: https://learn.microsoft.com/en-us/windows/wsl/install ### Install Docker in windows + Download the installer from docker and install it. Check this url for more detailed instructions: @@ -24,18 +27,21 @@ https://docs.docker.com/desktop/install/windows-install/ You should follow the next steps from within the Ubuntu terminal. ### Install NVM & Node 14 + NVM documentation: https://github.com/nvm-sh/nvm#installing-and-updating Install NVM + ``` curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash ``` + Install Node 14 + ``` nvm install 14 ``` - ### Install npm requirements ``` @@ -43,6 +49,7 @@ npm install -g yarn jest lerna ``` ### Clone the repo + ``` git clone https://github.com/Budibase/budibase.git ``` @@ -63,10 +70,13 @@ This setup process was tested on Windows 11 with version numbers show below. You cd budibase yarn setup ``` + The yarn setup command runs several build steps i.e. + ``` node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev ``` + So this command will actually run the application in dev mode. It creates .env files under `./packages/server` and `./packages/worker` and runs docker containers for each service via docker-compose. The dev version will be available on port 10000 i.e. @@ -74,8 +84,9 @@ The dev version will be available on port 10000 i.e. http://127.0.0.1:10000/builder/admin ### Working with the code + Here are the instructions to work on the application from within Visual Studio Code (in Windows) through the WSL. All the commands and files are within the Ubuntu system and it should run as if you were working on a Linux machine. https://code.visualstudio.com/docs/remote/wsl -Note you will be able to run the application from within the WSL terminal and you will be able to access the application from the a browser in Windows. \ No newline at end of file +Note you will be able to run the application from within the WSL terminal and you will be able to access the application from the a browser in Windows. diff --git a/lerna.json b/lerna.json index 1d55e1c029..6461309d43 100644 --- a/lerna.json +++ b/lerna.json @@ -1,8 +1,22 @@ { "version": "2.5.6-alpha.12", "npmClient": "yarn", + "packages": [ + "packages/backend-core", + "packages/bbui", + "packages/builder", + "packages/cli", + "packages/client", + "packages/frontend-core", + "packages/sdk", + "packages/server", + "packages/shared-core", + "packages/string-templates", + "packages/types", + "packages/worker", + "packages/pro/packages/pro" + ], "useWorkspaces": true, - "packages": ["packages/*"], "command": { "publish": { "ignoreChanges": [ diff --git a/package.json b/package.json index e944a5bf5e..32807dc963 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "eslint": "^7.28.0", "eslint-plugin-cypress": "^2.11.3", "eslint-plugin-svelte3": "^3.2.0", - "husky": "^7.0.1", + "husky": "^8.0.3", "js-yaml": "^4.1.0", "kill-port": "^1.6.1", "lerna": "^6.6.1", @@ -21,18 +21,16 @@ "typescript": "4.7.3" }, "scripts": { - "setup": "node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev", - "bootstrap": "lerna link && ./scripts/link-dependencies.sh", + "setup": "git config submodule.recurse true && git submodule update && node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev", + "bootstrap": "./scripts/bootstrap.sh && lerna link && ./scripts/link-dependencies.sh", "build": "lerna run --stream build", - "build:dev": "lerna run --stream prebuild && tsc --build --watch --preserveWatchOutput", + "build:dev": "lerna run --stream prebuild && yarn nx run-many --target=build --output-style=dynamic --watch --preserveWatchOutput", "backend:bootstrap": "./scripts/scopeBackend.sh && yarn run bootstrap", "backend:build": "./scripts/scopeBackend.sh 'lerna run --stream build'", "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish && yarn release:pro", "release:develop": "lerna publish prerelease --yes --force-publish --dist-tag develop --exact && yarn release:pro: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", @@ -46,7 +44,6 @@ "dev:server": "yarn run kill-server && lerna run --stream --parallel dev:builder --concurrency 1 --scope @budibase/backend-core --scope @budibase/worker --scope @budibase/server", "dev:built": "cd packages/server && yarn dev:stack:up && cd ../../ && lerna run --stream --parallel dev:built", "test": "lerna run --stream test --stream", - "test:pro": "bash scripts/pro/test.sh", "lint:eslint": "eslint packages && eslint qa-core", "lint:prettier": "prettier --check \"packages/**/*.{js,ts,svelte}\" && prettier --write \"examples/**/*.{js,ts,svelte}\" && prettier --check \"qa-core/**/*.{js,ts,svelte}\"", "lint": "yarn run lint:eslint && yarn run lint:prettier", @@ -82,12 +79,25 @@ "mode:account": "yarn mode:cloud && yarn env:account:enable", "security:audit": "node scripts/audit.js", "postinstall": "husky install", - "install:pro": "bash scripts/pro/install.sh", - "dep:clean": "yarn clean && yarn bootstrap" + "dep:clean": "yarn clean -y && yarn bootstrap", + "submodules:load": "git submodule init && git submodule update && yarn && yarn bootstrap", + "submodules:unload": "git submodule deinit --all && yarn && yarn bootstrap" }, "workspaces": { "packages": [ - "packages/*" + "packages/backend-core", + "packages/bbui", + "packages/builder", + "packages/cli", + "packages/client", + "packages/frontend-core", + "packages/sdk", + "packages/server", + "packages/shared-core", + "packages/string-templates", + "packages/types", + "packages/worker", + "packages/pro/packages/pro" ] } } diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 134ea04b75..4310827818 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -15,8 +15,6 @@ "prebuild": "rimraf dist/", "prepack": "cp package.json dist", "build": "tsc -p tsconfig.build.json", - "build:pro": "../../scripts/pro/build.sh", - "postbuild": "yarn run build:pro", "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", "test": "bash scripts/test.sh", "test:watch": "jest --watchAll" diff --git a/packages/backend-core/tsconfig.json b/packages/backend-core/tsconfig.json index e95fb9ab4d..2b1419b051 100644 --- a/packages/backend-core/tsconfig.json +++ b/packages/backend-core/tsconfig.json @@ -7,11 +7,6 @@ "@budibase/types": ["../types/src"] } }, - "references": [ - { "path": "../types" } - ], - "exclude": [ - "node_modules", - "dist", - ] -} \ No newline at end of file + + "exclude": ["node_modules", "dist"] +} diff --git a/packages/builder/tsconfig.json b/packages/builder/tsconfig.json index 1c018ab983..400f964e30 100644 --- a/packages/builder/tsconfig.json +++ b/packages/builder/tsconfig.json @@ -13,9 +13,5 @@ }, "ts-node": { "require": ["tsconfig-paths/register"] - }, - "references": [ - { "path": "../types" }, - { "path": "../backend-core" }, - ] -} \ No newline at end of file + } +} diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index b60cb7eed3..61e83c7c45 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -8,23 +8,14 @@ "paths": { "@budibase/types": ["../types/src"], "@budibase/backend-core": ["../backend-core/src"], - "@budibase/backend-core/*": ["../backend-core/*"], + "@budibase/backend-core/*": ["../backend-core/*"] } }, "ts-node": { "require": ["tsconfig-paths/register"], "swc": true }, - "references": [ - { "path": "../types" }, - { "path": "../backend-core" }, - ], - "include": [ - "src/**/*", - "package.json" - ], - "exclude": [ - "node_modules", - "dist" - ] -} \ No newline at end of file + + "include": ["src/**/*", "package.json"], + "exclude": ["node_modules", "dist"] +} diff --git a/packages/pro b/packages/pro new file mode 160000 index 0000000000..315e57dc91 --- /dev/null +++ b/packages/pro @@ -0,0 +1 @@ +Subproject commit 315e57dc9185dede169af073a01cc23e673b7091 diff --git a/packages/server/jest.config.ts b/packages/server/jest.config.ts index b1498cdad7..6a732a9591 100644 --- a/packages/server/jest.config.ts +++ b/packages/server/jest.config.ts @@ -20,9 +20,9 @@ const baseConfig: Config.InitialProjectOptions = { } // add pro sources if they exist -if (fs.existsSync("../../../budibase-pro")) { - baseConfig.moduleNameMapper["@budibase/pro"] = - "/../../../budibase-pro/packages/pro/src" +if (fs.existsSync("../pro/packages")) { + baseConfig.moduleNameMapper!["@budibase/pro"] = + "/../pro/packages/pro/src" } const config: Config.InitialOptions = { diff --git a/packages/server/nodemon.json b/packages/server/nodemon.json index c27f3aeaf3..b7d4d623c7 100644 --- a/packages/server/nodemon.json +++ b/packages/server/nodemon.json @@ -1,6 +1,10 @@ { - "watch": ["src", "../backend-core", "../../../budibase-pro/packages/pro"], + "watch": ["src", "../backend-core", "../pro/packages/pro"], "ext": "js,ts,json", - "ignore": ["src/**/*.spec.ts", "src/**/*.spec.js", "../backend-core/dist/**/*"], + "ignore": [ + "src/**/*.spec.ts", + "src/**/*.spec.js", + "../backend-core/dist/**/*" + ], "exec": "ts-node src/index.ts" -} \ No newline at end of file +} diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json index 5f4ee1a701..06a3dfaab3 100644 --- a/packages/server/tsconfig.json +++ b/packages/server/tsconfig.json @@ -10,19 +10,13 @@ "@budibase/backend-core": ["../backend-core/src"], "@budibase/backend-core/*": ["../backend-core/*"], "@budibase/shared-core": ["../shared-core/src"], - "@budibase/pro": ["../../../budibase-pro/packages/pro/src"] + "@budibase/pro": ["../pro/packages/pro/src"] } }, "ts-node": { "require": ["tsconfig-paths/register"], "swc": true }, - "references": [ - { "path": "../types" }, - { "path": "../backend-core" }, - { "path": "../shared-core" }, - { "path": "../../../budibase-pro/packages/pro" } - ], "include": ["src/**/*", "specs", "package.json"], "exclude": ["node_modules", "dist"] } diff --git a/packages/shared-core/tsconfig.json b/packages/shared-core/tsconfig.json index 58c9a25d5e..ebfec9c3a5 100644 --- a/packages/shared-core/tsconfig.json +++ b/packages/shared-core/tsconfig.json @@ -6,6 +6,5 @@ "paths": { "@budibase/types": ["../types/src"] } - }, - "references": [{ "path": "../types" }] + } } diff --git a/packages/worker/jest.config.ts b/packages/worker/jest.config.ts index 3655479d82..2b0d8fe23b 100644 --- a/packages/worker/jest.config.ts +++ b/packages/worker/jest.config.ts @@ -20,11 +20,11 @@ const config: Config.InitialOptions = { } // add pro sources if they exist -if (fs.existsSync("../../../budibase-pro")) { - config.moduleNameMapper["@budibase/pro/(.*)"] = - "/../../../budibase-pro/packages/pro/$1" - config.moduleNameMapper["@budibase/pro"] = - "/../../../budibase-pro/packages/pro/src" +if (fs.existsSync("../pro/packages")) { + config.moduleNameMapper!["@budibase/pro/(.*)"] = + "/../pro/packages/pro/$1" + config.moduleNameMapper!["@budibase/pro"] = + "/../pro/packages/pro/src" } export default config diff --git a/packages/worker/nodemon.json b/packages/worker/nodemon.json index e5184939ff..b7d4d623c7 100644 --- a/packages/worker/nodemon.json +++ b/packages/worker/nodemon.json @@ -1,6 +1,10 @@ { - "watch": ["src", "../backend-core", "../../../budibase-pro/packages/pro"], + "watch": ["src", "../backend-core", "../pro/packages/pro"], "ext": "js,ts,json", - "ignore": ["src/**/*.spec.ts", "src/**/*.spec.js", "../backend-core/dist/**/*"], + "ignore": [ + "src/**/*.spec.ts", + "src/**/*.spec.js", + "../backend-core/dist/**/*" + ], "exec": "ts-node src/index.ts" } diff --git a/packages/worker/tsconfig.json b/packages/worker/tsconfig.json index 3c8500d248..0b6ecd7f66 100644 --- a/packages/worker/tsconfig.json +++ b/packages/worker/tsconfig.json @@ -9,23 +9,13 @@ "@budibase/types": ["../types/src"], "@budibase/backend-core": ["../backend-core/src"], "@budibase/backend-core/*": ["../backend-core/*"], - "@budibase/pro": ["../../../budibase-pro/packages/pro/src"] + "@budibase/pro": ["../pro/packages/pro/src"] } }, "ts-node": { "require": ["tsconfig-paths/register"], "swc": true }, - "references": [ - { "path": "../types" }, - { "path": "../backend-core" }, - { "path": "../../../budibase-pro/packages/pro" } - ], - "include": [ - "src/**/*", - "package.json" - ], - "exclude": [ - "dist" - ] -} \ No newline at end of file + "include": ["src/**/*", "package.json"], + "exclude": ["dist"] +} diff --git a/qa-core/tsconfig.json b/qa-core/tsconfig.json index 8cd0c30d46..f8a2eedea0 100644 --- a/qa-core/tsconfig.json +++ b/qa-core/tsconfig.json @@ -16,22 +16,12 @@ "@budibase/types": ["../packages/types/src"], "@budibase/backend-core": ["../packages/backend-core/src"], "@budibase/backend-core/*": ["../packages/backend-core/*"], - "@budibase/server/*": ["../packages/server/src/*"], + "@budibase/server/*": ["../packages/server/src/*"] } }, "ts-node": { "require": ["tsconfig-paths/register"] }, - "references": [ - { "path": "../packages/types" }, - { "path": "../packages/backend-core" }, - ], - "include": [ - "src/**/*", - "package.json" - ], - "exclude": [ - "node_modules", - "dist" - ] -} \ No newline at end of file + "include": ["src/**/*", "package.json"], + "exclude": ["node_modules", "dist"] +} diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh new file mode 100755 index 0000000000..4e7eadc4ab --- /dev/null +++ b/scripts/bootstrap.sh @@ -0,0 +1,7 @@ +if [ -d "packages/pro/packages" ]; then + cd packages/pro + + yarn + lerna bootstrap + yarn setup +fi \ No newline at end of file diff --git a/scripts/link-dependencies.sh b/scripts/link-dependencies.sh index 31d99fda3c..aee03e2c09 100755 --- a/scripts/link-dependencies.sh +++ b/scripts/link-dependencies.sh @@ -34,33 +34,17 @@ yarn unlink yarn link cd - -if [ -d "../budibase-pro" ]; then - cd ../budibase-pro - echo "Bootstrapping budibase-pro" - yarn bootstrap +if [ -d packages/pro/packages ]; then + pro_loaded_locally=true +else + pro_loaded_locally=false +fi - cd packages/pro +if [ $pro_loaded_locally = true ]; then echo "Linking pro" + cd packages/pro/packages/pro yarn unlink yarn link - - echo "Linking backend-core to pro" - yarn link '@budibase/backend-core' - - echo "Linking types to pro" - yarn link '@budibase/types' - - echo "Linking string-templates to pro" - yarn link '@budibase/string-templates' - - cd ../../../budibase - - echo "Linking pro to worker" - cd packages/worker && yarn link '@budibase/pro' - cd - - - echo "Linking pro to server" - cd packages/server && yarn link '@budibase/pro' cd - fi @@ -79,7 +63,7 @@ if [ -d "../account-portal" ]; then echo "Linking types to account-portal" yarn link "@budibase/types" - if [ -d "../../../budibase-pro" ]; then + if [ $pro_loaded_locally = true ]; then echo "Linking pro to account-portal" yarn link "@budibase/pro" fi diff --git a/scripts/pro/build.sh b/scripts/pro/build.sh deleted file mode 100755 index b03d85a0d0..0000000000 --- a/scripts/pro/build.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -# This script is designed for building the pro repo after the backend-core build has completed. -# This ensures that any changes in core that are required by pro are done in the correct order. - -set -e - -# Go to parent of budibase -cd ../../../ - -if [[ -d "budibase-pro" ]]; then - cd budibase-pro - echo "Building pro" - yarn build -fi \ No newline at end of file diff --git a/scripts/pro/install.sh b/scripts/pro/install.sh deleted file mode 100755 index d6662d6341..0000000000 --- a/scripts/pro/install.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -if [[ -z "${CI}" ]]; then - echo 'Cannot run install.sh unless in CI' - exit 0 -fi - -BRANCH=$1 -BASE_BRANCH=$2 - -cd ../ -echo "Cloning pro repo..." -git clone https://$PERSONAL_ACCESS_TOKEN@github.com/Budibase/budibase-pro.git - -# 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 - - if [[ -z "${BRANCH}" ]]; then - echo Using GITHUB_REF_NAME: $GITHUB_REF_NAME - export BRANCH=$GITHUB_REF_NAME - fi - - # Try to checkout the matching pro branch - git checkout $BRANCH - - if [[ $? == "1" ]] && [[ $BASE_BRANCH ]]; then - # There is no matching branch, try to match the base branch - git checkout $BASE_BRANCH - fi - - # If neither branch exists continue with default branch 'develop' - git pull - - echo "Initializing pro repo..." - yarn -fi \ No newline at end of file diff --git a/scripts/pro/release.sh b/scripts/pro/release.sh deleted file mode 100755 index 1af7eea566..0000000000 --- a/scripts/pro/release.sh +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/bash - -# Fail when any command fails -set -e - -if [[ -z "${CI}" ]]; then - echo 'Cannot run release.sh unless in CI' - exit 0 -fi - -############################################# -# SETUP # -############################################# - -# Release pro with same version as budibase -VERSION=$(jq -r .version lerna.json) -echo "Version: $VERSION" -COMMAND=$1 -echo "Command: $COMMAND" - -# Determine tag to use -TAG="" -if [[ $COMMAND == "develop" ]]; then - TAG="develop" -else - TAG="latest" -fi - -echo "Releasing version $VERSION" -echo "Releasing tag $TAG" - -############################################# -# PRE-PUBLISH # -############################################# - -# Go to pro repo root -cd ../budibase-pro - -# Install NPM credentials -echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc - -# Sync budibase dependency versions in packages/pro/package.json -# Ensures pro does not use out of date dependency -cd packages/pro -jq '.dependencies."@budibase/backend-core"="'$VERSION'"' package.json > package.json.tmp && mv package.json.tmp package.json -jq '.dependencies."@budibase/types"="'$VERSION'"' package.json > package.json.tmp && mv package.json.tmp package.json - -# Go back to pro repo root -cd - - -# Update lockfile with new dependency versions -yarn clean -y && yarn bootstrap - -# Commit and push -git add packages/pro/yarn.lock -git commit -m "Update dependency versions to $VERSION" -n -git push - -############################################# -# PUBLISH # -############################################# - -lerna publish $VERSION --yes --force-publish --dist-tag $TAG - -############################################# -# POST-PUBLISH - BUDIBASE # -############################################# - -# Go to budibase repo root -cd ../budibase - -# Update pro version in packages/server/package.json -cd packages/server -jq '.dependencies."@budibase/pro"="'$VERSION'"' package.json > package.json.tmp && mv package.json.tmp package.json - -# Go back to budibase repo root -cd - - -# Update pro version in packages/worker/package.json -cd packages/worker -jq '.dependencies."@budibase/pro"="'$VERSION'"' package.json > package.json.tmp && mv package.json.tmp package.json - -# Go back to budibase repo root -cd - - -# Update lockfile with new pro version -yarn clean -y && yarn bootstrap - -# Commit and push changes -git add packages/server/package.json -git add packages/worker/package.json -git add yarn.lock -git commit -m "Update pro version to $VERSION" -n -git push diff --git a/scripts/pro/test.sh b/scripts/pro/test.sh deleted file mode 100755 index 9c56b8be6b..0000000000 --- a/scripts/pro/test.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -# Fail when any command fails -set -e - -cd ../ -if [[ -d "budibase-pro" ]]; then - cd budibase-pro - yarn test - cd ../budibase -fi \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json deleted file mode 100644 index 8382281d99..0000000000 --- a/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "references": [ - { "path": "./packages/types" }, - { "path": "./packages/backend-core" }, - { "path": "./packages/server" }, - { "path": "./packages/worker" } - ], - "files" :[] -} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index fe9c6768d3..ff755fed6b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1386,6 +1386,45 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@budibase/backend-core@2.5.6-alpha.3": + version "2.5.6-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.6-alpha.3.tgz#686d1533a3218507e4c82a58bf73caf875e0d895" + integrity sha512-TYaGj1G1h3K/QNwSanEFbwxlA04T3dc0DDHDgauyvqX8kHXYhY11BDn8xqrCQrpqXC7XlC4nL78NrhZiDJ+eFA== + dependencies: + "@budibase/nano" "10.1.2" + "@budibase/pouchdb-replication-stream" "1.2.10" + "@budibase/types" "2.5.6-alpha.3" + "@shopify/jest-koa-mocks" "5.0.1" + "@techpass/passport-openidconnect" "0.3.2" + aws-cloudfront-sign "2.2.0" + aws-sdk "2.1030.0" + bcrypt "5.0.1" + bcryptjs "2.4.3" + bull "4.10.1" + correlation-id "4.0.0" + dotenv "16.0.1" + emitter-listener "1.1.2" + ioredis "4.28.0" + joi "17.6.0" + jsonwebtoken "9.0.0" + koa-passport "4.1.4" + koa-pino-logger "4.0.0" + lodash "4.17.21" + lodash.isarguments "3.1.0" + node-fetch "2.6.7" + 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" + redlock "4.2.0" + sanitize-s3-objectkey "0.0.1" + semver "7.3.7" + tar-fs "2.1.1" + uuid "8.3.2" + "@budibase/bbui@^0.9.139": version "0.9.190" resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.190.tgz#e1ec400ac90f556bfbc80fc23a04506f1585ea81" @@ -1547,6 +1586,13 @@ resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933" integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg== +"@budibase/types@2.5.6-alpha.3": + version "2.5.6-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.6-alpha.3.tgz#fd7656599d388d2d5a21806b9058a2656793ec87" + integrity sha512-SD9WTXb2A+3jqEEk8HoEDwphm5tiwfQWiBFOzTZlooWiS5M6UGxKCgXzPv0Ad9Pfxi2oGxfGh7qJcNgHQDoE3Q== + dependencies: + scim-patch "^0.7.0" + "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" @@ -3007,7 +3053,7 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== -"@jridgewell/sourcemap-codec@^1.4.10": +"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13": version "1.4.15" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== @@ -3717,7 +3763,7 @@ dependencies: slash "^3.0.0" -"@rollup/plugin-commonjs@^16.0.0": +"@rollup/plugin-commonjs@16.0.0", "@rollup/plugin-commonjs@^16.0.0": version "16.0.0" resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-16.0.0.tgz#169004d56cd0f0a1d0f35915d31a036b0efe281f" integrity sha512-LuNyypCP3msCGVQJ7ki8PqYdpjfEkE/xtFa5DqlF+7IBD0JsfMZ87C58heSwIMint58sAUZbt3ITqOmdQv/dXw== @@ -3800,6 +3846,22 @@ "@rollup/pluginutils" "^3.1.0" magic-string "^0.25.7" +"@rollup/plugin-replace@^5.0.2": + version "5.0.2" + resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-5.0.2.tgz#45f53501b16311feded2485e98419acb8448c61d" + integrity sha512-M9YXNekv/C/iHHK+cvORzfRYfPbq0RDD8r0G+bMiTXjNGKulPnCT9O3Ss46WfhI6ZOCgApOP7xAdmCQJ+U2LAA== + dependencies: + "@rollup/pluginutils" "^5.0.1" + magic-string "^0.27.0" + +"@rollup/plugin-typescript@8.3.0": + version "8.3.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-8.3.0.tgz#bc1077fa5897b980fc27e376c4e377882c63e68b" + integrity sha512-I5FpSvLbtAdwJ+naznv+B4sjXZUcIvLLceYpITAn7wAP8W0wqc5noLdGIp9HGVntNhRWXctwPYrSSFQxtl0FPA== + dependencies: + "@rollup/pluginutils" "^3.1.0" + resolve "^1.17.0" + "@rollup/pluginutils@^3.0.8", "@rollup/pluginutils@^3.1.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b" @@ -11698,7 +11760,7 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== -fsevents@^2.1.2, fsevents@^2.3.2, fsevents@~2.3.2: +fsevents@^2.1.2, fsevents@^2.3.2, fsevents@~2.3.1, fsevents@~2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== @@ -12880,10 +12942,10 @@ humanize-ms@^1.2.0, humanize-ms@^1.2.1: dependencies: ms "^2.0.0" -husky@^7.0.1: - version "7.0.4" - resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.4.tgz#242048245dc49c8fb1bf0cc7cfb98dd722531535" - integrity sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ== +husky@^8.0.3: + version "8.0.3" + resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.3.tgz#4936d7212e46d1dea28fef29bb3a108872cd9184" + integrity sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg== iconv-lite@0.4.24, iconv-lite@^0.4.15, iconv-lite@^0.4.24, iconv-lite@^0.4.5: version "0.4.24" @@ -16688,6 +16750,13 @@ magic-string@^0.26.2: dependencies: sourcemap-codec "^1.4.8" +magic-string@^0.27.0: + version "0.27.0" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.27.0.tgz#e4a3413b4bab6d98d2becffd48b4a257effdbbf3" + integrity sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA== + dependencies: + "@jridgewell/sourcemap-codec" "^1.4.13" + make-dir@3.1.0, make-dir@^3.0.0, make-dir@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" @@ -21417,6 +21486,13 @@ rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.6.0, dependencies: estree-walker "^0.6.1" +rollup@2.45.2: + version "2.45.2" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.45.2.tgz#8fb85917c9f35605720e92328f3ccbfba6f78b48" + integrity sha512-kRRU7wXzFHUzBIv0GfoFFIN3m9oteY4uAsKllIpQDId5cfnkWF2J130l+27dzDju0E6MScKiV0ZM5Bw8m4blYQ== + optionalDependencies: + fsevents "~2.3.1" + rollup@^2.36.2, rollup@^2.44.0, rollup@^2.45.2, rollup@^2.79.1: version "2.79.1" resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7" @@ -23379,7 +23455,7 @@ timed-out@^4.0.1: resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" integrity sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA== -timekeeper@2.2.0: +timekeeper@2.2.0, timekeeper@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/timekeeper/-/timekeeper-2.2.0.tgz#9645731fce9e3280a18614a57a9d1b72af3ca368" integrity sha512-W3AmPTJWZkRwu+iSNxPIsLZ2ByADsOLbbLxe46UJyWj3mlYLlwucKiq+/dPm0l9wTzqoF3/2PH0AGFCebjq23A== From 0a83d8eec800ba76230b1a7f1b92fd42fef803b2 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 11:49:55 +0100 Subject: [PATCH 02/83] Remove release pro from commands --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 32807dc963..1c9dfa9205 100644 --- a/package.json +++ b/package.json @@ -29,8 +29,8 @@ "backend:build": "./scripts/scopeBackend.sh 'lerna run --stream build'", "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", - "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish && yarn release:pro", - "release:develop": "lerna publish prerelease --yes --force-publish --dist-tag develop --exact && yarn release:pro:develop", + "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish", + "release:develop": "lerna publish prerelease --yes --force-publish --dist-tag develop --exact", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", From 25bc89a9b6f45250c7c092f776aebf628edc5c4a Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 12:08:05 +0100 Subject: [PATCH 03/83] Remove package versions --- packages/backend-core/package.json | 4 +- packages/bbui/package.json | 6 +- packages/builder/package.json | 12 +- packages/cli/package.json | 14 +- packages/client/package.json | 12 +- packages/frontend-core/package.json | 7 +- packages/pro | 2 +- packages/sdk/package.json | 2 +- packages/server/package.json | 14 +- packages/shared-core/package.json | 4 +- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 10 +- yarn.lock | 173 +++++++++++++++++++++---- 14 files changed, 193 insertions(+), 71 deletions(-) diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 0c1ba18896..b72805fb50 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.19", + "version": "0.0.1", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -22,7 +22,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.19", + "@budibase/types": "latest", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index b3fe8ceabb..4145ce44c0 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": "2.5.6-alpha.19", + "version": "0.0.1", "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.5.6-alpha.19", - "@budibase/string-templates": "2.5.6-alpha.19", + "@budibase/shared-core": "latest", + "@budibase/string-templates": "latest", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index e9a7bfcc18..3c7d8abb7c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.19", + "version": "0.0.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.19", - "@budibase/client": "2.5.6-alpha.19", - "@budibase/frontend-core": "2.5.6-alpha.19", - "@budibase/shared-core": "2.5.6-alpha.19", - "@budibase/string-templates": "2.5.6-alpha.19", + "@budibase/bbui": "latest", + "@budibase/client": "latest", + "@budibase/frontend-core": "latest", + "@budibase/shared-core": "latest", + "@budibase/string-templates": "latest", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 85b978d861..4a383237c0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.19", + "version": "0.0.1", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,19 +29,13 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.19", - "@budibase/string-templates": "2.5.6-alpha.19", - "@budibase/types": "2.5.6-alpha.19", + "@budibase/backend-core": "latest", + "@budibase/string-templates": "latest", + "@budibase/types": "latest", "axios": "0.21.2", - "chalk": "4.1.0", - "cli-progress": "3.11.2", - "commander": "7.1.0", - "docker-compose": "0.23.12", - "dotenv": "16.0.1", "download": "8.0.0", "find-free-port": "^2.0.0", "inquirer": "8.0.0", - "joi": "17.6.0", "lookpath": "1.1.0", "node-fetch": "2.6.7", "pkg": "5.8.0", diff --git a/packages/client/package.json b/packages/client/package.json index 7745a6a6dd..15f1419a35 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.19", + "version": "0.0.1", "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.5.6-alpha.19", - "@budibase/frontend-core": "2.5.6-alpha.19", - "@budibase/shared-core": "2.5.6-alpha.19", - "@budibase/string-templates": "2.5.6-alpha.19", - "@budibase/types": "2.5.6-alpha.19", + "@budibase/bbui": "latest", + "@budibase/frontend-core": "latest", + "@budibase/shared-core": "latest", + "@budibase/string-templates": "latest", + "@budibase/types": "latest", "@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 ebd34d8a71..d6a1aaadf4 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,14 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.19", + "version": "0.0.1", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.19", - "@budibase/shared-core": "2.5.6-alpha.19", - "dayjs": "^1.11.7", + "@budibase/bbui": "latest", + "@budibase/shared-core": "latest", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", "svelte": "^3.46.2" diff --git a/packages/pro b/packages/pro index 315e57dc91..bacbea4741 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 315e57dc9185dede169af073a01cc23e673b7091 +Subproject commit bacbea4741e2a94f8a88960f9e7f15ba0e8cba42 diff --git a/packages/sdk/package.json b/packages/sdk/package.json index c442aeaf9e..7e8b74698d 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.19", + "version": "0.0.1", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 39f72be12e..5a2681478d 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.19", + "version": "0.0.1", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.19", - "@budibase/client": "2.5.6-alpha.19", - "@budibase/pro": "2.5.6-alpha.19", - "@budibase/shared-core": "2.5.6-alpha.19", - "@budibase/string-templates": "2.5.6-alpha.19", - "@budibase/types": "2.5.6-alpha.19", + "@budibase/backend-core": "latest", + "@budibase/client": "latest", + "@budibase/pro": "latest", + "@budibase/shared-core": "latest", + "@budibase/string-templates": "latest", + "@budibase/types": "latest", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 5458d64f33..81f40a7b32 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.19", + "version": "0.0.1", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.19" + "@budibase/types": "latest" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 6bd454753f..4ca866f18d 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.19", + "version": "0.0.1", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index d5ec431892..6f6b5c9ec3 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.19", + "version": "0.0.1", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 8166643b30..ba825eb150 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.19", + "version": "0.0.1", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.19", - "@budibase/pro": "2.5.6-alpha.19", - "@budibase/string-templates": "2.5.6-alpha.19", - "@budibase/types": "2.5.6-alpha.19", + "@budibase/backend-core": "latest", + "@budibase/pro": "latest", + "@budibase/string-templates": "latest", + "@budibase/types": "latest", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", diff --git a/yarn.lock b/yarn.lock index 817eb39f7f..307002fe06 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1386,14 +1386,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.6-alpha.3": - version "2.5.6-alpha.3" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.6-alpha.3.tgz#686d1533a3218507e4c82a58bf73caf875e0d895" - integrity sha512-TYaGj1G1h3K/QNwSanEFbwxlA04T3dc0DDHDgauyvqX8kHXYhY11BDn8xqrCQrpqXC7XlC4nL78NrhZiDJ+eFA== +"@budibase/backend-core@2.5.5", "@budibase/backend-core@latest": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.5.tgz#d1ae36564de447674a157790b1e8ebff5f42748c" + integrity sha512-mGQSK6wc4M6+KVpfsbcfijjOJaWreGnd0muLFrUYsogliglWDXeCTfdEXFMkhCyKEe+3TWeVkxVKzss6zSG+Mw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "2.5.6-alpha.3" + "@budibase/types" "^2.5.5" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1408,7 +1408,6 @@ joi "17.6.0" jsonwebtoken "9.0.0" koa-passport "4.1.4" - koa-pino-logger "4.0.0" lodash "4.17.21" lodash.isarguments "3.1.0" node-fetch "2.6.7" @@ -1424,6 +1423,7 @@ semver "7.3.7" tar-fs "2.1.1" uuid "8.3.2" + zlib "1.0.5" "@budibase/bbui@^0.9.139": version "0.9.190" @@ -1475,6 +1475,104 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" +"@budibase/bbui@^2.5.5", "@budibase/bbui@latest": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-2.5.5.tgz#860ab3f6cc1f8ada1f2cca1e8969e8390047800d" + integrity sha512-54kkCjOspcH25rybZ5+p1v6PfnyKouE7mQw73VFFh1AKSd+VORfLkMpwUm0w+Dsuoi1hBCA0k1eNLDY3md0+hg== + dependencies: + "@adobe/spectrum-css-workflow-icons" "1.2.1" + "@budibase/shared-core" "^2.5.5" + "@budibase/string-templates" "^2.5.5" + "@spectrum-css/accordion" "3.0.24" + "@spectrum-css/actionbutton" "1.0.1" + "@spectrum-css/actiongroup" "1.0.1" + "@spectrum-css/avatar" "3.0.2" + "@spectrum-css/button" "3.0.1" + "@spectrum-css/buttongroup" "3.0.2" + "@spectrum-css/checkbox" "3.0.2" + "@spectrum-css/dialog" "3.0.1" + "@spectrum-css/divider" "1.0.3" + "@spectrum-css/dropzone" "3.0.2" + "@spectrum-css/fieldgroup" "3.0.2" + "@spectrum-css/fieldlabel" "3.0.1" + "@spectrum-css/icon" "3.0.1" + "@spectrum-css/illustratedmessage" "3.0.2" + "@spectrum-css/inlinealert" "2.0.1" + "@spectrum-css/inputgroup" "3.0.2" + "@spectrum-css/label" "2.0.10" + "@spectrum-css/link" "3.1.1" + "@spectrum-css/menu" "3.0.1" + "@spectrum-css/modal" "3.0.1" + "@spectrum-css/pagination" "3.0.3" + "@spectrum-css/picker" "1.0.1" + "@spectrum-css/popover" "3.0.1" + "@spectrum-css/progressbar" "1.0.2" + "@spectrum-css/progresscircle" "1.0.2" + "@spectrum-css/radio" "3.0.2" + "@spectrum-css/search" "3.0.2" + "@spectrum-css/sidenav" "3.0.2" + "@spectrum-css/slider" "3.0.1" + "@spectrum-css/statuslight" "3.0.2" + "@spectrum-css/stepper" "3.0.3" + "@spectrum-css/switch" "1.0.2" + "@spectrum-css/table" "3.0.1" + "@spectrum-css/tabs" "3.2.12" + "@spectrum-css/tags" "3.0.2" + "@spectrum-css/textfield" "3.0.1" + "@spectrum-css/toast" "3.0.1" + "@spectrum-css/tooltip" "3.0.3" + "@spectrum-css/treeview" "3.0.2" + "@spectrum-css/typography" "3.0.1" + "@spectrum-css/underlay" "2.0.9" + "@spectrum-css/vars" "3.0.1" + dayjs "^1.10.4" + easymde "^2.16.1" + svelte-flatpickr "^3.2.3" + svelte-portal "^1.0.0" + +"@budibase/client@latest": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/client/-/client-2.5.5.tgz#2647c34ab1ca50bcdd41bb48a3cd5afc8d53566a" + integrity sha512-PyyYTD8juGyGsQI2lyTymqIvBH3nflkuTv+XE1UrjVSrK5DJsW3e9/UiUWcDhOgX9Sq3Q3D8JMMGfSriwBEdLg== + dependencies: + "@budibase/bbui" "^2.5.5" + "@budibase/frontend-core" "^2.5.5" + "@budibase/shared-core" "^2.5.5" + "@budibase/string-templates" "^2.5.5" + "@budibase/types" "^2.5.5" + "@spectrum-css/button" "^3.0.3" + "@spectrum-css/card" "^3.0.3" + "@spectrum-css/divider" "^1.0.3" + "@spectrum-css/link" "^3.1.3" + "@spectrum-css/page" "^3.0.1" + "@spectrum-css/tag" "^3.1.4" + "@spectrum-css/typography" "^3.0.2" + "@spectrum-css/vars" "^3.0.1" + apexcharts "^3.22.1" + dayjs "^1.10.5" + downloadjs "1.4.7" + html5-qrcode "^2.2.1" + leaflet "^1.7.1" + regexparam "^1.3.0" + sanitize-html "^2.7.0" + screenfull "^6.0.1" + shortid "^2.2.15" + socket.io-client "^4.5.1" + svelte "^3.49.0" + svelte-apexcharts "^1.0.2" + svelte-flatpickr "^3.1.0" + svelte-spa-router "^3.0.5" + +"@budibase/frontend-core@^2.5.5", "@budibase/frontend-core@latest": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-2.5.5.tgz#58f81e95c849b12d39cab3b8ac64c1d6ee37952b" + integrity sha512-U1xRQIFxeGiRJREEft5E3VwbW0KSJNRAww3Jd9WGhKXZIWIiIruwW1jeyX0ISFdIJqtOVt0Vow9s9DKcoroMew== + dependencies: + "@budibase/bbui" "^2.5.5" + "@budibase/shared-core" "^2.5.5" + lodash "^4.17.21" + svelte "^3.46.2" + "@budibase/handlebars-helpers@^0.11.8": version "0.11.8" resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841" @@ -1525,15 +1623,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.18": - version "2.5.6-alpha.18" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.18.tgz#d75600c3fe11872403c47fa8c45e55f53cb6d02b" - integrity sha512-SnSHlVFkJocvrFJFBrBVHN1+2+aoqyPaB+qn22BX7x02AY5Yrj938n5yNAMrXVrsmiSc1shZQ5S09a4uDTw6Ww== +"@budibase/pro@latest": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5.tgz#8aa44b99baa8763d85f0ba3db92a178259dcf13e" + integrity sha512-dOUWWZGbFIumTfCQPmNSaTqlkLD6O/SK6H7IYY8FP67eMrLRZUanO3l0XgbjDiOdFIS1Hw5vvjHmunP0hQdLyw== dependencies: - "@budibase/backend-core" "2.5.6-alpha.18" - "@budibase/shared-core" "2.4.44-alpha.1" - "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.18" + "@budibase/backend-core" "2.5.5" + "@budibase/string-templates" "2.3.20" + "@budibase/types" "2.5.5" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1541,8 +1638,6 @@ lru-cache "^7.14.1" memorystream "^0.3.1" node-fetch "^2.6.1" - scim-patch "^0.7.0" - scim2-parse-filter "^0.2.8" "@budibase/shared-core@2.4.44-alpha.1": version "2.4.44-alpha.1" @@ -1551,6 +1646,13 @@ dependencies: "@budibase/types" "2.4.44-alpha.1" +"@budibase/shared-core@^2.5.5", "@budibase/shared-core@latest": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/shared-core/-/shared-core-2.5.5.tgz#8cd61edd27ad0e75f47a1cfaff724e5ad7f22844" + integrity sha512-JQZHqVsOntSg2LXxyGZLntn9jS83R77c9MklQ9zESDVcAqxMFVVc0UNpaaW+MaTkMWfbdPFqnZAYP30mkZGe2g== + dependencies: + "@budibase/types" "^2.5.5" + "@budibase/standard-components@^0.9.139": version "0.9.139" resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.139.tgz#cf8e2b759ae863e469e50272b3ca87f2827e66e3" @@ -1569,6 +1671,18 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" +"@budibase/string-templates@2.3.20": + version "2.3.20" + resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.3.20.tgz#35f74b6f515e8127cc375ee0a4679b0a7c117588" + integrity sha512-wMKau3IzVF6M+dRu99aKV1yMdrrK5lghVm9qYtR1B163SMbHEwC8JmZFGPLIi1XsG0T+vw+xfcemfJ2zcATWwg== + dependencies: + "@budibase/handlebars-helpers" "^0.11.8" + dayjs "^1.10.4" + handlebars "^4.7.6" + handlebars-utils "^1.0.6" + lodash "^4.17.20" + vm2 "^3.9.4" + "@budibase/string-templates@2.4.44-alpha.1": version "2.4.44-alpha.1" resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.4.44-alpha.1.tgz#6c2aee594d16eac1f173c509e087a817dd3172f0" @@ -1581,17 +1695,27 @@ lodash "^4.17.20" vm2 "^3.9.4" +"@budibase/string-templates@^2.5.5", "@budibase/string-templates@latest": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.5.5.tgz#2cd506ca6612319713ec6407279bcbf8a9bb9fb2" + integrity sha512-7OyMlndEh3r5obT6SoZGQvg5aq033U1DnYJAzumcAKY4T/9ATHBUAGbJeVD/lFXEj9KcEIfd2A8JPXjxkrDDeQ== + dependencies: + "@budibase/handlebars-helpers" "^0.11.8" + dayjs "^1.10.4" + handlebars "^4.7.6" + handlebars-utils "^1.0.6" + lodash "^4.17.20" + vm2 "^3.9.15" + "@budibase/types@2.4.44-alpha.1": version "2.4.44-alpha.1" resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933" integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg== -"@budibase/types@2.5.6-alpha.3": - version "2.5.6-alpha.3" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.6-alpha.3.tgz#fd7656599d388d2d5a21806b9058a2656793ec87" - integrity sha512-SD9WTXb2A+3jqEEk8HoEDwphm5tiwfQWiBFOzTZlooWiS5M6UGxKCgXzPv0Ad9Pfxi2oGxfGh7qJcNgHQDoE3Q== - dependencies: - scim-patch "^0.7.0" +"@budibase/types@2.5.5", "@budibase/types@^2.5.5", "@budibase/types@latest": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.5.tgz#aca40d7e160e400b9a814fbaa7ad04d10dcf9672" + integrity sha512-caKRxeCfnXzMFCc2lfDhKREl4VsDqnAnT55339NHQFTpDrTFboY0bG6h6osNan5CQCafNCLtS32bz597frGT9A== "@bull-board/api@3.7.0": version "3.7.0" @@ -25382,3 +25506,8 @@ z-schema@^5.0.1: validator "^13.7.0" optionalDependencies: commander "^10.0.0" + +zlib@1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/zlib/-/zlib-1.0.5.tgz#6e7c972fc371c645a6afb03ab14769def114fcc0" + integrity sha512-40fpE2II+Cd3k8HWTWONfeKE2jL+P42iWJ1zzps5W51qcTsOUKM5Q5m2PFb0CLxlmFAaUuUdJGc3OfZy947v0w== From 9ddb148698ee49a5fe677bfd089224d96695feec Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 12:18:50 +0100 Subject: [PATCH 04/83] Add version file --- versions/package.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 versions/package.json diff --git a/versions/package.json b/versions/package.json new file mode 100644 index 0000000000..b350593f5a --- /dev/null +++ b/versions/package.json @@ -0,0 +1,3 @@ +{ + "version": "2.5.6-alpha.6" +} From 6ecb062acfb5c3d20b6541039f7ef6a123291252 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 12:24:23 +0100 Subject: [PATCH 05/83] Tag action --- .github/workflows/tag-prerelease.yml | 38 ++++++++++++++++++++++++++++ versions/package.json | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/tag-prerelease.yml diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml new file mode 100644 index 0000000000..51434f5248 --- /dev/null +++ b/.github/workflows/tag-prerelease.yml @@ -0,0 +1,38 @@ +name: Tag prerelease +concurrency: release-prerelease + +on: + push: + branches: + - develop + - chore/pipeline_npm_version_updates + paths: + - ".aws/**" + - ".github/**" + - "charts/**" + - "packages/**" + - "scripts/**" + - "package.json" + - "yarn.lock" + - "package.json" + - "yarn.lock" + workflow_dispatch: + +jobs: + tag-prerelease: + runs-on: ubuntu-latest + + steps: + - name: Fail if branch is not develop + if: github.ref != 'refs/heads/develop' + run: | + echo "Ref is not develop, you must run this job from develop." + exit 1 + - uses: actions/checkout@v2 + with: + submodules: true + token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} + + - name: Tag prerelease + run: | + yarn version --prerelease --cwd="./versions" diff --git a/versions/package.json b/versions/package.json index b350593f5a..ef25fb2aaa 100644 --- a/versions/package.json +++ b/versions/package.json @@ -1,3 +1,3 @@ { - "version": "2.5.6-alpha.6" + "version": "0.0.999-alpha.6" } From e10eba944782b5ec8ac4bf09477096d259f4ca7d Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 12:25:38 +0100 Subject: [PATCH 06/83] Remove check --- .github/workflows/tag-prerelease.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index 51434f5248..36bf26652c 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -23,11 +23,11 @@ jobs: runs-on: ubuntu-latest steps: - - name: Fail if branch is not develop - if: github.ref != 'refs/heads/develop' - run: | - echo "Ref is not develop, you must run this job from develop." - exit 1 + # - name: Fail if branch is not develop + # if: github.ref != 'refs/heads/develop' + # run: | + # echo "Ref is not develop, you must run this job from develop." + # exit 1 - uses: actions/checkout@v2 with: submodules: true From af8a27fa103ea90aca3bb8ccb376235da038785a Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 12:27:06 +0100 Subject: [PATCH 07/83] Setup git user --- .github/workflows/tag-prerelease.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index 36bf26652c..877dd73fdc 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -35,4 +35,7 @@ jobs: - name: Tag prerelease run: | + # setup the username and email. + git config --global user.name "Budibase Staging Release Bot" + git config --global user.email "<>" yarn version --prerelease --cwd="./versions" From ca84e0c94c57135cb350ef4d5a0b9570f3b2057c Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 12:32:40 +0100 Subject: [PATCH 08/83] Push changes --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 1c9dfa9205..0d8e493fce 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,8 @@ "postinstall": "husky install", "dep:clean": "yarn clean -y && yarn bootstrap", "submodules:load": "git submodule init && git submodule update && yarn && yarn bootstrap", - "submodules:unload": "git submodule deinit --all && yarn && yarn bootstrap" + "submodules:unload": "git submodule deinit --all && yarn && yarn bootstrap", + "postversion": "git push --tags && git push && echo \"Successfully pushed version and tag $npm_package_version!\"" }, "workspaces": { "packages": [ From 8faed6cfbc8e57a24d868ec22d3ba47e219d2bc2 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 12:37:06 +0100 Subject: [PATCH 09/83] Move script --- package.json | 3 +-- versions/package.json | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 0d8e493fce..1c9dfa9205 100644 --- a/package.json +++ b/package.json @@ -81,8 +81,7 @@ "postinstall": "husky install", "dep:clean": "yarn clean -y && yarn bootstrap", "submodules:load": "git submodule init && git submodule update && yarn && yarn bootstrap", - "submodules:unload": "git submodule deinit --all && yarn && yarn bootstrap", - "postversion": "git push --tags && git push && echo \"Successfully pushed version and tag $npm_package_version!\"" + "submodules:unload": "git submodule deinit --all && yarn && yarn bootstrap" }, "workspaces": { "packages": [ diff --git a/versions/package.json b/versions/package.json index ef25fb2aaa..10299dc2b2 100644 --- a/versions/package.json +++ b/versions/package.json @@ -1,3 +1,6 @@ { - "version": "0.0.999-alpha.6" + "version": "0.0.999-alpha.6", + "scripts": { + "postversion": "git push --tags && git push && echo \"Successfully pushed version and tag $npm_package_version!\"" + } } From 1bcb481d69c0cc91ffa6532689e1400c8eaa8eaf Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 12:50:26 +0100 Subject: [PATCH 10/83] Change publish process --- .github/workflows/release-develop.yml | 27 +++++++++++++++++++-------- package.json | 2 +- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 07ff0b20c7..cf5e0e6b9f 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -3,8 +3,8 @@ concurrency: release-prerelease on: push: - branches: - - develop + tags: + - v*-alpha.* paths: - ".aws/**" - ".github/**" @@ -30,24 +30,35 @@ jobs: runs-on: ubuntu-latest steps: - - name: Fail if branch is not develop - if: github.ref != 'refs/heads/develop' - run: | - echo "Ref is not develop, you must run this job from develop." - exit 1 - uses: actions/checkout@v2 with: submodules: true token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} + fetch-depth: 1 + + - name: Fail if tag is not develop + run: | + if ! git merge-base --is-ancestor ${{ github.sha }} origin/develop; then + echo "Tag is not in develop" + exit 1 + fi + - uses: actions/setup-node@v1 with: node-version: 14.x - run: yarn + - name: Update versions + run: | + version=$(cat versions/package.json \ + | grep version \ + | head -1 \ + | awk -F: '{ print $2 }' \ + | sed 's/[",]//g') + yarn lerna exec "yarn version --no-git-tag-version --new-version=$tag" - run: yarn bootstrap - run: yarn build - run: yarn build:sdk - # - run: yarn test - name: Publish budibase packages to NPM env: diff --git a/package.json b/package.json index 1c9dfa9205..9f8bb7113c 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish", - "release:develop": "lerna publish prerelease --yes --force-publish --dist-tag develop --exact", + "release:develop": "npm publish", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", From 5824b45c20a2d2b14ea051f9c9e19431d96321ff Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 12:53:16 +0100 Subject: [PATCH 11/83] Remove check for testing --- .github/workflows/release-develop.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index cf5e0e6b9f..d8db51ba44 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -36,12 +36,12 @@ jobs: token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} fetch-depth: 1 - - name: Fail if tag is not develop - run: | - if ! git merge-base --is-ancestor ${{ github.sha }} origin/develop; then - echo "Tag is not in develop" - exit 1 - fi + # - name: Fail if tag is not develop + # run: | + # if ! git merge-base --is-ancestor ${{ github.sha }} origin/develop; then + # echo "Tag is not in develop" + # exit 1 + # fi - uses: actions/setup-node@v1 with: From 4bc036c3901ed5c262d6d1e667e6399a75c31de8 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 13:09:44 +0100 Subject: [PATCH 12/83] Use lerna --- .github/workflows/tag-prerelease.yml | 2 +- lerna.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index 877dd73fdc..a0b6269eb3 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -38,4 +38,4 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" - yarn version --prerelease --cwd="./versions" + lerna version prerelease --yes" diff --git a/lerna.json b/lerna.json index 5534b2f45d..bd0f708b01 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,7 @@ { "version": "2.5.6-alpha.19", "npmClient": "yarn", + "version": "0.0.999-alpha.9", "packages": [ "packages/backend-core", "packages/bbui", From 5f8451b6e5e8fb8c94d782c65525adc26ba506b4 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 13:13:38 +0100 Subject: [PATCH 13/83] Yarn lerna --- .github/workflows/tag-prerelease.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index a0b6269eb3..e359269d2e 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -38,4 +38,4 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" - lerna version prerelease --yes" + yarn lerna version prerelease --yes" From dbc9f709749cd7591843e994ce061a92f7488be9 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 13:26:48 +0100 Subject: [PATCH 14/83] Rely on lerna version --- .github/workflows/tag-prerelease.yml | 6 +++++- versions/package.json | 6 ------ 2 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 versions/package.json diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index e359269d2e..ff617089f1 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -38,4 +38,8 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" - yarn lerna version prerelease --yes" + yarn lerna version prerelease --no-git-tag-version --force-publish --no-push --y + git add lerna.json + git commit -m 'Update version' + git push + git push --tags diff --git a/versions/package.json b/versions/package.json deleted file mode 100644 index 10299dc2b2..0000000000 --- a/versions/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "version": "0.0.999-alpha.6", - "scripts": { - "postversion": "git push --tags && git push && echo \"Successfully pushed version and tag $npm_package_version!\"" - } -} From ebde64eee8456333eada97c96f7049cc6e0180f7 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 13:28:02 +0100 Subject: [PATCH 15/83] Remove yarn --- .github/workflows/tag-prerelease.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index ff617089f1..aef73338b4 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -38,7 +38,7 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" - yarn lerna version prerelease --no-git-tag-version --force-publish --no-push --y + lerna version prerelease --no-git-tag-version --force-publish --no-push --y git add lerna.json git commit -m 'Update version' git push From 3837c5c8f4526e936224402482f413f7625c3abf Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 13:30:29 +0100 Subject: [PATCH 16/83] Tag --- .github/workflows/tag-prerelease.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index aef73338b4..b7b799c390 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -38,7 +38,7 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" - lerna version prerelease --no-git-tag-version --force-publish --no-push --y + lerna version prerelease --force-publish --no-push --y git add lerna.json git commit -m 'Update version' git push From 7275600be9800f53feb2c9890a0a93e4f9b55f86 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 14:09:37 +0100 Subject: [PATCH 17/83] Bump lerna.json only --- .github/workflows/tag-prerelease.yml | 6 +----- scripts/bumpLernaVersion.sh | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) create mode 100755 scripts/bumpLernaVersion.sh diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index b7b799c390..0da00aa710 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -38,8 +38,4 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" - lerna version prerelease --force-publish --no-push --y - git add lerna.json - git commit -m 'Update version' - git push - git push --tags + ./scripts/bumpLernaVersion.sh diff --git a/scripts/bumpLernaVersion.sh b/scripts/bumpLernaVersion.sh new file mode 100755 index 0000000000..30a8877dbf --- /dev/null +++ b/scripts/bumpLernaVersion.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +# Bump the version in lerna.json +CURRENT_VERSION=$(node -p "require('./lerna.json').version") +NEW_VERSION=$(echo $CURRENT_VERSION | awk -F. -v OFS=. '{++$NF; print}') +sed -i '' "s/\"version\": \"$CURRENT_VERSION\"/\"version\": \"$NEW_VERSION\"/" lerna.json + +lerna version prerelease --no-git-tag-version --force-publish --no-push --y +git add lerna.json +git commit -m "Bump version to $NEW_VERSION" +git tag $NEW_VERSION +git push +git push --tags + + From f4b8f932c4f99fb423f4ac2141bbf49a728d08ee Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 15:31:31 +0100 Subject: [PATCH 18/83] Add v prefix to tag --- scripts/bumpLernaVersion.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bumpLernaVersion.sh b/scripts/bumpLernaVersion.sh index 30a8877dbf..0eb524780c 100755 --- a/scripts/bumpLernaVersion.sh +++ b/scripts/bumpLernaVersion.sh @@ -8,7 +8,7 @@ sed -i '' "s/\"version\": \"$CURRENT_VERSION\"/\"version\": \"$NEW_VERSION\"/" l lerna version prerelease --no-git-tag-version --force-publish --no-push --y git add lerna.json git commit -m "Bump version to $NEW_VERSION" -git tag $NEW_VERSION +git tag v$NEW_VERSION git push git push --tags From 2692f51ffac3176d3ec280149780ef92528624b3 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 15:44:31 +0100 Subject: [PATCH 19/83] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index bacbea4741..0fdf845200 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit bacbea4741e2a94f8a88960f9e7f15ba0e8cba42 +Subproject commit 0fdf845200f433418d80c28b1a3f06c1e0a836c8 From a70ebc9faf83faed63c9d55aad5f5c9529ef7c06 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 20 Apr 2023 15:56:01 +0100 Subject: [PATCH 20/83] Update tag-prerelease.yml --- .github/workflows/tag-prerelease.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index 0da00aa710..06b82dac86 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -17,6 +17,7 @@ on: - "package.json" - "yarn.lock" workflow_dispatch: + jobs: tag-prerelease: From aa61dc6887c4e274b689c865a174257e6e808c12 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 16:31:20 +0100 Subject: [PATCH 21/83] Update versions --- .github/workflows/release-develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index d8db51ba44..f9d0410250 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -50,12 +50,12 @@ jobs: - run: yarn - name: Update versions run: | - version=$(cat versions/package.json \ + version=$(cat lerna.json \ | grep version \ | head -1 \ | awk -F: '{ print $2 }' \ | sed 's/[",]//g') - yarn lerna exec "yarn version --no-git-tag-version --new-version=$tag" + yarn lerna exec "yarn version --no-git-tag-version --new-version=$version" - run: yarn bootstrap - run: yarn build - run: yarn build:sdk From fa3f65a0e5635ef3d6874c800220fad99651c27b Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 16:45:14 +0100 Subject: [PATCH 22/83] Fix fetching version --- .github/workflows/release-develop.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index f9d0410250..ecd2a0d050 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -53,8 +53,9 @@ jobs: version=$(cat lerna.json \ | grep version \ | head -1 \ - | awk -F: '{ print $2 }' \ + | awk -F: '{gsub(/"/,"",$2);gsub(/[[:space:]]*/,"",$2); print $2}' \ | sed 's/[",]//g') + echo "Setting version $version" yarn lerna exec "yarn version --no-git-tag-version --new-version=$version" - run: yarn bootstrap - run: yarn build From bceeed390b376cd01658b13878747718ec2171e4 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 19:35:45 +0100 Subject: [PATCH 23/83] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 0fdf845200..e68c48e7c5 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 0fdf845200f433418d80c28b1a3f06c1e0a836c8 +Subproject commit e68c48e7c5740f2a9364319d47fc5b10fb4f2a7d From 8f6bf37496ec928857a2a31e6115f2e7138cd33a Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 19:58:48 +0100 Subject: [PATCH 24/83] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index e68c48e7c5..f70e747e06 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit e68c48e7c5740f2a9364319d47fc5b10fb4f2a7d +Subproject commit f70e747e0604d3c6c4bb66c2d8b37cf23275fc7b From 1ed1424d89b0c1b2875697a767c36d364f38484b Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 20:02:21 +0100 Subject: [PATCH 25/83] Use my user as git for testing --- .github/workflows/tag-prerelease.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index 06b82dac86..b11a2e78ac 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -17,7 +17,6 @@ on: - "package.json" - "yarn.lock" workflow_dispatch: - jobs: tag-prerelease: @@ -37,6 +36,6 @@ jobs: - name: Tag prerelease run: | # setup the username and email. - git config --global user.name "Budibase Staging Release Bot" - git config --global user.email "<>" + git config --global user.name "adrinr" + git config --global user.email "adria@budibase.com" ./scripts/bumpLernaVersion.sh From 3b6b15c97e7e6fe621b35e97b4f1a6af1479326f Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 19:04:45 +0000 Subject: [PATCH 26/83] Bump version to 0.0.999-alpha.18 --- lerna.json | 1 - 1 file changed, 1 deletion(-) diff --git a/lerna.json b/lerna.json index bd0f708b01..adb1628bd7 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,4 @@ { - "version": "2.5.6-alpha.19", "npmClient": "yarn", "version": "0.0.999-alpha.9", "packages": [ From 92115c5b956b256830f551b3df84f63595c6ab07 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 20:06:46 +0100 Subject: [PATCH 27/83] Remove latest references --- packages/backend-core/package.json | 1 - packages/bbui/package.json | 2 - packages/builder/package.json | 5 - packages/cli/package.json | 3 - packages/client/package.json | 5 - packages/frontend-core/package.json | 2 - packages/server/package.json | 6 - packages/shared-core/package.json | 3 - packages/worker/package.json | 4 - yarn.lock | 249 +--------------------------- 10 files changed, 2 insertions(+), 278 deletions(-) diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index b72805fb50..ac485694a6 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -22,7 +22,6 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "latest", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 4145ce44c0..f75ed7e701 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -38,8 +38,6 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "latest", - "@budibase/string-templates": "latest", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 3c7d8abb7c..20ff9049a3 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -58,11 +58,6 @@ } }, "dependencies": { - "@budibase/bbui": "latest", - "@budibase/client": "latest", - "@budibase/frontend-core": "latest", - "@budibase/shared-core": "latest", - "@budibase/string-templates": "latest", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 4a383237c0..8de23ec037 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -29,9 +29,6 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "latest", - "@budibase/string-templates": "latest", - "@budibase/types": "latest", "axios": "0.21.2", "download": "8.0.0", "find-free-port": "^2.0.0", diff --git a/packages/client/package.json b/packages/client/package.json index 15f1419a35..55558df45d 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -19,11 +19,6 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "latest", - "@budibase/frontend-core": "latest", - "@budibase/shared-core": "latest", - "@budibase/string-templates": "latest", - "@budibase/types": "latest", "@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 d6a1aaadf4..77a891ba01 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -6,8 +6,6 @@ "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "latest", - "@budibase/shared-core": "latest", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", "svelte": "^3.46.2" diff --git a/packages/server/package.json b/packages/server/package.json index 5a2681478d..9a8cc7fc54 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,12 +45,6 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "latest", - "@budibase/client": "latest", - "@budibase/pro": "latest", - "@budibase/shared-core": "latest", - "@budibase/string-templates": "latest", - "@budibase/types": "latest", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 81f40a7b32..2b465f8f18 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -19,9 +19,6 @@ "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, - "dependencies": { - "@budibase/types": "latest" - }, "devDependencies": { "concurrently": "^7.6.0", "rimraf": "3.0.2", diff --git a/packages/worker/package.json b/packages/worker/package.json index ba825eb150..22c50fd977 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,10 +37,6 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "latest", - "@budibase/pro": "latest", - "@budibase/string-templates": "latest", - "@budibase/types": "latest", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", diff --git a/yarn.lock b/yarn.lock index 307002fe06..651125dd3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1386,45 +1386,6 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.5", "@budibase/backend-core@latest": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.5.tgz#d1ae36564de447674a157790b1e8ebff5f42748c" - integrity sha512-mGQSK6wc4M6+KVpfsbcfijjOJaWreGnd0muLFrUYsogliglWDXeCTfdEXFMkhCyKEe+3TWeVkxVKzss6zSG+Mw== - dependencies: - "@budibase/nano" "10.1.2" - "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.5" - "@shopify/jest-koa-mocks" "5.0.1" - "@techpass/passport-openidconnect" "0.3.2" - aws-cloudfront-sign "2.2.0" - aws-sdk "2.1030.0" - bcrypt "5.0.1" - bcryptjs "2.4.3" - bull "4.10.1" - correlation-id "4.0.0" - dotenv "16.0.1" - emitter-listener "1.1.2" - ioredis "4.28.0" - joi "17.6.0" - jsonwebtoken "9.0.0" - koa-passport "4.1.4" - lodash "4.17.21" - lodash.isarguments "3.1.0" - node-fetch "2.6.7" - 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" - redlock "4.2.0" - sanitize-s3-objectkey "0.0.1" - semver "7.3.7" - tar-fs "2.1.1" - uuid "8.3.2" - zlib "1.0.5" - "@budibase/bbui@^0.9.139": version "0.9.190" resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.190.tgz#e1ec400ac90f556bfbc80fc23a04506f1585ea81" @@ -1475,104 +1436,6 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/bbui@^2.5.5", "@budibase/bbui@latest": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-2.5.5.tgz#860ab3f6cc1f8ada1f2cca1e8969e8390047800d" - integrity sha512-54kkCjOspcH25rybZ5+p1v6PfnyKouE7mQw73VFFh1AKSd+VORfLkMpwUm0w+Dsuoi1hBCA0k1eNLDY3md0+hg== - dependencies: - "@adobe/spectrum-css-workflow-icons" "1.2.1" - "@budibase/shared-core" "^2.5.5" - "@budibase/string-templates" "^2.5.5" - "@spectrum-css/accordion" "3.0.24" - "@spectrum-css/actionbutton" "1.0.1" - "@spectrum-css/actiongroup" "1.0.1" - "@spectrum-css/avatar" "3.0.2" - "@spectrum-css/button" "3.0.1" - "@spectrum-css/buttongroup" "3.0.2" - "@spectrum-css/checkbox" "3.0.2" - "@spectrum-css/dialog" "3.0.1" - "@spectrum-css/divider" "1.0.3" - "@spectrum-css/dropzone" "3.0.2" - "@spectrum-css/fieldgroup" "3.0.2" - "@spectrum-css/fieldlabel" "3.0.1" - "@spectrum-css/icon" "3.0.1" - "@spectrum-css/illustratedmessage" "3.0.2" - "@spectrum-css/inlinealert" "2.0.1" - "@spectrum-css/inputgroup" "3.0.2" - "@spectrum-css/label" "2.0.10" - "@spectrum-css/link" "3.1.1" - "@spectrum-css/menu" "3.0.1" - "@spectrum-css/modal" "3.0.1" - "@spectrum-css/pagination" "3.0.3" - "@spectrum-css/picker" "1.0.1" - "@spectrum-css/popover" "3.0.1" - "@spectrum-css/progressbar" "1.0.2" - "@spectrum-css/progresscircle" "1.0.2" - "@spectrum-css/radio" "3.0.2" - "@spectrum-css/search" "3.0.2" - "@spectrum-css/sidenav" "3.0.2" - "@spectrum-css/slider" "3.0.1" - "@spectrum-css/statuslight" "3.0.2" - "@spectrum-css/stepper" "3.0.3" - "@spectrum-css/switch" "1.0.2" - "@spectrum-css/table" "3.0.1" - "@spectrum-css/tabs" "3.2.12" - "@spectrum-css/tags" "3.0.2" - "@spectrum-css/textfield" "3.0.1" - "@spectrum-css/toast" "3.0.1" - "@spectrum-css/tooltip" "3.0.3" - "@spectrum-css/treeview" "3.0.2" - "@spectrum-css/typography" "3.0.1" - "@spectrum-css/underlay" "2.0.9" - "@spectrum-css/vars" "3.0.1" - dayjs "^1.10.4" - easymde "^2.16.1" - svelte-flatpickr "^3.2.3" - svelte-portal "^1.0.0" - -"@budibase/client@latest": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/client/-/client-2.5.5.tgz#2647c34ab1ca50bcdd41bb48a3cd5afc8d53566a" - integrity sha512-PyyYTD8juGyGsQI2lyTymqIvBH3nflkuTv+XE1UrjVSrK5DJsW3e9/UiUWcDhOgX9Sq3Q3D8JMMGfSriwBEdLg== - dependencies: - "@budibase/bbui" "^2.5.5" - "@budibase/frontend-core" "^2.5.5" - "@budibase/shared-core" "^2.5.5" - "@budibase/string-templates" "^2.5.5" - "@budibase/types" "^2.5.5" - "@spectrum-css/button" "^3.0.3" - "@spectrum-css/card" "^3.0.3" - "@spectrum-css/divider" "^1.0.3" - "@spectrum-css/link" "^3.1.3" - "@spectrum-css/page" "^3.0.1" - "@spectrum-css/tag" "^3.1.4" - "@spectrum-css/typography" "^3.0.2" - "@spectrum-css/vars" "^3.0.1" - apexcharts "^3.22.1" - dayjs "^1.10.5" - downloadjs "1.4.7" - html5-qrcode "^2.2.1" - leaflet "^1.7.1" - regexparam "^1.3.0" - sanitize-html "^2.7.0" - screenfull "^6.0.1" - shortid "^2.2.15" - socket.io-client "^4.5.1" - svelte "^3.49.0" - svelte-apexcharts "^1.0.2" - svelte-flatpickr "^3.1.0" - svelte-spa-router "^3.0.5" - -"@budibase/frontend-core@^2.5.5", "@budibase/frontend-core@latest": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-2.5.5.tgz#58f81e95c849b12d39cab3b8ac64c1d6ee37952b" - integrity sha512-U1xRQIFxeGiRJREEft5E3VwbW0KSJNRAww3Jd9WGhKXZIWIiIruwW1jeyX0ISFdIJqtOVt0Vow9s9DKcoroMew== - dependencies: - "@budibase/bbui" "^2.5.5" - "@budibase/shared-core" "^2.5.5" - lodash "^4.17.21" - svelte "^3.46.2" - "@budibase/handlebars-helpers@^0.11.8": version "0.11.8" resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841" @@ -1623,36 +1486,6 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@latest": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5.tgz#8aa44b99baa8763d85f0ba3db92a178259dcf13e" - integrity sha512-dOUWWZGbFIumTfCQPmNSaTqlkLD6O/SK6H7IYY8FP67eMrLRZUanO3l0XgbjDiOdFIS1Hw5vvjHmunP0hQdLyw== - dependencies: - "@budibase/backend-core" "2.5.5" - "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.5" - "@koa/router" "8.0.8" - bull "4.10.1" - joi "17.6.0" - jsonwebtoken "8.5.1" - lru-cache "^7.14.1" - memorystream "^0.3.1" - node-fetch "^2.6.1" - -"@budibase/shared-core@2.4.44-alpha.1": - version "2.4.44-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/shared-core/-/shared-core-2.4.44-alpha.1.tgz#3d499e40e7e6c646e13a87cd08e01ba116c2ff1d" - integrity sha512-cN8LaDczijtsfWUYiXC4sg9Z+US4020i3Mb8TwCbf8TQyA1b06U5PwPCp+GHVA/wDFqfwcpcE1GXf8GwVuYs7A== - dependencies: - "@budibase/types" "2.4.44-alpha.1" - -"@budibase/shared-core@^2.5.5", "@budibase/shared-core@latest": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/shared-core/-/shared-core-2.5.5.tgz#8cd61edd27ad0e75f47a1cfaff724e5ad7f22844" - integrity sha512-JQZHqVsOntSg2LXxyGZLntn9jS83R77c9MklQ9zESDVcAqxMFVVc0UNpaaW+MaTkMWfbdPFqnZAYP30mkZGe2g== - dependencies: - "@budibase/types" "^2.5.5" - "@budibase/standard-components@^0.9.139": version "0.9.139" resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.139.tgz#cf8e2b759ae863e469e50272b3ca87f2827e66e3" @@ -1671,52 +1504,6 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/string-templates@2.3.20": - version "2.3.20" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.3.20.tgz#35f74b6f515e8127cc375ee0a4679b0a7c117588" - integrity sha512-wMKau3IzVF6M+dRu99aKV1yMdrrK5lghVm9qYtR1B163SMbHEwC8JmZFGPLIi1XsG0T+vw+xfcemfJ2zcATWwg== - dependencies: - "@budibase/handlebars-helpers" "^0.11.8" - dayjs "^1.10.4" - handlebars "^4.7.6" - handlebars-utils "^1.0.6" - lodash "^4.17.20" - vm2 "^3.9.4" - -"@budibase/string-templates@2.4.44-alpha.1": - version "2.4.44-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.4.44-alpha.1.tgz#6c2aee594d16eac1f173c509e087a817dd3172f0" - integrity sha512-4gC2+0kccK0ilLnd0i/dmJzC0Ur7UgSAmV6zbzDDYNL4spU0qSy5VhBh7E3qKieg5RKMMzbpXLMWERpoPLlnqA== - dependencies: - "@budibase/handlebars-helpers" "^0.11.8" - dayjs "^1.10.4" - handlebars "^4.7.6" - handlebars-utils "^1.0.6" - lodash "^4.17.20" - vm2 "^3.9.4" - -"@budibase/string-templates@^2.5.5", "@budibase/string-templates@latest": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.5.5.tgz#2cd506ca6612319713ec6407279bcbf8a9bb9fb2" - integrity sha512-7OyMlndEh3r5obT6SoZGQvg5aq033U1DnYJAzumcAKY4T/9ATHBUAGbJeVD/lFXEj9KcEIfd2A8JPXjxkrDDeQ== - dependencies: - "@budibase/handlebars-helpers" "^0.11.8" - dayjs "^1.10.4" - handlebars "^4.7.6" - handlebars-utils "^1.0.6" - lodash "^4.17.20" - vm2 "^3.9.15" - -"@budibase/types@2.4.44-alpha.1": - version "2.4.44-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933" - integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg== - -"@budibase/types@2.5.5", "@budibase/types@^2.5.5", "@budibase/types@latest": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.5.tgz#aca40d7e160e400b9a814fbaa7ad04d10dcf9672" - integrity sha512-caKRxeCfnXzMFCc2lfDhKREl4VsDqnAnT55339NHQFTpDrTFboY0bG6h6osNan5CQCafNCLtS32bz597frGT9A== - "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" @@ -7990,13 +7777,6 @@ cli-cursor@3.1.0, cli-cursor@^3.1.0: dependencies: restore-cursor "^3.1.0" -cli-progress@3.11.2: - version "3.11.2" - resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.11.2.tgz#f8c89bd157e74f3f2c43bcfb3505670b4d48fc77" - integrity sha512-lCPoS6ncgX4+rJu5bS3F/iCz17kZ9MPZ6dpuTtI0KXKABkhyXIdYB3Inby1OpaGti3YlI3EeEkM9AuWpelJrVA== - dependencies: - string-width "^4.2.3" - cli-spinners@2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d" @@ -8286,11 +8066,6 @@ commander@6.2.0: resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75" integrity sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q== -commander@7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-7.1.0.tgz#f2eaecf131f10e36e07d894698226e36ae0eb5ff" - integrity sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg== - commander@^10.0.0: version "10.0.0" resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.0.tgz#71797971162cd3cf65f0b9d24eb28f8d303acdf1" @@ -9085,7 +8860,7 @@ dateformat@^4.5.1, dateformat@^4.6.3: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5" integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA== -dayjs@^1.10.4, dayjs@^1.10.5, dayjs@^1.11.2, dayjs@^1.11.7: +dayjs@^1.10.4, dayjs@^1.10.5, dayjs@^1.11.2: version "1.11.7" resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2" integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ== @@ -9731,13 +9506,6 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" -docker-compose@0.23.12: - version "0.23.12" - resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.23.12.tgz#fa883b98be08f6926143d06bf9e522ef7ed3210c" - integrity sha512-KFbSMqQBuHjTGZGmYDOCO0L4SaML3BsWTId5oSUyaBa22vALuFHNv+UdDWs3HcMylHWKsxCbLB7hnM/nCosWZw== - dependencies: - yaml "^1.10.2" - docker-compose@0.23.17: version "0.23.17" resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.23.17.tgz#8816bef82562d9417dc8c790aa4871350f93a2ba" @@ -24645,15 +24413,7 @@ vlq@^0.2.2: resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26" integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow== -vm2@3.9.17: - version "3.9.17" - resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.17.tgz#251b165ff8a0e034942b5181057305e39570aeab" - integrity sha512-AqwtCnZ/ERcX+AVj9vUsphY56YANXxRuqMb7GsDtAr0m0PcQX3u0Aj3KWiXM0YAHy7i6JEeHrwOnwXbGYgRpAw== - dependencies: - acorn "^8.7.0" - acorn-walk "^8.2.0" - -vm2@^3.9.11, vm2@^3.9.15, vm2@^3.9.4: +vm2@3.9.16, vm2@^3.9.11, vm2@^3.9.15: version "3.9.16" resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.16.tgz#0fbc2a265f7bf8b837cea6f4a908f88a3f93b8e6" integrity sha512-3T9LscojNTxdOyG+e8gFeyBXkMlOBYDoF6dqZbj+MPVHi9x10UfiTAJIobuchRCp3QvC+inybTbMJIUrLsig0w== @@ -25506,8 +25266,3 @@ z-schema@^5.0.1: validator "^13.7.0" optionalDependencies: commander "^10.0.0" - -zlib@1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/zlib/-/zlib-1.0.5.tgz#6e7c972fc371c645a6afb03ab14769def114fcc0" - integrity sha512-40fpE2II+Cd3k8HWTWONfeKE2jL+P42iWJ1zzps5W51qcTsOUKM5Q5m2PFb0CLxlmFAaUuUdJGc3OfZy947v0w== From f52a49091bde9296a30e2c6f747a94d295cc1e36 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 19:09:47 +0000 Subject: [PATCH 28/83] Bump version to 0.0.999-alpha.19 --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index f70e747e06..4f1832a13f 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit f70e747e0604d3c6c4bb66c2d8b37cf23275fc7b +Subproject commit 4f1832a13f1202194a76a52a37261dd96df9c0b1 From cc73606c71783a4b38ab24f15187da68c0569c46 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 20:15:03 +0100 Subject: [PATCH 29/83] Yarn after version updates --- .github/workflows/release-develop.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index ecd2a0d050..f2ba306906 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -57,6 +57,7 @@ jobs: | sed 's/[",]//g') echo "Setting version $version" yarn lerna exec "yarn version --no-git-tag-version --new-version=$version" + yarn - run: yarn bootstrap - run: yarn build - run: yarn build:sdk From ad547f32e22194cf0f7aca5fd688b9af6677577e Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 20:54:42 +0100 Subject: [PATCH 30/83] Add latest back --- packages/backend-core/package.json | 1 + packages/bbui/package.json | 2 + packages/builder/package.json | 5 + packages/cli/package.json | 3 + packages/client/package.json | 5 + packages/frontend-core/package.json | 2 + packages/server/package.json | 6 + packages/shared-core/package.json | 3 + packages/worker/package.json | 4 + yarn.lock | 202 ++++++++++++++++++++++++++++ 10 files changed, 233 insertions(+) diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index ac485694a6..b72805fb50 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -22,6 +22,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", + "@budibase/types": "latest", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index f75ed7e701..4145ce44c0 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -38,6 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", + "@budibase/shared-core": "latest", + "@budibase/string-templates": "latest", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 20ff9049a3..3c7d8abb7c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -58,6 +58,11 @@ } }, "dependencies": { + "@budibase/bbui": "latest", + "@budibase/client": "latest", + "@budibase/frontend-core": "latest", + "@budibase/shared-core": "latest", + "@budibase/string-templates": "latest", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 8de23ec037..4a383237c0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -29,6 +29,9 @@ "outputPath": "build" }, "dependencies": { + "@budibase/backend-core": "latest", + "@budibase/string-templates": "latest", + "@budibase/types": "latest", "axios": "0.21.2", "download": "8.0.0", "find-free-port": "^2.0.0", diff --git a/packages/client/package.json b/packages/client/package.json index 55558df45d..15f1419a35 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -19,6 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { + "@budibase/bbui": "latest", + "@budibase/frontend-core": "latest", + "@budibase/shared-core": "latest", + "@budibase/string-templates": "latest", + "@budibase/types": "latest", "@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 77a891ba01..d6a1aaadf4 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -6,6 +6,8 @@ "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { + "@budibase/bbui": "latest", + "@budibase/shared-core": "latest", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", "svelte": "^3.46.2" diff --git a/packages/server/package.json b/packages/server/package.json index 9a8cc7fc54..5a2681478d 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,6 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", + "@budibase/backend-core": "latest", + "@budibase/client": "latest", + "@budibase/pro": "latest", + "@budibase/shared-core": "latest", + "@budibase/string-templates": "latest", + "@budibase/types": "latest", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 2b465f8f18..81f40a7b32 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -19,6 +19,9 @@ "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, + "dependencies": { + "@budibase/types": "latest" + }, "devDependencies": { "concurrently": "^7.6.0", "rimraf": "3.0.2", diff --git a/packages/worker/package.json b/packages/worker/package.json index 22c50fd977..ba825eb150 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,6 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { + "@budibase/backend-core": "latest", + "@budibase/pro": "latest", + "@budibase/string-templates": "latest", + "@budibase/types": "latest", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", diff --git a/yarn.lock b/yarn.lock index 651125dd3b..1fee9f282e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1386,6 +1386,45 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@budibase/backend-core@2.5.6", "@budibase/backend-core@latest": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.6.tgz#c9dc047eac01088b9bd47abe1392080a2a041cfd" + integrity sha512-XwNhe7e+hzP/ejByXSKfOXbtxnfK7wThNhkSNMRQJ0NC78QdJyjRNTezDCW0TA+ILueNhG2zF5KW0Eazq1YWxA== + dependencies: + "@budibase/nano" "10.1.2" + "@budibase/pouchdb-replication-stream" "1.2.10" + "@budibase/types" "^2.5.6" + "@shopify/jest-koa-mocks" "5.0.1" + "@techpass/passport-openidconnect" "0.3.2" + aws-cloudfront-sign "2.2.0" + aws-sdk "2.1030.0" + bcrypt "5.0.1" + bcryptjs "2.4.3" + bull "4.10.1" + correlation-id "4.0.0" + dotenv "16.0.1" + emitter-listener "1.1.2" + ioredis "4.28.0" + joi "17.6.0" + jsonwebtoken "9.0.0" + koa-passport "4.1.4" + lodash "4.17.21" + lodash.isarguments "3.1.0" + node-fetch "2.6.7" + 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" + redlock "4.2.0" + sanitize-s3-objectkey "0.0.1" + semver "7.3.7" + tar-fs "2.1.1" + uuid "8.3.2" + zlib "1.0.5" + "@budibase/bbui@^0.9.139": version "0.9.190" resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.190.tgz#e1ec400ac90f556bfbc80fc23a04506f1585ea81" @@ -1436,6 +1475,104 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" +"@budibase/bbui@^2.5.6", "@budibase/bbui@latest": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-2.5.6.tgz#dfbed35417a850ca92628324a47c5705db69308b" + integrity sha512-3J2b4sg1dJ08/XVbCC2PtAnAiyk9/f2PlCay6Lj3eu75+bvN877T/B/S8GsD9+SwQuEKRinhd3a4KiPDpqItkA== + dependencies: + "@adobe/spectrum-css-workflow-icons" "1.2.1" + "@budibase/shared-core" "^2.5.6" + "@budibase/string-templates" "^2.5.6" + "@spectrum-css/accordion" "3.0.24" + "@spectrum-css/actionbutton" "1.0.1" + "@spectrum-css/actiongroup" "1.0.1" + "@spectrum-css/avatar" "3.0.2" + "@spectrum-css/button" "3.0.1" + "@spectrum-css/buttongroup" "3.0.2" + "@spectrum-css/checkbox" "3.0.2" + "@spectrum-css/dialog" "3.0.1" + "@spectrum-css/divider" "1.0.3" + "@spectrum-css/dropzone" "3.0.2" + "@spectrum-css/fieldgroup" "3.0.2" + "@spectrum-css/fieldlabel" "3.0.1" + "@spectrum-css/icon" "3.0.1" + "@spectrum-css/illustratedmessage" "3.0.2" + "@spectrum-css/inlinealert" "2.0.1" + "@spectrum-css/inputgroup" "3.0.2" + "@spectrum-css/label" "2.0.10" + "@spectrum-css/link" "3.1.1" + "@spectrum-css/menu" "3.0.1" + "@spectrum-css/modal" "3.0.1" + "@spectrum-css/pagination" "3.0.3" + "@spectrum-css/picker" "1.0.1" + "@spectrum-css/popover" "3.0.1" + "@spectrum-css/progressbar" "1.0.2" + "@spectrum-css/progresscircle" "1.0.2" + "@spectrum-css/radio" "3.0.2" + "@spectrum-css/search" "3.0.2" + "@spectrum-css/sidenav" "3.0.2" + "@spectrum-css/slider" "3.0.1" + "@spectrum-css/statuslight" "3.0.2" + "@spectrum-css/stepper" "3.0.3" + "@spectrum-css/switch" "1.0.2" + "@spectrum-css/table" "3.0.1" + "@spectrum-css/tabs" "3.2.12" + "@spectrum-css/tags" "3.0.2" + "@spectrum-css/textfield" "3.0.1" + "@spectrum-css/toast" "3.0.1" + "@spectrum-css/tooltip" "3.0.3" + "@spectrum-css/treeview" "3.0.2" + "@spectrum-css/typography" "3.0.1" + "@spectrum-css/underlay" "2.0.9" + "@spectrum-css/vars" "3.0.1" + dayjs "^1.10.4" + easymde "^2.16.1" + svelte-flatpickr "^3.2.3" + svelte-portal "^1.0.0" + +"@budibase/client@latest": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/client/-/client-2.5.6.tgz#91af2efacdec14e0d6af1db6d4aec1ff22819ac4" + integrity sha512-Yu/gs88fGi54GlPeVS/IO+cDicMUBT8+W/4YaUgfUOcxeqJDGPAkLNMLh2HlQ57x765V/PmRda1BAgDF3h5hkQ== + dependencies: + "@budibase/bbui" "^2.5.6" + "@budibase/frontend-core" "^2.5.6" + "@budibase/shared-core" "^2.5.6" + "@budibase/string-templates" "^2.5.6" + "@budibase/types" "^2.5.6" + "@spectrum-css/button" "^3.0.3" + "@spectrum-css/card" "^3.0.3" + "@spectrum-css/divider" "^1.0.3" + "@spectrum-css/link" "^3.1.3" + "@spectrum-css/page" "^3.0.1" + "@spectrum-css/tag" "^3.1.4" + "@spectrum-css/typography" "^3.0.2" + "@spectrum-css/vars" "^3.0.1" + apexcharts "^3.22.1" + dayjs "^1.10.5" + downloadjs "1.4.7" + html5-qrcode "^2.2.1" + leaflet "^1.7.1" + regexparam "^1.3.0" + sanitize-html "^2.7.0" + screenfull "^6.0.1" + shortid "^2.2.15" + socket.io-client "^4.5.1" + svelte "^3.49.0" + svelte-apexcharts "^1.0.2" + svelte-flatpickr "^3.1.0" + svelte-spa-router "^3.0.5" + +"@budibase/frontend-core@^2.5.6", "@budibase/frontend-core@latest": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-2.5.6.tgz#92ec20c006488cce4452f8af2cb65804026ec51e" + integrity sha512-/IbT5m7xv+aqZfTpxJFCtx3ZaA5xeM66OHe3AXa9HlKKWEU1jAEKolaTrC+Qmfhp0pwFSyYsP/U9RBZpFY/r9A== + dependencies: + "@budibase/bbui" "^2.5.6" + "@budibase/shared-core" "^2.5.6" + lodash "^4.17.21" + svelte "^3.46.2" + "@budibase/handlebars-helpers@^0.11.8": version "0.11.8" resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841" @@ -1486,6 +1623,29 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" +"@budibase/pro@latest": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6.tgz#6f7311b67c2f4928f0885e91694310abcf8786b0" + integrity sha512-VTBcmazP5Bi2LukCnzZKmtDrw0zwa7TViB0oJKPKp6QIJP74VT+wSyLOk9OPqwtlAHAPeBfkE+mBdvF5vvj7TA== + dependencies: + "@budibase/backend-core" "2.5.6" + "@budibase/string-templates" "2.3.20" + "@budibase/types" "2.5.6" + "@koa/router" "8.0.8" + bull "4.10.1" + joi "17.6.0" + jsonwebtoken "8.5.1" + lru-cache "^7.14.1" + memorystream "^0.3.1" + node-fetch "^2.6.1" + +"@budibase/shared-core@^2.5.6", "@budibase/shared-core@latest": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/shared-core/-/shared-core-2.5.6.tgz#f3960a39d66a4e016399cc641d54c318cf09ae8f" + integrity sha512-5+oJjpylG8YzO922Nidw1fOsxRhE0gK05FSO/DMYrEDhi6rDiLCQhBaPc+83MAnJi5Yec6Sffpd3gikSVdyMDA== + dependencies: + "@budibase/types" "^2.5.6" + "@budibase/standard-components@^0.9.139": version "0.9.139" resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.139.tgz#cf8e2b759ae863e469e50272b3ca87f2827e66e3" @@ -1504,6 +1664,35 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" +"@budibase/string-templates@2.3.20": + version "2.3.20" + resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.3.20.tgz#35f74b6f515e8127cc375ee0a4679b0a7c117588" + integrity sha512-wMKau3IzVF6M+dRu99aKV1yMdrrK5lghVm9qYtR1B163SMbHEwC8JmZFGPLIi1XsG0T+vw+xfcemfJ2zcATWwg== + dependencies: + "@budibase/handlebars-helpers" "^0.11.8" + dayjs "^1.10.4" + handlebars "^4.7.6" + handlebars-utils "^1.0.6" + lodash "^4.17.20" + vm2 "^3.9.4" + +"@budibase/string-templates@^2.5.6", "@budibase/string-templates@latest": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.5.6.tgz#d811ce82e99f57360669c0842187e0dc32bd31f1" + integrity sha512-dpKR8yexXuvcjHQzwGdRKauf+hmhS8gmpdo/FJbdrCBhJpEVJIQLn5O/3bXvMHwV7URuJ/H2AzTVybbt8Ob5gw== + dependencies: + "@budibase/handlebars-helpers" "^0.11.8" + dayjs "^1.10.4" + handlebars "^4.7.6" + handlebars-utils "^1.0.6" + lodash "^4.17.20" + vm2 "^3.9.15" + +"@budibase/types@2.5.6", "@budibase/types@^2.5.6", "@budibase/types@latest": + version "2.5.6" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.6.tgz#b52566ebe54de5b515b4fc6eabfd6f279202fce1" + integrity sha512-WQVCcYJhj0hexi7BsayOgwpOC3AaMsA7azD4PjpifzaK0Ez+U2NzAT7oEZM9TL8aG8p4BvnTaAxP/Q9KRTdeRA== + "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" @@ -24421,6 +24610,14 @@ vm2@3.9.16, vm2@^3.9.11, vm2@^3.9.15: acorn "^8.7.0" acorn-walk "^8.2.0" +vm2@^3.9.4: + version "3.9.17" + resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.17.tgz#251b165ff8a0e034942b5181057305e39570aeab" + integrity sha512-AqwtCnZ/ERcX+AVj9vUsphY56YANXxRuqMb7GsDtAr0m0PcQX3u0Aj3KWiXM0YAHy7i6JEeHrwOnwXbGYgRpAw== + dependencies: + acorn "^8.7.0" + acorn-walk "^8.2.0" + vuvuzela@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/vuvuzela/-/vuvuzela-1.0.3.tgz#3be145e58271c73ca55279dd851f12a682114b0b" @@ -25266,3 +25463,8 @@ z-schema@^5.0.1: validator "^13.7.0" optionalDependencies: commander "^10.0.0" + +zlib@1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/zlib/-/zlib-1.0.5.tgz#6e7c972fc371c645a6afb03ab14769def114fcc0" + integrity sha512-40fpE2II+Cd3k8HWTWONfeKE2jL+P42iWJ1zzps5W51qcTsOUKM5Q5m2PFb0CLxlmFAaUuUdJGc3OfZy947v0w== From 9387d37d3beb10b2ea5ef1bbb7ec25bc048f2065 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 22:51:28 +0100 Subject: [PATCH 31/83] Use 0.0.1 --- .github/workflows/release-develop.yml | 1 + packages/backend-core/package.json | 2 +- packages/bbui/package.json | 4 +- packages/builder/package.json | 10 +- packages/cli/package.json | 6 +- packages/client/package.json | 10 +- packages/frontend-core/package.json | 4 +- packages/server/package.json | 12 +- packages/shared-core/package.json | 2 +- packages/worker/package.json | 8 +- yarn.lock | 202 -------------------------- 11 files changed, 30 insertions(+), 231 deletions(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index f2ba306906..451062fdf1 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -58,6 +58,7 @@ jobs: echo "Setting version $version" yarn lerna exec "yarn version --no-git-tag-version --new-version=$version" yarn + node scripts/updateVersions.js $version - run: yarn bootstrap - run: yarn build - run: yarn build:sdk diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index b72805fb50..c603c9e033 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -22,7 +22,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "latest", + "@budibase/types": "0.0.1", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 4145ce44c0..f313dd04c0 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "latest", - "@budibase/string-templates": "latest", + "@budibase/shared-core": "0.0.1", + "@budibase/string-templates": "0.0.1", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 3c7d8abb7c..857ef21d47 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "latest", - "@budibase/client": "latest", - "@budibase/frontend-core": "latest", - "@budibase/shared-core": "latest", - "@budibase/string-templates": "latest", + "@budibase/bbui": "0.0.1", + "@budibase/client": "0.0.1", + "@budibase/frontend-core": "0.0.1", + "@budibase/shared-core": "0.0.1", + "@budibase/string-templates": "0.0.1", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 4a383237c0..21713fba2a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "latest", - "@budibase/string-templates": "latest", - "@budibase/types": "latest", + "@budibase/backend-core": "0.0.1", + "@budibase/string-templates": "0.0.1", + "@budibase/types": "0.0.1", "axios": "0.21.2", "download": "8.0.0", "find-free-port": "^2.0.0", diff --git a/packages/client/package.json b/packages/client/package.json index 15f1419a35..6a7b0de225 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "latest", - "@budibase/frontend-core": "latest", - "@budibase/shared-core": "latest", - "@budibase/string-templates": "latest", - "@budibase/types": "latest", + "@budibase/bbui": "0.0.1", + "@budibase/frontend-core": "0.0.1", + "@budibase/shared-core": "0.0.1", + "@budibase/string-templates": "0.0.1", + "@budibase/types": "0.0.1", "@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 d6a1aaadf4..3a8a7bc9f6 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -6,8 +6,8 @@ "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "latest", - "@budibase/shared-core": "latest", + "@budibase/bbui": "0.0.1", + "@budibase/shared-core": "0.0.1", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", "svelte": "^3.46.2" diff --git a/packages/server/package.json b/packages/server/package.json index 5a2681478d..f0ece87bed 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "latest", - "@budibase/client": "latest", - "@budibase/pro": "latest", - "@budibase/shared-core": "latest", - "@budibase/string-templates": "latest", - "@budibase/types": "latest", + "@budibase/backend-core": "0.0.1", + "@budibase/client": "0.0.1", + "@budibase/pro": "0.0.1", + "@budibase/shared-core": "0.0.1", + "@budibase/string-templates": "0.0.1", + "@budibase/types": "0.0.1", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 81f40a7b32..0bc643f551 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "latest" + "@budibase/types": "0.0.1" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index ba825eb150..d3bc7e3b13 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "latest", - "@budibase/pro": "latest", - "@budibase/string-templates": "latest", - "@budibase/types": "latest", + "@budibase/backend-core": "0.0.1", + "@budibase/pro": "0.0.1", + "@budibase/string-templates": "0.0.1", + "@budibase/types": "0.0.1", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", diff --git a/yarn.lock b/yarn.lock index 1fee9f282e..651125dd3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1386,45 +1386,6 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.6", "@budibase/backend-core@latest": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.6.tgz#c9dc047eac01088b9bd47abe1392080a2a041cfd" - integrity sha512-XwNhe7e+hzP/ejByXSKfOXbtxnfK7wThNhkSNMRQJ0NC78QdJyjRNTezDCW0TA+ILueNhG2zF5KW0Eazq1YWxA== - dependencies: - "@budibase/nano" "10.1.2" - "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.6" - "@shopify/jest-koa-mocks" "5.0.1" - "@techpass/passport-openidconnect" "0.3.2" - aws-cloudfront-sign "2.2.0" - aws-sdk "2.1030.0" - bcrypt "5.0.1" - bcryptjs "2.4.3" - bull "4.10.1" - correlation-id "4.0.0" - dotenv "16.0.1" - emitter-listener "1.1.2" - ioredis "4.28.0" - joi "17.6.0" - jsonwebtoken "9.0.0" - koa-passport "4.1.4" - lodash "4.17.21" - lodash.isarguments "3.1.0" - node-fetch "2.6.7" - 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" - redlock "4.2.0" - sanitize-s3-objectkey "0.0.1" - semver "7.3.7" - tar-fs "2.1.1" - uuid "8.3.2" - zlib "1.0.5" - "@budibase/bbui@^0.9.139": version "0.9.190" resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.190.tgz#e1ec400ac90f556bfbc80fc23a04506f1585ea81" @@ -1475,104 +1436,6 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/bbui@^2.5.6", "@budibase/bbui@latest": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-2.5.6.tgz#dfbed35417a850ca92628324a47c5705db69308b" - integrity sha512-3J2b4sg1dJ08/XVbCC2PtAnAiyk9/f2PlCay6Lj3eu75+bvN877T/B/S8GsD9+SwQuEKRinhd3a4KiPDpqItkA== - dependencies: - "@adobe/spectrum-css-workflow-icons" "1.2.1" - "@budibase/shared-core" "^2.5.6" - "@budibase/string-templates" "^2.5.6" - "@spectrum-css/accordion" "3.0.24" - "@spectrum-css/actionbutton" "1.0.1" - "@spectrum-css/actiongroup" "1.0.1" - "@spectrum-css/avatar" "3.0.2" - "@spectrum-css/button" "3.0.1" - "@spectrum-css/buttongroup" "3.0.2" - "@spectrum-css/checkbox" "3.0.2" - "@spectrum-css/dialog" "3.0.1" - "@spectrum-css/divider" "1.0.3" - "@spectrum-css/dropzone" "3.0.2" - "@spectrum-css/fieldgroup" "3.0.2" - "@spectrum-css/fieldlabel" "3.0.1" - "@spectrum-css/icon" "3.0.1" - "@spectrum-css/illustratedmessage" "3.0.2" - "@spectrum-css/inlinealert" "2.0.1" - "@spectrum-css/inputgroup" "3.0.2" - "@spectrum-css/label" "2.0.10" - "@spectrum-css/link" "3.1.1" - "@spectrum-css/menu" "3.0.1" - "@spectrum-css/modal" "3.0.1" - "@spectrum-css/pagination" "3.0.3" - "@spectrum-css/picker" "1.0.1" - "@spectrum-css/popover" "3.0.1" - "@spectrum-css/progressbar" "1.0.2" - "@spectrum-css/progresscircle" "1.0.2" - "@spectrum-css/radio" "3.0.2" - "@spectrum-css/search" "3.0.2" - "@spectrum-css/sidenav" "3.0.2" - "@spectrum-css/slider" "3.0.1" - "@spectrum-css/statuslight" "3.0.2" - "@spectrum-css/stepper" "3.0.3" - "@spectrum-css/switch" "1.0.2" - "@spectrum-css/table" "3.0.1" - "@spectrum-css/tabs" "3.2.12" - "@spectrum-css/tags" "3.0.2" - "@spectrum-css/textfield" "3.0.1" - "@spectrum-css/toast" "3.0.1" - "@spectrum-css/tooltip" "3.0.3" - "@spectrum-css/treeview" "3.0.2" - "@spectrum-css/typography" "3.0.1" - "@spectrum-css/underlay" "2.0.9" - "@spectrum-css/vars" "3.0.1" - dayjs "^1.10.4" - easymde "^2.16.1" - svelte-flatpickr "^3.2.3" - svelte-portal "^1.0.0" - -"@budibase/client@latest": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/client/-/client-2.5.6.tgz#91af2efacdec14e0d6af1db6d4aec1ff22819ac4" - integrity sha512-Yu/gs88fGi54GlPeVS/IO+cDicMUBT8+W/4YaUgfUOcxeqJDGPAkLNMLh2HlQ57x765V/PmRda1BAgDF3h5hkQ== - dependencies: - "@budibase/bbui" "^2.5.6" - "@budibase/frontend-core" "^2.5.6" - "@budibase/shared-core" "^2.5.6" - "@budibase/string-templates" "^2.5.6" - "@budibase/types" "^2.5.6" - "@spectrum-css/button" "^3.0.3" - "@spectrum-css/card" "^3.0.3" - "@spectrum-css/divider" "^1.0.3" - "@spectrum-css/link" "^3.1.3" - "@spectrum-css/page" "^3.0.1" - "@spectrum-css/tag" "^3.1.4" - "@spectrum-css/typography" "^3.0.2" - "@spectrum-css/vars" "^3.0.1" - apexcharts "^3.22.1" - dayjs "^1.10.5" - downloadjs "1.4.7" - html5-qrcode "^2.2.1" - leaflet "^1.7.1" - regexparam "^1.3.0" - sanitize-html "^2.7.0" - screenfull "^6.0.1" - shortid "^2.2.15" - socket.io-client "^4.5.1" - svelte "^3.49.0" - svelte-apexcharts "^1.0.2" - svelte-flatpickr "^3.1.0" - svelte-spa-router "^3.0.5" - -"@budibase/frontend-core@^2.5.6", "@budibase/frontend-core@latest": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-2.5.6.tgz#92ec20c006488cce4452f8af2cb65804026ec51e" - integrity sha512-/IbT5m7xv+aqZfTpxJFCtx3ZaA5xeM66OHe3AXa9HlKKWEU1jAEKolaTrC+Qmfhp0pwFSyYsP/U9RBZpFY/r9A== - dependencies: - "@budibase/bbui" "^2.5.6" - "@budibase/shared-core" "^2.5.6" - lodash "^4.17.21" - svelte "^3.46.2" - "@budibase/handlebars-helpers@^0.11.8": version "0.11.8" resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841" @@ -1623,29 +1486,6 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@latest": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6.tgz#6f7311b67c2f4928f0885e91694310abcf8786b0" - integrity sha512-VTBcmazP5Bi2LukCnzZKmtDrw0zwa7TViB0oJKPKp6QIJP74VT+wSyLOk9OPqwtlAHAPeBfkE+mBdvF5vvj7TA== - dependencies: - "@budibase/backend-core" "2.5.6" - "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.6" - "@koa/router" "8.0.8" - bull "4.10.1" - joi "17.6.0" - jsonwebtoken "8.5.1" - lru-cache "^7.14.1" - memorystream "^0.3.1" - node-fetch "^2.6.1" - -"@budibase/shared-core@^2.5.6", "@budibase/shared-core@latest": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/shared-core/-/shared-core-2.5.6.tgz#f3960a39d66a4e016399cc641d54c318cf09ae8f" - integrity sha512-5+oJjpylG8YzO922Nidw1fOsxRhE0gK05FSO/DMYrEDhi6rDiLCQhBaPc+83MAnJi5Yec6Sffpd3gikSVdyMDA== - dependencies: - "@budibase/types" "^2.5.6" - "@budibase/standard-components@^0.9.139": version "0.9.139" resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.139.tgz#cf8e2b759ae863e469e50272b3ca87f2827e66e3" @@ -1664,35 +1504,6 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/string-templates@2.3.20": - version "2.3.20" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.3.20.tgz#35f74b6f515e8127cc375ee0a4679b0a7c117588" - integrity sha512-wMKau3IzVF6M+dRu99aKV1yMdrrK5lghVm9qYtR1B163SMbHEwC8JmZFGPLIi1XsG0T+vw+xfcemfJ2zcATWwg== - dependencies: - "@budibase/handlebars-helpers" "^0.11.8" - dayjs "^1.10.4" - handlebars "^4.7.6" - handlebars-utils "^1.0.6" - lodash "^4.17.20" - vm2 "^3.9.4" - -"@budibase/string-templates@^2.5.6", "@budibase/string-templates@latest": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.5.6.tgz#d811ce82e99f57360669c0842187e0dc32bd31f1" - integrity sha512-dpKR8yexXuvcjHQzwGdRKauf+hmhS8gmpdo/FJbdrCBhJpEVJIQLn5O/3bXvMHwV7URuJ/H2AzTVybbt8Ob5gw== - dependencies: - "@budibase/handlebars-helpers" "^0.11.8" - dayjs "^1.10.4" - handlebars "^4.7.6" - handlebars-utils "^1.0.6" - lodash "^4.17.20" - vm2 "^3.9.15" - -"@budibase/types@2.5.6", "@budibase/types@^2.5.6", "@budibase/types@latest": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.6.tgz#b52566ebe54de5b515b4fc6eabfd6f279202fce1" - integrity sha512-WQVCcYJhj0hexi7BsayOgwpOC3AaMsA7azD4PjpifzaK0Ez+U2NzAT7oEZM9TL8aG8p4BvnTaAxP/Q9KRTdeRA== - "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" @@ -24610,14 +24421,6 @@ vm2@3.9.16, vm2@^3.9.11, vm2@^3.9.15: acorn "^8.7.0" acorn-walk "^8.2.0" -vm2@^3.9.4: - version "3.9.17" - resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.17.tgz#251b165ff8a0e034942b5181057305e39570aeab" - integrity sha512-AqwtCnZ/ERcX+AVj9vUsphY56YANXxRuqMb7GsDtAr0m0PcQX3u0Aj3KWiXM0YAHy7i6JEeHrwOnwXbGYgRpAw== - dependencies: - acorn "^8.7.0" - acorn-walk "^8.2.0" - vuvuzela@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/vuvuzela/-/vuvuzela-1.0.3.tgz#3be145e58271c73ca55279dd851f12a682114b0b" @@ -25463,8 +25266,3 @@ z-schema@^5.0.1: validator "^13.7.0" optionalDependencies: commander "^10.0.0" - -zlib@1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/zlib/-/zlib-1.0.5.tgz#6e7c972fc371c645a6afb03ab14769def114fcc0" - integrity sha512-40fpE2II+Cd3k8HWTWONfeKE2jL+P42iWJ1zzps5W51qcTsOUKM5Q5m2PFb0CLxlmFAaUuUdJGc3OfZy947v0w== From 93179855a7410664b0609b237f6b635a135e9cae Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 22:53:36 +0100 Subject: [PATCH 32/83] Update version script --- scripts/updateVersions.js | 53 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100755 scripts/updateVersions.js diff --git a/scripts/updateVersions.js b/scripts/updateVersions.js new file mode 100755 index 0000000000..d7bc8643bb --- /dev/null +++ b/scripts/updateVersions.js @@ -0,0 +1,53 @@ +const fs = require("fs") +const path = require("path") +const { execSync } = require("child_process") + +// Get the version argument from the command line +const version = process.argv[2] +if (!version) { + console.error("Usage: node update-workspace-dependencies.js ") + process.exit(1) +} + +// Get the list of workspaces with mismatched dependencies +const output = execSync("yarn --silent workspaces info --json", { + encoding: "utf-8", +}) +const data = JSON.parse(output) + +const workspaces = Object.keys(data).filter(key => { + return data[key].mismatchedWorkspaceDependencies?.length +}) + +// Loop through each workspace and update the dependencies +workspaces.forEach(workspace => { + const dependencies = data[workspace].mismatchedWorkspaceDependencies + + // Loop through each dependency and update its version in package.json + const packageJsonPath = path.join(data[workspace].location, "package.json") + const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8")) + let hasChanges = false + + dependencies.forEach(dependency => { + if (packageJson.dependencies?.[dependency]) { + packageJson.dependencies[dependency] = version + hasChanges = true + } + if (packageJson.devDependencies?.[dependency]) { + packageJson.devDependencies[dependency] = version + hasChanges = true + } + if (packageJson.peerDependencies?.[dependency]) { + packageJson.peerDependencies[dependency] = version + hasChanges = true + } + }) + + // Write changes to package.json if there are any + if (hasChanges) { + fs.writeFileSync( + packageJsonPath, + JSON.stringify(packageJson, null, 2) + "\n" + ) + } +}) From dd9d499cc1d9bb0b7af22c2476d1550b0a7892d2 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 22:54:59 +0100 Subject: [PATCH 33/83] Use latest for pro --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index f0ece87bed..04a7eabb7e 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "0.0.1", "@budibase/client": "0.0.1", - "@budibase/pro": "0.0.1", + "@budibase/pro": "latest", "@budibase/shared-core": "0.0.1", "@budibase/string-templates": "0.0.1", "@budibase/types": "0.0.1", diff --git a/packages/worker/package.json b/packages/worker/package.json index d3bc7e3b13..768acf52ee 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "0.0.1", - "@budibase/pro": "0.0.1", + "@budibase/pro": "latest", "@budibase/string-templates": "0.0.1", "@budibase/types": "0.0.1", "@koa/router": "8.0.8", From 5e844ac6dbde93620547d3d678da1d3aa3c3ec82 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 22:57:11 +0100 Subject: [PATCH 34/83] Run yarn after changing versions --- .github/workflows/release-develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 451062fdf1..2ec5f2b6c2 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -57,8 +57,8 @@ jobs: | sed 's/[",]//g') echo "Setting version $version" yarn lerna exec "yarn version --no-git-tag-version --new-version=$version" - yarn node scripts/updateVersions.js $version + yarn - run: yarn bootstrap - run: yarn build - run: yarn build:sdk From d6ea99689fa8439536f635ae12da57c2cfb7d6c5 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 23:12:12 +0100 Subject: [PATCH 35/83] Publish packages --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9f8bb7113c..a14be1a01b 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish", - "release:develop": "npm publish", + "release:develop": "yarn lerna exec 'npm publish'", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", From 49713e5f9a441b8ec903141050c82412df2bee12 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 23:31:46 +0100 Subject: [PATCH 36/83] Don't publish sdk --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a14be1a01b..822de21725 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish", - "release:develop": "yarn lerna exec 'npm publish'", + "release:develop": "yarn lerna exec 'npm publish' --ignore=@budibase/sdk", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", From d8103046e2c8f522535fd2d566f9a9461be38441 Mon Sep 17 00:00:00 2001 From: adrinr Date: Thu, 20 Apr 2023 23:48:48 +0100 Subject: [PATCH 37/83] Publish via lerna, from package --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 822de21725..ae4c5fff51 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish", - "release:develop": "yarn lerna exec 'npm publish' --ignore=@budibase/sdk", + "release:develop": "lerna publish from-package --yes --force-publish --dist-tag develop --exact", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", From 59aefecdd42a7aee8fd9d52106c6ff7ce3f85bb8 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 08:43:22 +0100 Subject: [PATCH 38/83] Reset git before publish --- .github/workflows/release-develop.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 2ec5f2b6c2..773f892715 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -70,6 +70,7 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" + git reset --hard echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc yarn release:develop From 7591ab3428ef61c61e9e51ca5d729ae57d5f9af8 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 09:03:25 +0100 Subject: [PATCH 39/83] Remove paths on workflow --- .github/workflows/release-develop.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 773f892715..3a0b759d63 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -5,16 +5,6 @@ on: push: tags: - v*-alpha.* - paths: - - ".aws/**" - - ".github/**" - - "charts/**" - - "packages/**" - - "scripts/**" - - "package.json" - - "yarn.lock" - - "package.json" - - "yarn.lock" workflow_dispatch: env: From acc79f9363ae0d725e2b545ce2dcae1ec35bdc87 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 09:22:59 +0100 Subject: [PATCH 40/83] Clean submodules --- .github/workflows/release-develop.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 3a0b759d63..294d048db0 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -61,6 +61,7 @@ jobs: git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" git reset --hard + git submodule foreach git reset --hard echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc yarn release:develop From 417b7b15381086c41603bcb3bd067e466a0ebea9 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 09:53:24 +0100 Subject: [PATCH 41/83] Bump version manually --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ae4c5fff51..725911d931 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish", - "release:develop": "lerna publish from-package --yes --force-publish --dist-tag develop --exact", + "release:develop": "lerna publish from-package --yes --force-publish --exact", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", From f9028e1a3f5ef6f2ebbbd493268a988acaed9034 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 10:01:41 +0100 Subject: [PATCH 42/83] Commit instead of reseting --- .github/workflows/release-develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 294d048db0..979e9ff147 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -60,8 +60,8 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" - git reset --hard - git submodule foreach git reset --hard + git submodule foreach git add . && git commit -m 'release process' + git add . && git commit -m 'release process' echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc yarn release:develop From c96c5350d62e44f4ac26b89f71dd650da73c8c8c Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 10:19:54 +0100 Subject: [PATCH 43/83] Commit all --- .github/workflows/release-develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 979e9ff147..697647380d 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -60,8 +60,8 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" - git submodule foreach git add . && git commit -m 'release process' - git add . && git commit -m 'release process' + git submodule foreach git commit -a -m 'release process' + git commit -a -m 'release process' echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc yarn release:develop From 9cbc90e7247e3408de97dd90499b9112c69bcdc1 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 10:28:39 +0100 Subject: [PATCH 44/83] Trigger --- .github/workflows/tag-prerelease.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index b11a2e78ac..102787eb0d 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -16,6 +16,7 @@ on: - "yarn.lock" - "package.json" - "yarn.lock" + - "lerna.json" workflow_dispatch: jobs: From d05938597935674f00f4df76a6b5b3773941873c Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 10:46:49 +0100 Subject: [PATCH 45/83] Add no-push --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 725911d931..2bc4bc6e31 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish", - "release:develop": "lerna publish from-package --yes --force-publish --exact", + "release:develop": "lerna publish from-package --yes --force-publish --dist-tag develop --exact --no-git-tag-version --no-push", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", From 7018fea06f9646dd79fc9f708a5c0e7c65a8acf5 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 11:00:25 +0100 Subject: [PATCH 46/83] Add logging --- .github/workflows/release-develop.yml | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 697647380d..cb098cb3c9 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -64,6 +64,7 @@ jobs: git commit -a -m 'release process' echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc yarn release:develop + echo 'Done' - name: Build/release Docker images run: | diff --git a/package.json b/package.json index 2bc4bc6e31..c0a2c41774 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish", - "release:develop": "lerna publish from-package --yes --force-publish --dist-tag develop --exact --no-git-tag-version --no-push", + "release:develop": "lerna publish from-package --yes --force-publish --dist-tag develop --exact --no-git-tag-version --no-push --loglevel silly", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", From a492455b28ea482f8759feb811c5e59ac6635b1b Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 10:01:48 +0000 Subject: [PATCH 47/83] Bump version to 0.0.999-alpha.33 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index adb1628bd7..40d522d652 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { + "version": "0.0.999-alpha.33", "npmClient": "yarn", - "version": "0.0.999-alpha.9", "packages": [ "packages/backend-core", "packages/bbui", From d8cfb68082f0aae69f9e3b6eae0badcf9f1801b1 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 11:14:08 +0100 Subject: [PATCH 48/83] --no-git-reset --- .github/workflows/tag-prerelease.yml | 2 -- package.json | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index 102787eb0d..d4efb92159 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -14,8 +14,6 @@ on: - "scripts/**" - "package.json" - "yarn.lock" - - "package.json" - - "yarn.lock" - "lerna.json" workflow_dispatch: diff --git a/package.json b/package.json index c0a2c41774..5f42e87ec7 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish", - "release:develop": "lerna publish from-package --yes --force-publish --dist-tag develop --exact --no-git-tag-version --no-push --loglevel silly", + "release:develop": "lerna publish from-package --yes --force-publish --dist-tag develop --exact --no-git-tag-version --no-push --loglevel silly --no-git-reset", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", From db6e25cbf1d8ebc099d56093a04ff8f8e79eb8bc Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 10:14:47 +0000 Subject: [PATCH 49/83] Bump version to 0.0.999-alpha.34 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 40d522d652..9fd9387824 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.0.999-alpha.33", + "version": "0.0.999-alpha.34", "npmClient": "yarn", "packages": [ "packages/backend-core", From b0407c519fcc1e6e947c40e9704c4f3665ae4641 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 10:15:05 +0000 Subject: [PATCH 50/83] Bump version to 0.0.999-alpha.35 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 9fd9387824..4e480fe1f4 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.0.999-alpha.34", + "version": "0.0.999-alpha.35", "npmClient": "yarn", "packages": [ "packages/backend-core", From a2746ec2416a38b6f8c15f9f985dd082ec61dc52 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 11:36:07 +0100 Subject: [PATCH 51/83] Cleanups --- .github/workflows/tag-prerelease.yml | 5 ++--- package.json | 2 +- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index d4efb92159..4f24f6983d 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -14,7 +14,6 @@ on: - "scripts/**" - "package.json" - "yarn.lock" - - "lerna.json" workflow_dispatch: jobs: @@ -35,6 +34,6 @@ jobs: - name: Tag prerelease run: | # setup the username and email. - git config --global user.name "adrinr" - git config --global user.email "adria@budibase.com" + git config --global user.name "Budibase Staging Release Bot" + git config --global user.email "<>" ./scripts/bumpLernaVersion.sh diff --git a/package.json b/package.json index 5f42e87ec7..1e2fea88f3 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish", - "release:develop": "lerna publish from-package --yes --force-publish --dist-tag develop --exact --no-git-tag-version --no-push --loglevel silly --no-git-reset", + "release:develop": "lerna publish from-package --yes --force-publish --dist-tag develop --exact --no-git-tag-version --no-push --no-git-reset", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", diff --git a/packages/server/package.json b/packages/server/package.json index 04a7eabb7e..96bdf5ed88 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "0.0.1", "@budibase/client": "0.0.1", - "@budibase/pro": "latest", + "@budibase/pro": "develop", "@budibase/shared-core": "0.0.1", "@budibase/string-templates": "0.0.1", "@budibase/types": "0.0.1", diff --git a/packages/worker/package.json b/packages/worker/package.json index 768acf52ee..334c4ff1e8 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "0.0.1", - "@budibase/pro": "latest", + "@budibase/pro": "develop", "@budibase/string-templates": "0.0.1", "@budibase/types": "0.0.1", "@koa/router": "8.0.8", From c5e6158329604d0d13f0a0ee2bcb5820c1b06c7e Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 11:42:49 +0100 Subject: [PATCH 52/83] Remove pull --- .github/workflows/release-develop.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index cb098cb3c9..aff1f3158e 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -91,7 +91,6 @@ jobs: git config user.name "Budibase Helm Bot" git config user.email "<>" git reset --hard - git pull mkdir sync echo "Packaging chart to sync dir" helm package charts/budibase --version 0.0.0-develop --app-version develop --destination sync From 2735f1bfc60ef7990607cd0e85bbf82f74294b93 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 12:01:33 +0100 Subject: [PATCH 53/83] Try fetching --- .github/workflows/release-develop.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index aff1f3158e..8cecc5f3d9 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -6,6 +6,11 @@ on: tags: - v*-alpha.* workflow_dispatch: + inputs: + tags: + description: "Release tag" + required: true + type: boolean env: # Posthog token used by ui at build time @@ -91,6 +96,7 @@ jobs: git config user.name "Budibase Helm Bot" git config user.email "<>" git reset --hard + git fetch mkdir sync echo "Packaging chart to sync dir" helm package charts/budibase --version 0.0.0-develop --app-version develop --destination sync From 7e271fed18b70b177dea4abc45d3b845b24b30c9 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 14:11:21 +0100 Subject: [PATCH 54/83] Bump version via node script --- .github/workflows/tag-prerelease.yml | 2 +- scripts/bumpLernaVersion.sh | 15 ---------- scripts/bumpVersion.js | 43 ++++++++++++++++++++++++++++ scripts/versionCommit.sh | 18 ++++++++++++ 4 files changed, 62 insertions(+), 16 deletions(-) delete mode 100755 scripts/bumpLernaVersion.sh create mode 100644 scripts/bumpVersion.js create mode 100755 scripts/versionCommit.sh diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index 4f24f6983d..7911b76ad4 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -36,4 +36,4 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" - ./scripts/bumpLernaVersion.sh + ./scripts/versionCommit.sh alpha diff --git a/scripts/bumpLernaVersion.sh b/scripts/bumpLernaVersion.sh deleted file mode 100755 index 0eb524780c..0000000000 --- a/scripts/bumpLernaVersion.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -# Bump the version in lerna.json -CURRENT_VERSION=$(node -p "require('./lerna.json').version") -NEW_VERSION=$(echo $CURRENT_VERSION | awk -F. -v OFS=. '{++$NF; print}') -sed -i '' "s/\"version\": \"$CURRENT_VERSION\"/\"version\": \"$NEW_VERSION\"/" lerna.json - -lerna version prerelease --no-git-tag-version --force-publish --no-push --y -git add lerna.json -git commit -m "Bump version to $NEW_VERSION" -git tag v$NEW_VERSION -git push -git push --tags - - diff --git a/scripts/bumpVersion.js b/scripts/bumpVersion.js new file mode 100644 index 0000000000..6853ee1338 --- /dev/null +++ b/scripts/bumpVersion.js @@ -0,0 +1,43 @@ +const fs = require("fs") + +const filePath = "lerna.json" +const versionBump = process.argv[2] || "patch" + +// Read and parse lerna.json file +const fileData = fs.readFileSync(filePath) +const lernaData = JSON.parse(fileData) + +// Get current version and split into major, minor, patch, and alpha components +const currentVersion = lernaData.version +const [versionWithoutPrerelease, prerelease] = currentVersion.split("-") +const [major, minor, patch] = versionWithoutPrerelease.split(".").map(Number) + +// Calculate new version based on specified version bump +let newVersion = currentVersion +switch (versionBump) { + case "major": + newVersion = `${major + 1}.0.0` + break + case "minor": + newVersion = `${major}.${minor + 1}.0` + break + case "patch": + newVersion = `${major}.${minor}.${patch + 1}` + break + case "alpha": + const newPrerelease = (prerelease || -1) + 1 + newVersion = prerelease + ? `${versionWithoutPrerelease}-alpha.${newPrerelease}` + : `${major}.${minor}.${patch}-alpha.${newPrerelease}` + break + default: + console.error(`Invalid version bump '${versionBump}' specified.`) + process.exit(1) +} + +// Update lerna.json file with new version +lernaData.version = newVersion +const updatedData = JSON.stringify(lernaData, null, 2) +fs.writeFileSync(filePath, updatedData) + +console.log(`Updated version from ${currentVersion} to ${newVersion}`) diff --git a/scripts/versionCommit.sh b/scripts/versionCommit.sh new file mode 100755 index 0000000000..4145d02782 --- /dev/null +++ b/scripts/versionCommit.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +if [ -z "$1" ] +then + echo "Error: version number is required. Usage: $0 [major|minor|patch|alpha]" + exit 1 +fi + +# Bump the version in lerna.json +node scripts/bumpVersion.js $1 + +git add lerna.json +git commit -m "Bump version to $NEW_VERSION" +git tag v$NEW_VERSION +git push +git push --tags + + From eaab3dfc460d40eee5bba61fa718a6e1ff40916e Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 14:25:36 +0100 Subject: [PATCH 55/83] Fix patching --- lerna.json | 2 +- scripts/bumpVersion.js | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lerna.json b/lerna.json index 4e480fe1f4..f8edafa311 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.0.999-alpha.35", + "version": "0.0.999-alpha.38", "npmClient": "yarn", "packages": [ "packages/backend-core", diff --git a/scripts/bumpVersion.js b/scripts/bumpVersion.js index 6853ee1338..7f68b44fc6 100644 --- a/scripts/bumpVersion.js +++ b/scripts/bumpVersion.js @@ -9,7 +9,7 @@ const lernaData = JSON.parse(fileData) // Get current version and split into major, minor, patch, and alpha components const currentVersion = lernaData.version -const [versionWithoutPrerelease, prerelease] = currentVersion.split("-") +const [versionWithoutPrerelease, alpha] = currentVersion.split("-") const [major, minor, patch] = versionWithoutPrerelease.split(".").map(Number) // Calculate new version based on specified version bump @@ -25,10 +25,13 @@ switch (versionBump) { newVersion = `${major}.${minor}.${patch + 1}` break case "alpha": - const newPrerelease = (prerelease || -1) + 1 - newVersion = prerelease - ? `${versionWithoutPrerelease}-alpha.${newPrerelease}` - : `${major}.${minor}.${patch}-alpha.${newPrerelease}` + let newAlphaVersion = 0 + if (alpha) { + const [_, alphaVersion] = alpha.split(".") + newAlphaVersion = +alphaVersion + 1 + } + newVersion = `${versionWithoutPrerelease}-alpha.${newAlphaVersion}` + break default: console.error(`Invalid version bump '${versionBump}' specified.`) From f52fc90dbcafeba1eb81697e11b11064ee9b98da Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 16:45:36 +0100 Subject: [PATCH 56/83] Fix --- scripts/versionCommit.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/versionCommit.sh b/scripts/versionCommit.sh index 4145d02782..b7f08ec18f 100755 --- a/scripts/versionCommit.sh +++ b/scripts/versionCommit.sh @@ -9,10 +9,10 @@ fi # Bump the version in lerna.json node scripts/bumpVersion.js $1 + +NEW_VERSION=$(node -p "require('./lerna.json').version") git add lerna.json git commit -m "Bump version to $NEW_VERSION" git tag v$NEW_VERSION git push -git push --tags - - +git push --tags \ No newline at end of file From 410046cae21eb94b0a553e6c12ae60fe71cf3ccc Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 16:48:01 +0100 Subject: [PATCH 57/83] Run tag only on develop --- .github/workflows/tag-prerelease.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index 7911b76ad4..54ce6dd547 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -5,7 +5,6 @@ on: push: branches: - develop - - chore/pipeline_npm_version_updates paths: - ".aws/**" - ".github/**" @@ -21,11 +20,11 @@ jobs: runs-on: ubuntu-latest steps: - # - name: Fail if branch is not develop - # if: github.ref != 'refs/heads/develop' - # run: | - # echo "Ref is not develop, you must run this job from develop." - # exit 1 + - name: Fail if branch is not develop + if: github.ref != 'refs/heads/develop' + run: | + echo "Ref is not develop, you must run this job from develop." + exit 1 - uses: actions/checkout@v2 with: submodules: true From 29ed6bf10ba2e51ced6357a8ab9340c07b5cf629 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 16:49:24 +0100 Subject: [PATCH 58/83] Release only on develop --- .github/workflows/release-develop.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 8cecc5f3d9..ebf3cb007e 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -31,12 +31,12 @@ jobs: token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} fetch-depth: 1 - # - name: Fail if tag is not develop - # run: | - # if ! git merge-base --is-ancestor ${{ github.sha }} origin/develop; then - # echo "Tag is not in develop" - # exit 1 - # fi + - name: Fail if tag is not develop + run: | + if ! git merge-base --is-ancestor ${{ github.sha }} origin/develop; then + echo "Tag is not in develop" + exit 1 + fi - uses: actions/setup-node@v1 with: From 842c63aa2b7c7ac65c4b902e3f2cdbcaac192a2c Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 16:50:11 +0100 Subject: [PATCH 59/83] Undo wrong deletes --- packages/cli/package.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/cli/package.json b/packages/cli/package.json index 21713fba2a..7494b6f1c9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -33,9 +33,15 @@ "@budibase/string-templates": "0.0.1", "@budibase/types": "0.0.1", "axios": "0.21.2", + "chalk": "4.1.0", + "cli-progress": "3.11.2", + "commander": "7.1.0", + "docker-compose": "0.23.12", + "dotenv": "16.0.1", "download": "8.0.0", "find-free-port": "^2.0.0", "inquirer": "8.0.0", + "joi": "17.6.0", "lookpath": "1.1.0", "node-fetch": "2.6.7", "pkg": "5.8.0", From 9bfbe38ba2020c8e4567fd1debdfda7d4a55aac7 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 17:26:12 +0100 Subject: [PATCH 60/83] Undo wrong deletes --- packages/frontend-core/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 3a8a7bc9f6..84c39571e4 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -8,6 +8,7 @@ "dependencies": { "@budibase/bbui": "0.0.1", "@budibase/shared-core": "0.0.1", + "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", "svelte": "^3.46.2" From 35bc055ba608cdd7510af393ad1fdb74bd0b40a9 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 17:29:04 +0100 Subject: [PATCH 61/83] Change release pipelines --- .github/workflows/release-develop.yml | 5 +-- .github/workflows/release-master.yml | 53 ++++++++++++++------------- .github/workflows/tag-release.yml | 48 ++++++++++++++++++++++++ package.json | 2 +- 4 files changed, 79 insertions(+), 29 deletions(-) create mode 100644 .github/workflows/tag-release.yml diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index ebf3cb007e..eecda4d926 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -65,11 +65,10 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" - git submodule foreach git commit -a -m 'release process' - git commit -a -m 'release process' + git submodule foreach git commit -a -m 'Release process' + git commit -a -m 'Release process' echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc yarn release:develop - echo 'Done' - name: Build/release Docker images run: | diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index e88fbbf0b8..cd0f3d40d7 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -3,29 +3,16 @@ concurrency: release on: push: - branches: - - master - paths: - - ".aws/**" - - ".github/**" - - "charts/**" - - "packages/**" - - "scripts/**" - - "package.json" - - "yarn.lock" - - "package.json" - - "yarn.lock" + tags: + - v* + tags-ignore: + - v*-alpha.* workflow_dispatch: inputs: - versioning: - type: choice - description: "Versioning type: patch, minor, major" - default: patch - options: - - patch - - minor - - major + tags: + description: "Release tag" required: true + type: boolean env: # Posthog token used by ui at build time @@ -38,20 +25,34 @@ jobs: release-images: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v2 + with: + submodules: true + token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} + fetch-depth: 1 + - name: Fail if branch is not master if: github.ref != 'refs/heads/master' run: | echo "Ref is not master, you must run this job from master." exit 1 - - uses: actions/checkout@v2 - with: - submodules: true - token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} + - uses: actions/setup-node@v1 with: node-version: 14.x - run: yarn + - name: Update versions + run: | + version=$(cat lerna.json \ + | grep version \ + | head -1 \ + | awk -F: '{gsub(/"/,"",$2);gsub(/[[:space:]]*/,"",$2); print $2}' \ + | sed 's/[",]//g') + echo "Setting version $version" + yarn lerna exec "yarn version --no-git-tag-version --new-version=$version" + node scripts/updateVersions.js $version + yarn - run: yarn bootstrap - run: yarn lint - run: yarn build @@ -65,6 +66,8 @@ jobs: # setup the username and email. I tend to use 'GitHub Actions Bot' with no email by default git config --global user.name "Budibase Release Bot" git config --global user.email "<>" + git submodule foreach git commit -a -m 'Release process' + git commit -a -m 'Release process' echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc yarn release @@ -104,7 +107,7 @@ jobs: git config user.name "Budibase Helm Bot" git config user.email "<>" git reset --hard - git pull + git fetch mkdir sync echo "Packaging chart to sync dir" helm package charts/budibase --version 0.0.0-master --app-version v"$RELEASE_VERSION" --destination sync diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml new file mode 100644 index 0000000000..da53612bd9 --- /dev/null +++ b/.github/workflows/tag-release.yml @@ -0,0 +1,48 @@ +name: Tag prerelease +concurrency: release-prerelease + +on: + push: + branches: + - master + paths: + - ".aws/**" + - ".github/**" + - "charts/**" + - "packages/**" + - "scripts/**" + - "package.json" + - "yarn.lock" + workflow_dispatch: + inputs: + versioning: + type: choice + description: "Versioning type: patch, minor, major" + default: patch + options: + - patch + - minor + - major + required: true + +jobs: + tag-prerelease: + runs-on: ubuntu-latest + + steps: + - name: Fail if branch is not master + if: github.ref != 'refs/heads/master' + run: | + echo "Ref is not master, you must run this job from master." + exit 1 + - uses: actions/checkout@v2 + with: + submodules: true + token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} + + - name: Tag prerelease + run: | + # setup the username and email. + git config --global user.name "Budibase Staging Release Bot" + git config --global user.email "<>" + ./scripts/versionCommit.sh ${{ github.event.inputs.versioning }} diff --git a/package.json b/package.json index 1e2fea88f3..742b65f90c 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "backend:build": "./scripts/scopeBackend.sh 'lerna run --stream build'", "build:sdk": "lerna run --stream build:sdk", "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular", - "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish", + "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish --no-git-tag-version --no-push --no-git-reset", "release:develop": "lerna publish from-package --yes --force-publish --dist-tag develop --exact --no-git-tag-version --no-push --no-git-reset", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", From e09e1c86275e6ee3ea303565bbba30f0eaaf2dea Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 17:36:48 +0100 Subject: [PATCH 62/83] Use local pro --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 21 ++++++++++++++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 96bdf5ed88..f0ece87bed 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "0.0.1", "@budibase/client": "0.0.1", - "@budibase/pro": "develop", + "@budibase/pro": "0.0.1", "@budibase/shared-core": "0.0.1", "@budibase/string-templates": "0.0.1", "@budibase/types": "0.0.1", diff --git a/packages/worker/package.json b/packages/worker/package.json index 334c4ff1e8..d3bc7e3b13 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "0.0.1", - "@budibase/pro": "develop", + "@budibase/pro": "0.0.1", "@budibase/string-templates": "0.0.1", "@budibase/types": "0.0.1", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 651125dd3b..4bd6c49403 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7777,6 +7777,13 @@ cli-cursor@3.1.0, cli-cursor@^3.1.0: dependencies: restore-cursor "^3.1.0" +cli-progress@3.11.2: + version "3.11.2" + resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.11.2.tgz#f8c89bd157e74f3f2c43bcfb3505670b4d48fc77" + integrity sha512-lCPoS6ncgX4+rJu5bS3F/iCz17kZ9MPZ6dpuTtI0KXKABkhyXIdYB3Inby1OpaGti3YlI3EeEkM9AuWpelJrVA== + dependencies: + string-width "^4.2.3" + cli-spinners@2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d" @@ -8066,6 +8073,11 @@ commander@6.2.0: resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75" integrity sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q== +commander@7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.1.0.tgz#f2eaecf131f10e36e07d894698226e36ae0eb5ff" + integrity sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg== + commander@^10.0.0: version "10.0.0" resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.0.tgz#71797971162cd3cf65f0b9d24eb28f8d303acdf1" @@ -8860,7 +8872,7 @@ dateformat@^4.5.1, dateformat@^4.6.3: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5" integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA== -dayjs@^1.10.4, dayjs@^1.10.5, dayjs@^1.11.2: +dayjs@^1.10.4, dayjs@^1.10.5, dayjs@^1.11.2, dayjs@^1.11.7: version "1.11.7" resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2" integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ== @@ -9506,6 +9518,13 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" +docker-compose@0.23.12: + version "0.23.12" + resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.23.12.tgz#fa883b98be08f6926143d06bf9e522ef7ed3210c" + integrity sha512-KFbSMqQBuHjTGZGmYDOCO0L4SaML3BsWTId5oSUyaBa22vALuFHNv+UdDWs3HcMylHWKsxCbLB7hnM/nCosWZw== + dependencies: + yaml "^1.10.2" + docker-compose@0.23.17: version "0.23.17" resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.23.17.tgz#8816bef82562d9417dc8c790aa4871350f93a2ba" From 2f8c50cee1263b65f87424a46a4353cf06355560 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 17:37:09 +0100 Subject: [PATCH 63/83] Rename scripts --- .github/workflows/release-develop.yml | 2 +- .github/workflows/release-master.yml | 2 +- scripts/{updateVersions.js => syncLocalDependencies.js} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename scripts/{updateVersions.js => syncLocalDependencies.js} (100%) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index eecda4d926..7f5002b5ee 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -52,7 +52,7 @@ jobs: | sed 's/[",]//g') echo "Setting version $version" yarn lerna exec "yarn version --no-git-tag-version --new-version=$version" - node scripts/updateVersions.js $version + node scripts/syncLocalDependencies.js $version yarn - run: yarn bootstrap - run: yarn build diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index cd0f3d40d7..d981154b4c 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -51,7 +51,7 @@ jobs: | sed 's/[",]//g') echo "Setting version $version" yarn lerna exec "yarn version --no-git-tag-version --new-version=$version" - node scripts/updateVersions.js $version + node scripts/syncLocalDependencies.js $version yarn - run: yarn bootstrap - run: yarn lint diff --git a/scripts/updateVersions.js b/scripts/syncLocalDependencies.js similarity index 100% rename from scripts/updateVersions.js rename to scripts/syncLocalDependencies.js From c9ab1f4a368bfec151c0ade8ebcb502944c83cea Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 17:44:11 +0100 Subject: [PATCH 64/83] Script to update pro deps --- scripts/bootstrap.sh | 3 +++ scripts/updateLocalPro.js | 41 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100755 scripts/updateLocalPro.js diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 4e7eadc4ab..37cb4c1279 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -4,4 +4,7 @@ if [ -d "packages/pro/packages" ]; then yarn lerna bootstrap yarn setup +else + node scripts/updateLocalPro.js + yarn fi \ No newline at end of file diff --git a/scripts/updateLocalPro.js b/scripts/updateLocalPro.js new file mode 100755 index 0000000000..ad1ab1f987 --- /dev/null +++ b/scripts/updateLocalPro.js @@ -0,0 +1,41 @@ +const fs = require("fs") +const path = require("path") +const { execSync } = require("child_process") + +// Get the version argument from the command line +let version = process.argv[2] +if (!version) { + console.error("Usage: node updateLocalPro.js ") + process.exit(1) +} + +if (version === "local") { + version = "0.0.1" +} + +// Get the list of workspaces with mismatched dependencies +const output = execSync("yarn --silent workspaces info --json", { + encoding: "utf-8", +}) +const data = JSON.parse(output) + +// Loop through each workspace and update the dependencies +Object.keys(data).forEach(workspace => { + // Loop through each dependency and update its version in package.json + const packageJsonPath = path.join(data[workspace].location, "package.json") + const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8")) + let hasChanges = false + + if (packageJson.dependencies["@budibase/pro"]) { + packageJson.dependencies["@budibase/pro"] = version + hasChanges = true + } + + // Write changes to package.json if there are any + if (hasChanges) { + fs.writeFileSync( + packageJsonPath, + JSON.stringify(packageJson, null, 2) + "\n" + ) + } +}) From 50a0662a99977359fdca66686923fbe9f6e32280 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 17:52:05 +0100 Subject: [PATCH 65/83] Smart script --- package.json | 6 +++--- .../{updateLocalPro.js => syncProPackage.js} | 20 ++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) rename scripts/{updateLocalPro.js => syncProPackage.js} (77%) diff --git a/package.json b/package.json index 742b65f90c..99c945e567 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "scripts": { "setup": "git config submodule.recurse true && git submodule update && node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev", - "bootstrap": "./scripts/bootstrap.sh && lerna link && ./scripts/link-dependencies.sh", + "bootstrap": "node scripts/syncProPackage.js && yarn && ./scripts/bootstrap.sh && lerna link && ./scripts/link-dependencies.sh", "build": "lerna run --stream build", "build:dev": "lerna run --stream prebuild && yarn nx run-many --target=build --output-style=dynamic --watch --preserveWatchOutput", "backend:bootstrap": "./scripts/scopeBackend.sh && yarn run bootstrap", @@ -80,8 +80,8 @@ "security:audit": "node scripts/audit.js", "postinstall": "husky install", "dep:clean": "yarn clean -y && yarn bootstrap", - "submodules:load": "git submodule init && git submodule update && yarn && yarn bootstrap", - "submodules:unload": "git submodule deinit --all && yarn && yarn bootstrap" + "submodules:load": "git submodule init && git submodule update && yarn bootstrap", + "submodules:unload": "git submodule deinit --all && yarn bootstrap" }, "workspaces": { "packages": [ diff --git a/scripts/updateLocalPro.js b/scripts/syncProPackage.js similarity index 77% rename from scripts/updateLocalPro.js rename to scripts/syncProPackage.js index ad1ab1f987..c84ed1c71f 100755 --- a/scripts/updateLocalPro.js +++ b/scripts/syncProPackage.js @@ -2,15 +2,17 @@ const fs = require("fs") const path = require("path") const { execSync } = require("child_process") -// Get the version argument from the command line -let version = process.argv[2] -if (!version) { - console.error("Usage: node updateLocalPro.js ") - process.exit(1) -} - -if (version === "local") { - version = "0.0.1" +let version = "0.0.1" +const localPro = fs.existsSync("/packages/pro/packages") +if (!localPro) { + const branchName = execSync("git rev-parse --abbrev-ref HEAD") + .toString() + .trim() + if (branchName === "master") { + version = "latest" + } else { + version = "develop" + } } // Get the list of workspaces with mismatched dependencies From f993a7a6b2bff87b668d41d3b67e8912982b56a1 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 17:54:12 +0100 Subject: [PATCH 66/83] Fix script --- scripts/syncProPackage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/syncProPackage.js b/scripts/syncProPackage.js index c84ed1c71f..236586fdf2 100755 --- a/scripts/syncProPackage.js +++ b/scripts/syncProPackage.js @@ -3,7 +3,7 @@ const path = require("path") const { execSync } = require("child_process") let version = "0.0.1" -const localPro = fs.existsSync("/packages/pro/packages") +const localPro = fs.existsSync("packages/pro/packages") if (!localPro) { const branchName = execSync("git rev-parse --abbrev-ref HEAD") .toString() From 1b8a780cb2d1bbcfae4379acf93b876ce1d3ff20 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 18:16:12 +0100 Subject: [PATCH 67/83] Clean scripts --- package.json | 2 +- scripts/bootstrap.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 99c945e567..274edd2343 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "scripts": { "setup": "git config submodule.recurse true && git submodule update && node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev", - "bootstrap": "node scripts/syncProPackage.js && yarn && ./scripts/bootstrap.sh && lerna link && ./scripts/link-dependencies.sh", + "bootstrap": "./scripts/bootstrap.sh && lerna link && ./scripts/link-dependencies.sh", "build": "lerna run --stream build", "build:dev": "lerna run --stream prebuild && yarn nx run-many --target=build --output-style=dynamic --watch --preserveWatchOutput", "backend:bootstrap": "./scripts/scopeBackend.sh && yarn run bootstrap", diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 37cb4c1279..844490a00e 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -1,10 +1,10 @@ +node scripts/syncProPackage.js +yarn + if [ -d "packages/pro/packages" ]; then cd packages/pro yarn lerna bootstrap yarn setup -else - node scripts/updateLocalPro.js - yarn fi \ No newline at end of file From 7cc859087ec1d8c7da2482e0853df9a4a8cdf193 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 18:22:19 +0100 Subject: [PATCH 68/83] Execute pro checks on preinstall --- package.json | 1 + scripts/bootstrap.sh | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/package.json b/package.json index 274edd2343..7ed38ad610 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "typescript": "4.7.3" }, "scripts": { + "preinstall": "node scripts/syncProPackage.js", "setup": "git config submodule.recurse true && git submodule update && node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev", "bootstrap": "./scripts/bootstrap.sh && lerna link && ./scripts/link-dependencies.sh", "build": "lerna run --stream build", diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 844490a00e..4e7eadc4ab 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -1,6 +1,3 @@ -node scripts/syncProPackage.js -yarn - if [ -d "packages/pro/packages" ]; then cd packages/pro From dfa33eb27bb50945c01861755fd60c6d7bd7b81a Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 18:23:10 +0100 Subject: [PATCH 69/83] Add yarn install back --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7ed38ad610..0689c81699 100644 --- a/package.json +++ b/package.json @@ -81,8 +81,8 @@ "security:audit": "node scripts/audit.js", "postinstall": "husky install", "dep:clean": "yarn clean -y && yarn bootstrap", - "submodules:load": "git submodule init && git submodule update && yarn bootstrap", - "submodules:unload": "git submodule deinit --all && yarn bootstrap" + "submodules:load": "git submodule init && git submodule update && yarn && yarn bootstrap", + "submodules:unload": "git submodule deinit --all && yarn && yarn bootstrap" }, "workspaces": { "packages": [ From 02234f32c6398021c4fd75daec2c7ed187c7cef4 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 18:28:24 +0100 Subject: [PATCH 70/83] Undo trigger --- .github/workflows/release-master.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index d981154b4c..3eda2a9829 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -3,8 +3,6 @@ concurrency: release on: push: - tags: - - v* tags-ignore: - v*-alpha.* workflow_dispatch: From d515d8981813b593f2e2e75e725f68490c89b3ea Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 18:29:18 +0100 Subject: [PATCH 71/83] Remove trigger --- .github/workflows/release-master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index 3eda2a9829..cdf4950af9 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -2,7 +2,7 @@ name: Budibase Release concurrency: release on: - push: + tag: tags-ignore: - v*-alpha.* workflow_dispatch: From 510544baebe5179d59eb29fe0aaee9311267dbf8 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 21 Apr 2023 18:29:22 +0100 Subject: [PATCH 72/83] Remove trigger --- .github/workflows/release-master.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index cdf4950af9..51b40a8641 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -2,9 +2,6 @@ name: Budibase Release concurrency: release on: - tag: - tags-ignore: - - v*-alpha.* workflow_dispatch: inputs: tags: From db6a9f97d7932d3fdd90b72b6f21d91b715c321d Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 24 Apr 2023 19:00:21 +0100 Subject: [PATCH 73/83] Use tags --- .github/workflows/release-master.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index 51b40a8641..553298c9e3 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -2,6 +2,11 @@ name: Budibase Release concurrency: release on: + push: + tags: + - 'v[0-9]+.[0-9]+.[0-9]+' + # Exclude all pre-releases + - '!v*[0-9]+.[0-9]+.[0-9]+-*' workflow_dispatch: inputs: tags: @@ -30,7 +35,8 @@ jobs: if: github.ref != 'refs/heads/master' run: | echo "Ref is not master, you must run this job from master." - exit 1 + // Change to "exit 1" when merged. Left to 0 to not fail all the pipelines and not to cause noise + exit 0 - uses: actions/setup-node@v1 with: From 452e7b6ecd99f77c7b62cf9b6116ee56f259d508 Mon Sep 17 00:00:00 2001 From: adrinr Date: Mon, 24 Apr 2023 20:02:43 +0100 Subject: [PATCH 74/83] Update yarn.lock --- yarn.lock | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index 4bd6c49403..3468036c37 100644 --- a/yarn.lock +++ b/yarn.lock @@ -24432,7 +24432,15 @@ vlq@^0.2.2: resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26" integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow== -vm2@3.9.16, vm2@^3.9.11, vm2@^3.9.15: +vm2@3.9.17: + version "3.9.17" + resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.17.tgz#251b165ff8a0e034942b5181057305e39570aeab" + integrity sha512-AqwtCnZ/ERcX+AVj9vUsphY56YANXxRuqMb7GsDtAr0m0PcQX3u0Aj3KWiXM0YAHy7i6JEeHrwOnwXbGYgRpAw== + dependencies: + acorn "^8.7.0" + acorn-walk "^8.2.0" + +vm2@^3.9.11, vm2@^3.9.15: version "3.9.16" resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.16.tgz#0fbc2a265f7bf8b837cea6f4a908f88a3f93b8e6" integrity sha512-3T9LscojNTxdOyG+e8gFeyBXkMlOBYDoF6dqZbj+MPVHi9x10UfiTAJIobuchRCp3QvC+inybTbMJIUrLsig0w== From c139768b1db31e3c74a30668edd3c68e600e9813 Mon Sep 17 00:00:00 2001 From: adrinr Date: Tue, 25 Apr 2023 10:13:58 +0100 Subject: [PATCH 75/83] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 315e57dc91..26d3a26c1e 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 315e57dc9185dede169af073a01cc23e673b7091 +Subproject commit 26d3a26c1e5b0fbfd6fc5614b30934352b8cf5ae From d0777f65035fe983f7fb9f6d18637c63b119dc29 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 2 May 2023 14:34:37 +0100 Subject: [PATCH 76/83] Update pro --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 4f1832a13f..1877e22c97 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 4f1832a13f1202194a76a52a37261dd96df9c0b1 +Subproject commit 1877e22c9723c3b4e497a345445e2b8ee52a7fc0 From 392ae49240cdbae1a713f363065e5b8825c335fb Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 3 May 2023 18:04:06 +0100 Subject: [PATCH 77/83] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 26d3a26c1e..89b236619d 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 26d3a26c1e5b0fbfd6fc5614b30934352b8cf5ae +Subproject commit 89b236619d6f3b76dc3e733f9cad215db2d8994f From cd59df8fa95b4cfd3b6047626101c798961366a6 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 4 May 2023 10:27:21 +0100 Subject: [PATCH 78/83] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 1877e22c97..616aa3ae4b 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 1877e22c9723c3b4e497a345445e2b8ee52a7fc0 +Subproject commit 616aa3ae4b13c65a4630be2126f86cda0fcec071 From eec66f6e5449f998bbe37abf2f5208324f79068c Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 4 May 2023 11:39:39 +0100 Subject: [PATCH 79/83] Update refs --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 616aa3ae4b..67838e687d 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 616aa3ae4b13c65a4630be2126f86cda0fcec071 +Subproject commit 67838e687df0a0cfa4c6d3d30cca11aa28689e7f From 09462974e192578921c924cb54c7c24b772421f2 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 13:23:14 +0100 Subject: [PATCH 80/83] Use semver --- .github/workflows/tag-prerelease.yml | 2 +- package.json | 1 + scripts/bumpVersion.js | 30 ++-------------------------- scripts/versionCommit.sh | 2 +- yarn.lock | 7 +++++++ 5 files changed, 12 insertions(+), 30 deletions(-) diff --git a/.github/workflows/tag-prerelease.yml b/.github/workflows/tag-prerelease.yml index 54ce6dd547..0ae1bf5adc 100644 --- a/.github/workflows/tag-prerelease.yml +++ b/.github/workflows/tag-prerelease.yml @@ -35,4 +35,4 @@ jobs: # setup the username and email. git config --global user.name "Budibase Staging Release Bot" git config --global user.email "<>" - ./scripts/versionCommit.sh alpha + ./scripts/versionCommit.sh prerelease diff --git a/package.json b/package.json index 4deb5a5bed..27f94ada0d 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "prettier-plugin-svelte": "^2.3.0", "rimraf": "^3.0.2", "rollup-plugin-replace": "^2.2.0", + "semver": "^7.5.0", "svelte": "^3.38.2", "typescript": "4.7.3" }, diff --git a/scripts/bumpVersion.js b/scripts/bumpVersion.js index 7f68b44fc6..19deb684da 100644 --- a/scripts/bumpVersion.js +++ b/scripts/bumpVersion.js @@ -1,4 +1,5 @@ const fs = require("fs") +const semver = require("semver") const filePath = "lerna.json" const versionBump = process.argv[2] || "patch" @@ -7,36 +8,9 @@ const versionBump = process.argv[2] || "patch" const fileData = fs.readFileSync(filePath) const lernaData = JSON.parse(fileData) -// Get current version and split into major, minor, patch, and alpha components const currentVersion = lernaData.version -const [versionWithoutPrerelease, alpha] = currentVersion.split("-") -const [major, minor, patch] = versionWithoutPrerelease.split(".").map(Number) -// Calculate new version based on specified version bump -let newVersion = currentVersion -switch (versionBump) { - case "major": - newVersion = `${major + 1}.0.0` - break - case "minor": - newVersion = `${major}.${minor + 1}.0` - break - case "patch": - newVersion = `${major}.${minor}.${patch + 1}` - break - case "alpha": - let newAlphaVersion = 0 - if (alpha) { - const [_, alphaVersion] = alpha.split(".") - newAlphaVersion = +alphaVersion + 1 - } - newVersion = `${versionWithoutPrerelease}-alpha.${newAlphaVersion}` - - break - default: - console.error(`Invalid version bump '${versionBump}' specified.`) - process.exit(1) -} +const newVersion = semver.inc(currentVersion, versionBump, "alpha") // Update lerna.json file with new version lernaData.version = newVersion diff --git a/scripts/versionCommit.sh b/scripts/versionCommit.sh index b7f08ec18f..10e7a9df71 100755 --- a/scripts/versionCommit.sh +++ b/scripts/versionCommit.sh @@ -2,7 +2,7 @@ if [ -z "$1" ] then - echo "Error: version number is required. Usage: $0 [major|minor|patch|alpha]" + echo "Error: version number is required. Usage: $0 [major|minor|patch|prerelease]" exit 1 fi diff --git a/yarn.lock b/yarn.lock index 0305f3f8d2..35f1cc1ef3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -21718,6 +21718,13 @@ semver@^7.2.1, semver@^7.3.5: dependencies: lru-cache "^6.0.0" +semver@^7.5.0: + version "7.5.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0" + integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA== + dependencies: + lru-cache "^6.0.0" + semver@~2.3.1: version "2.3.2" resolved "https://registry.yarnpkg.com/semver/-/semver-2.3.2.tgz#b9848f25d6cf36333073ec9ef8856d42f1233e52" From e4af6a802a4ef27ebb17a5d7757828bba317754e Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 13:27:22 +0100 Subject: [PATCH 81/83] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 67838e687d..79bc94b17b 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 67838e687df0a0cfa4c6d3d30cca11aa28689e7f +Subproject commit 79bc94b17baba885eb20e72f9abba3ac8b9c0eab From b63f593b17fe4e6091169ec97dffee27759b648d Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 14:07:05 +0100 Subject: [PATCH 82/83] Remove tag input --- .github/workflows/release-develop.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 7f5002b5ee..e30236971e 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -6,11 +6,6 @@ on: tags: - v*-alpha.* workflow_dispatch: - inputs: - tags: - description: "Release tag" - required: true - type: boolean env: # Posthog token used by ui at build time From d1ad7551dc2251494259fbfa3584c535cf8df7a5 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 5 May 2023 14:14:33 +0100 Subject: [PATCH 83/83] Build before pro test --- .github/workflows/budibase_ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index f4e0ddbd87..55c4405e10 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -79,6 +79,7 @@ jobs: node-version: 14.x - run: yarn - run: yarn bootstrap + - run: yarn build --scope=@budibase/types --scope=@budibase/shared-core - run: yarn test --scope=@budibase/pro integration-test: