diff --git a/lerna.json b/lerna.json index f7afef9948..1972f5d7d2 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.76-alpha.3", + "version": "1.0.76-alpha.4", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/package.json b/package.json index 5111ad204f..22f5963bd2 100644 --- a/package.json +++ b/package.json @@ -42,8 +42,8 @@ "lint:fix:prettier": "prettier --write \"packages/**/*.{js,ts,svelte}\"", "lint:fix:ts": "lerna run lint:fix", "lint:fix": "yarn run lint:fix:ts && yarn run lint:fix:prettier && yarn run lint:fix:eslint", - "test:e2e": "lerna run cy:test", - "test:e2e:ci": "lerna run cy:ci", + "test:e2e": "lerna run cy:test --stream", + "test:e2e:ci": "lerna run cy:ci --stream", "build:docker": "lerna run build:docker && npm run build:docker:proxy:compose && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh $BUDIBASE_RELEASE_VERSION && cd -", "build:docker:proxy": "docker build hosting/proxy -t proxy-service", "build:docker:proxy:compose": "lerna run generate:proxy:compose && npm run build:docker:proxy", diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index bcacc06ab8..0897aef02f 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.76-alpha.3", + "version": "1.0.76-alpha.4", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index eb1c3da6f5..b3087cfd49 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": "1.0.76-alpha.3", + "version": "1.0.76-alpha.4", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/cypress.json b/packages/builder/cypress.json index fb9953ae6c..edad1f39d3 100644 --- a/packages/builder/cypress.json +++ b/packages/builder/cypress.json @@ -1,9 +1,10 @@ { - "baseUrl": "http://localhost:10001", + "baseUrl": "http://localhost:4100", "video": false, "projectId": "bmbemn", "env": { - "PORT": "10001", + "PORT": "4100", + "WORKER_PORT": "4200", "JWT_SECRET": "test", "HOST_IP": "" } diff --git a/packages/builder/cypress/setup.js b/packages/builder/cypress/setup.js index ca5a65c7f5..e19c931ed9 100644 --- a/packages/builder/cypress/setup.js +++ b/packages/builder/cypress/setup.js @@ -4,17 +4,17 @@ const path = require("path") const tmpdir = path.join(require("os").tmpdir(), ".budibase") // normal development system -const WORKER_PORT = "10002" -const MAIN_PORT = cypressConfig.env.PORT +const SERVER_PORT = cypressConfig.env.PORT +const WORKER_PORT = cypressConfig.env.WORKER_PORT + process.env.BUDIBASE_API_KEY = "6BE826CB-6B30-4AEC-8777-2E90464633DE" process.env.NODE_ENV = "cypress" process.env.ENABLE_ANALYTICS = "false" -process.env.PORT = MAIN_PORT process.env.JWT_SECRET = cypressConfig.env.JWT_SECRET process.env.COUCH_URL = `leveldb://${tmpdir}/.data/` process.env.SELF_HOSTED = 1 -process.env.WORKER_URL = "http://localhost:10002/" -process.env.APPS_URL = `http://localhost:${MAIN_PORT}/` +process.env.WORKER_URL = `http://localhost:${WORKER_PORT}/` +process.env.APPS_URL = `http://localhost:${SERVER_PORT}/` process.env.MINIO_URL = `http://localhost:4004` process.env.MINIO_ACCESS_KEY = "budibase" process.env.MINIO_SECRET_KEY = "budibase" @@ -33,11 +33,14 @@ exports.run = ( // require("dotenv").config({ path: resolve(dir, ".env") }) // don't make this a variable or top level require // it will cause environment module to be loaded prematurely - require(serverLoc) + + // override the port with the worker port temporarily process.env.PORT = WORKER_PORT require(workerLoc) - // reload main port for rest of system - process.env.PORT = MAIN_PORT + + // override the port with the server port + process.env.PORT = SERVER_PORT + require(serverLoc) } if (require.main === module) { diff --git a/packages/builder/package.json b/packages/builder/package.json index 3ca2a167b8..cf3f9a7d00 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.76-alpha.3", + "version": "1.0.76-alpha.4", "license": "GPL-3.0", "private": true, "scripts": { @@ -11,12 +11,13 @@ "rollup": "rollup -c -w", "cy:setup": "ts-node ./cypress/ts/setup.ts", "cy:setup:ci": "node ./cypress/setup.js", - "cy:run": "xvfb-run cypress run --headed --browser chrome", "cy:open": "cypress open", - "cy:run:ci": "cypress run --record", - "cy:test": "start-server-and-test cy:setup http://localhost:10001/builder cy:run", - "cy:ci": "start-server-and-test cy:setup:ci http://localhost:10001/builder cy:run", - "cy:debug": "start-server-and-test cy:setup http://localhost:10001/builder cy:open" + "cy:run": "cypress run", + "cy:run:ci": "xvfb-run cypress run --headed --browser chrome --record", + "cy:test": "start-server-and-test cy:setup http://localhost:4100/builder cy:run", + "cy:ci": "start-server-and-test cy:setup:ci http://localhost:4100/builder cy:run:ci", + "cy:debug": "start-server-and-test cy:setup http://localhost:4100/builder cy:open", + "cy:debug:ci": "start-server-and-test cy:setup:ci http://localhost:4100/builder cy:open" }, "jest": { "globals": { @@ -64,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.76-alpha.3", - "@budibase/client": "^1.0.76-alpha.3", - "@budibase/frontend-core": "^1.0.76-alpha.3", - "@budibase/string-templates": "^1.0.76-alpha.3", + "@budibase/bbui": "^1.0.76-alpha.4", + "@budibase/client": "^1.0.76-alpha.4", + "@budibase/frontend-core": "^1.0.76-alpha.4", + "@budibase/string-templates": "^1.0.76-alpha.4", "@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 49b4376d7d..c7b30b3749 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.76-alpha.3", + "version": "1.0.76-alpha.4", "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 1eed59e1f5..798d2f0073 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.76-alpha.3", + "version": "1.0.76-alpha.4", "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.76-alpha.3", - "@budibase/frontend-core": "^1.0.76-alpha.3", - "@budibase/string-templates": "^1.0.76-alpha.3", + "@budibase/bbui": "^1.0.76-alpha.4", + "@budibase/frontend-core": "^1.0.76-alpha.4", + "@budibase/string-templates": "^1.0.76-alpha.4", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 91ac12da2b..cbf854616d 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.76-alpha.3", + "version": "1.0.76-alpha.4", "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.76-alpha.3", + "@budibase/bbui": "^1.0.76-alpha.4", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 7dafc8396d..714901291c 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.76-alpha.3", + "version": "1.0.76-alpha.4", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -73,9 +73,9 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.76-alpha.3", - "@budibase/client": "^1.0.76-alpha.3", - "@budibase/string-templates": "^1.0.76-alpha.3", + "@budibase/backend-core": "^1.0.76-alpha.4", + "@budibase/client": "^1.0.76-alpha.4", + "@budibase/string-templates": "^1.0.76-alpha.4", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/server/scripts/likeCypress.ts b/packages/server/scripts/likeCypress.ts index 2ca4933ed7..5675966b68 100644 --- a/packages/server/scripts/likeCypress.ts +++ b/packages/server/scripts/likeCypress.ts @@ -2,14 +2,13 @@ * This script just makes it easy to re-create * * a cypress like environment for testing the backend * ******************************************************/ -const path = require("path") +import path from "path" const tmpdir = path.join(require("os").tmpdir(), ".budibase") -const MAIN_PORT = "10001" -const WORKER_PORT = "10002" +const SERVER_PORT = "4100" +const WORKER_PORT = "4200" // @ts-ignore -process.env.PORT = MAIN_PORT process.env.BUDIBASE_API_KEY = "6BE826CB-6B30-4AEC-8777-2E90464633DE" process.env.NODE_ENV = "cypress" process.env.ENABLE_ANALYTICS = "false" @@ -27,7 +26,11 @@ process.env.ALLOW_DEV_AUTOMATIONS = "1" // don't make this a variable or top level require // it will cause environment module to be loaded prematurely -const server = require("../src/app") + +// override the port with the worker port temporarily process.env.PORT = WORKER_PORT const worker = require("../../worker/src/index") -process.env.PORT = MAIN_PORT + +// override the port with the server port +process.env.PORT = SERVER_PORT +const server = require("../src/app") diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 2c399a7dac..cf79901c5c 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.76-alpha.3", + "version": "1.0.76-alpha.4", "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 14c8d7e402..7f4c8ad9ff 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.76-alpha.3", + "version": "1.0.76-alpha.4", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,8 +34,8 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.76-alpha.3", - "@budibase/string-templates": "^1.0.76-alpha.3", + "@budibase/backend-core": "^1.0.76-alpha.4", + "@budibase/string-templates": "^1.0.76-alpha.4", "@koa/router": "^8.0.0", "@sentry/node": "^6.0.0", "@techpass/passport-openidconnect": "^0.3.0",