diff --git a/.github/actions/build-electron/action.yml b/.github/actions/build-electron/action.yml index 9e5b1670b..93772d7d9 100644 --- a/.github/actions/build-electron/action.yml +++ b/.github/actions/build-electron/action.yml @@ -85,7 +85,7 @@ runs: APPLE_ID: ${{ env.APPLE_ID }} APPLE_ID_PASSWORD: ${{ env.APPLE_ID_PASSWORD }} WINDOWS_SIGN_EXECUTABLE: ${{ env.WINDOWS_SIGN_EXECUTABLE }} - TRILIUM_ARTIFACT_NAME_HINT: TriliumNextNotes-${{ github.ref_name }}-${{ inputs.os }}-${{ inputs.arch }} + TRILIUM_ARTIFACT_NAME_HINT: TriliumNotes-${{ github.ref_name }}-${{ inputs.os }}-${{ inputs.arch }} run: pnpm nx --project=desktop electron-forge:make -- --arch=${{ inputs.arch }} --platform=${{ inputs.forge_platform }} # Add DMG signing step diff --git a/.github/actions/build-server/action.yml b/.github/actions/build-server/action.yml index c3c6288bc..b0ab05212 100644 --- a/.github/actions/build-server/action.yml +++ b/.github/actions/build-server/action.yml @@ -30,4 +30,4 @@ runs: mkdir -p upload file=$(find ./apps/server/out -name '*.tar.xz' -print -quit) name=${{ github.ref_name }} - cp "$file" "upload/TriliumNextNotes-Server-${name//\//-}-${{ inputs.os }}-${{ inputs.arch }}.tar.xz" + cp "$file" "upload/TriliumNotes-Server-${name//\//-}-${{ inputs.os }}-${{ inputs.arch }}.tar.xz" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 1f370c360..990c8dfb9 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -92,7 +92,7 @@ jobs: uses: actions/upload-artifact@v4 if: ${{ github.event_name == 'pull_request' }} with: - name: TriliumNextNotes ${{ matrix.os.name }} ${{ matrix.arch }} + name: TriliumNotes ${{ matrix.os.name }} ${{ matrix.arch }} path: apps/desktop/upload nightly-server: diff --git a/.nvmrc b/.nvmrc index 156ca6d39..fcc226927 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -22.16.0 \ No newline at end of file +22.17.0 \ No newline at end of file diff --git a/_regroup/package.json b/_regroup/package.json index abca80567..b9e974e1b 100644 --- a/_regroup/package.json +++ b/_regroup/package.json @@ -38,7 +38,7 @@ "@playwright/test": "1.53.1", "@stylistic/eslint-plugin": "5.0.0", "@types/express": "5.0.3", - "@types/node": "22.15.32", + "@types/node": "22.15.33", "@types/yargs": "17.0.33", "@vitest/coverage-v8": "3.2.4", "eslint": "9.29.0", diff --git a/apps/server/Dockerfile b/apps/server/Dockerfile index dbb021f58..22fecf269 100644 --- a/apps/server/Dockerfile +++ b/apps/server/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22.16.0-bullseye-slim AS builder +FROM node:22.17.0-bullseye-slim AS builder RUN corepack enable # Install native dependencies since we might be building cross-platform. @@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/ # We have to use --no-frozen-lockfile due to CKEditor patches RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild -FROM node:22.16.0-bullseye-slim +FROM node:22.17.0-bullseye-slim # Install only runtime dependencies RUN apt-get update && \ apt-get install -y --no-install-recommends \ diff --git a/apps/server/Dockerfile.alpine b/apps/server/Dockerfile.alpine index 18bc42bf5..53d5506ac 100644 --- a/apps/server/Dockerfile.alpine +++ b/apps/server/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM node:22.16.0-alpine AS builder +FROM node:22.17.0-alpine AS builder RUN corepack enable # Install native dependencies since we might be building cross-platform. @@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/ # We have to use --no-frozen-lockfile due to CKEditor patches RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild -FROM node:22.16.0-alpine +FROM node:22.17.0-alpine # Install runtime dependencies RUN apk add --no-cache su-exec shadow diff --git a/apps/server/Dockerfile.alpine.rootless b/apps/server/Dockerfile.alpine.rootless index 8f2325c29..dbc0a32b8 100644 --- a/apps/server/Dockerfile.alpine.rootless +++ b/apps/server/Dockerfile.alpine.rootless @@ -1,4 +1,4 @@ -FROM node:22.16.0-alpine AS builder +FROM node:22.17.0-alpine AS builder RUN corepack enable # Install native dependencies since we might be building cross-platform. @@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/ # We have to use --no-frozen-lockfile due to CKEditor patches RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild -FROM node:22.16.0-alpine +FROM node:22.17.0-alpine # Create a non-root user with configurable UID/GID ARG USER=trilium ARG UID=1001 diff --git a/apps/server/Dockerfile.rootless b/apps/server/Dockerfile.rootless index 1c4ae0321..035d487c6 100644 --- a/apps/server/Dockerfile.rootless +++ b/apps/server/Dockerfile.rootless @@ -1,4 +1,4 @@ -FROM node:22.16.0-bullseye-slim AS builder +FROM node:22.17.0-bullseye-slim AS builder RUN corepack enable # Install native dependencies since we might be building cross-platform. @@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/ # We have to use --no-frozen-lockfile due to CKEditor patches RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild -FROM node:22.16.0-bullseye-slim +FROM node:22.17.0-bullseye-slim # Create a non-root user with configurable UID/GID ARG USER=trilium ARG UID=1001 diff --git a/apps/server/scripts/build-server.sh b/apps/server/scripts/build-server.sh index b81e2901a..115a441cb 100644 --- a/apps/server/scripts/build-server.sh +++ b/apps/server/scripts/build-server.sh @@ -48,7 +48,7 @@ chmod 755 $BUILD_DIR/trilium.sh VERSION=`jq -r ".version" package.json` -ARCHIVE_NAME="TriliumNextNotes-Server-${VERSION}-linux-${ARCH}" +ARCHIVE_NAME="TriliumNotes-Server-${VERSION}-linux-${ARCH}" echo "Creating Archive $ARCHIVE_NAME..." mkdir $DIST_DIR diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.html index 6d92fef26..8cff3851b 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.html @@ -3,10 +3,10 @@

Steps

tar -xvf TriliumNotes-Server-[VERSION]-linux-x64.tar.xz
 sudo mv trilium-linux-x64-server /opt/trilium