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

.gitignore

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

hosting/docker-compose.dev.yaml

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

package.json

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

packages/builder/README.md

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

packages/builder/cypress/support/commands.js

@@ -26,6 +26,8 @@
 
 Cypress.Commands.add("createApp", name => {
   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.get("body")
     .then($body => {

packages/server/package.json

@@ -32,14 +32,14 @@
     }
   },
   "scripts": {
-    "test": "jest --testPathIgnorePatterns=routes && npm run test:integration",
+    "test": "jest --testPathIgnorePatterns=routes && yarn run test:integration",
     "test:integration": "jest --coverage --detectOpenHandles",
     "test:watch": "jest --watch",
     "run:docker": "node src/index",
     "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": "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",
     "build:electron": "electron-builder --dir",
     "publish:electron": "electron-builder -mwl --publish always",

packages/server/scripts/dev/manage.js

@@ -25,7 +25,7 @@ async function init() {
   // generate envoy file, always do this incase it has changed
   const hostingPath = path.join(process.cwd(), "..", "..", "hosting")
   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 config = {
     address: isLinux() ? "172.17.0.1" : "host.docker.internal",