chore: refresh lockfile, use `htmlnano` + pin workflow deps (#28946)

This commit is contained in:
Daniel Roe 2024-09-11 15:54:22 +01:00
parent a878abc5e9
commit 6d990ceca6
No known key found for this signature in database
GPG Key ID: 3714AB03996F442B
10 changed files with 1607 additions and 1603 deletions

View File

@ -1,4 +1,4 @@
FROM node:lts FROM node:lts@sha256:48db4f6ea21d134be744207225753a1730c4bc1b4cdf836d44511c36bf0e34d7
RUN apt-get update && \ RUN apt-get update && \
apt-get install -fy libnss3 libnspr4 libatk1.0-0 libatk-bridge2.0-0 libcups2 libdbus-1-3 libdrm2 libxkbcommon0 libatspi2.0-0 libxcomposite1 libxdamage1 libxfixes3 libxrandr2 libgbm1 libasound2 && \ apt-get install -fy libnss3 libnspr4 libatk1.0-0 libatk-bridge2.0-0 libcups2 libdbus-1-3 libdrm2 libxkbcommon0 libatspi2.0-0 libxcomposite1 libxdamage1 libxfixes3 libxrandr2 libgbm1 libasound2 && \

View File

@ -22,14 +22,14 @@ jobs:
gh extension install actions/gh-actions-cache gh extension install actions/gh-actions-cache
echo "Fetching list of cache keys" echo "Fetching list of cache keys"
cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH -L 100 | cut -f 1 ) cacheKeysForPR=$(gh actions-cache list -R "$REPO" -B "$BRANCH" -L 100 | cut -f 1 )
## Setting this to not fail the workflow while deleting cache keys. ## Setting this to not fail the workflow while deleting cache keys.
set +e set +e
echo "Deleting caches..." echo "Deleting caches..."
for cacheKey in $cacheKeysForPR for cacheKey in $cacheKeysForPR
do do
gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm gh actions-cache delete "$cacheKey" -R "$REPO" -B "$BRANCH" --confirm
done done
echo "Done" echo "Done"
env: env:

View File

@ -26,6 +26,6 @@ jobs:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
# From https://github.com/rhysd/actionlint/blob/main/docs/usage.md#use-actionlint-on-github-actions # From https://github.com/rhysd/actionlint/blob/main/docs/usage.md#use-actionlint-on-github-actions
- name: Check workflow files - name: Check workflow files
run: | uses: docker://rhysd/actionlint:1.7.1
bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/590d3bd9dde0c91f7a66071d40eb84716526e5a6/scripts/download-actionlint.bash) 1.6.25 with:
./actionlint -color -shellcheck="" args: -color

View File

@ -39,7 +39,7 @@ jobs:
GH_REPO: ${{ github.repository }} GH_REPO: ${{ github.repository }}
COMMENT_AT: ${{ github.event.comment.created_at }} COMMENT_AT: ${{ github.event.comment.created_at }}
run: | run: |
pr="$(gh api -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" /repos/${GH_REPO}/pulls/${PR_NUMBER})" pr="$(gh api -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" /repos/"${GH_REPO}"/pulls/"${PR_NUMBER}")"
head_sha="$(echo "$pr" | jq -r .head.sha)" head_sha="$(echo "$pr" | jq -r .head.sha)"
updated_at="$(echo "$pr" | jq -r .updated_at)" updated_at="$(echo "$pr" | jq -r .updated_at)"
@ -47,7 +47,7 @@ jobs:
exit 1 exit 1
fi fi
echo "head_sha=$head_sha" >> $GITHUB_OUTPUT echo "head_sha=$head_sha" >> "$GITHUB_OUTPUT"
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with: with:
ref: ${{ steps.pr.outputs.head_sha }} ref: ${{ steps.pr.outputs.head_sha }}

View File

@ -11,7 +11,7 @@ jobs:
stackblitz: stackblitz:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: huang-julien/reproduire-sur-stackblitz@v1.0.2 - uses: huang-julien/reproduire-sur-stackblitz@9ceccbfbb0f2f9a9a8db2d1f0dd909cf5cfe67aa # v1.0.2
with: with:
reproduction-heading: '### Reproduction' reproduction-heading: '### Reproduction'

View File

@ -44,6 +44,7 @@
"nuxt": "workspace:*", "nuxt": "workspace:*",
"postcss": "8.4.45", "postcss": "8.4.45",
"rollup": "4.21.2", "rollup": "4.21.2",
"send": ">=0.19.0",
"typescript": "5.6.2", "typescript": "5.6.2",
"ufo": "1.5.4", "ufo": "1.5.4",
"vite": "5.4.4", "vite": "5.4.4",

View File

@ -6,7 +6,7 @@ import type { Plugin } from 'vite'
// @ts-expect-error https://github.com/GoogleChromeLabs/critters/pull/151 // @ts-expect-error https://github.com/GoogleChromeLabs/critters/pull/151
import Critters from 'critters' import Critters from 'critters'
import { genObjectFromRawEntries } from 'knitwork' import { genObjectFromRawEntries } from 'knitwork'
import htmlMinifier from 'html-minifier' import htmlnano from 'htmlnano'
import { glob } from 'tinyglobby' import { glob } from 'tinyglobby'
import { camelCase } from 'scule' import { camelCase } from 'scule'
@ -86,7 +86,7 @@ export const RenderPlugin = () => {
} }
// Minify HTML // Minify HTML
html = htmlMinifier.minify(html, { collapseWhitespace: true }) html = await htmlnano.process(html, { collapseWhitespace: 'aggressive' }).then(r => r.html)
if (!isCompleteHTML) { if (!isCompleteHTML) {
html = html.replace('<html><head></head><body>', '') html = html.replace('<html><head></head><body>', '')

View File

@ -18,12 +18,11 @@
"test": "pnpm lint && pnpm build" "test": "pnpm lint && pnpm build"
}, },
"devDependencies": { "devDependencies": {
"@types/html-minifier": "4.0.5",
"@types/lodash-es": "4.17.12", "@types/lodash-es": "4.17.12",
"@unocss/reset": "0.62.3", "@unocss/reset": "0.62.3",
"critters": "0.0.24", "critters": "0.0.24",
"html-minifier": "4.0.0",
"html-validate": "8.22.0", "html-validate": "8.22.0",
"htmlnano": "^2.1.1",
"jiti": "1.21.6", "jiti": "1.21.6",
"knitwork": "1.1.0", "knitwork": "1.1.0",
"lodash-es": "4.17.21", "lodash-es": "4.17.21",

File diff suppressed because it is too large Load Diff