ufkc7e3d
/
budibase
forked from tsai/budibase
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

chore: resolved merge conflicts from develop branch

master
Vinoth Kirubakaran 5 years ago
parent
2140be55f2 bd32fae00f
commit
96599cae65
13 changed files with 120 additions and 103 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      lerna.json
  2. 6
      package.json
  3. 2
      packages/backend-core/package.json
  4. 4
      packages/bbui/package.json
  5. 10
      packages/builder/package.json
  6. 2
      packages/cli/package.json
  7. 8
      packages/client/package.json
  8. 4
      packages/frontend-core/package.json
  9. 145
      packages/server/package.json
  10. 2
      packages/string-templates/package.json
  11. 6
      packages/worker/package.json
  12. 24
      scripts/pro/install.sh
  13. 8
      scripts/pro/release.sh

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.0.105-alpha.30", "version": "1.0.105-alpha.32",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*" "packages/*"

6
package.json
View File

@ -25,8 +25,8 @@
"build": "lerna run build", "build": "lerna run build",
"release": "lerna publish patch --yes --force-publish && yarn release:pro", "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:develop": "lerna publish prerelease --yes --force-publish --dist-tag develop && yarn release:pro:develop",
"release:pro": "sh scripts/pro/release.sh", "release:pro": "bash scripts/pro/release.sh",
"release:pro:develop": "sh scripts/pro/release.sh develop", "release:pro:develop": "bash scripts/pro/release.sh develop",
"restore": "yarn run clean && yarn run bootstrap && yarn run build", "restore": "yarn run clean && yarn run bootstrap && yarn run build",
"nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke": "yarn run nuke:packages && yarn run nuke:docker",
"nuke:packages": "yarn run restore", "nuke:packages": "yarn run restore",
@ -74,6 +74,6 @@
"mode:account": "yarn mode:cloud && yarn env:account:enable", "mode:account": "yarn mode:cloud && yarn env:account:enable",
"security:audit": "node scripts/audit.js", "security:audit": "node scripts/audit.js",
"postinstall": "husky install", "postinstall": "husky install",
"install:pro": "sh ./scripts/pro/install.sh" "install:pro": "bash scripts/pro/install.sh"
} }
} }

2
packages/backend-core/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/backend-core", "name": "@budibase/backend-core",
"version": "1.0.105-alpha.30", "version": "1.0.105-alpha.32",
"description": "Budibase backend core libraries used in server and worker", "description": "Budibase backend core libraries used in server and worker",
"main": "src/index.js", "main": "src/index.js",
"author": "Budibase", "author": "Budibase",

4
packages/bbui/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/bbui", "name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.", "description": "A UI solution used in the different Budibase projects.",
"version": "1.0.105-alpha.30", "version": "1.0.105-alpha.32",
"license": "MPL-2.0", "license": "MPL-2.0",
"svelte": "src/index.js", "svelte": "src/index.js",
"module": "dist/bbui.es.js", "module": "dist/bbui.es.js",
@ -38,7 +38,7 @@
], ],
"dependencies": { "dependencies": {
"@adobe/spectrum-css-workflow-icons": "^1.2.1", "@adobe/spectrum-css-workflow-icons": "^1.2.1",
"@budibase/string-templates": "^1.0.105-alpha.30", "@budibase/string-templates": "^1.0.105-alpha.32",
"@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actionbutton": "^1.0.1",
"@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1",
"@spectrum-css/avatar": "^3.0.2", "@spectrum-css/avatar": "^3.0.2",

10
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/builder", "name": "@budibase/builder",
"version": "1.0.105-alpha.30", "version": "1.0.105-alpha.32",
"license": "GPL-3.0", "license": "GPL-3.0",
"private": true, "private": true,
"scripts": { "scripts": {
@ -65,10 +65,10 @@
} }
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "^1.0.105-alpha.30", "@budibase/bbui": "^1.0.105-alpha.32",
"@budibase/client": "^1.0.105-alpha.30", "@budibase/client": "^1.0.105-alpha.32",
"@budibase/frontend-core": "^1.0.105-alpha.30", "@budibase/frontend-core": "^1.0.105-alpha.32",
"@budibase/string-templates": "^1.0.105-alpha.30", "@budibase/string-templates": "^1.0.105-alpha.32",
"@sentry/browser": "5.19.1", "@sentry/browser": "5.19.1",
"@spectrum-css/page": "^3.0.1", "@spectrum-css/page": "^3.0.1",
"@spectrum-css/vars": "^3.0.1", "@spectrum-css/vars": "^3.0.1",

2
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/cli", "name": "@budibase/cli",
"version": "1.0.105-alpha.30", "version": "1.0.105-alpha.32",
"description": "Budibase CLI, for developers, self hosting and migrations.", "description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js", "main": "src/index.js",
"bin": { "bin": {

8
packages/client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/client", "name": "@budibase/client",
"version": "1.0.105-alpha.30", "version": "1.0.105-alpha.32",
"license": "MPL-2.0", "license": "MPL-2.0",
"module": "dist/budibase-client.js", "module": "dist/budibase-client.js",
"main": "dist/budibase-client.js", "main": "dist/budibase-client.js",
@ -19,9 +19,9 @@
"dev:builder": "rollup -cw" "dev:builder": "rollup -cw"
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "^1.0.105-alpha.30", "@budibase/bbui": "^1.0.105-alpha.32",
"@budibase/frontend-core": "^1.0.105-alpha.30", "@budibase/frontend-core": "^1.0.105-alpha.32",
"@budibase/string-templates": "^1.0.105-alpha.30", "@budibase/string-templates": "^1.0.105-alpha.32",
"@spectrum-css/button": "^3.0.3", "@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3", "@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3", "@spectrum-css/divider": "^1.0.3",

4
packages/frontend-core/package.json
View File

@ -1,12 +1,12 @@
{ {
"name": "@budibase/frontend-core", "name": "@budibase/frontend-core",
"version": "1.0.105-alpha.30", "version": "1.0.105-alpha.32",
"description": "Budibase frontend core libraries used in builder and client", "description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase", "author": "Budibase",
"license": "MPL-2.0", "license": "MPL-2.0",
"svelte": "src/index.js", "svelte": "src/index.js",
"dependencies": { "dependencies": {
"@budibase/bbui": "^1.0.105-alpha.30", "@budibase/bbui": "^1.0.105-alpha.32",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"svelte": "^3.46.2" "svelte": "^3.46.2"
} }

145
packages/server/package.json
View File

@ -1,19 +1,85 @@
{ {
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "1.0.105-alpha.29",
"description": "Budibase Web Server",
"main": "src/index.ts",
"repository": {
"type": "git",
"url": "https://github.com/Budibase/budibase.git"
},
"scripts": {
"build": "rimraf dist/ && tsc -p tsconfig.build.json && mv dist/src/* dist/ && rimraf dist/src/ && yarn postbuild",
"postbuild": "copyfiles -u 1 src/**/*.svelte dist/ && copyfiles -u 1 src/**/*.hbs dist/ && copyfiles -u 1 src/**/*.json dist/",
"test": "jest --coverage --maxWorkers=2",
"test:watch": "jest --watch",
"predocker": "copyfiles -f ../client/dist/budibase-client.js ../client/manifest.json client",
"build:docker": "yarn run predocker && docker build . -t app-service --label version=$BUDIBASE_RELEASE_VERSION",
"build:docs": "node ./scripts/docs/generate.js open",
"run:docker": "node dist/index.js",
"dev:stack:up": "node scripts/dev/manage.js up",
"dev:stack:down": "node scripts/dev/manage.js down",
"dev:stack:nuke": "node scripts/dev/manage.js nuke",
"dev:builder": "yarn run dev:stack:up && nodemon",
"specs": "node specs/generate.js && openapi-typescript specs/openapi.yaml --output src/definitions/openapi.ts",
"initialise": "node scripts/initialise.js",
"env:multi:enable": "node scripts/multiTenancy.js enable",
"env:multi:disable": "node scripts/multiTenancy.js disable",
"env:selfhost:enable": "node scripts/selfhost.js enable",
"env:selfhost:disable": "node scripts/selfhost.js disable",
"env:localdomain:enable": "node scripts/localdomain.js enable",
"env:localdomain:disable": "node scripts/localdomain.js disable",
"env:account:enable": "node scripts/account.js enable",
"env:account:disable": "node scripts/account.js disable"
},
"jest": {
"preset": "ts-jest",
"testEnvironment": "node",
"setupFiles": [
"./scripts/jestSetup.js"
],
"collectCoverageFrom": [
"src/**/*.js",
"!**/node_modules/**",
"!src/db/views/*.js",
"!src/api/controllers/deploy/**/*.js",
"!src/*.js",
"!src/api/controllers/static/**/*",
"!src/db/dynamoClient.js",
"!src/utilities/usageQuota.js",
"!src/api/routes/tests/**/*",
"!src/db/tests/**/*",
"!src/tests/**/*",
"!src/automations/tests/**/*",
"!src/utilities/fileProcessor.js",
"!src/utilities/fileSystem/**/*",
"!src/utilities/redis.js"
],
"coverageReporters": [
"lcov",
"json",
"clover"
]
},
"keywords": [
"budibase"
],
"author": "Budibase", "author": "Budibase",
"license": "GPL-3.0",
"dependencies": { "dependencies": {
"@apidevtools/swagger-parser": "^10.0.3", "@apidevtools/swagger-parser": "^10.0.3",
"@budibase/backend-core": "^1.0.105-alpha.30", "@budibase/backend-core": "^1.0.105-alpha.29",
"@budibase/client": "^1.0.105-alpha.30", "@budibase/client": "^1.0.105-alpha.29",
"@budibase/pro": "^1.0.0", "@budibase/pro": "^1.0.0",
"@budibase/string-templates": "^1.0.105-alpha.30", "@budibase/string-templates": "^1.0.105-alpha.29",
"@bull-board/api": "^3.7.0", "@bull-board/api": "^3.7.0",
"@bull-board/koa": "^3.7.0", "@bull-board/koa": "^3.7.0",
"@elastic/elasticsearch": "7.10.0", "@elastic/elasticsearch": "7.10.0",
"@google-cloud/firestore": "^5.0.2", "@google-cloud/firestore": "^5.0.2",
"@koa/router": "8.0.0", "@koa/router": "8.0.0",
"@sendgrid/mail": "7.1.1", "@sendgrid/mail": "7.1.1",
"@sentry/node": "6.17.7",
"@types/global-agent": "^2.1.1", "@types/global-agent": "^2.1.1",
"@sentry/node": "6.17.7",
"@types/koa__router": "^8.0.11", "@types/koa__router": "^8.0.11",
"airtable": "0.10.1", "airtable": "0.10.1",
"arangojs": "7.2.0", "arangojs": "7.2.0",
@ -73,7 +139,6 @@
"yargs": "13.2.4", "yargs": "13.2.4",
"zlib": "1.0.5" "zlib": "1.0.5"
}, },
"description": "Budibase Web Server",
"devDependencies": { "devDependencies": {
"@babel/core": "^7.14.3", "@babel/core": "^7.14.3",
"@babel/preset-env": "^7.14.4", "@babel/preset-env": "^7.14.4",
@ -111,70 +176,8 @@
"typescript": "^4.5.5", "typescript": "^4.5.5",
"update-dotenv": "^1.1.1" "update-dotenv": "^1.1.1"
}, },
"email": "hi@budibase.com", "optionalDependencies": {
"gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc", "oracledb": "^5.3.0"
"jest": {
"collectCoverageFrom": [
"src/**/*.js",
"!**/node_modules/**",
"!src/db/views/*.js",
"!src/api/controllers/deploy/**/*.js",
"!src/*.js",
"!src/api/controllers/static/**/*",
"!src/db/dynamoClient.js",
"!src/utilities/usageQuota.js",
"!src/api/routes/tests/**/*",
"!src/db/tests/**/*",
"!src/tests/**/*",
"!src/automations/tests/**/*",
"!src/utilities/fileProcessor.js",
"!src/utilities/fileSystem/**/*",
"!src/utilities/redis.js"
],
"coverageReporters": [
"lcov",
"json",
"clover"
],
"preset": "ts-jest",
"setupFiles": [
"./scripts/jestSetup.js"
],
"testEnvironment": "node"
},
"keywords": [
"budibase"
],
"license": "GPL-3.0",
"main": "src/index.ts",
"name": "@budibase/server",
"repository": {
"type": "git",
"url": "https://github.com/Budibase/budibase.git"
},
"scripts": {
"build": "rimraf dist/ && tsc -p tsconfig.build.json && mv dist/src/* dist/ && rimraf dist/src/ && yarn postbuild",
"build:docker": "yarn run predocker && docker build . -t app-service --label version=$BUDIBASE_RELEASE_VERSION",
"build:docs": "node ./scripts/docs/generate.js open",
"dev:builder": "yarn run dev:stack:up && nodemon",
"dev:stack:down": "node scripts/dev/manage.js down",
"dev:stack:nuke": "node scripts/dev/manage.js nuke",
"dev:stack:up": "node scripts/dev/manage.js up",
"env:account:disable": "node scripts/account.js disable",
"env:account:enable": "node scripts/account.js enable",
"env:localdomain:disable": "node scripts/localdomain.js disable",
"env:localdomain:enable": "node scripts/localdomain.js enable",
"env:multi:disable": "node scripts/multiTenancy.js disable",
"env:multi:enable": "node scripts/multiTenancy.js enable",
"env:selfhost:disable": "node scripts/selfhost.js disable",
"env:selfhost:enable": "node scripts/selfhost.js enable",
"initialise": "node scripts/initialise.js",
"postbuild": "copyfiles -u 1 src/**/*.svelte dist/ && copyfiles -u 1 src/**/*.hbs dist/ && copyfiles -u 1 src/**/*.json dist/",
"predocker": "copyfiles -f ../client/dist/budibase-client.js ../client/manifest.json client",
"run:docker": "node dist/index.js",
"specs": "node specs/generate.js && openapi-typescript specs/openapi.yaml --output src/definitions/openapi.ts",
"test": "jest --coverage --maxWorkers=2",
"test:watch": "jest --watch"
}, },
"version": "1.0.105-alpha.30" "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
} }

2
packages/string-templates/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/string-templates", "name": "@budibase/string-templates",
"version": "1.0.105-alpha.30", "version": "1.0.105-alpha.32",
"description": "Handlebars wrapper for Budibase templating.", "description": "Handlebars wrapper for Budibase templating.",
"main": "src/index.cjs", "main": "src/index.cjs",
"module": "dist/bundle.mjs", "module": "dist/bundle.mjs",

6
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/worker", "name": "@budibase/worker",
"email": "hi@budibase.com", "email": "hi@budibase.com",
"version": "1.0.105-alpha.30", "version": "1.0.105-alpha.32",
"description": "Budibase background service", "description": "Budibase background service",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
@ -31,9 +31,9 @@
"author": "Budibase", "author": "Budibase",
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@budibase/backend-core": "^1.0.105-alpha.30", "@budibase/backend-core": "^1.0.105-alpha.32",
"@budibase/pro": "^1.0.0", "@budibase/pro": "^1.0.0",
"@budibase/string-templates": "^1.0.105-alpha.30", "@budibase/string-templates": "^1.0.105-alpha.32",
"@koa/router": "^8.0.0", "@koa/router": "^8.0.0",
"@sentry/node": "6.17.7", "@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "^0.3.0", "@techpass/passport-openidconnect": "^0.3.0",

24
scripts/pro/install.sh
View File

@ -11,14 +11,20 @@ BASE_BRANCH=$2
cd ../ cd ../
echo "Cloning pro repo..." echo "Cloning pro repo..."
git clone https://$PERSONAL_ACCESS_TOKEN@github.com/Budibase/budibase-pro.git git clone https://$PERSONAL_ACCESS_TOKEN@github.com/Budibase/budibase-pro.git
cd budibase-pro
# Try to checkout the matching pro branch # Community forks won't be able to clone the pro repo as they can't access secrets
git checkout $BRANCH # Skip the rest of the installation and rely on npm version instead
# Try to checkout the matching pro base (master or develop) branch # This should be ok as forks will not rely on pro changes
git checkout $BASE_BRANCH if [[ -d "budibase-pro" ]]; then
# If neither branch exists continue with default branch 'develop' cd budibase-pro
git pull
echo "Initializing pro repo..." # Try to checkout the matching pro branch
yarn setup git checkout $BRANCH
# Try to checkout the matching pro base (master or develop) branch
git checkout $BASE_BRANCH
# If neither branch exists continue with default branch 'develop'
git pull
echo "Initializing pro repo..."
yarn setup
fi

8
scripts/pro/release.sh
View File

@ -29,6 +29,14 @@ echo "Releasing version $VERSION"
echo "Releasing tag $TAG" echo "Releasing tag $TAG"
lerna publish $VERSION --yes --force-publish --dist-tag $TAG lerna publish $VERSION --yes --force-publish --dist-tag $TAG
# reset main and types to point to src for dev
cd packages/pro
jq '.main = "src/index.ts" | .types = "src/index.ts"' package.json > package.json.tmp && mv package.json.tmp package.json
cd ../../
git add packages/pro/package.json
git commit -m 'Prep dev'
git push
cd - cd -
if [[ $COMMAND == "develop" ]]; then if [[ $COMMAND == "develop" ]]; then

Write Preview
Loading…
Cancel
Save