Skip to content

Commit 4314330

Browse files
committed
Revert "upgrades some old packages in project that were causing build issues"
This reverts commit 8840a18.
1 parent 8840a18 commit 4314330

File tree

8 files changed

+2749
-3169
lines changed

8 files changed

+2749
-3169
lines changed

src/packages/pnpm-lock.yaml

Lines changed: 2740 additions & 3111 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/packages/project/browser-websocket/symmetric_channel.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export async function browser_symmetric_channel(
7171
return name;
7272
}
7373

74-
export class SymmetricChannel extends EventEmitter {
74+
class SymmetricChannel extends EventEmitter {
7575
channel: any;
7676

7777
constructor(channel?: any) {

src/packages/project/daemonize-process/index.d.ts

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/packages/project/daemonize-process/index.js

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/packages/project/named-servers/control.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
* License: MS-RSL – see LICENSE.md for details
44
*/
55

6+
import getPort from "get-port";
67
import { exec } from "node:child_process";
78
import { mkdir, readFile, writeFile } from "node:fs/promises";
89
import { join } from "node:path";
10+
911
import basePath from "@cocalc/backend/base-path";
1012
import { data } from "@cocalc/backend/data";
1113
import { project_id } from "@cocalc/project/data";
@@ -24,7 +26,6 @@ export async function start(name: NamedServerName): Promise<number> {
2426
winston.debug(`${name} is already running`);
2527
return s.port;
2628
}
27-
const getPort = (await import("get-port")).default; // since esm only
2829
const port = await getPort({ port: preferredPort(name) });
2930
// For servers that need a basePath, they will use this one.
3031
// Other servers (e.g., Pluto, code-server) that don't need

src/packages/project/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@
3838
"body-parser": "^1.20.3",
3939
"commander": "^7.2.0",
4040
"compression": "^1.7.4",
41+
"daemonize-process": "^3.0.0",
4142
"debug": "^4.3.2",
42-
"diskusage": "^1.2.0",
43+
"diskusage": "^1.1.3",
4344
"expect": "^26.6.2",
4445
"express": "^4.20.0",
4546
"express-rate-limit": "^7.4.0",

src/packages/project/project.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* License: MS-RSL – see LICENSE.md for details
44
*/
55

6+
import daemonizeProcess from "daemonize-process";
7+
68
import { init as initBugCounter } from "./bug-counter";
79
import { init as initClient } from "./client";
810
import initInfoJson from "./info-json";
@@ -11,7 +13,6 @@ import { getOptions } from "./init-program";
1113
import { cleanup as cleanupEnvironmentVariables } from "./project-setup";
1214
import initPublicPaths from "./public-paths";
1315
import initServers from "./servers/init";
14-
import { daemonizeProcess } from "./daemonize-process";
1516

1617
import { getLogger } from "./logger";
1718
const logger = getLogger("project-main");

src/packages/project/upload.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ export default function init(): Router {
3737

3838
const router = Router();
3939

40-
router.get("/.smc/upload", (_, res) => {
40+
router.get("/.smc/upload", function (_, res) {
4141
logger.http("upload GET");
42-
res.send("hello");
42+
return res.send("hello");
4343
});
4444

4545
router.post("/.smc/upload", async function (req, res): Promise<void> {

0 commit comments

Comments
 (0)