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 adf7634370..7092f4006f 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -41,4 +41,4 @@ "pouchdb-all-dbs": "^1.0.2" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} +} \ No newline at end of file diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 5ed212ef07..c19c994e82 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -81,4 +81,4 @@ "svelte-portal": "^1.0.0" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} +} \ No newline at end of file diff --git a/packages/builder/package.json b/packages/builder/package.json index a27f78fab2..7798609594 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -67,7 +67,7 @@ "dependencies": { "@budibase/bbui": "^0.9.99-alpha.2", "@budibase/client": "^0.9.99-alpha.2", - "@budibase/colorpicker": "1.1.2", + "@budibase/colorpicker": "^1.1.2", "@budibase/string-templates": "^0.9.99-alpha.2", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", @@ -109,4 +109,4 @@ "vite": "^2.1.5" }, "gitHead": "115189f72a850bfb52b65ec61d932531bf327072" -} +} \ No newline at end of file diff --git a/packages/cli/package.json b/packages/cli/package.json index 90d4e75e97..7da27dbfac 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -31,4 +31,4 @@ "devDependencies": { "eslint": "^7.20.0" } -} +} \ No newline at end of file diff --git a/packages/client/package.json b/packages/client/package.json index e8e8a200b2..6b8d1ccc5f 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -42,4 +42,4 @@ "svelte": "^3.38.2" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} +} \ No newline at end of file diff --git a/packages/server/package.json b/packages/server/package.json index f51a91ac65..a792c40637 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -142,4 +142,4 @@ "update-dotenv": "^1.1.1" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} +} \ No newline at end of file diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json index 48d84ca132..625d3e22bd 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -45,4 +45,4 @@ "svelte-apexcharts": "^1.0.2", "svelte-flatpickr": "^3.1.0" } -} +} \ No newline at end of file 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 3558e27162..26e85caffc 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -40,4 +40,4 @@ "typescript": "^4.1.3" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} +} \ No newline at end of file diff --git a/packages/worker/package.json b/packages/worker/package.json index 17a392d10d..8508055942 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -64,4 +64,4 @@ ] }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} +} \ No newline at end of file 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