Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2026-03-02 04:09:24 +00:00
Code Issues Projects Releases Wiki Activity

Make changes required for Desktop FS updates (#1099)

Browse Source 
Make a set of changes required for Desktop FS improvements, see
https://github.com/gristlabs/grist-desktop/pull/42

---------

Co-authored-by: Spoffy <contact@spoffy.net>
Co-authored-by: Spoffy <4805393+Spoffy@users.noreply.github.com>
This commit is contained in:
Leslie H
2024-09-17 01:01:58 +00:00
committed by GitHub
parent 938bb0666e
commit 02cfcee84d
29 changed files with 552 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
stubs/app/client/ui/HomeImports.ts Normal file
View File

@@ -0,0 +1,2 @@
import * as coreHomeImports from "app/client/ui/CoreHomeImports";
export const homeImports = coreHomeImports;

2
stubs/app/client/ui/NewDocMethods.ts Normal file
View File

@@ -0,0 +1,2 @@
import * as coreNewDocMethods from "app/client/ui/CoreNewDocMethods";
export const newDocMethods = coreNewDocMethods;

6
stubs/app/server/lib/logins.ts
View File

@@ -1,6 +0,0 @@
import { getCoreLoginSystem } from "app/server/lib/coreLogins";
import { GristLoginSystem } from "app/server/lib/GristServer";
export async function getLoginSystem(): Promise<GristLoginSystem> {
return getCoreLoginSystem();
}

16
stubs/app/server/server.ts
View File

@@ -34,7 +34,7 @@ setDefaultEnv('GRIST_UI_FEATURES',
'helpCenter,billing,templates,multiSite,multiAccounts,sendToDrive,createSite,supportGrist');
setDefaultEnv('GRIST_WIDGET_LIST_URL', commonUrls.gristLabsWidgetRepository);
import {updateDb} from 'app/server/lib/dbUtils';
import {main as mergedServerMain, parseServerTypes} from 'app/server/mergedServerMain';
import {MergedServer, parseServerTypes} from 'app/server/MergedServer';
import * as fse from 'fs-extra';
import {runPrometheusExporter} from './prometheus-exporter';
@@ -124,20 +124,20 @@ export async function main() {
}
// Launch single-port, self-contained version of Grist.
const server = await mergedServerMain(G.port, serverTypes);
const mergedServer = await MergedServer.create(G.port, serverTypes);
await mergedServer.run();
if (process.env.GRIST_TESTING_SOCKET) {
await server.addTestingHooks();
await mergedServer.flexServer.addTestingHooks();
}
if (process.env.GRIST_SERVE_PLUGINS_PORT) {
await server.startCopy('pluginServer', parseInt(process.env.GRIST_SERVE_PLUGINS_PORT, 10));
await mergedServer.flexServer.startCopy('pluginServer', parseInt(process.env.GRIST_SERVE_PLUGINS_PORT, 10));
}
await fixSiteProducts({
deploymentType: server.getDeploymentType(),
db: server.getHomeDBManager()
deploymentType: mergedServer.flexServer.getDeploymentType(),
db: mergedServer.flexServer.getHomeDBManager()
});
return server;
return mergedServer.flexServer;
}
if (require.main === module) {