wasp-lang/wasp
1
1
Fork 0
mirror of https://github.com/wasp-lang/wasp.git synced 2024-12-24 17:44:21 +03:00
Code Issues Projects Releases Wiki Activity

Adds support for FE listening on multiple addresses (#1048)

Browse Source
This commit is contained in:
Mihovil Ilakovac 2023-03-10 11:30:48 +01:00 committed by GitHub
parent 6844ba33bf
commit 6d979c1c7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 146 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
waspc/data/Generator/templates/react-app/vite.config.ts
View File

@ -6,6 +6,7 @@ export default defineConfig({
plugins: [react()],
server: {
port: 3000,
host: '0.0.0.0',
},
envPrefix: 'REACT_APP_',
build: {

2
waspc/data/Generator/templates/server/src/app.js
View File

@ -16,7 +16,7 @@ const app = express()
app.use(helmet())
app.use(cors({
// TODO: Consider allowing users to provide an ENV variable or function to further configure CORS setup.
origin: config.frontendUrl,
origin: config.allowedCORSOrigins,
}))
app.use(logger('dev'))
app.use(express.json())

29
waspc/data/Generator/templates/server/src/config.js
View File

@ -16,22 +16,38 @@ const config = {
port: parseInt(process.env.PORT) || 3001,
databaseUrl: process.env.{= databaseUrlEnvVar =},
frontendUrl: undefined,
allowedCORSOrigins: [],
{=# isAuthEnabled =}
auth: {
jwtSecret: undefined
}
{=/ isAuthEnabled =}
},
development: {
frontendUrl: stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL) || 'http://localhost:3000',
development: getDevelopmentConfig(),
production: getProductionConfig(),
}
const resolvedConfig = merge(config.all, config[env])
export default resolvedConfig
function getDevelopmentConfig() {
const frontendUrl = stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL) || 'http://localhost:3000';
return {
frontendUrl,
allowedCORSOrigins: '*',
{=# isAuthEnabled =}
auth: {
jwtSecret: 'DEVJWTSECRET'
}
{=/ isAuthEnabled =}
},
production: {
frontendUrl: stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL),
}
}
function getProductionConfig() {
const frontendUrl = stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL);
return {
frontendUrl,
allowedCORSOrigins: [frontendUrl],
{=# isAuthEnabled =}
auth: {
jwtSecret: process.env.JWT_SECRET
@ -39,6 +55,3 @@ const config = {
{=/ isAuthEnabled =}
}
}
const resolvedConfig = merge(config.all, config[env])
export default resolvedConfig

6
waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/.waspchecksums generated
View File

@ -95,14 +95,14 @@
"file",
"server/src/app.js"
],
"1e802078a0c6738f9dc2dc8f1739120d28fdc3d6fdc8029671ec9aed73c8ed72"
"f7df4b76a53a92117e0ddca41edd47961cf20ee6f13cc4d252e11c2a293a6e76"
],
[
[
"file",
"server/src/config.js"
],
"60a63ed453f6a6d8306f7a3660eff80b5f9803b37e5865db66fcae80df918a68"
"db65648bfa899b556f499abfde8a4cc6360b01dce88d9318456a8920e6a7d942"
],
[
[
@ -487,6 +487,6 @@
"file",
"web-app/vite.config.ts"
],
"ab5c138ab0ab01f5108c2da9a8bf6b673b79115ca97276f6293da8e3bc0a45b1"
"56541f643d10dec29609b98dfc0df75d4893a592396be2888e89591efc93bd7c"
]
]

2
waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/src/app.js generated
View File

@ -16,7 +16,7 @@ const app = express()
app.use(helmet())
app.use(cors({
// TODO: Consider allowing users to provide an ENV variable or function to further configure CORS setup.
origin: config.frontendUrl,
origin: config.allowedCORSOrigins,
}))
app.use(logger('dev'))
app.use(express.json())

25
waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/src/config.js generated
View File

@ -15,14 +15,27 @@ const config = {
port: parseInt(process.env.PORT) || 3001,
databaseUrl: process.env.DATABASE_URL,
frontendUrl: undefined,
allowedCORSOrigins: [],
},
development: {
frontendUrl: stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL) || 'http://localhost:3000',
},
production: {
frontendUrl: stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL),
}
development: getDevelopmentConfig(),
production: getProductionConfig(),
}
const resolvedConfig = merge(config.all, config[env])
export default resolvedConfig
function getDevelopmentConfig() {
const frontendUrl = stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL) || 'http://localhost:3000';
return {
frontendUrl,
allowedCORSOrigins: '*',
}
}
function getProductionConfig() {
const frontendUrl = stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL);
return {
frontendUrl,
allowedCORSOrigins: [frontendUrl],
}
}

1
waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/web-app/vite.config.ts generated
View File

@ -6,6 +6,7 @@ export default defineConfig({
plugins: [react()],
server: {
port: 3000,
host: '0.0.0.0',
},
envPrefix: 'REACT_APP_',
build: {

6
waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/.waspchecksums generated
View File

@ -95,14 +95,14 @@
"file",
"server/src/app.js"
],
"1e802078a0c6738f9dc2dc8f1739120d28fdc3d6fdc8029671ec9aed73c8ed72"
"f7df4b76a53a92117e0ddca41edd47961cf20ee6f13cc4d252e11c2a293a6e76"
],
[
[
"file",
"server/src/config.js"
],
"60a63ed453f6a6d8306f7a3660eff80b5f9803b37e5865db66fcae80df918a68"
"db65648bfa899b556f499abfde8a4cc6360b01dce88d9318456a8920e6a7d942"
],
[
[
@ -487,6 +487,6 @@
"file",
"web-app/vite.config.ts"
],
"ab5c138ab0ab01f5108c2da9a8bf6b673b79115ca97276f6293da8e3bc0a45b1"
"56541f643d10dec29609b98dfc0df75d4893a592396be2888e89591efc93bd7c"
]
]

2
waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/server/src/app.js generated
View File

@ -16,7 +16,7 @@ const app = express()
app.use(helmet())
app.use(cors({
// TODO: Consider allowing users to provide an ENV variable or function to further configure CORS setup.
origin: config.frontendUrl,
origin: config.allowedCORSOrigins,
}))
app.use(logger('dev'))
app.use(express.json())

25
waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/server/src/config.js generated
View File

@ -15,14 +15,27 @@ const config = {
port: parseInt(process.env.PORT) || 3001,
databaseUrl: process.env.DATABASE_URL,
frontendUrl: undefined,
allowedCORSOrigins: [],
},
development: {
frontendUrl: stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL) || 'http://localhost:3000',
},
production: {
frontendUrl: stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL),
}
development: getDevelopmentConfig(),
production: getProductionConfig(),
}
const resolvedConfig = merge(config.all, config[env])
export default resolvedConfig
function getDevelopmentConfig() {
const frontendUrl = stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL) || 'http://localhost:3000';
return {
frontendUrl,
allowedCORSOrigins: '*',
}
}
function getProductionConfig() {
const frontendUrl = stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL);
return {
frontendUrl,
allowedCORSOrigins: [frontendUrl],
}
}

1
waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/web-app/vite.config.ts generated
View File

@ -6,6 +6,7 @@ export default defineConfig({
plugins: [react()],
server: {
port: 3000,
host: '0.0.0.0',
},
envPrefix: 'REACT_APP_',
build: {

6
waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/.waspchecksums generated
View File

@ -116,14 +116,14 @@
"file",
"server/src/app.js"
],
"1e802078a0c6738f9dc2dc8f1739120d28fdc3d6fdc8029671ec9aed73c8ed72"
"f7df4b76a53a92117e0ddca41edd47961cf20ee6f13cc4d252e11c2a293a6e76"
],
[
[
"file",
"server/src/config.js"
],
"99e89fb4d207108caf0afeaf8f364819bac6f6d7c28a0a14b6ae7a4f134aa779"
"feb61b839f6ce3c1f49b279fd08275479308089a6f12188b312b64bdf571e6c5"
],
[
[
@ -753,6 +753,6 @@
"file",
"web-app/vite.config.ts"
],
"ab5c138ab0ab01f5108c2da9a8bf6b673b79115ca97276f6293da8e3bc0a45b1"
"56541f643d10dec29609b98dfc0df75d4893a592396be2888e89591efc93bd7c"
]
]

2
waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/server/src/app.js generated
View File

@ -16,7 +16,7 @@ const app = express()
app.use(helmet())
app.use(cors({
// TODO: Consider allowing users to provide an ENV variable or function to further configure CORS setup.
origin: config.frontendUrl,
origin: config.allowedCORSOrigins,
}))
app.use(logger('dev'))
app.use(express.json())

29
waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/server/src/config.js generated
View File

@ -15,23 +15,36 @@ const config = {
port: parseInt(process.env.PORT) || 3001,
databaseUrl: process.env.DATABASE_URL,
frontendUrl: undefined,
allowedCORSOrigins: [],
auth: {
jwtSecret: undefined
}
},
development: {
frontendUrl: stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL) || 'http://localhost:3000',
development: getDevelopmentConfig(),
production: getProductionConfig(),
}
const resolvedConfig = merge(config.all, config[env])
export default resolvedConfig
function getDevelopmentConfig() {
const frontendUrl = stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL) || 'http://localhost:3000';
return {
frontendUrl,
allowedCORSOrigins: '*',
auth: {
jwtSecret: 'DEVJWTSECRET'
}
},
production: {
frontendUrl: stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL),
}
}
function getProductionConfig() {
const frontendUrl = stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL);
return {
frontendUrl,
allowedCORSOrigins: [frontendUrl],
auth: {
jwtSecret: process.env.JWT_SECRET
}
}
}
const resolvedConfig = merge(config.all, config[env])
export default resolvedConfig

1
waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/web-app/vite.config.ts generated
View File

@ -6,6 +6,7 @@ export default defineConfig({
plugins: [react()],
server: {
port: 3000,
host: '0.0.0.0',
},
envPrefix: 'REACT_APP_',
build: {

6
waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/.waspchecksums generated
View File

@ -95,14 +95,14 @@
"file",
"server/src/app.js"
],
"1e802078a0c6738f9dc2dc8f1739120d28fdc3d6fdc8029671ec9aed73c8ed72"
"f7df4b76a53a92117e0ddca41edd47961cf20ee6f13cc4d252e11c2a293a6e76"
],
[
[
"file",
"server/src/config.js"
],
"60a63ed453f6a6d8306f7a3660eff80b5f9803b37e5865db66fcae80df918a68"
"db65648bfa899b556f499abfde8a4cc6360b01dce88d9318456a8920e6a7d942"
],
[
[
@ -501,6 +501,6 @@
"file",
"web-app/vite.config.ts"
],
"ab5c138ab0ab01f5108c2da9a8bf6b673b79115ca97276f6293da8e3bc0a45b1"
"56541f643d10dec29609b98dfc0df75d4893a592396be2888e89591efc93bd7c"
]
]

2
waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/server/src/app.js generated
View File

@ -16,7 +16,7 @@ const app = express()
app.use(helmet())
app.use(cors({
// TODO: Consider allowing users to provide an ENV variable or function to further configure CORS setup.
origin: config.frontendUrl,
origin: config.allowedCORSOrigins,
}))
app.use(logger('dev'))
app.use(express.json())

25
waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/server/src/config.js generated
View File

@ -15,14 +15,27 @@ const config = {
port: parseInt(process.env.PORT) || 3001,
databaseUrl: process.env.DATABASE_URL,
frontendUrl: undefined,
allowedCORSOrigins: [],
},
development: {
frontendUrl: stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL) || 'http://localhost:3000',
},
production: {
frontendUrl: stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL),
}
development: getDevelopmentConfig(),
production: getProductionConfig(),
}
const resolvedConfig = merge(config.all, config[env])
export default resolvedConfig
function getDevelopmentConfig() {
const frontendUrl = stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL) || 'http://localhost:3000';
return {
frontendUrl,
allowedCORSOrigins: '*',
}
}
function getProductionConfig() {
const frontendUrl = stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL);
return {
frontendUrl,
allowedCORSOrigins: [frontendUrl],
}
}

1
waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/web-app/vite.config.ts generated
View File

@ -6,6 +6,7 @@ export default defineConfig({
plugins: [react()],
server: {
port: 3000,
host: '0.0.0.0',
},
envPrefix: 'REACT_APP_',
build: {

6
waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/.waspchecksums generated
View File

@ -95,14 +95,14 @@
"file",
"server/src/app.js"
],
"1e802078a0c6738f9dc2dc8f1739120d28fdc3d6fdc8029671ec9aed73c8ed72"
"f7df4b76a53a92117e0ddca41edd47961cf20ee6f13cc4d252e11c2a293a6e76"
],
[
[
"file",
"server/src/config.js"
],
"60a63ed453f6a6d8306f7a3660eff80b5f9803b37e5865db66fcae80df918a68"
"db65648bfa899b556f499abfde8a4cc6360b01dce88d9318456a8920e6a7d942"
],
[
[
@ -487,6 +487,6 @@
"file",
"web-app/vite.config.ts"
],
"ab5c138ab0ab01f5108c2da9a8bf6b673b79115ca97276f6293da8e3bc0a45b1"
"56541f643d10dec29609b98dfc0df75d4893a592396be2888e89591efc93bd7c"
]
]

2
waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/server/src/app.js generated
View File

@ -16,7 +16,7 @@ const app = express()
app.use(helmet())
app.use(cors({
// TODO: Consider allowing users to provide an ENV variable or function to further configure CORS setup.
origin: config.frontendUrl,
origin: config.allowedCORSOrigins,
}))
app.use(logger('dev'))
app.use(express.json())

25
waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/server/src/config.js generated
View File

@ -15,14 +15,27 @@ const config = {
port: parseInt(process.env.PORT) || 3001,
databaseUrl: process.env.DATABASE_URL,
frontendUrl: undefined,
allowedCORSOrigins: [],
},
development: {
frontendUrl: stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL) || 'http://localhost:3000',
},
production: {
frontendUrl: stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL),
}
development: getDevelopmentConfig(),
production: getProductionConfig(),
}
const resolvedConfig = merge(config.all, config[env])
export default resolvedConfig
function getDevelopmentConfig() {
const frontendUrl = stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL) || 'http://localhost:3000';
return {
frontendUrl,
allowedCORSOrigins: '*',
}
}
function getProductionConfig() {
const frontendUrl = stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL);
return {
frontendUrl,
allowedCORSOrigins: [frontendUrl],
}
}

1
waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/web-app/vite.config.ts generated
View File

@ -6,6 +6,7 @@ export default defineConfig({
plugins: [react()],
server: {
port: 3000,
host: '0.0.0.0',
},
envPrefix: 'REACT_APP_',
build: {

2
waspc/examples/todoApp/todoApp.wasp
View File

@ -1,6 +1,6 @@
app todoApp {
wasp: {
version: "^0.8.0"
version: "^0.9.0"
},
title: "ToDo App",
// head: [],