diff --git a/.npmrc b/.npmrc index fa0ab67b..bce8a6d8 100644 --- a/.npmrc +++ b/.npmrc @@ -1,2 +1,3 @@ shamefully-hoist=true -auto-install-peers=true \ No newline at end of file +auto-install-peers=true +strict-peer-dependencies=false \ No newline at end of file diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 00000000..3c032078 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +18 diff --git a/apps/app-server/package.json b/apps/app-server/package.json index 59cf4872..b0020e48 100644 --- a/apps/app-server/package.json +++ b/apps/app-server/package.json @@ -59,12 +59,12 @@ "build:watch": "concurrently \"tsc --build ./tsconfig.json --watch\" \"tsc-alias -p tsconfig.json --watch\"", "bundle": "tsup", "clean": "rimraf --glob ./dist *.tsbuildinfo", - "dev": "ts-node-dev -r tsconfig-paths/register ./src/index.ts", + "dev": "tsx --inspect-brk ./src/index.ts", "fix": "eslint --fix --ext .js,.ts,.vue ./", "npkill": "rimraf --glob ./node_modules", "preinstall": "npx only-allow pnpm", "repo:build": "tsc-alias -p tsconfig.json", "repo:build:watch": "tsc-alias -p tsconfig.json --watch", - "start": "ts-node -r tsconfig-paths/register ./src/index.ts" + "start": "tsx ./src/index.ts" } } diff --git a/apps/app-server/tsconfig.json b/apps/app-server/tsconfig.json index 82d3c79e..9899e002 100644 --- a/apps/app-server/tsconfig.json +++ b/apps/app-server/tsconfig.json @@ -3,12 +3,6 @@ "extends": "@deeplib/tsconfig/base.json", - // Necessary for ts-node-dev to work - "ts-node": { - "files": true - }, - "files": ["src/env.d.ts"], - "compilerOptions": { "baseUrl": ".", diff --git a/apps/client/src/boot/auth.client.ts b/apps/client/src/boot/auth.client.ts index 0465e986..c9e37272 100644 --- a/apps/client/src/boot/auth.client.ts +++ b/apps/client/src/boot/auth.client.ts @@ -1,6 +1,6 @@ import { sleep } from '@stdlib/misc'; import { boot } from 'quasar/wrappers'; -import { tryRefreshTokens } from 'src/code/auth/refresh'; +import { tryRefreshTokens } from 'src/code/areas/auth/refresh'; const _moduleLogger = mainLogger.sub('boot/auth.client.ts'); diff --git a/apps/client/src/boot/internals.universal.ts b/apps/client/src/boot/internals.universal.ts index 96dd9c9e..1e37bd0e 100644 --- a/apps/client/src/boot/internals.universal.ts +++ b/apps/client/src/boot/internals.universal.ts @@ -1,8 +1,8 @@ import type { KeyPair, SymmetricKeyring } from '@stdlib/crypto'; import { boot } from 'quasar/wrappers'; +import { RealtimeClient } from 'src/code/areas/realtime/client'; import { factories } from 'src/code/factories'; import type { Pages } from 'src/code/pages/pages'; -import { RealtimeClient } from 'src/code/realtime/client'; import { shouldRememberSession, wrapStorage } from 'src/code/utils/misc'; import type { Ref } from 'vue'; import type { RouteLocationNormalized, Router } from 'vue-router'; diff --git a/apps/client/src/boot/tiptap.client/extensions.ts b/apps/client/src/boot/tiptap.client/extensions.ts index 4e1e3a95..5ea64e7a 100644 --- a/apps/client/src/boot/tiptap.client/extensions.ts +++ b/apps/client/src/boot/tiptap.client/extensions.ts @@ -18,12 +18,12 @@ import StarterKit from '@tiptap/starter-kit'; import { Extension } from '@tiptap/vue-3'; import { once } from 'lodash'; import { lowlight } from 'lowlight/lib/common'; -import { ImageResizeExtension } from 'src/code/tiptap/image-resize/extension'; -import { InlineMathExtension } from 'src/code/tiptap/inline-math/extension'; -import { MathBlockExtension } from 'src/code/tiptap/math-block/extension'; -import { ProsemirrorPasteHandlerPlugin } from 'src/code/tiptap/paste-handler'; -import { TaskItemExtension } from 'src/code/tiptap/task-item'; -import { YoutubeVideoExtension } from 'src/code/tiptap/youtube-video/extension'; +import { ImageResizeExtension } from 'src/code/areas/tiptap/image-resize/extension'; +import { InlineMathExtension } from 'src/code/areas/tiptap/inline-math/extension'; +import { MathBlockExtension } from 'src/code/areas/tiptap/math-block/extension'; +import { ProsemirrorPasteHandlerPlugin } from 'src/code/areas/tiptap/paste-handler'; +import { TaskItemExtension } from 'src/code/areas/tiptap/task-item'; +import { YoutubeVideoExtension } from 'src/code/areas/tiptap/youtube-video/extension'; import { FindAndReplaceExtension } from './find-and-replace'; diff --git a/apps/client/src/code/api-interface/groups/change-user-role.ts b/apps/client/src/code/areas/api-interface/groups/change-user-role.ts similarity index 100% rename from apps/client/src/code/api-interface/groups/change-user-role.ts rename to apps/client/src/code/areas/api-interface/groups/change-user-role.ts diff --git a/apps/client/src/code/api-interface/groups/deletion/delete-permanently.ts b/apps/client/src/code/areas/api-interface/groups/deletion/delete-permanently.ts similarity index 100% rename from apps/client/src/code/api-interface/groups/deletion/delete-permanently.ts rename to apps/client/src/code/areas/api-interface/groups/deletion/delete-permanently.ts diff --git a/apps/client/src/code/api-interface/groups/deletion/delete.ts b/apps/client/src/code/areas/api-interface/groups/deletion/delete.ts similarity index 100% rename from apps/client/src/code/api-interface/groups/deletion/delete.ts rename to apps/client/src/code/areas/api-interface/groups/deletion/delete.ts diff --git a/apps/client/src/code/api-interface/groups/deletion/restore.ts b/apps/client/src/code/areas/api-interface/groups/deletion/restore.ts similarity index 100% rename from apps/client/src/code/api-interface/groups/deletion/restore.ts rename to apps/client/src/code/areas/api-interface/groups/deletion/restore.ts diff --git a/apps/client/src/code/api-interface/groups/join-invitations/accept.ts b/apps/client/src/code/areas/api-interface/groups/join-invitations/accept.ts similarity index 100% rename from apps/client/src/code/api-interface/groups/join-invitations/accept.ts rename to apps/client/src/code/areas/api-interface/groups/join-invitations/accept.ts diff --git a/apps/client/src/code/api-interface/groups/join-invitations/cancel.ts b/apps/client/src/code/areas/api-interface/groups/join-invitations/cancel.ts similarity index 100% rename from apps/client/src/code/api-interface/groups/join-invitations/cancel.ts rename to apps/client/src/code/areas/api-interface/groups/join-invitations/cancel.ts diff --git a/apps/client/src/code/api-interface/groups/join-invitations/reject.ts b/apps/client/src/code/areas/api-interface/groups/join-invitations/reject.ts similarity index 100% rename from apps/client/src/code/api-interface/groups/join-invitations/reject.ts rename to apps/client/src/code/areas/api-interface/groups/join-invitations/reject.ts diff --git a/apps/client/src/code/api-interface/groups/join-invitations/send.ts b/apps/client/src/code/areas/api-interface/groups/join-invitations/send.ts similarity index 100% rename from apps/client/src/code/api-interface/groups/join-invitations/send.ts rename to apps/client/src/code/areas/api-interface/groups/join-invitations/send.ts diff --git a/apps/client/src/code/api-interface/groups/join-requests/accept.ts b/apps/client/src/code/areas/api-interface/groups/join-requests/accept.ts similarity index 100% rename from apps/client/src/code/api-interface/groups/join-requests/accept.ts rename to apps/client/src/code/areas/api-interface/groups/join-requests/accept.ts diff --git a/apps/client/src/code/api-interface/groups/join-requests/cancel.ts b/apps/client/src/code/areas/api-interface/groups/join-requests/cancel.ts similarity index 100% rename from apps/client/src/code/api-interface/groups/join-requests/cancel.ts rename to apps/client/src/code/areas/api-interface/groups/join-requests/cancel.ts diff --git a/apps/client/src/code/api-interface/groups/join-requests/reject.ts b/apps/client/src/code/areas/api-interface/groups/join-requests/reject.ts similarity index 100% rename from apps/client/src/code/api-interface/groups/join-requests/reject.ts rename to apps/client/src/code/areas/api-interface/groups/join-requests/reject.ts diff --git a/apps/client/src/code/api-interface/groups/join-requests/send.ts b/apps/client/src/code/areas/api-interface/groups/join-requests/send.ts similarity index 100% rename from apps/client/src/code/api-interface/groups/join-requests/send.ts rename to apps/client/src/code/areas/api-interface/groups/join-requests/send.ts diff --git a/apps/client/src/code/api-interface/groups/key-rotation.ts b/apps/client/src/code/areas/api-interface/groups/key-rotation.ts similarity index 100% rename from apps/client/src/code/api-interface/groups/key-rotation.ts rename to apps/client/src/code/areas/api-interface/groups/key-rotation.ts diff --git a/apps/client/src/code/api-interface/groups/password/change.ts b/apps/client/src/code/areas/api-interface/groups/password/change.ts similarity index 100% rename from apps/client/src/code/api-interface/groups/password/change.ts rename to apps/client/src/code/areas/api-interface/groups/password/change.ts diff --git a/apps/client/src/code/api-interface/groups/password/disable.ts b/apps/client/src/code/areas/api-interface/groups/password/disable.ts similarity index 100% rename from apps/client/src/code/api-interface/groups/password/disable.ts rename to apps/client/src/code/areas/api-interface/groups/password/disable.ts diff --git a/apps/client/src/code/api-interface/groups/password/enable.ts b/apps/client/src/code/areas/api-interface/groups/password/enable.ts similarity index 100% rename from apps/client/src/code/api-interface/groups/password/enable.ts rename to apps/client/src/code/areas/api-interface/groups/password/enable.ts diff --git a/apps/client/src/code/api-interface/groups/privacy/make-private.ts b/apps/client/src/code/areas/api-interface/groups/privacy/make-private.ts similarity index 100% rename from apps/client/src/code/api-interface/groups/privacy/make-private.ts rename to apps/client/src/code/areas/api-interface/groups/privacy/make-private.ts diff --git a/apps/client/src/code/api-interface/groups/privacy/make-public.ts b/apps/client/src/code/areas/api-interface/groups/privacy/make-public.ts similarity index 100% rename from apps/client/src/code/api-interface/groups/privacy/make-public.ts rename to apps/client/src/code/areas/api-interface/groups/privacy/make-public.ts diff --git a/apps/client/src/code/api-interface/groups/remove-user.ts b/apps/client/src/code/areas/api-interface/groups/remove-user.ts similarity index 100% rename from apps/client/src/code/api-interface/groups/remove-user.ts rename to apps/client/src/code/areas/api-interface/groups/remove-user.ts diff --git a/apps/client/src/code/api-interface/pages/backlinks/create.ts b/apps/client/src/code/areas/api-interface/pages/backlinks/create.ts similarity index 100% rename from apps/client/src/code/api-interface/pages/backlinks/create.ts rename to apps/client/src/code/areas/api-interface/pages/backlinks/create.ts diff --git a/apps/client/src/code/api-interface/pages/bump.ts b/apps/client/src/code/areas/api-interface/pages/bump.ts similarity index 100% rename from apps/client/src/code/api-interface/pages/bump.ts rename to apps/client/src/code/areas/api-interface/pages/bump.ts diff --git a/apps/client/src/code/api-interface/pages/create.ts b/apps/client/src/code/areas/api-interface/pages/create.ts similarity index 100% rename from apps/client/src/code/api-interface/pages/create.ts rename to apps/client/src/code/areas/api-interface/pages/create.ts diff --git a/apps/client/src/code/api-interface/pages/deletion/delete-permanently.ts b/apps/client/src/code/areas/api-interface/pages/deletion/delete-permanently.ts similarity index 100% rename from apps/client/src/code/api-interface/pages/deletion/delete-permanently.ts rename to apps/client/src/code/areas/api-interface/pages/deletion/delete-permanently.ts diff --git a/apps/client/src/code/api-interface/pages/deletion/delete.ts b/apps/client/src/code/areas/api-interface/pages/deletion/delete.ts similarity index 100% rename from apps/client/src/code/api-interface/pages/deletion/delete.ts rename to apps/client/src/code/areas/api-interface/pages/deletion/delete.ts diff --git a/apps/client/src/code/api-interface/pages/deletion/restore.ts b/apps/client/src/code/areas/api-interface/pages/deletion/restore.ts similarity index 100% rename from apps/client/src/code/api-interface/pages/deletion/restore.ts rename to apps/client/src/code/areas/api-interface/pages/deletion/restore.ts diff --git a/apps/client/src/code/api-interface/pages/move.ts b/apps/client/src/code/areas/api-interface/pages/move.ts similarity index 100% rename from apps/client/src/code/api-interface/pages/move.ts rename to apps/client/src/code/areas/api-interface/pages/move.ts diff --git a/apps/client/src/code/api-interface/pages/snapshots/delete.ts b/apps/client/src/code/areas/api-interface/pages/snapshots/delete.ts similarity index 100% rename from apps/client/src/code/api-interface/pages/snapshots/delete.ts rename to apps/client/src/code/areas/api-interface/pages/snapshots/delete.ts diff --git a/apps/client/src/code/api-interface/pages/snapshots/restore.ts b/apps/client/src/code/areas/api-interface/pages/snapshots/restore.ts similarity index 100% rename from apps/client/src/code/api-interface/pages/snapshots/restore.ts rename to apps/client/src/code/areas/api-interface/pages/snapshots/restore.ts diff --git a/apps/client/src/code/api-interface/pages/snapshots/save.ts b/apps/client/src/code/areas/api-interface/pages/snapshots/save.ts similarity index 100% rename from apps/client/src/code/api-interface/pages/snapshots/save.ts rename to apps/client/src/code/areas/api-interface/pages/snapshots/save.ts diff --git a/apps/client/src/code/api-interface/users/add-favorite-pages.ts b/apps/client/src/code/areas/api-interface/users/add-favorite-pages.ts similarity index 100% rename from apps/client/src/code/api-interface/users/add-favorite-pages.ts rename to apps/client/src/code/areas/api-interface/users/add-favorite-pages.ts diff --git a/apps/client/src/code/api-interface/users/change-email.ts b/apps/client/src/code/areas/api-interface/users/change-email.ts similarity index 100% rename from apps/client/src/code/api-interface/users/change-email.ts rename to apps/client/src/code/areas/api-interface/users/change-email.ts diff --git a/apps/client/src/code/api-interface/users/change-password.ts b/apps/client/src/code/areas/api-interface/users/change-password.ts similarity index 100% rename from apps/client/src/code/api-interface/users/change-password.ts rename to apps/client/src/code/areas/api-interface/users/change-password.ts diff --git a/apps/client/src/code/api-interface/users/delete-account.ts b/apps/client/src/code/areas/api-interface/users/delete-account.ts similarity index 100% rename from apps/client/src/code/api-interface/users/delete-account.ts rename to apps/client/src/code/areas/api-interface/users/delete-account.ts diff --git a/apps/client/src/code/api-interface/users/remove-favorite-pages.ts b/apps/client/src/code/areas/api-interface/users/remove-favorite-pages.ts similarity index 100% rename from apps/client/src/code/api-interface/users/remove-favorite-pages.ts rename to apps/client/src/code/areas/api-interface/users/remove-favorite-pages.ts diff --git a/apps/client/src/code/api-interface/users/remove-recent-pages.ts b/apps/client/src/code/areas/api-interface/users/remove-recent-pages.ts similarity index 100% rename from apps/client/src/code/api-interface/users/remove-recent-pages.ts rename to apps/client/src/code/areas/api-interface/users/remove-recent-pages.ts diff --git a/apps/client/src/code/api-interface/users/rotate-keys.ts b/apps/client/src/code/areas/api-interface/users/rotate-keys.ts similarity index 100% rename from apps/client/src/code/api-interface/users/rotate-keys.ts rename to apps/client/src/code/areas/api-interface/users/rotate-keys.ts diff --git a/apps/client/src/code/auth/demo.ts b/apps/client/src/code/areas/auth/demo.ts similarity index 88% rename from apps/client/src/code/auth/demo.ts rename to apps/client/src/code/areas/auth/demo.ts index a6f13ba8..f08f0074 100644 --- a/apps/client/src/code/auth/demo.ts +++ b/apps/client/src/code/areas/auth/demo.ts @@ -1,8 +1,8 @@ import { wrapSymmetricKey } from '@stdlib/crypto'; import sodium from 'libsodium-wrappers-sumo'; -import type { deriveUserValues } from '../crypto'; -import { trpcClient } from '../trpc'; +import type { deriveUserValues } from '../../crypto'; +import { trpcClient } from '../../trpc'; import { login } from './login'; import { getRegistrationValues } from './register'; diff --git a/apps/client/src/code/auth/login.ts b/apps/client/src/code/areas/auth/login.ts similarity index 98% rename from apps/client/src/code/auth/login.ts rename to apps/client/src/code/areas/auth/login.ts index 905950b3..000b6ca1 100644 --- a/apps/client/src/code/auth/login.ts +++ b/apps/client/src/code/areas/auth/login.ts @@ -3,7 +3,7 @@ import type { SymmetricKey } from '@stdlib/crypto'; import { createPrivateKeyring } from '@stdlib/crypto'; import { createSymmetricKeyring, wrapSymmetricKey } from '@stdlib/crypto'; -import { multiModePath } from '../utils/misc'; +import { multiModePath } from '../../utils/misc'; import { storeClientTokenExpirations } from './tokens'; export async function login(input: { diff --git a/apps/client/src/code/auth/logout.ts b/apps/client/src/code/areas/auth/logout.ts similarity index 87% rename from apps/client/src/code/auth/logout.ts rename to apps/client/src/code/areas/auth/logout.ts index 6ab83eb4..28b76b54 100644 --- a/apps/client/src/code/auth/logout.ts +++ b/apps/client/src/code/areas/auth/logout.ts @@ -1,6 +1,6 @@ -import { clearCookie } from '../cookies'; -import { trpcClient } from '../trpc'; -import { multiModePath } from '../utils/misc'; +import { clearCookie } from '../../cookies'; +import { trpcClient } from '../../trpc'; +import { multiModePath } from '../../utils/misc'; import { clearClientTokenExpirations } from './tokens'; export async function logout() { diff --git a/apps/client/src/code/auth/refresh.ts b/apps/client/src/code/areas/auth/refresh.ts similarity index 97% rename from apps/client/src/code/auth/refresh.ts rename to apps/client/src/code/areas/auth/refresh.ts index 929aaa71..dde6a31a 100644 --- a/apps/client/src/code/auth/refresh.ts +++ b/apps/client/src/code/areas/auth/refresh.ts @@ -12,8 +12,8 @@ import { wrapSymmetricKey, } from '@stdlib/crypto'; -import { redirectIfNecessary } from '../routing'; -import { trpcClient } from '../trpc'; +import { redirectIfNecessary } from '../../routing'; +import { trpcClient } from '../../trpc'; import { logout } from './logout'; import { areClientTokensExpiring, diff --git a/apps/client/src/code/auth/register.ts b/apps/client/src/code/areas/auth/register.ts similarity index 100% rename from apps/client/src/code/auth/register.ts rename to apps/client/src/code/areas/auth/register.ts diff --git a/apps/client/src/code/auth/tokens.ts b/apps/client/src/code/areas/auth/tokens.ts similarity index 97% rename from apps/client/src/code/auth/tokens.ts rename to apps/client/src/code/areas/auth/tokens.ts index a9b4dde5..cf9ac06f 100644 --- a/apps/client/src/code/auth/tokens.ts +++ b/apps/client/src/code/areas/auth/tokens.ts @@ -3,7 +3,7 @@ import { getRefreshTokenExpiration, } from '@deeplib/misc'; -import { shouldRememberSession } from '../utils/misc'; +import { shouldRememberSession } from '../../utils/misc'; export function getClientTokenExpirationDate( token: 'access' | 'refresh', diff --git a/apps/client/src/code/realtime/client.ts b/apps/client/src/code/areas/realtime/client.ts similarity index 99% rename from apps/client/src/code/realtime/client.ts rename to apps/client/src/code/areas/realtime/client.ts index 94ef71de..0342c747 100644 --- a/apps/client/src/code/realtime/client.ts +++ b/apps/client/src/code/areas/realtime/client.ts @@ -13,7 +13,7 @@ import * as encoding from 'lib0/encoding'; import { once, throttle } from 'lodash'; import { pack, unpack } from 'msgpackr'; -import { getNotificationInfo } from '../pages/notifications/notifications'; +import { getNotificationInfo } from '../../pages/notifications/notifications'; import { RealtimeContext } from './context'; export interface RealtimeCommand { diff --git a/apps/client/src/code/realtime/context.ts b/apps/client/src/code/areas/realtime/context.ts similarity index 100% rename from apps/client/src/code/realtime/context.ts rename to apps/client/src/code/areas/realtime/context.ts diff --git a/apps/client/src/code/tiptap/image-resize/NodeView.vue b/apps/client/src/code/areas/tiptap/image-resize/NodeView.vue similarity index 100% rename from apps/client/src/code/tiptap/image-resize/NodeView.vue rename to apps/client/src/code/areas/tiptap/image-resize/NodeView.vue diff --git a/apps/client/src/code/tiptap/image-resize/extension.ts b/apps/client/src/code/areas/tiptap/image-resize/extension.ts similarity index 100% rename from apps/client/src/code/tiptap/image-resize/extension.ts rename to apps/client/src/code/areas/tiptap/image-resize/extension.ts diff --git a/apps/client/src/code/tiptap/inline-math/NodeView.vue b/apps/client/src/code/areas/tiptap/inline-math/NodeView.vue similarity index 100% rename from apps/client/src/code/tiptap/inline-math/NodeView.vue rename to apps/client/src/code/areas/tiptap/inline-math/NodeView.vue diff --git a/apps/client/src/code/tiptap/inline-math/extension.ts b/apps/client/src/code/areas/tiptap/inline-math/extension.ts similarity index 100% rename from apps/client/src/code/tiptap/inline-math/extension.ts rename to apps/client/src/code/areas/tiptap/inline-math/extension.ts diff --git a/apps/client/src/code/tiptap/math-block/NodeView.vue b/apps/client/src/code/areas/tiptap/math-block/NodeView.vue similarity index 100% rename from apps/client/src/code/tiptap/math-block/NodeView.vue rename to apps/client/src/code/areas/tiptap/math-block/NodeView.vue diff --git a/apps/client/src/code/tiptap/math-block/extension.ts b/apps/client/src/code/areas/tiptap/math-block/extension.ts similarity index 100% rename from apps/client/src/code/tiptap/math-block/extension.ts rename to apps/client/src/code/areas/tiptap/math-block/extension.ts diff --git a/apps/client/src/code/tiptap/paste-handler.ts b/apps/client/src/code/areas/tiptap/paste-handler.ts similarity index 100% rename from apps/client/src/code/tiptap/paste-handler.ts rename to apps/client/src/code/areas/tiptap/paste-handler.ts diff --git a/apps/client/src/code/tiptap/task-item.ts b/apps/client/src/code/areas/tiptap/task-item.ts similarity index 100% rename from apps/client/src/code/tiptap/task-item.ts rename to apps/client/src/code/areas/tiptap/task-item.ts diff --git a/apps/client/src/code/tiptap/utils.ts b/apps/client/src/code/areas/tiptap/utils.ts similarity index 100% rename from apps/client/src/code/tiptap/utils.ts rename to apps/client/src/code/areas/tiptap/utils.ts diff --git a/apps/client/src/code/tiptap/youtube-video/NodeView.vue b/apps/client/src/code/areas/tiptap/youtube-video/NodeView.vue similarity index 100% rename from apps/client/src/code/tiptap/youtube-video/NodeView.vue rename to apps/client/src/code/areas/tiptap/youtube-video/NodeView.vue diff --git a/apps/client/src/code/tiptap/youtube-video/extension.ts b/apps/client/src/code/areas/tiptap/youtube-video/extension.ts similarity index 100% rename from apps/client/src/code/tiptap/youtube-video/extension.ts rename to apps/client/src/code/areas/tiptap/youtube-video/extension.ts diff --git a/apps/client/src/code/tiptap/youtube-video/utils.ts b/apps/client/src/code/areas/tiptap/youtube-video/utils.ts similarity index 100% rename from apps/client/src/code/tiptap/youtube-video/utils.ts rename to apps/client/src/code/areas/tiptap/youtube-video/utils.ts diff --git a/apps/client/src/code/pages/composables/use-keyboard-shortcuts.ts b/apps/client/src/code/pages/composables/use-keyboard-shortcuts.ts index 0f553d76..843b8135 100644 --- a/apps/client/src/code/pages/composables/use-keyboard-shortcuts.ts +++ b/apps/client/src/code/pages/composables/use-keyboard-shortcuts.ts @@ -1,6 +1,6 @@ import { Vec2 } from '@stdlib/misc'; import { useEventListener } from '@vueuse/core'; -import { unsetNode } from 'src/code/tiptap/utils'; +import { unsetNode } from 'src/code/areas/tiptap/utils'; import { modsMatch } from 'src/code/utils/misc'; import InsertImageDialog from 'src/layouts/PagesLayout/MainToolbar/InsertImageDialog.vue'; import InsertLinkDialog from 'src/layouts/PagesLayout/MainToolbar/InsertLinkDialog.vue'; diff --git a/apps/client/src/code/pages/composables/use-page-navigation-interception.ts b/apps/client/src/code/pages/composables/use-page-navigation-interception.ts index d97dc628..46338fd5 100644 --- a/apps/client/src/code/pages/composables/use-page-navigation-interception.ts +++ b/apps/client/src/code/pages/composables/use-page-navigation-interception.ts @@ -1,6 +1,6 @@ import { useEventListener } from '@vueuse/core'; -import { imageResizing } from 'src/code/tiptap/image-resize/NodeView.vue'; -import { youtubeResizing } from 'src/code/tiptap/youtube-video/NodeView.vue'; +import { imageResizing } from 'src/code/areas/tiptap/image-resize/NodeView.vue'; +import { youtubeResizing } from 'src/code/areas/tiptap/youtube-video/NodeView.vue'; import { handleError, isCtrlDown } from 'src/code/utils/misc'; export function usePageNavigationInterception() { diff --git a/apps/client/src/code/pages/notifications/group-invitation-sent.ts b/apps/client/src/code/pages/notifications/group-invitation-sent.ts index a2204c9c..b17d0030 100644 --- a/apps/client/src/code/pages/notifications/group-invitation-sent.ts +++ b/apps/client/src/code/pages/notifications/group-invitation-sent.ts @@ -1,4 +1,4 @@ -import { rejectJoinInvitation } from 'src/code/api-interface/groups/join-invitations/reject'; +import { rejectJoinInvitation } from 'src/code/areas/api-interface/groups/join-invitations/reject'; import { asyncDialog, handleError } from 'src/code/utils/misc'; import AcceptInvitationDialog from 'src/layouts/PagesLayout/MainContent/DisplayPage/DisplayScreens/AcceptInvitationDialog.vue'; diff --git a/apps/client/src/code/pages/notifications/group-request-sent.ts b/apps/client/src/code/pages/notifications/group-request-sent.ts index 2c54ea9a..dc41d8cd 100644 --- a/apps/client/src/code/pages/notifications/group-request-sent.ts +++ b/apps/client/src/code/pages/notifications/group-request-sent.ts @@ -1,4 +1,4 @@ -import { rejectJoinRequest } from 'src/code/api-interface/groups/join-requests/reject'; +import { rejectJoinRequest } from 'src/code/areas/api-interface/groups/join-requests/reject'; import { asyncDialog, handleError } from 'src/code/utils/misc'; import GroupSettingsDialog from 'src/layouts/PagesLayout/RightSidebar/PageProperties/GroupSettingsDialog/GroupSettingsDialog.vue'; import AcceptRequestDialog from 'src/layouts/PagesLayout/RightSidebar/PageProperties/GroupSettingsDialog/RequestsTab/AcceptRequestDialog.vue'; diff --git a/apps/client/src/code/pages/page/page.ts b/apps/client/src/code/pages/page/page.ts index 43055d6c..8928110c 100644 --- a/apps/client/src/code/pages/page/page.ts +++ b/apps/client/src/code/pages/page/page.ts @@ -2,10 +2,10 @@ import { rolesMap } from '@deeplib/misc'; import { isNanoID, sleep, Vec2 } from '@stdlib/misc'; import { watchUntilTrue } from '@stdlib/vue'; import { once, pull } from 'lodash'; -import { bumpPage } from 'src/code/api-interface/pages/bump'; +import { bumpPage } from 'src/code/areas/api-interface/pages/bump'; +import { RealtimeContext } from 'src/code/areas/realtime/context'; import type { Factories } from 'src/code/factories'; import type { Pages } from 'src/code/pages/pages'; -import { RealtimeContext } from 'src/code/realtime/context'; import { scrollIntoView } from 'src/code/utils/scroll-into-view'; import type { ComputedRef, UnwrapNestedRefs } from 'vue'; import type { z } from 'zod'; diff --git a/apps/client/src/code/pages/page/selection/selection.ts b/apps/client/src/code/pages/page/selection/selection.ts index 9e48a822..01760e84 100644 --- a/apps/client/src/code/pages/page/selection/selection.ts +++ b/apps/client/src/code/pages/page/selection/selection.ts @@ -2,7 +2,7 @@ import type { MarkName, NodeName } from '@stdlib/misc'; import { Vec2 } from '@stdlib/misc'; import type { ChainedCommands, Editor } from '@tiptap/vue-3'; import { every } from 'lodash'; -import { unsetNode } from 'src/code/tiptap/utils'; +import { unsetNode } from 'src/code/areas/tiptap/utils'; import { getClipboardText, setClipboardText } from 'src/code/utils/clipboard'; import type { ComputedRef, UnwrapNestedRefs } from 'vue'; diff --git a/apps/client/src/components/LinkURL.vue b/apps/client/src/components/LinkURL.vue index d8f82967..2628ebb7 100644 --- a/apps/client/src/components/LinkURL.vue +++ b/apps/client/src/components/LinkURL.vue @@ -17,7 +17,7 @@