diff --git a/server/core/helpers/custom-validators/activitypub/actor.ts b/server/core/helpers/custom-validators/activitypub/actor.ts index 00774670d..3b60ddd1c 100644 --- a/server/core/helpers/custom-validators/activitypub/actor.ts +++ b/server/core/helpers/custom-validators/activitypub/actor.ts @@ -1,6 +1,6 @@ import { arrayify } from '@peertube/peertube-core-utils' +import { ActivityPubActor } from '@peertube/peertube-models' import { peertubeTruncate } from '@server/helpers/core-utils.js' -import { ActivityPubActor } from 'packages/models/src/activitypub/activitypub-actor.js' import validator from 'validator' import { CONSTRAINTS_FIELDS } from '../../../initializers/constants.js' import { exists, isArray, isDateValid } from '../misc.js' diff --git a/server/core/helpers/custom-validators/activitypub/misc.ts b/server/core/helpers/custom-validators/activitypub/misc.ts index 49187ab1b..a77bb6cb5 100644 --- a/server/core/helpers/custom-validators/activitypub/misc.ts +++ b/server/core/helpers/custom-validators/activitypub/misc.ts @@ -1,5 +1,5 @@ +import { ActivityHtmlUrlObject } from '@peertube/peertube-models' import { CONFIG } from '@server/initializers/config.js' -import { ActivityHtmlUrlObject } from 'packages/models/src/activitypub/index.js' import validator from 'validator' import { CONSTRAINTS_FIELDS } from '../../../initializers/constants.js' import { exists } from '../misc.js' diff --git a/server/tsconfig.json b/server/tsconfig.json index ed0bfca48..0df6dcd4c 100644 --- a/server/tsconfig.json +++ b/server/tsconfig.json @@ -2,11 +2,10 @@ "extends": "../tsconfig.base.json", "compilerOptions": { "outDir": "../dist", - "baseUrl": "../", "rootDir": ".", "tsBuildInfoFile": "../dist/.tsbuildinfo", "paths": { - "@server/*": [ "server/core/*" ] + "@server/*": [ "./core/*" ] } }, "references": [