conditionally symlink "ui" pkg

Author: sawka

tsunami/build/build.go

@@ -3,6 +3,8 @@ package build
 import (
 	"bufio"
 	"fmt"
+	"go/parser"
+	"go/token"
 	"io"
 	"log"
 	"os"
@@ -21,6 +23,7 @@ import (
 )
 
 const MinSupportedGoMinorVersion = 22
+const TsunamiUIImportPath = "github.com/wavetermdev/waveterm/tsunami/ui"
 
 type BuildOpts struct {
 	Dir            string
@@ -138,7 +141,7 @@ func createGoMod(tempDir, appDirName, goVersion string, opts BuildOpts, verbose
 		if verbose {
 			log.Printf("Found existing go.mod, copying from %s", originalGoModPath)
 		}
-		
+
 		// Copy existing go.mod to temp directory
 		tempGoModPath := filepath.Join(tempDir, "go.mod")
 		if err := copyFile(originalGoModPath, tempGoModPath); err != nil {
@@ -160,7 +163,7 @@ func createGoMod(tempDir, appDirName, goVersion string, opts BuildOpts, verbose
 		if verbose {
 			log.Printf("No existing go.mod found, creating new one")
 		}
-		
+
 		modFile = &modfile.File{}
 		if err := modFile.AddModuleStmt(modulePath); err != nil {
 			return fmt.Errorf("failed to add module statement: %w", err)
@@ -320,6 +323,31 @@ func verifyScaffoldPath(scaffoldPath string) error {
 	return nil
 }
 
+func buildImportsMap(dir string) (map[string]bool, error) {
+	imports := make(map[string]bool)
+
+	files, err := filepath.Glob(filepath.Join(dir, "*.go"))
+	if err != nil {
+		return nil, fmt.Errorf("failed to list go files: %w", err)
+	}
+
+	fset := token.NewFileSet()
+	for _, file := range files {
+		node, err := parser.ParseFile(fset, file, nil, parser.ImportsOnly)
+		if err != nil {
+			continue // Skip files that can't be parsed
+		}
+
+		for _, imp := range node.Imports {
+			// Remove quotes from import path
+			importPath := strings.Trim(imp.Path.Value, `"`)
+			imports[importPath] = true
+		}
+	}
+
+	return imports, nil
+}
+
 func (be *BuildEnv) cleanupTempDir(keepTemp bool, verbose bool) {
 	if be == nil || be.cleanupOnce == nil {
 		return
@@ -430,14 +458,24 @@ func tsunamiBuildInternal(opts BuildOpts) (*BuildEnv, error) {
 		return buildEnv, fmt.Errorf("failed to create go.mod: %w", err)
 	}
 
-	// Create symlink to SDK ui directory so Tailwind can see those classes
-	uiLinkPath := filepath.Join(tempDir, "ui")
-	uiTargetPath := filepath.Join(opts.SdkReplacePath, "ui")
-	if err := os.Symlink(uiTargetPath, uiLinkPath); err != nil {
-		return buildEnv, fmt.Errorf("failed to create ui symlink: %w", err)
+	// Build imports map from Go files
+	imports, err := buildImportsMap(tempDir)
+	if err != nil {
+		return buildEnv, fmt.Errorf("failed to build imports map: %w", err)
 	}
-	if opts.Verbose {
-		log.Printf("Created symlink: %s -> %s", uiLinkPath, uiTargetPath)
+
+	// Create symlink to SDK ui directory only if UI package is imported
+	if imports[TsunamiUIImportPath] {
+		uiLinkPath := filepath.Join(tempDir, "ui")
+		uiTargetPath := filepath.Join(opts.SdkReplacePath, "ui")
+		if err := os.Symlink(uiTargetPath, uiLinkPath); err != nil {
+			return buildEnv, fmt.Errorf("failed to create ui symlink: %w", err)
+		}
+		if opts.Verbose {
+			log.Printf("Created UI symlink: %s -> %s", uiLinkPath, uiTargetPath)
+		}
+	} else if opts.Verbose {
+		log.Printf("Skipping UI symlink creation - no UI package imports found")
 	}
 
 	// Generate Tailwind CSS

tsunami/cmd/main-tsunami.go

@@ -9,6 +9,11 @@ import (
 	"github.com/wavetermdev/waveterm/tsunami/tsunamibase"
 )
 
+const (
+	EnvTsunamiScaffoldPath   = "TSUNAMI_SCAFFOLDPATH"
+	EnvTsunamiSdkReplacePath = "TSUNAMI_SDKREPLACEPATH"
+)
+
 // these are set at build time
 var TsunamiVersion = "0.0.0"
 var BuildTime = "0"
@@ -29,14 +34,14 @@ var versionCmd = &cobra.Command{
 }
 
 func validateEnvironmentVars(opts *build.BuildOpts) error {
-	scaffoldPath := os.Getenv("TSUNAMI_SCAFFOLDPATH")
+	scaffoldPath := os.Getenv(EnvTsunamiScaffoldPath)
 	if scaffoldPath == "" {
-		return fmt.Errorf("TSUNAMI_SCAFFOLDPATH environment variable must be set")
+		return fmt.Errorf("%s environment variable must be set", EnvTsunamiScaffoldPath)
 	}
 
-	sdkReplacePath := os.Getenv("TSUNAMI_SDKREPLACEPATH")
+	sdkReplacePath := os.Getenv(EnvTsunamiSdkReplacePath)
 	if sdkReplacePath == "" {
-		return fmt.Errorf("TSUNAMI_SDKREPLACEPATH environment variable must be set")
+		return fmt.Errorf("%s environment variable must be set", EnvTsunamiSdkReplacePath)
 	}
 
 	opts.ScaffoldPath = scaffoldPath

tsunami/demo/tsunamiconfig/static/tw.css

@@ -285,9 +285,6 @@
       max-width: 96rem;
     }
   }
-  .mx-1 {
-    margin-inline: calc(var(--spacing) * 1);
-  }
   .mx-auto {
     margin-inline: auto;
   }
@@ -463,18 +460,9 @@
   .flex-wrap {
     flex-wrap: wrap;
   }
-  .items-center {
-    align-items: center;
-  }
-  .justify-between {
-    justify-content: space-between;
-  }
   .gap-2 {
     gap: calc(var(--spacing) * 2);
   }
-  .gap-3 {
-    gap: calc(var(--spacing) * 3);
-  }
   .space-y-1 {
     :where(& > :not(:last-child)) {
       --tw-space-y-reverse: 0;
@@ -514,11 +502,6 @@
       --tw-divide-y-reverse: 1;
     }
   }
-  .divide-gray-700 {
-    :where(& > :not(:last-child)) {
-      border-color: var(--color-gray-700);
-    }
-  }
   .truncate {
     overflow: hidden;
     text-overflow: ellipsis;
@@ -627,9 +610,6 @@
   .border-border {
     border-color: var(--color-border);
   }
-  .border-gray-600 {
-    border-color: var(--color-gray-600);
-  }
   .border-green-700 {
     border-color: var(--color-green-700);
   }
@@ -645,21 +625,6 @@
   .bg-blue-600 {
     background-color: var(--color-blue-600);
   }
-  .bg-blue-900 {
-    background-color: var(--color-blue-900);
-  }
-  .bg-gray-600 {
-    background-color: var(--color-gray-600);
-  }
-  .bg-gray-700 {
-    background-color: var(--color-gray-700);
-  }
-  .bg-gray-800 {
-    background-color: var(--color-gray-800);
-  }
-  .bg-gray-900 {
-    background-color: var(--color-gray-900);
-  }
   .bg-green-600 {
     background-color: var(--color-green-600);
   }
@@ -690,9 +655,6 @@
   .mask-repeat {
     mask-repeat: repeat;
   }
-  .p-3 {
-    padding: calc(var(--spacing) * 3);
-  }
   .p-4 {
     padding: calc(var(--spacing) * 4);
   }
@@ -702,9 +664,6 @@
   .px-1 {
     padding-inline: calc(var(--spacing) * 1);
   }
-  .px-2 {
-    padding-inline: calc(var(--spacing) * 2);
-  }
   .px-3 {
     padding-inline: calc(var(--spacing) * 3);
   }
@@ -714,12 +673,6 @@
   .py-0\.5 {
     padding-block: calc(var(--spacing) * 0.5);
   }
-  .py-1 {
-    padding-block: calc(var(--spacing) * 1);
-  }
-  .py-1\.5 {
-    padding-block: calc(var(--spacing) * 1.5);
-  }
   .py-2 {
     padding-block: calc(var(--spacing) * 2);
   }
@@ -777,10 +730,6 @@
     --tw-font-weight: var(--font-weight-medium);
     font-weight: var(--font-weight-medium);
   }
-  .font-semibold {
-    --tw-font-weight: var(--font-weight-semibold);
-    font-weight: var(--font-weight-semibold);
-  }
   .text-wrap {
     text-wrap: wrap;
   }
@@ -793,18 +742,6 @@
   .text-accent {
     color: var(--color-accent);
   }
-  .text-blue-400 {
-    color: var(--color-blue-400);
-  }
-  .text-gray-200 {
-    color: var(--color-gray-200);
-  }
-  .text-gray-400 {
-    color: var(--color-gray-400);
-  }
-  .text-gray-500 {
-    color: var(--color-gray-500);
-  }
   .text-green-100 {
     color: var(--color-green-100);
   }
@@ -987,20 +924,6 @@
       }
     }
   }
-  .hover\:bg-gray-700 {
-    &:hover {
-      @media (hover: hover) {
-        background-color: var(--color-gray-700);
-      }
-    }
-  }
-  .hover\:bg-gray-800 {
-    &:hover {
-      @media (hover: hover) {
-        background-color: var(--color-gray-800);
-      }
-    }
-  }
   .hover\:bg-green-700 {
     &:hover {
       @media (hover: hover) {
@@ -1015,17 +938,6 @@
       }
     }
   }
-  .focus\:bg-gray-600 {
-    &:focus {
-      background-color: var(--color-gray-600);
-    }
-  }
-  .focus\:ring-1 {
-    &:focus {
-      --tw-ring-shadow: var(--tw-ring-inset,) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);
-      box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
-    }
-  }
   .focus\:ring-2 {
     &:focus {
       --tw-ring-shadow: var(--tw-ring-inset,) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);