Skip to content

Commit

Permalink
Revert "upgrades some old packages in project that were causing build…
Browse files Browse the repository at this point in the history
… issues"

This reverts commit 8840a18.
  • Loading branch information
williamstein committed Oct 14, 2024
1 parent 8840a18 commit 4314330
Show file tree
Hide file tree
Showing 8 changed files with 2,749 additions and 3,169 deletions.
5,851 changes: 2,740 additions & 3,111 deletions src/packages/pnpm-lock.yaml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export async function browser_symmetric_channel(
return name;
}

export class SymmetricChannel extends EventEmitter {
class SymmetricChannel extends EventEmitter {
channel: any;

constructor(channel?: any) {
Expand Down
16 changes: 0 additions & 16 deletions src/packages/project/daemonize-process/index.d.ts

This file was deleted.

36 changes: 0 additions & 36 deletions src/packages/project/daemonize-process/index.js

This file was deleted.

3 changes: 2 additions & 1 deletion src/packages/project/named-servers/control.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
* License: MS-RSL – see LICENSE.md for details
*/

import getPort from "get-port";
import { exec } from "node:child_process";
import { mkdir, readFile, writeFile } from "node:fs/promises";
import { join } from "node:path";

import basePath from "@cocalc/backend/base-path";
import { data } from "@cocalc/backend/data";
import { project_id } from "@cocalc/project/data";
Expand All @@ -24,7 +26,6 @@ export async function start(name: NamedServerName): Promise<number> {
winston.debug(`${name} is already running`);
return s.port;
}
const getPort = (await import("get-port")).default; // since esm only
const port = await getPort({ port: preferredPort(name) });
// For servers that need a basePath, they will use this one.
// Other servers (e.g., Pluto, code-server) that don't need
Expand Down
3 changes: 2 additions & 1 deletion src/packages/project/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@
"body-parser": "^1.20.3",
"commander": "^7.2.0",
"compression": "^1.7.4",
"daemonize-process": "^3.0.0",
"debug": "^4.3.2",
"diskusage": "^1.2.0",
"diskusage": "^1.1.3",
"expect": "^26.6.2",
"express": "^4.20.0",
"express-rate-limit": "^7.4.0",
Expand Down
3 changes: 2 additions & 1 deletion src/packages/project/project.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
* License: MS-RSL – see LICENSE.md for details
*/

import daemonizeProcess from "daemonize-process";

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

import { getLogger } from "./logger";
const logger = getLogger("project-main");
Expand Down
4 changes: 2 additions & 2 deletions src/packages/project/upload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ export default function init(): Router {

const router = Router();

router.get("/.smc/upload", (_, res) => {
router.get("/.smc/upload", function (_, res) {
logger.http("upload GET");
res.send("hello");
return res.send("hello");
});

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

0 comments on commit 4314330

Please sign in to comment.