mirror of
https://github.com/gristlabs/grist-core.git
synced 2024-10-01 04:20:48 +00:00
51ff72c15e
Summary: Building: - Builds no longer wait for tsc for either client, server, or test targets. All use esbuild which is very fast. - Build still runs tsc, but only to report errors. This may be turned off with `SKIP_TSC=1` env var. - Grist-core continues to build using tsc. - Esbuild requires ES6 module semantics. Typescript's esModuleInterop is turned on, so that tsc accepts and enforces correct usage. - Client-side code is watched and bundled by webpack as before (using esbuild-loader) Code changes: - Imports must now follow ES6 semantics: `import * as X from ...` produces a module object; to import functions or class instances, use `import X from ...`. - Everything is now built with isolatedModules flag. Some exports were updated for it. Packages: - Upgraded browserify dependency, and related packages (used for the distribution-building step). - Building the distribution now uses esbuild's minification. babel-minify is no longer used. Test Plan: Should have no behavior changes, existing tests should pass, and docker image should build too. Reviewers: georgegevoian Reviewed By: georgegevoian Subscribers: alexmojaki Differential Revision: https://phab.getgrist.com/D3506
67 lines
2.0 KiB
TypeScript
67 lines
2.0 KiB
TypeScript
import {getAppRoot} from 'app/server/lib/places';
|
|
import {fromCallback, listenPromise} from 'app/server/lib/serverUtils';
|
|
import express from 'express';
|
|
import * as http from 'http';
|
|
import {AddressInfo, Socket} from 'net';
|
|
import * as path from 'path';
|
|
import {fixturesRoot} from 'test/server/testUtils';
|
|
|
|
export interface Serving {
|
|
url: string;
|
|
shutdown: () => Promise<void>;
|
|
}
|
|
|
|
|
|
// Adds static files from a directory.
|
|
// By default exposes /fixture/sites
|
|
export function addStatic(app: express.Express, rootDir?: string) {
|
|
// mix in a copy of the plugin api
|
|
app.use(/^\/(grist-plugin-api.js)$/, (req, res) =>
|
|
res.sendFile(req.params[0], {root:
|
|
path.resolve(getAppRoot(), "static")}));
|
|
app.use(express.static(rootDir || path.resolve(fixturesRoot, "sites"), {
|
|
setHeaders: (res) => {
|
|
res.set("Access-Control-Allow-Origin", "*");
|
|
}
|
|
}));
|
|
}
|
|
|
|
// Serve from a directory.
|
|
export async function serveStatic(rootDir: string): Promise<Serving> {
|
|
return serveSomething(app => addStatic(app, rootDir));
|
|
}
|
|
|
|
// Serve a string of html.
|
|
export async function serveSinglePage(html: string): Promise<Serving> {
|
|
return serveSomething(app => {
|
|
app.get('', (req, res) => res.send(html));
|
|
});
|
|
}
|
|
|
|
export function serveCustomViews(): Promise<Serving> {
|
|
return serveStatic(path.resolve(fixturesRoot, "sites"));
|
|
}
|
|
|
|
export async function serveSomething(setup: (app: express.Express) => void, port= 0): Promise<Serving> {
|
|
const app = express();
|
|
const server = http.createServer(app);
|
|
await listenPromise(server.listen(port));
|
|
|
|
const connections = new Set<Socket>();
|
|
server.on('connection', (conn) => {
|
|
connections.add(conn);
|
|
conn.on('close', () => connections.delete(conn));
|
|
});
|
|
|
|
async function shutdown() {
|
|
await fromCallback(cb => server.close(cb));
|
|
for (const conn of connections) { conn.destroy(); }
|
|
}
|
|
|
|
port = (server.address() as AddressInfo).port;
|
|
app.set('port', port);
|
|
setup(app);
|
|
const url = `http://localhost:${port}`;
|
|
return {url, shutdown};
|
|
}
|