import icons.json statically

aslilac · aslilac · commit 07961c9d70fc · 2023-10-05T21:57:29.000Z
diff --git a/.gitignore b/.gitignore
@@ -29,7 +29,7 @@ site/e2e/test-results/*
 site/e2e/states/*.json
 site/e2e/.auth.json
 site/playwright-report/*
-site/static/icons.json
+site/src/theme/icons.json
 site/.swc
 
 # Make target for updating golden files (any dir).
diff --git a/.prettierignore b/.prettierignore
@@ -32,7 +32,7 @@ site/e2e/test-results/*
 site/e2e/states/*.json
 site/e2e/.auth.json
 site/playwright-report/*
-site/static/icons.json
+site/src/theme/icons.json
 site/.swc
 
 # Make target for updating golden files (any dir).
diff --git a/Makefile b/Makefile
@@ -472,7 +472,7 @@ gen: \
 	site/.prettierignore \
 	site/.eslintignore \
 	site/e2e/provisionerGenerated.ts \
-	site/static/icons.json \
+	site/src/theme/icons.json \
 	examples/examples.gen.json
 .PHONY: gen
 
@@ -496,7 +496,7 @@ gen/mark-fresh:
 		site/.prettierignore \
 		site/.eslintignore \
 		site/e2e/provisionerGenerated.ts \
-		site/static/icons.json \
+		site/src/theme/icons.json \
 		examples/examples.gen.json \
 	"
 	for file in $$files; do
@@ -549,8 +549,8 @@ site/e2e/provisionerGenerated.ts: provisionerd/proto/provisionerd.pb.go provisio
 	../scripts/pnpm_install.sh
 	pnpm run gen:provisioner
 
-site/static/icons.json: $(wildcard site/static/icon/*)
-	go run ./scripts/sitestatic/
+site/src/theme/icons.json: $(wildcard site/static/icon/*)
+	go run ./scripts/gensite/ -icons $@
 
 examples/examples.gen.json: scripts/examplegen/main.go examples/examples.go $(shell find ./examples/templates)
 	go run ./scripts/examplegen/main.go > examples/examples.gen.json
diff --git a/scripts/gensite/generateIconList.go b/scripts/gensite/generateIconList.go
@@ -6,10 +6,14 @@ import (
 	"os"
 )
 
-func generateIconList() int {
-	files, err := os.ReadDir("site/static/icon")
+func generateIconList(path string) int {
+	if path == "" {
+		return 0 // skip
+	}
+
+	files, err := os.ReadDir("site/static/icon/")
 	if err != nil {
-		_, _ = fmt.Println("failed to read icon/ directory")
+		_, _ = fmt.Println("failed to read site/static/icon/ directory")
 		_, _ = fmt.Println("err:", err.Error())
 		return 71 // OSERR
 	}
@@ -26,7 +30,7 @@ func generateIconList() int {
 	}
 	icons = icons[:i]
 
-	outputFile, err := os.Create("./site/static/icons.json")
+	outputFile, err := os.Create(path)
 	if err != nil {
 		_, _ = fmt.Println("failed to create file")
 		_, _ = fmt.Println("err:", err.Error())
@@ -50,5 +54,7 @@ func generateIconList() int {
 		return 74 // IOERR
 	}
 
+	_, _ = fmt.Println(green.Sprintf("==>"), path)
+
 	return 0
 }
diff --git a/scripts/gensite/main.go b/scripts/gensite/main.go
@@ -0,0 +1,19 @@
+package main
+
+import (
+	"flag"
+	"os"
+
+	"github.com/fatih/color"
+)
+
+var green = color.New(color.FgGreen).Add(color.Bold)
+
+func main() {
+	var iconsPath string
+	flag.StringVar(&iconsPath, "icons", "", "the path to place icons.json at")
+	flag.Parse()
+
+	status := generateIconList(iconsPath)
+	os.Exit(status)
+}
diff --git a/scripts/sitestatic/main.go b/scripts/sitestatic/main.go
diff --git a/site/.eslintignore b/site/.eslintignore
@@ -32,7 +32,7 @@ e2e/test-results/*
 e2e/states/*.json
 e2e/.auth.json
 playwright-report/*
-static/icons.json
+src/theme/icons.json
 .swc
 
 # Make target for updating golden files (any dir).
diff --git a/site/.prettierignore b/site/.prettierignore
@@ -32,7 +32,7 @@ e2e/test-results/*
 e2e/states/*.json
 e2e/.auth.json
 playwright-report/*
-static/icons.json
+src/theme/icons.json
 .swc
 
 # Make target for updating golden files (any dir).
