Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Extracts config.json into its own module #1061

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

Extracts config.json into its own module #1061

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
abfbf20
Extracts FlexServer settings into a config module
Spoffy Jun 20, 2024
7f2fbb4
Adds comment about untrustedContentRoot not being used
Spoffy Jun 20, 2024
5837de1
WIP - Type checked config file.
Spoffy Jun 21, 2024
7032e7c
Splits config into separate files
Spoffy Jun 24, 2024
4e3ff70
Fixes various typing issues
Spoffy Jun 24, 2024
a8091f8
Makes config initialise when file not found
Spoffy Jun 24, 2024
7592540
Moved config load into main()
Spoffy Jun 24, 2024
d84761b
Removes error handling in getGlobalConfig
Spoffy Jun 24, 2024
fbef8ca
Adds non-async config loader and unified memory/file/defaults
Spoffy Jun 25, 2024
7c70a84
Cleans up some linter complaints
Spoffy Jun 25, 2024
7be4383
Renames `loadLoginSystem` to `addLoginMiddleware`
Spoffy Jun 25, 2024
1cf0178
Renames 'login' to 'loginMiddleware' FlexServer dep
Spoffy Jun 25, 2024
66b3f71
Makes import formatting consistent
Spoffy Jun 25, 2024
f1498e4
Adds tests for config.ts
Spoffy Jun 25, 2024
9276595
Adds configCore and configCoreFileFormats tests
Spoffy Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Moved config load into main()
  • Loading branch information
@Spoffy
Spoffy committed Jun 25, 2024
commit 7592540cc1e1d81dba3bcc796dd493dadc6ddbbd
5 changes: 3 additions & 2 deletions app/server/mergedServerMain.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ export async function main(port: number, serverTypes: ServerType[],
const includeStatic = serverTypes.includes("static");
const includeApp = serverTypes.includes("app");

options.settings ??= await getGlobalConfig();

const server = new FlexServer(port, `server(${serverTypes.join(",")})`, options);

// We need to know early on whether we will be serving plugins or not.
Expand Down Expand Up @@ -196,7 +198,6 @@ export async function main(port: number, serverTypes: ServerType[],

export async function startMain() {
try {
const config = await getGlobalConfig();

const serverTypes = parseServerTypes(process.env.GRIST_SERVERS);

Expand All @@ -207,7 +208,7 @@ export async function startMain() {

const port = parseInt(process.env.GRIST_PORT, 10);

const server = await main(port, serverTypes, { settings: config });
const server = await main(port, serverTypes);

const opt = process.argv[2];
if (opt === '--testingHooks') {
Expand Down