...

lib/web/docusaurus/dsite.v

@@ -30,24 +30,12 @@ pub mut:
 	nameshort string
 	path      string
 	url       string
-	// publish_path string
+	publish_path string
 	build_path    string
 	production    bool
 	watch_changes bool = true
 	update        bool
-}
-
-pub fn (mut f DocusaurusFactory) build_dev(args_ DSiteNewArgs) !&DocSite {
-	mut s := f.add(args_)!
-	s.generate()!
-	osal.exec(
-		cmd:   '	
-			cd ${s.path_build.path}
-			bash build_dev.sh
-			'
-		retry: 0
-	)!
-	return s
+	deploykey string
 }
 
 pub fn (mut f DocusaurusFactory) build(args_ DSiteNewArgs) !&DocSite {
@@ -63,6 +51,33 @@ pub fn (mut f DocusaurusFactory) build(args_ DSiteNewArgs) !&DocSite {
 	return s
 }
 
+
+pub fn (mut f DocusaurusFactory) build_dev_publish(args_ DSiteNewArgs) !&DocSite {
+	mut s := f.add(args_)!
+	s.generate()!
+	osal.exec(
+		cmd:   '	
+			cd ${s.path_build.path}
+			bash build_dev_publish.sh
+			'
+		retry: 0
+	)!
+	return s
+}
+
+pub fn (mut f DocusaurusFactory) build_publish(args_ DSiteNewArgs) !&DocSite {
+	mut s := f.add(args_)!
+	s.generate()!
+	osal.exec(
+		cmd:   '	
+			cd ${s.path_build.path}
+			bash build_publish.sh
+			'
+		retry: 0
+	)!
+	return s
+}
+
 pub fn (mut f DocusaurusFactory) dev(args_ DSiteNewArgs) !&DocSite {
 	mut s := f.add(args_)!
 
@@ -126,8 +141,9 @@ pub fn (mut f DocusaurusFactory) add(args_ DSiteNewArgs) !&DocSite {
 	// if args.publish_path.len == 0 {
 	// 	args.publish_path = '${f.path_publish.path}/${args.name}'
 
+	mut gs := gittools.new(ssh_key_path:args.deploykey, coderoot:"/var/publishcode")!
+
 	if args.url.len > 0 {
-		mut gs := gittools.new()!
 		args.path = gs.get_path(url: args.url)!
 	}
 
@@ -135,7 +151,6 @@ pub fn (mut f DocusaurusFactory) add(args_ DSiteNewArgs) !&DocSite {
 		return error("Can't get path from docusaurus site, its not specified.")
 	}
 
-	mut gs := gittools.new()!
 	mut r := gs.get_repo(
 		url:  'https://github.com/freeflowuniverse/docusaurus_template.git'
 		pull: args.update
@@ -262,7 +277,8 @@ fn (mut site DocSite) template_install() ! {
 
 	develop := $tmpl('templates/develop.sh')
 	build := $tmpl('templates/build.sh')
-	build_dev := $tmpl('templates/build_dev.sh')
+	build_dev_publish := $tmpl('templates/build_dev_publish.sh')
+	build_publish := $tmpl('templates/build_publish.sh')
 
 	mut develop_ := site.path_build.file_get_new('develop.sh')!
 	develop_.template_write(develop, true)!
@@ -272,9 +288,13 @@ fn (mut site DocSite) template_install() ! {
 	build_.template_write(build, true)!
 	build_.chmod(0o700)!
 
-	mut build_dev_ := site.path_build.file_get_new('build_dev.sh')!
-	build_dev_.template_write(build_dev, true)!
-	build_dev_.chmod(0o700)!
+	mut build_publish_ := site.path_build.file_get_new('build_publish.sh')!
+	build_publish_.template_write(build_publish, true)!
+	build_publish_.chmod(0o700)!	
+
+	mut build_dev_publish_ := site.path_build.file_get_new('build_dev_publish.sh')!
+	build_dev_publish_.template_write(build_dev_publish, true)!
+	build_dev_publish_.chmod(0o700)!
 
 	mut develop2_ := site.path_src.file_get_new('develop.sh')!
 	develop2_.template_write(develop, true)!
@@ -284,7 +304,4 @@ fn (mut site DocSite) template_install() ! {
 	build2_.template_write(build, true)!
 	build2_.chmod(0o700)!
 
-	mut build_dev2_ := site.path_src.file_get_new('build_dev.sh')!
-	build_dev2_.template_write(build_dev, true)!
-	build_dev2_.chmod(0o700)!
 }

lib/web/docusaurus/templates/build.sh

@@ -17,4 +17,6 @@ ${profile_include}
 
 bun docusaurus build
 
-rsync -rv --delete ${site.path_build.path}/build/ ${cfg.main.build_dest.trim_right("/")}/${cfg.main.name.trim_right("/")}/
+mkdir -p ${site.args.publish_path.trim_right("/")}
+echo SYNC TO ${site.args.publish_path.trim_right("/")}
+rsync -rv --delete ${site.path_build.path}/build/ ${site.args.publish_path.trim_right("/")}/

lib/web/docusaurus/templates/build_dev_publish.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e
+
+script_dir="??(cd "??(dirname "??{BASH_SOURCE[0]}")" && pwd)"
+cd "??{script_dir}"
+
+
+echo "Docs directory: ??script_dir"
+
+cd ${site.path_build.path}
+
+export PATH=/tmp/docusaurus_build/node_modules/.bin:??{HOME}/.bun/bin/:??PATH
+
+rm -rf ${site.path_build.path}/build/
+
+${profile_include} 
+
+bun docusaurus build
+
+rsync -rv --delete ${site.path_build.path}/build/ ${cfg.main.build_dest.trim_right("/")}/${cfg.main.name.trim_right("/")}/

lib/web/docusaurus/templates/build_publish.sh

@@ -5,7 +5,6 @@ set -e
 script_dir="??(cd "??(dirname "??{BASH_SOURCE[0]}")" && pwd)"
 cd "??{script_dir}"
 
-
 echo "Docs directory: ??script_dir"
 
 cd ${site.path_build.path}