diff --git a/.chglog/CHANGELOG.tpl.md b/.chglog/CHANGELOG.tpl.md new file mode 100644 index 0000000000000000000000000000000000000000..e0ffe4235e82a87acf75d4151ccf437736e8282f --- /dev/null +++ b/.chglog/CHANGELOG.tpl.md @@ -0,0 +1,27 @@ +{{ range .Versions }} +<a name="{{ .Tag.Name }}"></a> +## {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - {{ datetime "2006-01-02" .Tag.Date }} +{{ range .CommitGroups -}} +### {{ .Title }} +{{ range .Commits -}} +- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }} +{{ end }} +{{ end -}} + +{{- if .NoteGroups -}} +{{ range .NoteGroups -}} +### {{ .Title }} +{{ range .Notes }} +{{ .Body }} +{{ end }} +{{ end -}} +{{ end -}} +{{ end -}} + +{{- if .Versions }} +{{ range .Versions -}} +{{ if .Tag.Previous -}} +[{{ .Tag.Name }}]: {{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }} +{{ end -}} +{{ end -}} +{{ end -}} diff --git a/.chglog/config.yml b/.chglog/config.yml new file mode 100644 index 0000000000000000000000000000000000000000..e89fc7035ac729c8cae9c79cfd9f001f72c28922 --- /dev/null +++ b/.chglog/config.yml @@ -0,0 +1,58 @@ +style: gitlab +template: CHANGELOG.tpl.md +info: + title: CHANGELOG + repository_url: https://gitlab.schukai.com/oss/bob +options: + commits: + filters: + Type: + - feat + - fix + - doc + - refactor + - perf + - test + - chore + ## deprecated types and typos + - docs + - documentation + - feat + - added + - add + - bugfix + - revert + - update + - updates + - change + - changed + commit_groups: + title_maps: + feat: Add Features + fix: Bug Fixes + doc: Documentation + refactor: Code Refactoring + perf: Performance Improvements + test: Tests + ## Chore is used for all other changes that don't fit in the other categories + chore: Changes + ## deprecated types and typos + docs: Documentation + documentation: Documentation + added: Add Features + add: Add Features + bugfix: Bug Fixes + revert: Reverts + update: Changes + updates: Changes + change: Changes + changed: Changes + header: + pattern: "^(\\w*)(?:\\(([\\w\\$\\.\\-\\*\\s]*)\\))?\\:\\s(.*)$" + pattern_maps: + - Type + - Scope + - Subject + notes: + keywords: + - BREAKING CHANGE diff --git a/application/source/html/sync.go b/application/source/html/sync.go index 9a2a84027d8fe3643813357579dcc9692976356e..a15aabd672b874a5de701735c3ebf34b167dc670 100644 --- a/application/source/html/sync.go +++ b/application/source/html/sync.go @@ -175,7 +175,7 @@ func SyncHtml(p string) error { } for _, k := range kNode { - keepMap[n] = append(keepMap[n], engine.CloneNode(k)) + keepMap[n] = append(keepMap[n], k) } } @@ -213,7 +213,7 @@ func SyncHtml(p string) error { continue } - n1.Parent.InsertBefore(kk, n1) + n1.Parent.InsertBefore(engine.CloneNode(kk), n1) n1.Parent.RemoveChild(n1) } diff --git a/development/makefiles/bob.mk b/development/makefiles/bob.mk new file mode 100644 index 0000000000000000000000000000000000000000..1ebfe277c286d86d86d51253c6275dd327aa159a --- /dev/null +++ b/development/makefiles/bob.mk @@ -0,0 +1,60 @@ +############################################################################################# +############################################################################################# +## +## DEFINE BOB +## +############################################################################################# +############################################################################################# + + +BOB_BIN ?= $(VENDOR_PATH)bob +BOB_SNIPPED_CONFIG ?= $(VENDOR_PATH)bob/snippet.conf +BOB_SYNC_CONFIG ?= $(VENDOR_PATH)bob/sync.conf + +define SYNCEXAMPLECONF +sync: + + - source: + path: '../original/test1.html' + selector: '#mainscript' + destination: + path: '../original/' + exclude: + - ../original/test1.html + + - source: + path: '../original/test1.html' + selector: '.deco' + destination: + path: '../original/' + exclude: + - ../original/test1.html + +endef + +export SYNCEXAMPLECONF + +define SNIPPETEXAMPLECONF +snippet: + - + source: ../../template.html + selector: 'h1' + destination: ../../snippets/meta/container.html + attribute: + - selector: 'li' + name: 'data-state' + value: 'monster' + replacement: + - + selector: 'li>span' + content: 'hello' +endef + +export SNIPPETEXAMPLECONF + +$(BOB_SNIPPED_CONFIG): + $(QUIET) $(ECHO) "$$BOB_SNIPPED_CONFIG" >> $@ + +$(BOB_SYNC_CONFIG): + $(QUIET) $(ECHO) "$$BOB_SYNC_CONFIG" >> $@ + diff --git a/development/makefiles/directories-go-utilities.mk b/development/makefiles/directories-go-utilities.mk index a1d28a57a2210628bfd74be5908d5f98692c081f..f754f0370196ba8529d9cf23b614f0e6bb12788c 100644 --- a/development/makefiles/directories-go-utilities.mk +++ b/development/makefiles/directories-go-utilities.mk @@ -13,8 +13,8 @@ DOCUMENTATION_PATH ?= $(PROJECT_ROOT)documentation/ RESOURCE_PATH ?= $(APPLICATION_PATH)resource/ SOURCE_PATH ?= $(APPLICATION_PATH)source/ +WEB_PATH ?= $(APPLICATION_PATH)web/ -WEB_PATH ?= $(APPLICATION_PATH)web/ ## SCRIPTS_PATH IS DEPRECATED SCRIPTS_PATH ?= $(DEVELOPMENT_PATH)script/ diff --git a/development/makefiles/directories-platform-part.mk b/development/makefiles/directories-platform-part.mk index 2ed3ec8407d2a91cf16a4c79854b00fbb1dc086d..2a6c77de56c0865f781dcb32439217ace64dab24 100644 --- a/development/makefiles/directories-platform-part.mk +++ b/development/makefiles/directories-platform-part.mk @@ -19,10 +19,13 @@ DEVELOPMENT_PATH ?= $(PROJECT_ROOT) LICENSE_PATH ?= $(PROJECT_ROOT) DIST_PATH ?= $(PROJECT_ROOT)dist/ +CONFIG_PATH ?= $(PROJECT_ROOT)config/ + PROJECT_DIRECTORIES := $(PROJECT_DIRECTORIES) \ $(SOURCE_PATH) \ $(SCRIPT_PATH) \ $(VENDOR_PATH) \ $(NODE_PATH) \ $(TEST_PATH) \ - $(LICENSE_PATH) \ No newline at end of file + $(LICENSE_PATH) + diff --git a/development/makefiles/target-bob.mk b/development/makefiles/target-bob.mk new file mode 100644 index 0000000000000000000000000000000000000000..314990e7b7a6d4a4773d02ee5acd75d3a333c784 --- /dev/null +++ b/development/makefiles/target-bob.mk @@ -0,0 +1,18 @@ +############################################################################################# +############################################################################################# +## +## SERVER BOB +## +############################################################################################# +############################################################################################# + +ifeq ($(BOB_BIN),) + $(error $(ERRORMARKER) Bob is not defined, check your Makefile if bob.mk is included) +endif + + +$(BOB_BIN): + $(QUIET) $(MKDIR) -p $(VENDOR_PATH) + $(QUIET) $(WGET) -O $(BOB_BIN) http://download.schukai.com/tools/bob/bob-$(shell uname -s | tr [:upper:] [:lower:])-$(shell echo `uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/`) + $(QUIET) $(CHMOD) u+x $(BOB_BIN) +