Merge branch 'master' into cleanup_deps

Drop also ttf files
Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
2026-02-03 03:02:38 -05:00 · 2024-08-21 13:10:46 +02:00 · 2024-08-21 13:03:26 +02:00 · 2024-08-21 13:02:19 +02:00 · 2024-08-21 13:02:19 +02:00 · 2024-08-21 13:02:19 +02:00
21 changed files with 5 additions and 1348 deletions
--- a/2
+++ b/2
@@ -338,7 +338,7 @@ rebuild: ## Rebuilds the project
 	$(MAKE) -C sources/go-tiny-dream clean
 	$(MAKE) build

-prepare: prepare-sources $(OPTIONAL_TARGETS)
+prepare: prepare-sources gen-assets $(OPTIONAL_TARGETS)

 clean: ## Remove build related file
 	$(GOCMD) clean -cache
--- a/core/http/static/assets/KFOlCnqEu92Fr1MmEU9fBBc9.ttf
+++ b/core/http/static/assets/KFOlCnqEu92Fr1MmEU9fBBc9.ttf
--- a/core/http/static/assets/KFOlCnqEu92Fr1MmEU9vAw.ttf
+++ b/core/http/static/assets/KFOlCnqEu92Fr1MmEU9vAw.ttf
--- a/core/http/static/assets/KFOlCnqEu92Fr1MmSU5fBBc9.ttf
+++ b/core/http/static/assets/KFOlCnqEu92Fr1MmSU5fBBc9.ttf
--- a/core/http/static/assets/KFOlCnqEu92Fr1MmWUlfBBc9.ttf
+++ b/core/http/static/assets/KFOlCnqEu92Fr1MmWUlfBBc9.ttf
--- a/core/http/static/assets/KFOlCnqEu92Fr1MmYUtfBBc9.ttf
+++ b/core/http/static/assets/KFOlCnqEu92Fr1MmYUtfBBc9.ttf
--- a/core/http/static/assets/KFOmCnqEu92Fr1Me5Q.ttf
+++ b/core/http/static/assets/KFOmCnqEu92Fr1Me5Q.ttf
--- a/core/http/static/assets/KFOmCnqEu92Fr1Mu4mxP.ttf
+++ b/core/http/static/assets/KFOmCnqEu92Fr1Mu4mxP.ttf
--- a/core/http/static/assets/UcCO3FwrK3iLTeHuS_fvQtMwCp50KnMw2boKoduKmMEVuFuYMZg.ttf
+++ b/core/http/static/assets/UcCO3FwrK3iLTeHuS_fvQtMwCp50KnMw2boKoduKmMEVuFuYMZg.ttf
--- a/core/http/static/assets/UcCO3FwrK3iLTeHuS_fvQtMwCp50KnMw2boKoduKmMEVuGKYMZg.ttf
+++ b/core/http/static/assets/UcCO3FwrK3iLTeHuS_fvQtMwCp50KnMw2boKoduKmMEVuGKYMZg.ttf
--- a/core/http/static/assets/UcCO3FwrK3iLTeHuS_fvQtMwCp50KnMw2boKoduKmMEVuLyfMZg.ttf
+++ b/core/http/static/assets/UcCO3FwrK3iLTeHuS_fvQtMwCp50KnMw2boKoduKmMEVuLyfMZg.ttf
--- a/core/http/static/assets/alpine.js
+++ b/core/http/static/assets/alpine.js
--- a/core/http/static/assets/highlightjs.css
+++ b/core/http/static/assets/highlightjs.css
@@ -1,9 +0,0 @@
-/*!
-  Theme: Default
-  Description: Original highlight.js style
-  Author: (c) Ivan Sagalaev <maniac@softwaremaniacs.org>
-  Maintainer: @highlightjs/core-team
-  Website: https://highlightjs.org/
-  License: see project LICENSE
-  Touched: 2021
-*/pre code.hljs{display:block;overflow-x:auto;padding:1em}code.hljs{padding:3px 5px}.hljs{background:#f3f3f3;color:#444}.hljs-comment{color:#697070}.hljs-punctuation,.hljs-tag{color:#444a}.hljs-tag .hljs-attr,.hljs-tag .hljs-name{color:#444}.hljs-attribute,.hljs-doctag,.hljs-keyword,.hljs-meta .hljs-keyword,.hljs-name,.hljs-selector-tag{font-weight:700}.hljs-deletion,.hljs-number,.hljs-quote,.hljs-selector-class,.hljs-selector-id,.hljs-string,.hljs-template-tag,.hljs-type{color:#800}.hljs-section,.hljs-title{color:#800;font-weight:700}.hljs-link,.hljs-operator,.hljs-regexp,.hljs-selector-attr,.hljs-selector-pseudo,.hljs-symbol,.hljs-template-variable,.hljs-variable{color:#ab5656}.hljs-literal{color:#695}.hljs-addition,.hljs-built_in,.hljs-bullet,.hljs-code{color:#397300}.hljs-meta{color:#1f7199}.hljs-meta .hljs-string{color:#38a}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700}
--- a/core/http/static/assets/highlightjs.js
+++ b/core/http/static/assets/highlightjs.js
--- a/core/http/static/assets/htmx.js
+++ b/core/http/static/assets/htmx.js
--- a/core/http/static/assets/marked.js
+++ b/core/http/static/assets/marked.js
--- a/core/http/static/assets/purify.js
+++ b/core/http/static/assets/purify.js
--- a/core/http/static/assets/tailwindcss.js
+++ b/core/http/static/assets/tailwindcss.js
--- a/core/http/static/assets/tw-elements.css
+++ b/core/http/static/assets/tw-elements.css
--- a/core/http/static/assets/tw-elements.js
+++ b/core/http/static/assets/tw-elements.js
--- a/embedded/webui_static.yaml
+++ b/embedded/webui_static.yaml
@@ -5,11 +5,11 @@
  url: "https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.8.0/build/highlight.min.js"
  sha: "4499ff936d4fd562adca5a5cbe512dc19eb80942eee8618dafbcebc4f7974bdb"
 - filename: "alpine.js"
-  url: "https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js"
-  sha: "fb9b146b7fbd1bbf251fb3ef464f2e7c5d33a4a83aeb0fcf21e92ca6a9558c4b"
+  url: "https://cdn.jsdelivr.net/npm/alpinejs@3.14.1/dist/cdn.min.js"
+  sha: "358d9afbb1ab5befa2f48061a30776e5bcd7707f410a606ba985f98bc3b1c034"
 - filename: "marked.js"
-  url: "https://cdn.jsdelivr.net/npm/marked/marked.min.js"
-  sha: "15fabce5b65898b32b03f5ed25e9f891a729ad4c0d6d877110a7744aa847a894"
+  url: "https://cdn.jsdelivr.net/npm/marked@14.0.0/lib/marked.umd.min.js"
+  sha: "0996c58f732096b6aed537916589c0786dd3332bf4612cc9c206bc44a031b13d"
 - filename: "purify.js"
  url: "https://cdn.jsdelivr.net/npm/dompurify@3.0.6/dist/purify.min.js"
  sha: "ea4b09082ca4ba0ae71be6431a097678751d0453b9c52a4d2c7c39a2166ed9fc"
Author	SHA1	Message	Date
Ettore Di Giacinto	2a03905920	Merge branch 'master' into cleanup_deps	2024-08-21 13:10:46 +02:00
Ettore Di Giacinto	35297ebc14	Drop also ttf files Signed-off-by: Ettore Di Giacinto <mudler@localai.io>	2024-08-21 13:03:26 +02:00
Ettore Di Giacinto	b303805df9	fix marked	2024-08-21 13:02:19 +02:00
Ettore Di Giacinto	32d51797d9	fix alpine.js	2024-08-21 13:02:19 +02:00
Ettore Di Giacinto	af09b019ed	fix(assets): generate assets on build time Signed-off-by: Ettore Di Giacinto <mudler@localai.io>	2024-08-21 13:02:19 +02:00