waveterm/wails
0
0
Fork 0
mirror of https://github.com/wavetermdev/wails.git synced 2026-08-05 13:53:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

[dev] Do not try to infer assetdir from fs.FS when a frontend dev server is in use (#1972)

Browse Source
This commit is contained in:
stffabi
2022-10-14 07:52:52 +11:00
committed by GitHub
parent 2d4f7f4de8
commit 7f733d787f
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2/internal/app/app_dev.go
+18 -16
View File
@@ -90,14 +90,6 @@ func CreateApp(appoptions *options.App) (*App, error) {
}
}
if assetdir == "" {
// If no assetdir has been defined, let's try to infer it from the project root and the asset FS.
assetdir, err = tryInferAssetDirFromFS(appoptions.Assets)
if err != nil {
return nil, err
}
}
if frontendDevServerURL != "" {
if devServer == "" {
return nil, fmt.Errorf("Unable to use FrontendDevServerUrl without a DevServer address")
@@ -112,17 +104,27 @@ func CreateApp(appoptions *options.App) (*App, error) {
ctx = context.WithValue(ctx, "frontenddevserverurl", frontendDevServerURL)
myLogger.Info("Serving assets from frontend DevServer URL: %s", frontendDevServerURL)
} else if assetdir != "" {
// Let's override the assets to serve from on disk, if needed
absdir, err := filepath.Abs(assetdir)
if err != nil {
return nil, err
} else {
if assetdir == "" {
// If no assetdir has been defined, let's try to infer it from the project root and the asset FS.
assetdir, err = tryInferAssetDirFromFS(appoptions.Assets)
if err != nil {
return nil, err
}
}
myLogger.Info("Serving assets from disk: %s", absdir)
appoptions.Assets = os.DirFS(absdir)
if assetdir != "" {
// Let's override the assets to serve from on disk, if needed
absdir, err := filepath.Abs(assetdir)
if err != nil {
return nil, err
}
ctx = context.WithValue(ctx, "assetdir", assetdir)
myLogger.Info("Serving assets from disk: %s", absdir)
appoptions.Assets = os.DirFS(absdir)
ctx = context.WithValue(ctx, "assetdir", assetdir)
}
}
if devServer != "" {