Changes from mar-2025 to apr-2025

Author: pashokitsme

.cargo/config.toml

@@ -8,7 +8,7 @@ CARGO_WORKSPACE_DIR = { value = "", relative = true }
 rustflags = [
   "-Ctarget-feature=+atomics,+bulk-memory",
   "-Clink-args=-pthread -sPTHREAD_POOL_SIZE=8",
-  "-Clink-args=--post-js apps/browser/wasm/js/post.js -o apps/browser/wasm/dist/gramax-wasm.js",
+  "-Clink-args=--post-js apps/browser/crates/gramax-wasm/js/post.js -o apps/browser/crates/gramax-wasm/dist/gramax-wasm.js",
   "-Clink-args=-sWASM=1 -sWASMFS=1 -sUSE_ZLIB=1 -sEXPORT_ES6=1 -sMALLOC=emmalloc -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory -sALLOW_MEMORY_GROWTH=1 -sMAXIMUM_MEMORY=4gb -sINITIAL_MEMORY=1024mb -sSTACK_SIZE=15mb",
   "-Clink-args=-sASYNCIFY=1 -sASYNCIFY_IMPORTS=@.cargo/asyncify-imports",
   "-Clink-args=-sDEFAULT_LIBRARY_FUNCS_TO_INCLUDE=$writeArrayToMemory",

.cargo/exported-functions

@@ -14,6 +14,7 @@ _delete_branch
 _diff
 _fetch
 _file_history
+_format_merge_message
 _get_content
 _get_parent
 _get_remote
@@ -58,4 +59,6 @@ _list_merge_requests
 _create_or_update_merge_request
 _get_draft_merge_request
 _get_all_commit_authors
+_gc
 _reset_repo
+_set_last_http_error

.dockerignore

@@ -10,4 +10,4 @@ node_modules/
 **/out/
 target/
 
-!apps/browser/wasm/dist
+!apps/browser/crates/gramax-wasm/dist

.eslintrc

@@ -33,7 +33,9 @@
 		"**/dist/**/*",
 		"apps/tauri/target",
 		"apps/tauri/src-tauri",
-		"apps/next/crates/next-gramax-git"
+		"apps/next/crates/next-gramax-git",
+
+		"services/target/admin/client"
 	],
 	"plugins": ["@typescript-eslint", "react", "react-hooks", "promise"],
 	"settings": {

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,31 @@
+name: Bug Report
+description: Report a bug
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please give the issue a good title - be less abstract and more specific.
+        Use code blocks for markdown, stacktraces or code snippets.
+        If there is a related issue, please reference it in the description.
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the bug
+      description: A clear description of what the bug is. Screenshots or videos can be included to describe the issue more precisely
+      placeholder: Bug description
+    validations:
+      required: true
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Stacktrace / Markdown  (Optional)
+      description: Include an error stacktrace from the devtools console or markdown code block that reproduces the issue
+
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected behavior (Optional)
+      description: Describe what you expected to happen

.gitignore

@@ -64,5 +64,5 @@ junit*.xml
 .idea/
 
 
-!apps/browser/wasm/dist
+!apps/browser/crates/gramax-wasm/dist
 apps/next/gramaxVersion.txt

.vscode/settings.json

@@ -1,20 +1,38 @@
 {
-	// "rust-analyzer.cargo.target": "x86_64-pc-windows-msvc",
-	// "rust-analyzer.cargo.target": "x86_64-apple-darwin",
-	"rust-analyzer.cargo.target": "aarch64-apple-darwin",
+	// wasm
+
 	// "rust-analyzer.cargo.target": "wasm32-unknown-emscripten",
-	// "rust-analyzer.cargo.target": "aarch64-linux-android",
-	// "rust-analyzer.cargo.target": "aarch64-apple-ios",
+	// "rust-analyzer.check.targets": ["wasm32-unknown-emscripten"],
+	// "rust-analyzer.check.allTargets": true,
+	// "rust-analyzer.cargo.extraEnv": {
+	// 	"BUGSNAG_API_KEY": ""
+	// },
+
+	// macos
 
+	"rust-analyzer.cargo.target": "aarch64-apple-darwin",
 	"rust-analyzer.check.allTargets": true,
 	"rust-analyzer.check.targets": ["aarch64-apple-darwin"],
-	// "rust-analyzer.check.targets": ["wasm32-unknown-emscripten"],
-	// "rust-analyzer.check.features": [],
-	// "rust-analyzer.cargo.features": [],
 	"rust-analyzer.cargo.extraEnv": {
 		"BUGSNAG_API_KEY": ""
 	},
 
+	// windows
+
+	// "rust-analyzer.cargo.target": "x86_64-pc-windows-msvc",
+	// "rust-analyzer.check.allTargets": false,
+	// "rust-analyzer.cargo.target": "x86_64-pc-windows-msvc",
+	// "rust-analyzer.check.targets": ["x86_64-pc-windows-msvc"],
+	// "rust-analyzer.cargo.extraEnv": {
+	// 	"BUGSNAG_API_KEY": "",
+	// 	"TARGET_CC": "clang"
+	// },
+
+	// "rust-analyzer.server.extraEnv": {
+	// 	"CFLAGS": "-I$HOME/.xwin/splat/crt/include/ -I$HOME/.xwin/splat/sdk/include/um -I$HOME/.xwin/splat/sdk/include/ucrt -I$HOME/.xwin/splat/sdk/include/shared -I$HOME/.xwin/splat/sdk/include/winrt",
+	// 	"CARGO": "$HOME/.cargo/bin/cargo-xwin"
+	// },
+
 	"editor.tabCompletion": "on",
 
 	"search.exclude": {

Cargo.toml

@@ -1,22 +1,19 @@
 [workspace]
 resolver = "2"
-default-members = [
-  "crates/git",
-  "crates/fs",
-  "crates/bugsnag",
-  "crates/test-utils",
-]
+default-members = ["crates/git", "crates/fs", "crates/test-utils"]
 members = [
   "apps/tauri/plugins/plugin-gramax-fs",
   "apps/tauri/plugins/plugin-gramax-git",
   "apps/tauri/src-tauri",
+  "crates/bugsnag",
 
-  "apps/browser/wasm",
+  "apps/browser/crates/em-bindgen-macro",
+  "apps/browser/crates/gramax-wasm",
 
   "apps/next/crates/next-gramax-git",
-
-  "rbins/warp-spa",
   "apps/next/crates/napi-async-macro",
+
+  "crates/warp-spa",
 ]
 
 [workspace.package]
@@ -26,15 +23,9 @@ description = "Gramax"
 edition = "2021"
 
 [workspace.dependencies]
-tauri = { git = "https://github.com/tauri-apps/tauri", rev = "2d029a9f53117f756f9d6783fab74b06a7ab3e8e", features = [
-  "macos-private-api",
-  "devtools",
-] }
+tauri = { version = "^2.0.0", features = ["macos-private-api", "devtools"] }
 tauri-plugin = { version = "^2.0.0", features = ["build"] }
-tauri-build = { git = "https://github.com/tauri-apps/tauri", rev = "2d029a9f53117f756f9d6783fab74b06a7ab3e8e", features = [
-  "tauri-codegen",
-  "codegen",
-] }
+tauri-build = { version = "^2.0.0", features = ["tauri-codegen", "codegen"] }
 
 tauri-plugin-deep-link = "^2.0.0"
 tauri-plugin-dialog = "^2.0.0"
@@ -65,7 +56,3 @@ codegen-units = 256
 opt-level = 1
 debug = "full"
 debug-assertions = false
-
-[patch.crates-io]
-tauri = { git = "https://github.com/tauri-apps/tauri", rev = "2d029a9f53117f756f9d6783fab74b06a7ab3e8e" }
-tao = { git = "https://github.com/tauri-apps/tao", rev = "c97080cd0d65e0b3b32ba22007047f1f25533f12" }

app/browser/app.ts

@@ -1,4 +1,5 @@
-import resolveModule from "@app/resolveModule/backend";
+import resolveModule, { initModules } from "@app/resolveModule/backend";
+import { initModules as initModulesFrontend } from "@app/resolveModule/frontend";
 import { ContextFactory } from "@core/Context/ContextFactory";
 import DiskFileProvider from "@core/FileProvider/DiskFileProvider/DiskFileProvider";
 import MountFileProvider from "@core/FileProvider/MountFileProvider/MountFileProvider";
@@ -14,7 +15,6 @@ import VideoUrlRepository from "@core/components/video/videoUrlRepository";
 import YamlFileConfig from "@core/utils/YamlFileConfig";
 import Cache from "@ext/Cache";
 import { Encoder } from "@ext/Encoder/Encoder";
-import MailProvider from "@ext/MailProvider";
 import ThemeManager from "@ext/Theme/ThemeManager";
 import EnterpriseManager from "@ext/enterprise/EnterpriseManager";
 import RepositoryProvider from "@ext/git/core/Repository/RepositoryProvider";
@@ -31,18 +31,22 @@ import ClientAuthManager from "@ext/security/logic/ClientAuthManager";
 import { TicketManager } from "@ext/security/logic/TicketManager/TicketManager";
 import FuseSearcher from "@ext/serach/Fuse/FuseSearcher";
 import { IndexDataProvider } from "@ext/serach/IndexDataProvider";
-import Searcher from "@ext/serach/Searcher";
+import SearcherManager from "@ext/serach/SearcherManager";
 import { SourceDataProvider } from "@ext/storage/logic/SourceDataProvider/logic/SourceDataProvider";
 import WorkspaceManager from "@ext/workspace/WorkspaceManager";
 import setWorkerProxy from "../../apps/browser/src/logic/setWorkerProxy";
 import { AppConfig, getConfig, type AppGlobalConfig } from "../config/AppConfig";
 import Application from "../types/Application";
 
 const _init = async (config: AppConfig): Promise<Application> => {
-	const mp: MailProvider = null;
+	await initModulesFrontend();
+	await initModules();
+
 	const vur: VideoUrlRepository = null;
 
-	await resolveModule("initWasm")?.(config.services.gitProxy.url);
+	const initWasm = resolveModule("initWasm");
+
+	await initWasm?.(config.services.gitProxy.url);
 	await XxHash.init();
 
 	const fileConfig = await YamlFileConfig.readFromFile<AppGlobalConfig>(
@@ -69,7 +73,8 @@ const _init = async (config: AppConfig): Promise<Application> => {
 	rp.addSourceDataProvider(sdp);
 
 	await wm.readWorkspaces();
-	const services = wm.maybeCurrent()?.config()?.services ?? config.services;
+	const workspaceConfig = await wm.maybeCurrent()?.config();
+	const services = workspaceConfig?.services ?? config.services;
 	setWorkerProxy(services.gitProxy.url);
 
 	const hashes = new HashItemProvider();
@@ -92,25 +97,25 @@ const _init = async (config: AppConfig): Promise<Application> => {
 
 	const cache = new Cache(new DiskFileProvider(config.paths.data));
 	const indexDataProvider = new IndexDataProvider(wm, cache, parser, parserContextFactory);
-	const searcher: Searcher = new FuseSearcher(indexDataProvider);
+	const searcherManager = new SearcherManager(new FuseSearcher(indexDataProvider), { vector: null });
 
 	return {
 		am,
 		tm,
-		mp,
 		wm,
 		em,
 		rp,
 		vur,
 		logger,
 		parser,
 		hashes,
-		searcher,
+		searcherManager,
 		formatter,
 		htmlParser,
 		tablesManager,
 		ticketManager,
 		contextFactory,
+		indexDataProvider,
 		sitePresenterFactory,
 		parserContextFactory,
 		resourceUpdaterFactory,
@@ -130,6 +135,8 @@ const _init = async (config: AppConfig): Promise<Application> => {
 			version: config.version,
 			buildVersion: config.buildVersion,
 			bugsnagApiKey: config.bugsnagApiKey,
+
+			search: { vector: { enabled: false } },
 		},
 	};
 };

app/commands/article/features/getCustomArticle.ts

@@ -1,6 +1,6 @@
 import { ResponseKind } from "@app/types/ResponseKind";
 import CustomArticle from "@core/SitePresenter/customArticles/model/CustomArticle";
-import { Command } from "../../../types/Command";
+import { Command } from "@app/types/Command";
 
 const getCustomArticle: Command<{ name: CustomArticle; props: any }, { title: string; content: string }> =
 	Command.create({
@@ -20,7 +20,9 @@ const getCustomArticle: Command<{ name: CustomArticle; props: any }, { title: st
 
 			return {
 				title: article?.getTitle() ?? "None article",
-				content: await article.parsedContent.read((content) => (content ? JSON.stringify(content.renderTree) : "")),
+				content: await article.parsedContent.read((content) =>
+					content ? JSON.stringify(content.renderTree) : "",
+				),
 			};
 		},