Merge remote-tracking branch 'origin/develop' into feature/i18n_first_steps

; Conflicts:
;	package-lock.json
;	package.json

Author: eliandoran

.github/workflows/dev.yml

@@ -1,6 +1,14 @@
 name: Dev
 on:
   push:
+    branches-ignore:
+      - 'develop'
+      - 'feature/update**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build_docker:
     name: Build Docker image
@@ -10,7 +18,7 @@ jobs:
       - name: Set up node & dependencies
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: "npm"
       - run: npm ci    
       - name: Run the TypeScript build

.github/workflows/main.yml

@@ -3,9 +3,18 @@ on:
   push:
     branches:
       - 'develop'
+      - 'feature/update*'
+    paths-ignore:
+      - 'docs/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
+
 jobs:
   build_darwin-x64:
     name: Build macOS x86_64
@@ -15,10 +24,12 @@ jobs:
       - name: Set up node & dependencies
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: "npm"
       - run: npm ci
-      - run: ./bin/build-mac-x64.sh
+      - run: |
+          npm run update-build-info
+          ./bin/build-mac-x64.sh
       - uses: actions/upload-artifact@v4
         with:
           name: trilium-mac-x64.zip
@@ -31,10 +42,12 @@ jobs:
       - name: Set up node & dependencies
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: "npm"
       - run: npm ci
-      - run: ./bin/build-mac-arm64.sh
+      - run: |
+          npm run update-build-info
+          ./bin/build-mac-arm64.sh
       - uses: actions/upload-artifact@v4
         with:
           name: trilium-mac-arm64.zip
@@ -47,10 +60,12 @@ jobs:
       - name: Set up node & dependencies
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: "npm"
       - run: npm ci
-      - run: ./bin/build-linux-x64.sh
+      - run: |
+          npm run update-build-info
+          ./bin/build-linux-x64.sh
       - uses: actions/upload-artifact@v4
         with:
           name: trilium-linux-x64.tar.xz
@@ -67,10 +82,12 @@ jobs:
       - name: Set up node & dependencies
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: "npm"
       - run: npm ci
-      - run: ./bin/build-server.sh
+      - run: |
+          npm run update-build-info
+          ./bin/build-server.sh
       - uses: actions/upload-artifact@v4
         with:
           name: trilium-linux-x64-server.tar.xz
@@ -90,14 +107,36 @@ jobs:
       - name: Set up node & dependencies
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: "npm"
       - run: npm ci
-      - run: ./bin/build-win-x64.sh
+      - run: |
+          npm run update-build-info
+          ./bin/build-win-x64.sh DONTPACK
       - uses: actions/upload-artifact@v4
         with:
-          name: trilium-windows-x64.zip
-          path: dist/trilium-windows-x64-*.zip
+          name: trilium-windows-x64
+          path: dist/trilium-windows-x64
+  build_windows-installer:
+    name: Build Windows x86_64 (Setup)
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up node & dependencies
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: "npm"
+      - run: npm ci
+      - name: Run installer build
+        run: |
+          npm run update-build-info
+          npm run make-electron
+      - name: Publish installer artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: TriliumNext Notes for Windows (Setup)
+          path: out/make/squirrel.windows/x64/*.exe
   build_docker:
     name: Build Docker image
     runs-on: ubuntu-latest
@@ -122,7 +161,7 @@ jobs:
       - name: Set up node & dependencies
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: "npm"
       - run: npm ci    
       - name: Run the TypeScript build

.gitignore

@@ -15,3 +15,5 @@ data/
 data-test/
 tmp/
 .eslintcache
+
+out/

.gitpod.yml

@@ -2,7 +2,7 @@ image:
   file: .gitpod.dockerfile
 
 tasks:
-    - before: nvm install 18.18.2 && nvm use 18.18.2
+    - before: nvm install 20.15.1 && nvm use 20.15.1
       init: npm install
       command: npm run start-server
 

Dockerfile

@@ -1,5 +1,5 @@
 # !!! Don't try to build this Dockerfile directly, run it through bin/build-docker.sh script !!!
-FROM node:18.18.2-alpine
+FROM node:20.15.1-alpine
 
 # Configure system dependencies
 RUN apk add --no-cache --virtual .build-dependencies \

bin/build-linux-x64.sh

@@ -35,7 +35,7 @@ echo "Packaging linux x64 electron build"
 BUILD_DIR=./dist/trilium-linux-x64
 rm -rf "$BUILD_DIR"
 
-mv "./dist/Trilium Notes-linux-x64" "$BUILD_DIR"
+mv "./dist/TriliumNext Notes-linux-x64" "$BUILD_DIR"
 
 cp images/app-icons/png/128x128.png "$BUILD_DIR"/icon.png
 cp bin/tpl/anonymize-database.sql "$BUILD_DIR"/

bin/build-mac-arm64.sh

@@ -21,7 +21,7 @@ BUILD_DIR=./dist/trilium-mac-arm64
 rm -rf $BUILD_DIR
 
 # Mac build has by default useless directory level
-mv "./dist/Trilium Notes-darwin-arm64" $BUILD_DIR
+mv "./dist/TriliumNext Notes-darwin-arm64" $BUILD_DIR
 
 cp bin/tpl/anonymize-database.sql $BUILD_DIR/
 

bin/build-mac-x64.sh

@@ -21,7 +21,7 @@ BUILD_DIR=./dist/trilium-mac-x64
 rm -rf $BUILD_DIR
 
 # Mac build has by default useless directory level
-mv "./dist/Trilium Notes-darwin-x64" $BUILD_DIR
+mv "./dist/TriliumNext Notes-darwin-x64" $BUILD_DIR
 
 cp bin/tpl/anonymize-database.sql $BUILD_DIR/
 

bin/build-server.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 PKG_DIR=dist/trilium-linux-x64-server
-NODE_VERSION=18.18.2
+NODE_VERSION=20.15.1
 
 if [ "$1" != "DONTCOPY" ]
 then

bin/build-win-x64.sh

@@ -25,7 +25,7 @@ echo "Packaging windows x64 electron build"
 BUILD_DIR=./dist/trilium-windows-x64
 rm -rf $BUILD_DIR
 
-mv "./dist/Trilium Notes-win32-x64" $BUILD_DIR
+mv "./dist/TriliumNext Notes-win32-x64" $BUILD_DIR
 
 cp bin/tpl/anonymize-database.sql $BUILD_DIR/
 
@@ -34,9 +34,11 @@ rm -rf $BUILD_DIR/dump-db/node_modules
 
 cp bin/tpl/trilium-{portable,no-cert-check,safe-mode}.bat $BUILD_DIR/
 
-echo "Zipping windows x64 electron distribution..."
-VERSION=`jq -r ".version" package.json`
-
-cd dist
+if [ "$1" != "DONTPACK" ]
+then
+  echo "Zipping windows x64 electron distribution..."
+  VERSION=`jq -r ".version" package.json`
 
-zip -r9 trilium-windows-x64-${VERSION}.zip trilium-windows-x64
+  cd dist
+  zip -r9 trilium-windows-x64-${VERSION}.zip trilium-windows-x64
+fi