chore(moon)!: upgrade to Next 16, React 19, and Node 26

.github/workflows/web-sync-server-deploy.yml

@@ -31,7 +31,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: "26"
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4

.github/workflows/web-test.yml

@@ -21,12 +21,12 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '26'
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v4.0.0
+        uses: pnpm/action-setup@v4
         with:
-          version: 9
+          package_json_file: moon/package.json
 
       - name: Get pnpm store directory
         shell: bash

.gitignore

@@ -63,6 +63,9 @@ orion-server/docker-compose.override.yml
 # Claude Code configuration and cache
 .claude
 
+# pnpm content-addressable store (local / custom store-dir)
+.pnpm-store
+
 tools/**
 
 .libra

moon/.gitignore

@@ -4,6 +4,7 @@
 node_modules
 .pnp
 .pnp.js
+.pnpm-store
 dist
 *.tsbuildinfo
 

moon/.nvmrc

@@ -1 +1 @@
-20
+26

moon/apps/sync-server/Dockerfile

@@ -1,11 +1,11 @@
 # syntax = docker/dockerfile:1
 
-FROM node:22-slim AS base
+FROM node:26-slim AS base
 
-# configure pnpm
+# configure pnpm (node:26 images no longer ship corepack)
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME/bin:$PNPM_HOME:$PATH"
-RUN corepack enable && corepack prepare pnpm@9.7.1 --activate
+RUN npm install -g pnpm@11.17.0
 
 
 # ENV SENTRY_PROPERTIES=sentry.properties

moon/apps/sync-server/package.json

@@ -6,7 +6,6 @@
     "build": "tsup",
     "clean": "rm -rf .turbo dist node_modules",
     "dev": "tsup --watch --onSuccess \"node dist/index.mjs\"",
-    "sentry:sourcemaps": "sentry-cli sourcemaps inject --org mega --project sync-server ./dist && sentry-cli sourcemaps upload --org mega --project sync-server --log-level=debug ./dist",
     "start": "node dist/index.mjs"
   },
   "dependencies": {
@@ -16,7 +15,6 @@
     "@hocuspocus/extension-logger": "catalog:",
     "@hocuspocus/server": "catalog:",
     "@hocuspocus/transformer": "catalog:",
-    "@sentry/node": "catalog:",
     "@tiptap/core": "catalog:",
     "@tiptap/html": "catalog:",
     "@tiptap/pm": "catalog:",
@@ -27,7 +25,6 @@
   "devDependencies": {
     "@flydotio/dockerfile": "catalog:",
     "@gitmono/tsconfig": "workspace:*",
-    "@sentry/cli": "catalog:",
     "tsup": "catalog:",
     "typescript": "catalog:"
   }

moon/apps/sync-server/src/database.ts

@@ -1,7 +1,6 @@
 import { Database } from '@hocuspocus/extension-database'
 import { Document } from '@hocuspocus/server'
 import { TiptapTransformer } from '@hocuspocus/transformer'
-import * as Sentry from '@sentry/node'
 import { generateHTML, generateJSON } from '@tiptap/html'
 import { fromUint8Array, toUint8Array } from 'js-base64'
 import * as Y from 'yjs'
@@ -14,14 +13,14 @@ import { Context } from './types'
 const extensions = getNoteExtensions()
 
 export function sendVersionToConnections(document: Document, version: number) {
-  document.connections.forEach((connection) => {
-    const connectionSchemaVersion = connection.connection.context.schemaVersion ?? 0
+  document.getConnections().forEach((connection) => {
+    const connectionSchemaVersion = (connection.context as Context | undefined)?.schemaVersion ?? 0
 
     // Update connections to readOnly if the schema version is lower than the current version
-    connection.connection.readOnly = connectionSchemaVersion < version
+    connection.readOnly = connectionSchemaVersion < version
 
     // Send the schema version to the client
-    connection.connection.sendStateless(
+    connection.sendStateless(
       JSON.stringify({
         type: 'schema',
         version
@@ -45,20 +44,41 @@ export async function getResource({ token, id, type, organization }: GetResource
   }
 }
 
+function resolveContext(data: {
+  context?: Context
+  lastContext?: Context
+  requestParameters?: URLSearchParams
+}): Context | undefined {
+  const fromPayload = data.lastContext ?? data.context
+
+  if (fromPayload?.token && fromPayload.organization) {
+    return fromPayload
+  }
+
+  const organization = data.requestParameters?.get('organization') ?? fromPayload?.organization
+  const type = data.requestParameters?.get('type') ?? fromPayload?.type ?? null
+  const token = fromPayload?.token
+  const schemaVersion = fromPayload?.schemaVersion ?? 0
+
+  if (!token || !organization) return fromPayload
+
+  return { token, schemaVersion, organization, type }
+}
+
 export const database = new Database({
   /**
    * Fetch the document state from Campsite, or generate a new document from the existing
    * HTML if the document has never been edited before.
    */
   async fetch(data) {
-    const context: Context = data.context
+    const context = resolveContext(data)
 
     const id = data.documentName
-    const organization = data.requestParameters.get('organization')
-    const type = data.requestParameters.get('type')
+    const organization = context?.organization
+    const type = context?.type ?? null
 
     try {
-      if (!organization) return new Uint8Array()
+      if (!context?.token || !organization) return new Uint8Array()
 
       const state = await getResource({ token: context.token, id, type, organization })
 
@@ -79,16 +99,11 @@ export const database = new Database({
 
       return Y.encodeStateAsUpdate(ydoc)
     } catch (error) {
-      Sentry.setContext('document', {
-        id,
-        organization,
-        type
-      })
-      Sentry.setContext('context', {
-        schemaVersion: context.schemaVersion,
-        token: context.token
+      console.error('database.fetch failed', {
+        document: { id, organization, type },
+        schemaVersion: context?.schemaVersion,
+        error
       })
-      Sentry.captureException(error)
       throw error
     }
   },
@@ -97,14 +112,14 @@ export const database = new Database({
    * Store the document state in Campsite.
    */
   async store(data) {
-    const context: Context = data.context
+    const context = resolveContext(data)
 
     const id = data.documentName
-    const organization = data.requestParameters.get('organization')
-    const type = data.requestParameters.get('type')
+    const organization = context?.organization
+    const type = context?.type ?? null
 
     try {
-      if (!organization) return
+      if (!context?.token || !organization) return
 
       // Generate a state from the Yjs document
       const state = Y.encodeStateAsUpdate(data.document)
@@ -128,16 +143,11 @@ export const database = new Database({
         }
       )
     } catch (error) {
-      Sentry.setContext('document', {
-        id,
-        organization,
-        type
-      })
-      Sentry.setContext('context', {
-        schemaVersion: context.schemaVersion,
-        token: context.token
+      console.error('database.store failed', {
+        document: { id, organization, type },
+        schemaVersion: context?.schemaVersion,
+        error
       })
-      Sentry.captureException(error)
       throw error
     }
   }

moon/apps/sync-server/src/index.ts

@@ -1,12 +1,11 @@
 import { Logger } from '@hocuspocus/extension-logger'
-import { Hocuspocus } from '@hocuspocus/server'
-import * as Sentry from '@sentry/node'
+import { Server } from '@hocuspocus/server'
 
 import { PORT } from './config'
 import { database, getResource, sendVersionToConnections } from './database'
 import { AuthenticationError, Context } from './types'
 
-const server = new Hocuspocus({
+const server = new Server({
   port: PORT,
 
   async onAuthenticate(data): Promise<Context> {
@@ -32,23 +31,20 @@ const server = new Hocuspocus({
       const document = data.instance.documents.get(data.documentName)
 
       if (document) sendVersionToConnections(document, state.description_schema_version)
-      data.connection.readOnly = schemaVersion < state.description_schema_version
+      data.connectionConfig.readOnly = schemaVersion < state.description_schema_version
 
       return {
         token: data.token,
-        schemaVersion
-      }
-    } catch (error) {
-      Sentry.setContext('document', {
-        id: data.documentName,
+        schemaVersion,
         organization,
         type
+      }
+    } catch (error) {
+      console.error('onAuthenticate failed', {
+        document: { id: data.documentName, organization, type },
+        schemaVersion,
+        error
       })
-      Sentry.setContext('context', {
-        schemaVersion: schemaVersion,
-        token: data.token
-      })
-      Sentry.captureException(error)
       throw error
     }
   },

moon/apps/sync-server/src/types.ts

@@ -1,6 +1,8 @@
 export interface Context {
   token: string
   schemaVersion: number
+  organization: string
+  type: string | null
 }
 
 export type AuthenticationErrorType = 'no-token' | 'invalid-type'

moon/apps/sync-server/tsconfig.json

@@ -7,9 +7,6 @@
     "outDir": "./dist",
     "sourceMap": true,
     "inlineSources": true,
-    // Set `sourceRoot` to  "/" to strip the build path prefix
-    // from generated source code references.
-    // This improves issue grouping in Sentry.
     "sourceRoot": "/"
   }
 }

moon/apps/sync-server/turbo.json

@@ -3,14 +3,11 @@
   "extends": ["//"],
   "tasks": {
     "dev": {
-      "dependsOn": ["build"],
+      "dependsOn": ["^build", "build"],
       "passThroughEnv": ["PORT"]
     },
     "build": {
-      "env": ["SENTRY_AUTH_TOKEN", "SENTRY_ORG", "SENTRY_PROJECT", "TIPTAP_PRIVATE_REGISTRY_KEY", "NODE_ENV", "PORT"]
-    },
-    "sentry:sourcemaps": {
-      "env": ["SENTRY_AUTH_TOKEN", "SENTRY_ORG", "SENTRY_PROJECT"]
+      "env": ["TIPTAP_PRIVATE_REGISTRY_KEY", "NODE_ENV", "PORT"]
     }
   }
 }

moon/apps/web/.storybook/main.js

@@ -11,12 +11,7 @@ function getAbsolutePath(value) {
 /** @type { import('@storybook/nextjs').StorybookConfig } */
 const config = {
   stories: ['../**/*.stories.@(js|jsx|mjs|ts|tsx)', '../../../packages/ui/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
-  addons: [
-    getAbsolutePath('@storybook/addon-links'),
-    getAbsolutePath('@storybook/addon-essentials'),
-    getAbsolutePath('@storybook/addon-interactions'),
-    getAbsolutePath('@storybook/addon-docs')
-  ],
+  addons: [getAbsolutePath('@storybook/addon-links'), getAbsolutePath('@storybook/addon-docs')],
   framework: {
     name: getAbsolutePath('@storybook/nextjs'),
     options: {}
@@ -36,4 +31,5 @@ const config = {
   // },
   staticDirs: ['../public']
 }
+
 export default config

moon/apps/web/Dockerfile

@@ -1,11 +1,11 @@
 # syntax = docker/dockerfile:1
 
-FROM node:20-slim AS base
+FROM node:26-slim AS base
 
-# configure pnpm
+# configure pnpm (node:26 images no longer ship corepack)
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME/bin:$PNPM_HOME:$PATH"
-RUN corepack enable && corepack prepare pnpm@9.7.1 --activate
+RUN npm install -g pnpm@11.17.0
 
 
 # Throw-away build stage to reduce size of final image