Skip to content

Commit 4a4be47

Browse files
committed
revert to ancient pkg-dir for compat with nextjs :-(
1 parent 38445ce commit 4a4be47

File tree

4 files changed

+18
-8
lines changed

4 files changed

+18
-8
lines changed

src/packages/backend/data.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@ import { isEmpty } from "lodash";
3131
import basePath from "@cocalc/backend/base-path";
3232
import port from "@cocalc/backend/port";
3333
import { FALLBACK_ACCOUNT_UUID } from "@cocalc/util/misc";
34-
import { packageDirectorySync } from "package-directory";
34+
// using old version of pkg-dir because of nextjs :-(
35+
import { sync as packageDirectorySync } from "pkg-dir";
3536

3637
function determineRoot(): string {
37-
const pd = packageDirectorySync({ cwd: __dirname }) ?? "/";
38+
const pd = packageDirectorySync(__dirname) ?? "/";
3839
const root = resolve(pd, "..", "..");
3940
process.env.COCALC_ROOT = root;
4041
return root;

src/packages/backend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
"fs-extra": "^11.3.1",
5454
"lodash": "^4.17.21",
5555
"lru-cache": "^7.18.3",
56-
"package-directory": "^8.1.0",
5756
"password-hash": "^1.2.2",
57+
"pkg-dir": "^5.0.0",
5858
"prom-client": "^15.1.3",
5959
"rimraf": "^5.0.5",
6060
"shell-escape": "^0.2.0",

src/packages/backend/sandbox/install.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ import { arch, platform } from "os";
1616
import { execFileSync, execSync } from "child_process";
1717
import { writeFile, stat, unlink, mkdir, chmod } from "fs/promises";
1818
import { join } from "path";
19-
import { packageDirectorySync } from "package-directory";
19+
// using old version of pkg-dir because of nextjs :-(
20+
import { sync as packageDirectorySync } from "pkg-dir";
2021
import getLogger from "@cocalc/backend/logger";
2122

2223
const logger = getLogger("files:sandbox:install");
2324

2425
const binPath = join(
25-
packageDirectorySync({ cwd: __dirname }) ?? "",
26+
packageDirectorySync(__dirname) ?? "",
2627
"node_modules",
2728
".bin",
2829
);

src/packages/pnpm-lock.yaml

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

0 commit comments

Comments
 (0)