Merge branch 'develop' into chore_lint-share

Author: eliandoran

.dockerignore

@@ -5,7 +5,6 @@
 .prettier*
 electron*
 entitlements.plist
-forge.config.cjs
 nodemon.json
 renovate.json
 trilium.iml
@@ -34,4 +33,10 @@ npm-debug.log
 
 
 # exceptions
-!/bin/copy-dist.ts
+!/bin/copy-dist.ts
+
+# temporary exception to make copy-dist inside Docker build not fail
+# TriliumNextTODO: make copy-dist *not* requiring to copy this file for builds other than electron-forge
+!forge.config.cjs
+!/bin/tpl
+!/bin/electron-forge/desktop.ejs

.github/actions/build-electron/action.yml

@@ -18,7 +18,7 @@ runs:
     # Certificate setup
     - name: Import Apple certificates
       if: inputs.os == 'macos'
-      uses: apple-actions/import-codesign-certs@v3
+      uses: apple-actions/import-codesign-certs@v4
       with:
         p12-file-base64: ${{ env.APPLE_APP_CERTIFICATE_BASE64 }}
         p12-password: ${{ env.APPLE_APP_CERTIFICATE_PASSWORD }}
@@ -27,7 +27,7 @@ runs:
 
     - name: Install Installer certificate
       if: inputs.os == 'macos'
-      uses: apple-actions/import-codesign-certs@v3
+      uses: apple-actions/import-codesign-certs@v4
       with:
         p12-file-base64: ${{ env.APPLE_INSTALLER_CERTIFICATE_BASE64 }}
         p12-password: ${{ env.APPLE_INSTALLER_CERTIFICATE_PASSWORD }}
@@ -97,7 +97,7 @@ runs:
       shell: bash
       run: |
         echo "Signing DMG file..."
-        dmg_file=$(find out -name "*.dmg" -print -quit)
+        dmg_file=$(find ./dist -name "*.dmg" -print -quit)
         if [ -n "$dmg_file" ]; then
           echo "Found DMG: $dmg_file"
           # Get the first valid signing identity from the keychain
@@ -125,7 +125,7 @@ runs:
 
         # First check the .app bundle
         echo "Looking for .app bundle..."
-        app_bundle=$(find out -name "*.app" -print -quit)
+        app_bundle=$(find ./dist -name "*.app" -print -quit)
         if [ -n "$app_bundle" ]; then
           echo "Found app bundle: $app_bundle"
           echo "Verifying app bundle signing..."
@@ -144,7 +144,7 @@ runs:
 
         # Then check DMG if it exists
         echo "Looking for DMG..."
-        dmg_file=$(find out -name "*.dmg" -print -quit)
+        dmg_file=$(find ./dist -name "*.dmg" -print -quit)
         if [ -n "$dmg_file" ]; then
           echo "Found DMG: $dmg_file"
           echo "Verifying DMG signing..."
@@ -160,7 +160,7 @@ runs:
 
         # Finally check ZIP if it exists
         echo "Looking for ZIP..."
-        zip_file=$(find out -name "*.zip" -print -quit)
+        zip_file=$(find ./dist -name "*.zip" -print -quit)
         if [ -n "$zip_file" ]; then
           echo "Found ZIP: $zip_file"
           echo "Note: ZIP files are not code signed, but their contents should be"
@@ -177,7 +177,7 @@ runs:
 
           # Look for DMG files recursively
           echo "Looking for DMG files..."
-          dmg_file=$(find out -name "*.dmg" -print -quit)
+          dmg_file=$(find ./dist -name "*.dmg" -print -quit)
           if [ -n "$dmg_file" ]; then
             echo "Found DMG: $dmg_file"
             cp "$dmg_file" "upload/TriliumNextNotes-${{ github.ref_name }}-macos-${{ inputs.arch }}.dmg"
@@ -187,7 +187,7 @@ runs:
 
           # Look for ZIP files recursively
           echo "Looking for ZIP files..."
-          zip_file=$(find out -name "*.zip" -print -quit)
+          zip_file=$(find ./dist -name "*.zip" -print -quit)
           if [ -n "$zip_file" ]; then
             echo "Found ZIP: $zip_file"
             cp "$zip_file" "upload/TriliumNextNotes-${{ github.ref_name }}-macos-${{ inputs.arch }}.zip"
@@ -199,7 +199,7 @@ runs:
           echo "Collecting artifacts for ${{ inputs.os }}..."
           for ext in ${{ inputs.extension }}; do
             echo "Looking for .$ext files..."
-            file=$(find out -name "*.$ext" -print -quit)
+            file=$(find ./dist -name "*.$ext" -print -quit)
             if [ -n "$file" ]; then
               echo "Found $file for extension $ext"
               cp "$file" "upload/TriliumNextNotes-${{ github.ref_name }}-${{ inputs.os }}-${{ inputs.arch }}.$ext"

.github/workflows/dev.yml

@@ -1,9 +1,9 @@
 name: Dev
 on:
   push:
-    branches-ignore:
-      - 'develop'
-      - 'feature/update**'
+    branches: [ develop ]
+  pull_request:
+    branches: [ develop ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

_check_ts_progress.sh

@@ -30,6 +30,9 @@ try {
         "./package.json",
         "./LICENSE",
         "./README.md",
+        "./forge.config.cjs",
+        "./bin/tpl/",
+        "./bin/electron-forge/desktop.ejs",
         "./src/views/",
         "./src/etapi/etapi.openapi.yaml",
         "./src/routes/api/openapi.json",
@@ -38,7 +41,8 @@ try {
         "./src/public/robots.txt",
         "./src/public/fonts",
         "./src/public/stylesheets",
-        "./src/public/translations"
+        "./src/public/translations",
+        "./packages/turndown-plugin-gfm/src"
     ]);
 
     for (const asset of assetsToCopy) {
@@ -64,7 +68,6 @@ try {
         "node_modules/katex/dist/contrib/mhchem.min.js",
         "node_modules/katex/dist/contrib/auto-render.min.js",
         "node_modules/@highlightjs/cdn-assets/highlight.min.js",
-        "node_modules/@mind-elixir/node-menu/dist/node-menu.umd.cjs"
     ]);
 
     const nodeModulesFolder = new Set([
@@ -73,14 +76,11 @@ try {
         "node_modules/dayjs/",
         "node_modules/boxicons/css/",
         "node_modules/boxicons/fonts/",
-        "node_modules/mermaid/dist/",
         "node_modules/jquery/dist/",
         "node_modules/jquery-hotkeys/",
         "node_modules/split.js/dist/",
-        "node_modules/panzoom/dist/",
         "node_modules/i18next/",
         "node_modules/i18next-http-backend/",
-        "node_modules/jsplumb/dist/",
         "node_modules/vanilla-js-wheel-zoom/dist/",
         "node_modules/mark.js/dist/",
         "node_modules/normalize.css/",
@@ -90,7 +90,6 @@ try {
         "node_modules/codemirror/addon/",
         "node_modules/codemirror/mode/",
         "node_modules/codemirror/keymap/",
-        "node_modules/mind-elixir/dist/",
         "node_modules/@highlightjs/cdn-assets/languages",
         "node_modules/@highlightjs/cdn-assets/styles",
         "node_modules/leaflet/dist"