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

Update builder to hit port 1000

This commit is contained in:
Andrew Kingston 2021-04-01 10:59:15 +01:00
parent 677c3e0e86
commit f2a898147f
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/builder/cypress.json
View File

@ -1,9 +1,9 @@
{ {
"baseUrl": "http://localhost:4001/builder/", "baseUrl": "http://localhost:10000/builder/",
"video": true, "video": true,
"projectId": "bmbemn", "projectId": "bmbemn",
"env": { "env": {
"PORT": "4001", "PORT": "10000",
"JWT_SECRET": "test" "JWT_SECRET": "test"
} }
} }

4
packages/builder/package.json
View File

@ -15,8 +15,8 @@
"cy:run": "cypress run", "cy:run": "cypress run",
"cy:open": "cypress open", "cy:open": "cypress open",
"cy:run:ci": "cypress run --browser electron --record --key f308590b-6070-41af-b970-794a3823d451", "cy:run:ci": "cypress run --browser electron --record --key f308590b-6070-41af-b970-794a3823d451",
"cy:test": "start-server-and-test cy:setup http://localhost:4001/builder cy:run", "cy:test": "start-server-and-test cy:setup http://localhost:10000/builder cy:run",
"cy:ci": "start-server-and-test cy:setup http://localhost:4001/builder cy:run:ci" "cy:ci": "start-server-and-test cy:setup http://localhost:10000/builder cy:run:ci"
}, },
"jest": { "jest": {
"globals": { "globals": {

3
packages/builder/src/builderStore/api.js
View File

@ -8,8 +8,7 @@ const apiCall = method => async (
) => { ) => {
headers["x-budibase-app-id"] = svelteGet(store).appId headers["x-budibase-app-id"] = svelteGet(store).appId
const json = headers["Content-Type"] === "application/json" const json = headers["Content-Type"] === "application/json"
const fullUrl = `http://192.168.1.175:4001${url}` return await fetch(url, {
return await fetch(fullUrl, {
method: method, method: method,
body: json ? JSON.stringify(body) : body, body: json ? JSON.stringify(body) : body,
headers, headers,

6
packages/server/src/api/controllers/static/index.js
View File

@ -130,11 +130,11 @@ exports.serveAttachment = async function(ctx) {
exports.serveAppAsset = async function(ctx) { exports.serveAppAsset = async function(ctx) {
// TODO: can we just always serve this locally? is anything in S3? // TODO: can we just always serve this locally? is anything in S3?
if (env.isDev() || env.isTest()) { // if (env.isDev() || env.isTest()) {
const builderPath = resolve(__dirname, "../../../../builder/assets") const builderPath = resolve(__dirname, "../../../../builder/assets")
return send(ctx, ctx.file, { root: builderPath }) return send(ctx, ctx.file, { root: builderPath })
} // }
await returnObjectStoreFile(ctx, join(ctx.user.appId, "public", ctx.file)) // await returnObjectStoreFile(ctx, join(ctx.user.appId, "public", ctx.file))
} }
exports.serveComponentLibrary = async function(ctx) { exports.serveComponentLibrary = async function(ctx) {