MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removing merge HEAD

This commit is contained in:
Martin McKeaveney 2021-08-31 13:23:46 +01:00
parent 71ac81e8c9
commit 929697b5f4
8 changed files with 0 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/auth/package.json
View File

@ -1,10 +1,6 @@
{
"name": "@budibase/auth",
<<<<<<< HEAD
"version": "0.9.116-alpha.3",
=======
"version": "0.9.116",
>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
"description": "Authentication middlewares for budibase builder and apps",
"main": "src/index.js",
"author": "Budibase",

4
packages/bbui/package.json
View File

@ -1,11 +1,7 @@
{
"name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.",
<<<<<<< HEAD
"version": "0.9.116-alpha.3",
=======
"version": "0.9.116",
>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
"license": "AGPL-3.0",
"svelte": "src/index.js",
"module": "dist/bbui.es.js",

11
packages/builder/package.json
View File

@ -1,10 +1,6 @@
{
"name": "@budibase/builder",
<<<<<<< HEAD
"version": "0.9.116-alpha.3",
=======
"version": "0.9.116",
>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
"license": "AGPL-3.0",
"private": true,
"scripts": {
@ -69,17 +65,10 @@
}
},
"dependencies": {
<<<<<<< HEAD
"@budibase/bbui": "^0.9.116-alpha.3",
"@budibase/client": "^0.9.116-alpha.3",
"@budibase/colorpicker": "1.1.2",
"@budibase/string-templates": "^0.9.116-alpha.3",
=======
"@budibase/bbui": "^0.9.116",
"@budibase/client": "^0.9.116",
"@budibase/colorpicker": "1.1.2",
"@budibase/string-templates": "^0.9.116",
>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
"@sentry/browser": "5.19.1",
"@spectrum-css/page": "^3.0.1",
"@spectrum-css/vars": "^3.0.1",

4
packages/cli/package.json
View File

@ -1,10 +1,6 @@
{
"name": "@budibase/cli",
<<<<<<< HEAD
"version": "0.9.116-alpha.3",
=======
"version": "0.9.116",
>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
"description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js",
"bin": {

10
packages/client/package.json
View File

@ -1,10 +1,6 @@
{
"name": "@budibase/client",
<<<<<<< HEAD
"version": "0.9.116-alpha.3",
=======
"version": "0.9.116",
>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
"license": "MPL-2.0",
"module": "dist/budibase-client.js",
"main": "dist/budibase-client.js",
@ -22,15 +18,9 @@
"dev:builder": "rollup -cw"
},
"dependencies": {
<<<<<<< HEAD
"@budibase/bbui": "^0.9.116-alpha.3",
"@budibase/standard-components": "^0.9.116-alpha.3",
"@budibase/string-templates": "^0.9.116-alpha.3",
=======
"@budibase/bbui": "^0.9.116",
"@budibase/standard-components": "^0.9.116",
"@budibase/string-templates": "^0.9.116",
>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
"regexparam": "^1.3.0",
"shortid": "^2.2.15",
"svelte-spa-router": "^3.0.5"

14
packages/server/package.json
View File

@ -1,11 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
<<<<<<< HEAD
"version": "0.9.116-alpha.3",
=======
"version": "0.9.116",
>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
"description": "Budibase Web Server",
"main": "src/index.js",
"repository": {
@ -66,15 +62,9 @@
"author": "Budibase",
"license": "AGPL-3.0-or-later",
"dependencies": {
<<<<<<< HEAD
"@budibase/auth": "^0.9.116-alpha.3",
"@budibase/client": "^0.9.116-alpha.3",
"@budibase/string-templates": "^0.9.116-alpha.3",
=======
"@budibase/auth": "^0.9.116",
"@budibase/client": "^0.9.116",
"@budibase/string-templates": "^0.9.116",
>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
"@elastic/elasticsearch": "7.10.0",
"@koa/router": "8.0.0",
"@sendgrid/mail": "7.1.1",
@ -127,11 +117,7 @@
"devDependencies": {
"@babel/core": "^7.14.3",
"@babel/preset-env": "^7.14.4",
<<<<<<< HEAD
"@budibase/standard-components": "^0.9.116-alpha.3",
=======
"@budibase/standard-components": "^0.9.116",
>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
"@jest/test-sequencer": "^24.8.0",
"@types/bull": "^3.15.1",
"@types/jest": "^26.0.23",

8
packages/standard-components/package.json
View File

@ -29,19 +29,11 @@
"keywords": [
"svelte"
],
<<<<<<< HEAD
"version": "0.9.116-alpha.3",
"license": "MIT",
"gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
"dependencies": {
"@budibase/bbui": "^0.9.116-alpha.3",
=======
"version": "0.9.116",
"license": "MIT",
"gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
"dependencies": {
"@budibase/bbui": "^0.9.116",
>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
"@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3",

9
packages/worker/package.json
View File

@ -1,11 +1,7 @@
{
"name": "@budibase/worker",
"email": "hi@budibase.com",
<<<<<<< HEAD
"version": "0.9.116-alpha.3",
=======
"version": "0.9.116",
>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
"description": "Budibase background service",
"main": "src/index.js",
"repository": {
@ -27,13 +23,8 @@
"author": "Budibase",
"license": "AGPL-3.0-or-later",
"dependencies": {
<<<<<<< HEAD
"@budibase/auth": "^0.9.116-alpha.3",
"@budibase/string-templates": "^0.9.116-alpha.3",
=======
"@budibase/auth": "^0.9.116",
"@budibase/string-templates": "^0.9.116",
>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
"@koa/router": "^8.0.0",
"@techpass/passport-openidconnect": "^0.3.0",
"aws-sdk": "^2.811.0",