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

Merge branch 'feature/global-user-management' of https://github.com/Budibase/budibase into feature/global-user-management

This commit is contained in:
Martin McKeaveney 2021-04-08 11:20:42 +01:00
parent c7f4070ff5 d0e5967851
commit f9dd480bb3
7 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -63,7 +63,7 @@ typings/
# dotenv environment variables file # dotenv environment variables file
.env .env
!hosting/.env !hosting/.env
hosting/generated-envoy.dev.yaml hosting/.generated-envoy.dev.yaml
# parcel-bundler cache (https://parceljs.org/) # parcel-bundler cache (https://parceljs.org/)
.cache .cache

2
hosting/docker-compose.dev.yaml
View File

@ -27,7 +27,7 @@ services:
restart: always restart: always
image: envoyproxy/envoy:v1.16-latest image: envoyproxy/envoy:v1.16-latest
volumes: volumes:
- ./generated-envoy.dev.yaml:/etc/envoy/envoy.yaml - ./.generated-envoy.dev.yaml:/etc/envoy/envoy.yaml
ports: ports:
- "${MAIN_PORT}:10000" - "${MAIN_PORT}:10000"
depends_on: depends_on:

6
package.json
View File

@ -22,9 +22,9 @@
"initialise": "lerna run initialise", "initialise": "lerna run initialise",
"publishdev": "lerna run publishdev", "publishdev": "lerna run publishdev",
"publishnpm": "yarn build && lerna publish --force-publish", "publishnpm": "yarn build && lerna publish --force-publish",
"restore": "npm run clean && npm run bootstrap && npm run build", "restore": "yarn run clean && yarn run bootstrap && yarn run build",
"nuke": "npm run nuke:packages && npm run nuke:docker", "nuke": "yarn run nuke:packages && yarn run nuke:docker",
"nuke:packages": "npm run restore", "nuke:packages": "yarn run restore",
"nuke:docker": "lerna run --parallel dev:stack:nuke", "nuke:docker": "lerna run --parallel dev:stack:nuke",
"clean": "lerna clean", "clean": "lerna clean",
"kill-port": "kill-port 4001", "kill-port": "kill-port 4001",

6
packages/builder/README.md
View File

@ -1,6 +1,6 @@
## Get Started ## Get Started
`npm install` `yarn install`
Webpack dev server (port 8080): `npm run dev` Vite dev server (port 3000): `yarn run dev`
Build `npm run build` Build `yarn run build`

2
packages/builder/cypress/support/commands.js
View File

@ -26,6 +26,8 @@
Cypress.Commands.add("createApp", name => { Cypress.Commands.add("createApp", name => {
cy.visit(`localhost:${Cypress.env("PORT")}/builder`) cy.visit(`localhost:${Cypress.env("PORT")}/builder`)
// wait for init API calls on visit
cy.wait(100)
cy.contains("Create New Web App").click() cy.contains("Create New Web App").click()
cy.get("body") cy.get("body")
.then($body => { .then($body => {

4
packages/server/package.json
View File

@ -32,14 +32,14 @@
} }
}, },
"scripts": { "scripts": {
"test": "jest --testPathIgnorePatterns=routes && npm run test:integration", "test": "jest --testPathIgnorePatterns=routes && yarn run test:integration",
"test:integration": "jest --coverage --detectOpenHandles", "test:integration": "jest --coverage --detectOpenHandles",
"test:watch": "jest --watch", "test:watch": "jest --watch",
"run:docker": "node src/index", "run:docker": "node src/index",
"dev:stack:up": "node scripts/dev/manage.js up", "dev:stack:up": "node scripts/dev/manage.js up",
"dev:stack:down": "node scripts/dev/manage.js down", "dev:stack:down": "node scripts/dev/manage.js down",
"dev:stack:nuke": "node scripts/dev/manage.js nuke", "dev:stack:nuke": "node scripts/dev/manage.js nuke",
"dev:builder": "npm run dev:stack:up && nodemon src/index.js", "dev:builder": "yarn run dev:stack:up && nodemon src/index.js",
"electron": "electron src/electron.js", "electron": "electron src/electron.js",
"build:electron": "electron-builder --dir", "build:electron": "electron-builder --dir",
"publish:electron": "electron-builder -mwl --publish always", "publish:electron": "electron-builder -mwl --publish always",

2
packages/server/scripts/dev/manage.js
View File

@ -25,7 +25,7 @@ async function init() {
// generate envoy file, always do this incase it has changed // generate envoy file, always do this incase it has changed
const hostingPath = path.join(process.cwd(), "..", "..", "hosting") const hostingPath = path.join(process.cwd(), "..", "..", "hosting")
const envoyHbsPath = path.join(hostingPath, "envoy.dev.yaml.hbs") const envoyHbsPath = path.join(hostingPath, "envoy.dev.yaml.hbs")
const envoyOutputPath = path.join(hostingPath, "generated-envoy.dev.yaml") const envoyOutputPath = path.join(hostingPath, ".generated-envoy.dev.yaml")
const contents = fs.readFileSync(envoyHbsPath, "utf8") const contents = fs.readFileSync(envoyHbsPath, "utf8")
const config = { const config = {
address: isLinux() ? "172.17.0.1" : "host.docker.internal", address: isLinux() ? "172.17.0.1" : "host.docker.internal",