diff --git a/lerna.json b/lerna.json index 3a1663c723..9342917447 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.9.99-alpha.1", + "version": "0.9.99-alpha.3", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/package.json b/package.json index 8fbed6175a..bb226ee568 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "test:e2e": "lerna run cy:test", "test:e2e:ci": "lerna run cy:ci", "build:docker": "lerna run build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh && cd -", - "build:docker:develop": "lerna run build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh develop && cd -", + "build:docker:develop": "node scripts/pinVersions && lerna run build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh develop && cd -", "multi:enable": "lerna run multi:enable", "multi:disable": "lerna run multi:disable" } diff --git a/packages/auth/package.json b/packages/auth/package.json index ff645685da..8490e025c4 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/auth", - "version": "0.9.99-alpha.1", + "version": "0.9.99-alpha.3", "description": "Authentication middlewares for budibase builder and apps", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 12fe117a25..f5de734f3a 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": "0.9.99-alpha.1", + "version": "0.9.99-alpha.3", "license": "AGPL-3.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index 0f381d0f8f..e7c20c27df 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.9.99-alpha.1", + "version": "0.9.99-alpha.3", "license": "AGPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^0.9.99-alpha.1", - "@budibase/client": "^0.9.99-alpha.1", - "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^0.9.99-alpha.1", + "@budibase/bbui": "^0.9.99-alpha.3", + "@budibase/client": "^0.9.99-alpha.3", + "@budibase/colorpicker": "^1.1.2", + "@budibase/string-templates": "^0.9.99-alpha.3", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 27660de29f..04710b22b0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "0.9.99-alpha.1", + "version": "0.9.99-alpha.3", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 413f2820d7..93a384c4a2 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.9.99-alpha.1", + "version": "0.9.99-alpha.3", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -18,9 +18,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^0.9.99-alpha.1", - "@budibase/standard-components": "^0.9.99-alpha.1", - "@budibase/string-templates": "^0.9.99-alpha.1", + "@budibase/bbui": "^0.9.99-alpha.3", + "@budibase/standard-components": "^0.9.99-alpha.3", + "@budibase/string-templates": "^0.9.99-alpha.3", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" diff --git a/packages/server/package.json b/packages/server/package.json index 26c483652e..41b0787440 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.9.99-alpha.1", + "version": "0.9.99-alpha.3", "description": "Budibase Web Server", "main": "src/index.js", "repository": { @@ -62,9 +62,9 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.99-alpha.1", - "@budibase/client": "^0.9.99-alpha.1", - "@budibase/string-templates": "^0.9.99-alpha.1", + "@budibase/auth": "^0.9.99-alpha.3", + "@budibase/client": "^0.9.99-alpha.3", + "@budibase/string-templates": "^0.9.99-alpha.3", "@elastic/elasticsearch": "7.10.0", "@koa/router": "8.0.0", "@sendgrid/mail": "7.1.1", @@ -117,7 +117,7 @@ "devDependencies": { "@babel/core": "^7.14.3", "@babel/preset-env": "^7.14.4", - "@budibase/standard-components": "^0.9.99-alpha.1", + "@budibase/standard-components": "^0.9.99-alpha.3", "@jest/test-sequencer": "^24.8.0", "@types/bull": "^3.15.1", "@types/jest": "^26.0.23", diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json index b460da0a0c..8b9842e6c0 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -29,11 +29,11 @@ "keywords": [ "svelte" ], - "version": "0.9.99-alpha.1", + "version": "0.9.99-alpha.3", "license": "MIT", "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc", "dependencies": { - "@budibase/bbui": "^0.9.99-alpha.1", + "@budibase/bbui": "^0.9.99-alpha.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", "@spectrum-css/link": "^3.1.3", diff --git a/packages/standard-components/yarn.lock b/packages/standard-components/yarn.lock index 42f455198f..81963a00fa 100644 --- a/packages/standard-components/yarn.lock +++ b/packages/standard-components/yarn.lock @@ -7,7 +7,7 @@ resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.2.1.tgz#7e2cb3fcfb5c8b12d7275afafbb6ec44913551b4" integrity sha512-uVgekyBXnOVkxp+CUssjN/gefARtudZC8duEn1vm0lBQFwGRZFlDEzU1QC+aIRWCrD1Z8OgRpmBYlSZ7QS003w== -"@budibase/bbui@^0.9.96": +"@budibase/bbui@^0.9.98": version "0.9.98" resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.98.tgz#8fe80cc573df204d1a4147ebda5c20322f4616df" integrity sha512-T03xRq/Kz0/goMNfqsfXymvqhm9jHJQbzWx4oqPtgwIJlb/spx4kEgHS7MWuf3uyagAaFbW2x56Lauoiha8uLQ== diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index e23a892793..02e84a5622 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.9.99-alpha.1", + "version": "0.9.99-alpha.3", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index bea84f3955..088efa018e 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "0.9.99-alpha.1", + "version": "0.9.99-alpha.3", "description": "Budibase background service", "main": "src/index.js", "repository": { @@ -23,8 +23,8 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.99-alpha.1", - "@budibase/string-templates": "^0.9.99-alpha.1", + "@budibase/auth": "^0.9.99-alpha.3", + "@budibase/string-templates": "^0.9.99-alpha.3", "@koa/router": "^8.0.0", "@techpass/passport-openidconnect": "^0.3.0", "aws-sdk": "^2.811.0", diff --git a/scripts/pinVersions.js b/scripts/pinVersions.js new file mode 100644 index 0000000000..ecc605ad28 --- /dev/null +++ b/scripts/pinVersions.js @@ -0,0 +1,37 @@ +const fs = require("fs") +const path = require("path") + +const MONOREPO_ROOT = "packages" + +const packages = fs.readdirSync(MONOREPO_ROOT) + +function pinDeps(dependencies) { + for (let dependency in dependencies) { + if (dependency.startsWith("@budibase")) { + dependencies[dependency] = dependencies[dependency].replace("^", "") + } + } +} + +// iterate over the monorepo packages +for (let pkg of packages) { + const pkgPath = path.join(MONOREPO_ROOT, pkg) + + // only directories + if (fs.statSync(pkgPath).isDirectory()) { + + + // get the package JSON file + const pkgJsonPath = path.join(pkgPath, "package.json") + const pkgJson = require(`../${pkgJsonPath}`) + + // find any budibase dependencies, and pin them + pinDeps(pkgJson.dependencies) + pinDeps(pkgJson.devDependencies) + + // update the package JSON files + fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2)) + } +} + +console.log("Pinned dev versions for budibase packages successfully.") \ No newline at end of file