diff options
| author | Marcel Amirault <mamirault@gitlab.com> | 2022-07-15 05:38:55 +0300 |
|---|---|---|
| committer | Marcel Amirault <mamirault@gitlab.com> | 2022-07-15 05:38:55 +0300 |
| commit | d0d9e46b1785c67f3cbf55441595abc2b1310a3d (patch) | |
| tree | 6f1cb4eb98ee758b36415889cc47f93859b99eae | |
| parent | 75fe48dd516798193cbf9e92a729014a85984c6f (diff) | |
| parent | b30631c8bd5355ebf11fb7aa9d6ce751ba5178d6 (diff) | |
Merge branch '1236-minify-flags' into 'main'
Avoid incorrect pattern matching during minification
Closes #1236
See merge request gitlab-org/gitlab-docs!2915
| -rwxr-xr-x | scripts/minify-assets.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/minify-assets.sh b/scripts/minify-assets.sh index 7da94bf9..80bc7b91 100755 --- a/scripts/minify-assets.sh +++ b/scripts/minify-assets.sh @@ -35,9 +35,9 @@ fi # Minify assets printf "Optimizing assets..." -printf "HTML..."; $MINIFY_BIN $MINIFY_FLAGS --type=html --match=\.html -o ${TARGET}/${VER}/ ${TARGET}/${VER} || true -printf "CSS..." ; $MINIFY_BIN $MINIFY_FLAGS --type=css --match=\.css -o ${TARGET}/${VER}/ ${TARGET}/${VER} || true -printf "JSON..."; $MINIFY_BIN $MINIFY_FLAGS --type=json --match=\.json -o ${TARGET}/${VER}/ ${TARGET}/${VER} || true -printf "SVG..." ; $MINIFY_BIN $MINIFY_FLAGS --type=svg --match=\.svg -o ${TARGET}/${VER}/ ${TARGET}/${VER} || true +printf "HTML..."; $MINIFY_BIN $MINIFY_FLAGS --type=html --match="\.html$" -o ${TARGET}/${VER}/ ${TARGET}/${VER} || true +printf "CSS..." ; $MINIFY_BIN $MINIFY_FLAGS --type=css --match="\.css$" -o ${TARGET}/${VER}/ ${TARGET}/${VER} || true +printf "JSON..."; $MINIFY_BIN $MINIFY_FLAGS --type=json --match="\.json$" -o ${TARGET}/${VER}/ ${TARGET}/${VER} || true +printf "SVG..." ; $MINIFY_BIN $MINIFY_FLAGS --type=svg --match="\.svg$" -o ${TARGET}/${VER}/ ${TARGET}/${VER} || true echo "Done" |