From 486a9fb58b37eb85db42d729a6342b5ba49b883e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?= <haozi@loli.email>
Date: Sat, 12 Apr 2025 03:19:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A7=BB=E5=8A=A8embed=E5=88=B0pkg?=
 =?UTF-8?q?=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml                | 2 +-
 internal/data/website.go                   | 2 +-
 internal/route/http.go                     | 2 +-
 {internal => pkg}/embed/.gitignore         | 0
 {internal => pkg}/embed/embed.go           | 5 +++--
 {internal => pkg}/embed/frontend/.gitkeep  | 0
 pkg/embed/locales/.gitkeep                 | 0
 {internal => pkg}/embed/website/404.html   | 0
 {internal => pkg}/embed/website/index.html | 0
 web/package.json                           | 2 +-
 10 files changed, 7 insertions(+), 6 deletions(-)
 rename {internal => pkg}/embed/.gitignore (100%)
 rename {internal => pkg}/embed/embed.go (72%)
 rename {internal => pkg}/embed/frontend/.gitkeep (100%)
 create mode 100644 pkg/embed/locales/.gitkeep
 rename {internal => pkg}/embed/website/404.html (100%)
 rename {internal => pkg}/embed/website/index.html (100%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4554e25e..8304405a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -55,7 +55,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: frontend
-          path: internal/embed/frontend
+          path: pkg/embed/frontend
       - name: Set build info
         run: |
           echo "VERSION=$(git describe --tags --abbrev=0 2>/dev/null | sed 's/^v//' || echo '0.0.0')" >> $GITHUB_ENV
diff --git a/internal/data/website.go b/internal/data/website.go
index a54715f8..7c63dec6 100644
--- a/internal/data/website.go
+++ b/internal/data/website.go
@@ -17,11 +17,11 @@ import (
 
 	"github.com/tnb-labs/panel/internal/app"
 	"github.com/tnb-labs/panel/internal/biz"
-	"github.com/tnb-labs/panel/internal/embed"
 	"github.com/tnb-labs/panel/internal/http/request"
 	"github.com/tnb-labs/panel/pkg/acme"
 	"github.com/tnb-labs/panel/pkg/api"
 	"github.com/tnb-labs/panel/pkg/cert"
+	"github.com/tnb-labs/panel/pkg/embed"
 	"github.com/tnb-labs/panel/pkg/io"
 	"github.com/tnb-labs/panel/pkg/nginx"
 	"github.com/tnb-labs/panel/pkg/punycode"
diff --git a/internal/route/http.go b/internal/route/http.go
index 85ad41e0..7cacdcba 100644
--- a/internal/route/http.go
+++ b/internal/route/http.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/go-chi/chi/v5"
 
-	"github.com/tnb-labs/panel/internal/embed"
 	"github.com/tnb-labs/panel/internal/http/middleware"
 	"github.com/tnb-labs/panel/internal/service"
 	"github.com/tnb-labs/panel/pkg/apploader"
+	"github.com/tnb-labs/panel/pkg/embed"
 )
 
 type Http struct {
diff --git a/internal/embed/.gitignore b/pkg/embed/.gitignore
similarity index 100%
rename from internal/embed/.gitignore
rename to pkg/embed/.gitignore
diff --git a/internal/embed/embed.go b/pkg/embed/embed.go
similarity index 72%
rename from internal/embed/embed.go
rename to pkg/embed/embed.go
index 1f59530c..5a1d309d 100644
--- a/internal/embed/embed.go
+++ b/pkg/embed/embed.go
@@ -2,10 +2,11 @@ package embed
 
 import "embed"
 
-// TODO 移到pkg目录下
-
 //go:embed all:frontend/*
 var PublicFS embed.FS
 
 //go:embed all:website/*
 var WebsiteFS embed.FS
+
+//go:embed all:locales/*
+var LocalesFS embed.FS
diff --git a/internal/embed/frontend/.gitkeep b/pkg/embed/frontend/.gitkeep
similarity index 100%
rename from internal/embed/frontend/.gitkeep
rename to pkg/embed/frontend/.gitkeep
diff --git a/pkg/embed/locales/.gitkeep b/pkg/embed/locales/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/internal/embed/website/404.html b/pkg/embed/website/404.html
similarity index 100%
rename from internal/embed/website/404.html
rename to pkg/embed/website/404.html
diff --git a/internal/embed/website/index.html b/pkg/embed/website/index.html
similarity index 100%
rename from internal/embed/website/index.html
rename to pkg/embed/website/index.html
diff --git a/web/package.json b/web/package.json
index 2f514f49..e9c67534 100644
--- a/web/package.json
+++ b/web/package.json
@@ -19,7 +19,7 @@
     "lint": "run-s gen-auto-import lint-only",
     "lint-only": "eslint . --fix",
     "format": "prettier --write src/",
-    "copy": "cpx \"dist/**/*\" \"../internal/embed/frontend\" -C",
+    "copy": "cpx \"dist/**/*\" \"../pkg/embed/frontend\" -C",
     "gen-auto-import": "tsx gen-auto-import.ts"
   },
   "dependencies": {