Merge branch 'main' into ndh/task-3829-viewtype-vcard

deltachat · May 31, 2024 · 3211415 · 3211415
2 parents 4753ae1 + 377526d
commit 3211415
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 178 deletions.
diff --git a/README.md b/README.md
@@ -48,23 +48,23 @@
 
 <details><summary>Click to expand</summary>
 
-- [deltachat-desktop](#deltachat-desktop)
-  - [Documentation Links](#docs)
+- [Delta Chat Desktop ](#delta-chat-desktop-)
+  - [Documentation Links ](#documentation-links-)
   - [Table of Contents](#table-of-contents)
-  - [Install](#install-)
-    - [Linux](#linux-)
-      - [Flatpak](#flatpak-)
-      - [Arch Linux](#arch-linux-)
-    - [MacOS](#mac-os-)
+  - [Install ](#install-)
+    - [Linux ](#linux-)
+      - [Flatpak ](#flatpak-)
+      - [Arch Linux ](#arch-linux-)
+    - [Mac OS ](#mac-os-)
       - [Homebrew](#homebrew)
       - [DMG](#dmg)
-    - [Windows](#windows)
-    - [From Source](#from-source-)
-    - [Troubleshooting](#troubleshooting-)
-  - [Configuration and Databases](#configuration-and-databases-)
-  - [How to Contribute](#how-to-contribute-)
-  - [Logging](#logging-)
-  - [License](#license-)
+    - [Windows ](#windows-)
+    - [From Source ](#from-source-)
+    - [Troubleshooting ](#troubleshooting-)
+  - [Configuration and Databases ](#configuration-and-databases-)
+  - [How to Contribute ](#how-to-contribute-)
+  - [Logging ](#logging-)
+  - [License ](#license-)
 
 </details>
 
@@ -167,7 +167,7 @@ Then try running `npm install` again.
 
 Make sure that your nodejs version is `20.0.0` or newer.
 
-If you still get errors look at the instructions in the [`deltachat-node`](https://github.com/deltachat/deltachat-core-rust/tree/master/node) and [`deltachat-core-rust`](https://github.com/deltachat/deltachat-core-rust) README files to set things up [`or write an issue`](https://github.com/deltachat/deltachat-desktop/issues/new/choose).
+If you still get errors look at the instructions in [UPDATE_CORE Readme](./docs/UPDATE_CORE.md) to set things up [`or write an issue`](https://github.com/deltachat/deltachat-desktop/issues/new/choose).
 
 ## Configuration and Databases <a id="config-and-db"></a>
 

diff --git a/build/packageignore_list b/build/packageignore_list
@@ -92,44 +92,6 @@ node_modules/classnames
 node_modules/use-debounce
 node_modules/create-react-context
 
-
-# cleanup deltachat-node
-node_modules/deltachat-node/.*
-node_modules/deltachat-node/*.md
-node_modules/deltachat-node/target
-node_modules/deltachat-node/src
-node_modules/deltachat-node/assets
-node_modules/deltachat-node/benches
-node_modules/deltachat-node/Cargo.*
-node_modules/deltachat-node/deltachat_derive
-node_modules/deltachat-node/deltachat-ffi
-node_modules/deltachat-node/examples
-node_modules/deltachat-node/LICENSE
-node_modules/deltachat-node/node/*.md
-node_modules/deltachat-node/node/constants.js
-node_modules/deltachat-node/node/events.js
-node_modules/deltachat-node/node/binding.gyp
-node_modules/deltachat-node/node/lib
-node_modules/deltachat-node/node/LICENSE
-node_modules/deltachat-node/node/patches
-node_modules/deltachat-node/node/scripts
-node_modules/deltachat-node/node/src
-node_modules/deltachat-node/node/tsconfig.json
-node_modules/deltachat-node/release.toml
-node_modules/deltachat-node/rust-toolchain
-node_modules/deltachat-node/deltachat-jsonrpc
-node_modules/deltachat-node/deltachat-ratelimit
-node_modules/deltachat-node/deltachat-repl
-node_modules/deltachat-node/deltachat-rpc-client
-node_modules/deltachat-node/deltachat-rpc-server
-node_modules/deltachat-node/format-flowed 
-node_modules/deltachat-node/fuzz
-
-
-# backend dev dependencies, only needed for building backend (dc node in the case)
-node_modules/napi-macros
-
-
 # need testing?
 node_modules/resize-observer-polyfill
 

diff --git a/electron-builder.json5 b/electron-builder.json5
@@ -50,6 +50,7 @@
     '!**/.eslintignore',
     '!**/Makefile',
     '!html-dist/help/**/.keep-dir',
+    '!html-dist/xdcs/',
     '!docs/',
     '!dist/',
     '!src/',
@@ -84,37 +85,6 @@
     '!node_modules/classnames',
     '!node_modules/use-debounce',
     '!node_modules/create-react-context',
-    '!node_modules/deltachat-node/.*',
-    '!node_modules/deltachat-node/*.md',
-    '!node_modules/deltachat-node/target',
-    '!node_modules/deltachat-node/src',
-    '!node_modules/deltachat-node/assets',
-    '!node_modules/deltachat-node/benches',
-    '!node_modules/deltachat-node/Cargo.*',
-    '!node_modules/deltachat-node/deltachat_derive',
-    '!node_modules/deltachat-node/deltachat-ffi',
-    '!node_modules/deltachat-node/examples',
-    '!node_modules/deltachat-node/LICENSE',
-    '!node_modules/deltachat-node/node/*.md',
-    '!node_modules/deltachat-node/node/constants.js',
-    '!node_modules/deltachat-node/node/events.js',
-    '!node_modules/deltachat-node/node/binding.gyp',
-    '!node_modules/deltachat-node/node/lib',
-    '!node_modules/deltachat-node/node/LICENSE',
-    '!node_modules/deltachat-node/node/patches',
-    '!node_modules/deltachat-node/node/scripts',
-    '!node_modules/deltachat-node/node/src',
-    '!node_modules/deltachat-node/node/tsconfig.json',
-    '!node_modules/deltachat-node/release.toml',
-    '!node_modules/deltachat-node/rust-toolchain',
-    '!node_modules/deltachat-node/deltachat-jsonrpc',
-    '!node_modules/deltachat-node/deltachat-ratelimit',
-    '!node_modules/deltachat-node/deltachat-repl',
-    '!node_modules/deltachat-node/deltachat-rpc-client',
-    '!node_modules/deltachat-node/deltachat-rpc-server',
-    '!node_modules/deltachat-node/format-flowed',
-    '!node_modules/deltachat-node/fuzz',
-    '!node_modules/napi-macros',
     '!node_modules/resize-observer-polyfill',
     '!node_modules/geojson-vt',
     '!node_modules/geojson-flatten',
@@ -175,7 +145,7 @@
     '!node_modules/tough-cookie',
     '!node_modules/punycode',
   ],
-  asarUnpack: ['html-dist/xdcs/'],
+  asarUnpack: [],
   afterPack: './build/afterPackHook.cjs',
   afterSign: './build/afterSignHook.cjs',
   mac: {
@@ -224,6 +194,7 @@
       '!**/.eslintignore',
       '!**/Makefile',
       '!html-dist/help/**/.keep-dir',
+      '!html-dist/xdcs/',
       '!docs/',
       '!dist/',
       '!src/',
@@ -258,37 +229,6 @@
       '!node_modules/classnames',
       '!node_modules/use-debounce',
       '!node_modules/create-react-context',
-      '!node_modules/deltachat-node/.*',
-      '!node_modules/deltachat-node/*.md',
-      '!node_modules/deltachat-node/target',
-      '!node_modules/deltachat-node/src',
-      '!node_modules/deltachat-node/assets',
-      '!node_modules/deltachat-node/benches',
-      '!node_modules/deltachat-node/Cargo.*',
-      '!node_modules/deltachat-node/deltachat_derive',
-      '!node_modules/deltachat-node/deltachat-ffi',
-      '!node_modules/deltachat-node/examples',
-      '!node_modules/deltachat-node/LICENSE',
-      '!node_modules/deltachat-node/node/*.md',
-      '!node_modules/deltachat-node/node/constants.js',
-      '!node_modules/deltachat-node/node/events.js',
-      '!node_modules/deltachat-node/node/binding.gyp',
-      '!node_modules/deltachat-node/node/lib',
-      '!node_modules/deltachat-node/node/LICENSE',
-      '!node_modules/deltachat-node/node/patches',
-      '!node_modules/deltachat-node/node/scripts',
-      '!node_modules/deltachat-node/node/src',
-      '!node_modules/deltachat-node/node/tsconfig.json',
-      '!node_modules/deltachat-node/release.toml',
-      '!node_modules/deltachat-node/rust-toolchain',
-      '!node_modules/deltachat-node/deltachat-jsonrpc',
-      '!node_modules/deltachat-node/deltachat-ratelimit',
-      '!node_modules/deltachat-node/deltachat-repl',
-      '!node_modules/deltachat-node/deltachat-rpc-client',
-      '!node_modules/deltachat-node/deltachat-rpc-server',
-      '!node_modules/deltachat-node/format-flowed',
-      '!node_modules/deltachat-node/fuzz',
-      '!node_modules/napi-macros',
       '!node_modules/resize-observer-polyfill',
       '!node_modules/geojson-vt',
       '!node_modules/geojson-flatten',
@@ -405,6 +345,7 @@
       '!**/.eslintignore',
       '!**/Makefile',
       '!html-dist/help/**/.keep-dir',
+      '!html-dist/xdcs/',
       '!docs/',
       '!dist/',
       '!src/',
@@ -439,37 +380,6 @@
       '!node_modules/classnames',
       '!node_modules/use-debounce',
       '!node_modules/create-react-context',
-      '!node_modules/deltachat-node/.*',
-      '!node_modules/deltachat-node/*.md',
-      '!node_modules/deltachat-node/target',
-      '!node_modules/deltachat-node/src',
-      '!node_modules/deltachat-node/assets',
-      '!node_modules/deltachat-node/benches',
-      '!node_modules/deltachat-node/Cargo.*',
-      '!node_modules/deltachat-node/deltachat_derive',
-      '!node_modules/deltachat-node/deltachat-ffi',
-      '!node_modules/deltachat-node/examples',
-      '!node_modules/deltachat-node/LICENSE',
-      '!node_modules/deltachat-node/node/*.md',
-      '!node_modules/deltachat-node/node/constants.js',
-      '!node_modules/deltachat-node/node/events.js',
-      '!node_modules/deltachat-node/node/binding.gyp',
-      '!node_modules/deltachat-node/node/lib',
-      '!node_modules/deltachat-node/node/LICENSE',
-      '!node_modules/deltachat-node/node/patches',
-      '!node_modules/deltachat-node/node/scripts',
-      '!node_modules/deltachat-node/node/src',
-      '!node_modules/deltachat-node/node/tsconfig.json',
-      '!node_modules/deltachat-node/release.toml',
-      '!node_modules/deltachat-node/rust-toolchain',
-      '!node_modules/deltachat-node/deltachat-jsonrpc',
-      '!node_modules/deltachat-node/deltachat-ratelimit',
-      '!node_modules/deltachat-node/deltachat-repl',
-      '!node_modules/deltachat-node/deltachat-rpc-client',
-      '!node_modules/deltachat-node/deltachat-rpc-server',
-      '!node_modules/deltachat-node/format-flowed',
-      '!node_modules/deltachat-node/fuzz',
-      '!node_modules/napi-macros',
       '!node_modules/resize-observer-polyfill',
       '!node_modules/geojson-vt',
       '!node_modules/geojson-flatten',
@@ -570,6 +480,7 @@
       '!**/.eslintignore',
       '!**/Makefile',
       '!html-dist/help/**/.keep-dir',
+      '!html-dist/xdcs/',
       '!docs/',
       '!dist/',
       '!src/',
@@ -604,37 +515,6 @@
       '!node_modules/classnames',
       '!node_modules/use-debounce',
       '!node_modules/create-react-context',
-      '!node_modules/deltachat-node/.*',
-      '!node_modules/deltachat-node/*.md',
-      '!node_modules/deltachat-node/target',
-      '!node_modules/deltachat-node/src',
-      '!node_modules/deltachat-node/assets',
-      '!node_modules/deltachat-node/benches',
-      '!node_modules/deltachat-node/Cargo.*',
-      '!node_modules/deltachat-node/deltachat_derive',
-      '!node_modules/deltachat-node/deltachat-ffi',
-      '!node_modules/deltachat-node/examples',
-      '!node_modules/deltachat-node/LICENSE',
-      '!node_modules/deltachat-node/node/*.md',
-      '!node_modules/deltachat-node/node/constants.js',
-      '!node_modules/deltachat-node/node/events.js',
-      '!node_modules/deltachat-node/node/binding.gyp',
-      '!node_modules/deltachat-node/node/lib',
-      '!node_modules/deltachat-node/node/LICENSE',
-      '!node_modules/deltachat-node/node/patches',
-      '!node_modules/deltachat-node/node/scripts',
-      '!node_modules/deltachat-node/node/src',
-      '!node_modules/deltachat-node/node/tsconfig.json',
-      '!node_modules/deltachat-node/release.toml',
-      '!node_modules/deltachat-node/rust-toolchain',
-      '!node_modules/deltachat-node/deltachat-jsonrpc',
-      '!node_modules/deltachat-node/deltachat-ratelimit',
-      '!node_modules/deltachat-node/deltachat-repl',
-      '!node_modules/deltachat-node/deltachat-rpc-client',
-      '!node_modules/deltachat-node/deltachat-rpc-server',
-      '!node_modules/deltachat-node/format-flowed',
-      '!node_modules/deltachat-node/fuzz',
-      '!node_modules/napi-macros',
       '!node_modules/resize-observer-polyfill',
       '!node_modules/geojson-vt',
       '!node_modules/geojson-flatten',