From a0067c73d69e2cb497df7cd38536de2ed15b4e30 Mon Sep 17 00:00:00 2001 From: xfy Date: Fri, 26 Jun 2026 13:58:54 +0800 Subject: [PATCH] =?UTF-8?q?chore(core):=20yggdrasil-core=20=E6=8E=A5?= =?UTF-8?q?=E5=85=A5=E6=9E=84=E5=BB=BA=E7=AE=A1=E7=BA=BF=E4=B8=8E=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E6=B3=A8=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dioxus.toml 追加 yggdrasil-core 的 css/script;Makefile 加 build-core / build-core-incremental,接入 build/build-linux/dev/test。 --- Dioxus.toml | 8 ++++---- Makefile | 16 ++++++++++++++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Dioxus.toml b/Dioxus.toml index 94fff66..b4bdecb 100644 --- a/Dioxus.toml +++ b/Dioxus.toml @@ -10,9 +10,9 @@ title = "Yggdrasil - Dioxus SSR" watch_path = ["src", "Cargo.toml"] [web.resource] -style = ["/style.css", "/highlight.css", "/tiptap/editor.css", "/lightbox/lightbox.css"] -script = ["/tiptap/editor.js", "/lightbox/lightbox.js"] +style = ["/style.css", "/highlight.css", "/tiptap/editor.css", "/lightbox/lightbox.css", "/yggdrasil-core/yggdrasil-core.css"] +script = ["/tiptap/editor.js", "/lightbox/lightbox.js", "/yggdrasil-core/yggdrasil-core.js"] [web.resource.dev] -style = ["/style.css", "/highlight.css", "/tiptap/editor.css", "/lightbox/lightbox.css"] -script = ["/tiptap/editor.js", "/lightbox/lightbox.js"] +style = ["/style.css", "/highlight.css", "/tiptap/editor.css", "/lightbox/lightbox.css", "/yggdrasil-core/yggdrasil-core.css"] +script = ["/tiptap/editor.js", "/lightbox/lightbox.js", "/yggdrasil-core/yggdrasil-core.js"] diff --git a/Makefile b/Makefile index dfa0a85..f99488f 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,9 @@ -.PHONY: dev build build-linux css css-watch clean build-editor build-editor-incremental build-lightbox build-lightbox-incremental highlight-css test doc doc-open +.PHONY: dev build build-linux css css-watch clean build-editor build-editor-incremental build-lightbox build-lightbox-incremental build-core build-core-incremental highlight-css test doc doc-open build: @$(MAKE) build-editor @$(MAKE) build-lightbox + @$(MAKE) build-core @$(MAKE) highlight-css @tailwindcss -i input.css -o public/style.css --minify @dx build --release --debug-symbols=false @@ -10,6 +11,7 @@ build: build-linux: @$(MAKE) build-editor @$(MAKE) build-lightbox + @$(MAKE) build-core @$(MAKE) highlight-css @tailwindcss -i input.css -o public/style.css --minify @dx build @client --release --debug-symbols=false --wasm-js-cfg false @@ -37,7 +39,16 @@ build-lightbox: build-lightbox-incremental: @cd libs/lightbox && npm run build -dev: build-editor-incremental build-lightbox-incremental +build-core: + @echo "Building yggdrasil-core..." + @cd libs/yggdrasil-core && npm install && npm run build + @echo "yggdrasil-core built." + +# dev 用的增量构建:跳过 npm install(假设 node_modules 已存在),仅 vite build。 +build-core-incremental: + @cd libs/yggdrasil-core && npm run build + +dev: build-editor-incremental build-lightbox-incremental build-core-incremental @echo "Cleaning static/..." @rm -rf static/ @echo "Building Tiptap editor (incremental)..." @@ -57,6 +68,7 @@ test: @cargo test @cd libs/tiptap-editor && npm test @cd libs/lightbox && npm test + @cd libs/yggdrasil-core && npm test # 只编译当前 crate 的文档(--no-deps 跳过依赖,--document-private-items # 让纯 binary crate 的内部模块/私有项也进文档,否则页面基本是空的)。