diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile index 2070717a21..e3008c269b 100644 --- a/hosting/single/Dockerfile +++ b/hosting/single/Dockerfile @@ -9,7 +9,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends g++ make python WORKDIR /app COPY package.json . COPY yarn.lock . -COPY lerna.json . COPY .yarnrc . COPY packages/server/package.json packages/server/package.json diff --git a/lerna.json b/lerna.json index 5143beb4c4..8363faabeb 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "3.41.3", + "version": "independent", "npmClient": "yarn", "concurrency": 20, "command": { @@ -17,4 +17,4 @@ "loadEnvFiles": false } } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 153e9b52af..1cdd65c3bc 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,6 @@ "check:unused-deps:fix": "yarn check:unused-deps --fix", "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 from-package --yes --force-publish --no-git-tag-version --no-push --no-git-reset", "pending-releases": "node scripts/pendingReleases.js", "restore": "yarn run clean && yarn && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts index c183adee0e..a4146edaa1 100644 --- a/packages/backend-core/src/environment.ts +++ b/packages/backend-core/src/environment.ts @@ -93,21 +93,14 @@ function getPackageJsonFields(): { return parsedContent } - let localVersion: string | undefined - if (isDev() && !isTest()) { - try { - const lerna = getParentFile("lerna.json") - localVersion = `${lerna.version}+local` - } catch { - // - } - } - try { const parsedContent = getParentFile("package.json") return { VERSION: - localVersion || process.env.BUDIBASE_VERSION || parsedContent.version, + process.env.BUDIBASE_VERSION || + (isDev() && !isTest() + ? `${parsedContent.version}+local` + : parsedContent.version), SERVICE_NAME: parsedContent.name, } } catch { diff --git a/scripts/build-single-image.sh b/scripts/build-single-image.sh index 79b9d118b8..526edd517f 100755 --- a/scripts/build-single-image.sh +++ b/scripts/build-single-image.sh @@ -1,11 +1,10 @@ #!/bin/bash cd "$(dirname "$0")/.." yarn build:apps -version=$(./scripts/getCurrentVersion.sh) docker build \ -f hosting/single/Dockerfile \ -t budibase:latest \ - --build-arg BUDIBASE_VERSION=$version \ + --build-arg BUDIBASE_VERSION=0.0.0+local \ --build-arg TARGETBUILD=single \ . diff --git a/scripts/bumpVersion.js b/scripts/bumpVersion.js deleted file mode 100644 index dd54074ae8..0000000000 --- a/scripts/bumpVersion.js +++ /dev/null @@ -1,20 +0,0 @@ -const fs = require("fs") -const semver = require("semver") - -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) - -const currentVersion = lernaData.version - -const newVersion = semver.inc(currentVersion, versionBump, "alpha") - -// 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/getCurrentVersion.sh b/scripts/getCurrentVersion.sh deleted file mode 100755 index 61522b1666..0000000000 --- a/scripts/getCurrentVersion.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -version=$(cat lerna.json \ - | grep version \ - | head -1 \ - | awk -F: '{gsub(/"/,"",$2);gsub(/[[:space:]]*/,"",$2); print $2}' \ - | sed 's/[",]//g') -echo $version diff --git a/scripts/run-single-image.sh b/scripts/run-single-image.sh index b3e2a171f6..2d8f5e41e5 100755 --- a/scripts/run-single-image.sh +++ b/scripts/run-single-image.sh @@ -1,8 +1,6 @@ #!/bin/bash cd "$(dirname "$0")/.." -version=$(./scripts/getCurrentVersion.sh) - docker run -d \ --name budibase-single \ -p 80:80 \ @@ -18,7 +16,7 @@ docker run -d \ -e DEPLOYMENT_ENVIRONMENT="docker" \ -e SELF_HOSTED="1" \ -e NODE_ENV="production" \ - -e BUDIBASE_VERSION=$version \ + -e BUDIBASE_VERSION=0.0.0+local \ budibase:latest echo "Budibase single image is running. Access it at http://localhost:80" diff --git a/scripts/versionCommit.sh b/scripts/versionCommit.sh deleted file mode 100755 index c6bf8adda9..0000000000 --- a/scripts/versionCommit.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -set -euo pipefail - -if [ -z "${1:-}" ] -then - echo "Error: bump type is required. Usage: $0 [major|minor|patch|prerelease]" - exit 1 -fi - -# Bump the version in lerna.json -node ./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 $NEW_VERSION -git push -git push --tags