Merge branch 'develop' into develop
This commit is contained in:
commit
f0ab62c9c1
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"version": "1.0.105-alpha.30",
|
||||
"version": "1.0.105-alpha.31",
|
||||
"npmClient": "yarn",
|
||||
"packages": [
|
||||
"packages/*"
|
||||
|
|
|
@ -25,8 +25,8 @@
|
|||
"build": "lerna run build",
|
||||
"release": "lerna publish patch --yes --force-publish && yarn release:pro",
|
||||
"release:develop": "lerna publish prerelease --yes --force-publish --dist-tag develop && yarn release:pro:develop",
|
||||
"release:pro": "sh scripts/pro/release.sh",
|
||||
"release:pro:develop": "sh scripts/pro/release.sh develop",
|
||||
"release:pro": "bash scripts/pro/release.sh",
|
||||
"release:pro:develop": "bash scripts/pro/release.sh develop",
|
||||
"restore": "yarn run clean && yarn run bootstrap && yarn run build",
|
||||
"nuke": "yarn run nuke:packages && yarn run nuke:docker",
|
||||
"nuke:packages": "yarn run restore",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/backend-core",
|
||||
"version": "1.0.105-alpha.30",
|
||||
"version": "1.0.105-alpha.31",
|
||||
"description": "Budibase backend core libraries used in server and worker",
|
||||
"main": "src/index.js",
|
||||
"author": "Budibase",
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "@budibase/bbui",
|
||||
"description": "A UI solution used in the different Budibase projects.",
|
||||
"version": "1.0.105-alpha.30",
|
||||
"version": "1.0.105-alpha.31",
|
||||
"license": "MPL-2.0",
|
||||
"svelte": "src/index.js",
|
||||
"module": "dist/bbui.es.js",
|
||||
|
@ -38,7 +38,7 @@
|
|||
],
|
||||
"dependencies": {
|
||||
"@adobe/spectrum-css-workflow-icons": "^1.2.1",
|
||||
"@budibase/string-templates": "^1.0.105-alpha.30",
|
||||
"@budibase/string-templates": "^1.0.105-alpha.31",
|
||||
"@spectrum-css/actionbutton": "^1.0.1",
|
||||
"@spectrum-css/actiongroup": "^1.0.1",
|
||||
"@spectrum-css/avatar": "^3.0.2",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/builder",
|
||||
"version": "1.0.105-alpha.30",
|
||||
"version": "1.0.105-alpha.31",
|
||||
"license": "GPL-3.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
|
@ -65,10 +65,10 @@
|
|||
}
|
||||
},
|
||||
"dependencies": {
|
||||
"@budibase/bbui": "^1.0.105-alpha.30",
|
||||
"@budibase/client": "^1.0.105-alpha.30",
|
||||
"@budibase/frontend-core": "^1.0.105-alpha.30",
|
||||
"@budibase/string-templates": "^1.0.105-alpha.30",
|
||||
"@budibase/bbui": "^1.0.105-alpha.31",
|
||||
"@budibase/client": "^1.0.105-alpha.31",
|
||||
"@budibase/frontend-core": "^1.0.105-alpha.31",
|
||||
"@budibase/string-templates": "^1.0.105-alpha.31",
|
||||
"@sentry/browser": "5.19.1",
|
||||
"@spectrum-css/page": "^3.0.1",
|
||||
"@spectrum-css/vars": "^3.0.1",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/cli",
|
||||
"version": "1.0.105-alpha.30",
|
||||
"version": "1.0.105-alpha.31",
|
||||
"description": "Budibase CLI, for developers, self hosting and migrations.",
|
||||
"main": "src/index.js",
|
||||
"bin": {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/client",
|
||||
"version": "1.0.105-alpha.30",
|
||||
"version": "1.0.105-alpha.31",
|
||||
"license": "MPL-2.0",
|
||||
"module": "dist/budibase-client.js",
|
||||
"main": "dist/budibase-client.js",
|
||||
|
@ -19,9 +19,9 @@
|
|||
"dev:builder": "rollup -cw"
|
||||
},
|
||||
"dependencies": {
|
||||
"@budibase/bbui": "^1.0.105-alpha.30",
|
||||
"@budibase/frontend-core": "^1.0.105-alpha.30",
|
||||
"@budibase/string-templates": "^1.0.105-alpha.30",
|
||||
"@budibase/bbui": "^1.0.105-alpha.31",
|
||||
"@budibase/frontend-core": "^1.0.105-alpha.31",
|
||||
"@budibase/string-templates": "^1.0.105-alpha.31",
|
||||
"@spectrum-css/button": "^3.0.3",
|
||||
"@spectrum-css/card": "^3.0.3",
|
||||
"@spectrum-css/divider": "^1.0.3",
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"name": "@budibase/frontend-core",
|
||||
"version": "1.0.105-alpha.30",
|
||||
"version": "1.0.105-alpha.31",
|
||||
"description": "Budibase frontend core libraries used in builder and client",
|
||||
"author": "Budibase",
|
||||
"license": "MPL-2.0",
|
||||
"svelte": "src/index.js",
|
||||
"dependencies": {
|
||||
"@budibase/bbui": "^1.0.105-alpha.30",
|
||||
"@budibase/bbui": "^1.0.105-alpha.31",
|
||||
"lodash": "^4.17.21",
|
||||
"svelte": "^3.46.2"
|
||||
}
|
||||
|
|
|
@ -2,10 +2,10 @@
|
|||
"author": "Budibase",
|
||||
"dependencies": {
|
||||
"@apidevtools/swagger-parser": "^10.0.3",
|
||||
"@budibase/backend-core": "^1.0.105-alpha.30",
|
||||
"@budibase/client": "^1.0.105-alpha.30",
|
||||
"@budibase/backend-core": "^1.0.105-alpha.31",
|
||||
"@budibase/client": "^1.0.105-alpha.31",
|
||||
"@budibase/pro": "^1.0.0",
|
||||
"@budibase/string-templates": "^1.0.105-alpha.30",
|
||||
"@budibase/string-templates": "^1.0.105-alpha.31",
|
||||
"@bull-board/api": "^3.7.0",
|
||||
"@bull-board/koa": "^3.7.0",
|
||||
"@elastic/elasticsearch": "7.10.0",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/string-templates",
|
||||
"version": "1.0.105-alpha.30",
|
||||
"version": "1.0.105-alpha.31",
|
||||
"description": "Handlebars wrapper for Budibase templating.",
|
||||
"main": "src/index.cjs",
|
||||
"module": "dist/bundle.mjs",
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "@budibase/worker",
|
||||
"email": "hi@budibase.com",
|
||||
"version": "1.0.105-alpha.30",
|
||||
"version": "1.0.105-alpha.31",
|
||||
"description": "Budibase background service",
|
||||
"main": "src/index.ts",
|
||||
"repository": {
|
||||
|
@ -31,9 +31,9 @@
|
|||
"author": "Budibase",
|
||||
"license": "GPL-3.0",
|
||||
"dependencies": {
|
||||
"@budibase/backend-core": "^1.0.105-alpha.30",
|
||||
"@budibase/backend-core": "^1.0.105-alpha.31",
|
||||
"@budibase/pro": "^1.0.0",
|
||||
"@budibase/string-templates": "^1.0.105-alpha.30",
|
||||
"@budibase/string-templates": "^1.0.105-alpha.31",
|
||||
"@koa/router": "^8.0.0",
|
||||
"@sentry/node": "6.17.7",
|
||||
"@techpass/passport-openidconnect": "^0.3.0",
|
||||
|
|
|
@ -29,6 +29,12 @@ echo "Releasing version $VERSION"
|
|||
echo "Releasing tag $TAG"
|
||||
lerna publish $VERSION --yes --force-publish --dist-tag $TAG
|
||||
|
||||
# reset main and types to point to src for dev
|
||||
jq '.main = "src/index.ts" | .types = "src/index.ts"' package.json > package.json.tmp && mv package.json.tmp package.json
|
||||
git add package.json
|
||||
git commit -m 'Prep dev'
|
||||
git push
|
||||
|
||||
cd -
|
||||
|
||||
if [[ $COMMAND == "develop" ]]; then
|
||||
|
|
Loading…
Reference in New Issue