From 1ba438688a0d4958af3a50439cc7a5596e6daa47 Mon Sep 17 00:00:00 2001 From: tim h Date: Mon, 2 Jan 2023 19:38:37 -0600 Subject: [PATCH] updates pre-commit to call .ps1 file instead, prevents updatehashes from looking in node_modules lol, updates hashes so git actions doesn't have to? --- .devtools/updatehashes.ps1 | 2 +- .githooks/windows/pre-commit | 2 +- index.html | 239 +++++++++++++++++++++++++++++++---- pages/configuration.html | 66 ++++++++-- 4 files changed, 269 insertions(+), 40 deletions(-) diff --git a/.devtools/updatehashes.ps1 b/.devtools/updatehashes.ps1 index afd8f26..993cab6 100644 --- a/.devtools/updatehashes.ps1 +++ b/.devtools/updatehashes.ps1 @@ -1,7 +1,7 @@ # Updates html files with cache busting urls including file hashes. # Actual file processing -$htmlfiles = Get-ChildItem -Path . -Recurse -Filter "*.html" | Resolve-path -relative +$htmlfiles = Get-ChildItem -Path . -Recurse -Filter "*.html" | Where {$_.FullName -notlike "*\node_modules\*"} | Resolve-path -relative foreach ($htmlfile in $htmlfiles) { Write-Host "[info] Processing '${htmlfile}' for cache busting..." -ForegroundColor Blue diff --git a/.githooks/windows/pre-commit b/.githooks/windows/pre-commit index b78afe4..6b35b79 100755 --- a/.githooks/windows/pre-commit +++ b/.githooks/windows/pre-commit @@ -3,7 +3,7 @@ # Script to perform some basic operations to the code before committing. # Adds file hashes to html script imports for cache busting purposes -powershell .devtools/updatehashes.bat gitadd +powershell .devtools/updatehashes.ps1 gitadd # Adds file to current commit git add "**.html" \ No newline at end of file diff --git a/index.html b/index.html index 9491f31..0e26542 100644 --- a/index.html +++ b/index.html @@ -4,22 +4,22 @@ openOutpaint 🐠 - - + + - - + + - + - - - + + + - - - + + + @@ -317,16 +317,16 @@ - - - - + + + + - - + + @@ -348,33 +348,33 @@ src="js/ui/tool/generic.js?v=f1a19a4" type="text/javascript"> - + - + @@ -472,6 +472,191 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pages/configuration.html b/pages/configuration.html index f89147b..dbf33b0 100644 --- a/pages/configuration.html +++ b/pages/configuration.html @@ -4,22 +4,22 @@ openOutpaint 🐠 - - + + - - + + - + - - - + + + - - - + + + @@ -108,6 +108,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +