diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 766a144d..b754ff1e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: denoland/deno:2.1.10 +image: denoland/deno:2.2.0 default: interruptible: true diff --git a/.tool-versions b/.tool-versions index a3cfae3c..f9adf79b 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -deno 2.1.10 \ No newline at end of file +deno 2.2.0 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 78ae7fad..0b8724a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM denoland/deno:2.1.10 +FROM denoland/deno:2.2.0 ENV PORT 5000 WORKDIR /app diff --git a/packages/conf/DittoConf.ts b/packages/conf/DittoConf.ts index 6d4b45d7..456e9cd2 100644 --- a/packages/conf/DittoConf.ts +++ b/packages/conf/DittoConf.ts @@ -1,4 +1,3 @@ -import Module from 'node:module'; import os from 'node:os'; import path from 'node:path'; @@ -354,7 +353,7 @@ export class DittoConf { /** Absolute path to the data directory used by Ditto. */ get dataDir(): string { - return this.env.get('DITTO_DATA_DIR') || path.join(cwd(), 'data'); + return this.env.get('DITTO_DATA_DIR') || path.join(Deno.cwd(), 'data'); } /** Absolute path of the Deno directory. */ @@ -465,12 +464,3 @@ export class DittoConf { return Number(this.env.get('STREAK_WINDOW') || 129600); } } - -/** - * HACK: get cwd without read permissions. - * https://github.com/denoland/deno/issues/27080#issuecomment-2504150155 - */ -function cwd() { - // @ts-ignore Internal method, but it does exist. - return Module._nodeModulePaths('a')[0].slice(0, -15); -}