Skip to content

fix: make template-hardening retrofit tolerate non-template icon scripts #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
veillette merged 1 commit into from
Aug 12, 2026
Merged

fix: make template-hardening retrofit tolerate non-template icon scripts #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 67 additions & 18 deletions scripts/retrofit-template-hardening.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,21 +156,37 @@ function patchViteConfig(pkgName, displayName, description) {
log("vite: added CSP TODOs");
}

if (!text.includes("INLINE_LIMIT_BYTES")) {
// Insert constants after securityHeaders block closing `};`
const hasInlineLimit =
/assetsInlineLimit:\s*(?:100_000_000|100\s*\*\s*1024\s*\*\s*1024)/.test(text);
const hasWorkboxLimit = /maximumFileSizeToCacheInBytes:\s*12\s*\*\s*1024\s*\*\s*1024/.test(text);
if (!text.includes("INLINE_LIMIT_BYTES") && !text.includes("WORKBOX_MAX_FILE_BYTES") && (hasInlineLimit || hasWorkboxLimit)) {
const constants = [
hasInlineLimit
? "/** Single-file mode: inline every imported asset as base64 (effectively unlimited). */\nconst INLINE_LIMIT_BYTES = 100 * 1024 * 1024;"
: "",
hasWorkboxLimit
? "/** Workbox precache ceiling — SceneryStack bundles exceed the default 2 MB limit. */\nconst WORKBOX_MAX_FILE_BYTES = 12 * 1024 * 1024;"
: "",
]
.filter(Boolean)
.join("\n\n");
text = text.replace(
/(const securityHeaders: Record<string, string> = \{[\s\S]*?\n\};\n)/,
`$1\n/** Single-file mode: inline every imported asset as base64 (effectively unlimited). */\nconst INLINE_LIMIT_BYTES = 100 * 1024 * 1024;\n\n/** Workbox precache ceiling — SceneryStack bundles exceed the default 2 MB limit. */\nconst WORKBOX_MAX_FILE_BYTES = 12 * 1024 * 1024;\n`,
);
text = text.replace(/assetsInlineLimit:\s*100_000_000/, "assetsInlineLimit: INLINE_LIMIT_BYTES");
text = text.replace(
/assetsInlineLimit:\s*100\s*\*\s*1024\s*\*\s*1024/,
"assetsInlineLimit: INLINE_LIMIT_BYTES",
);
text = text.replace(
/maximumFileSizeToCacheInBytes:\s*12\s*\*\s*1024\s*\*\s*1024/,
"maximumFileSizeToCacheInBytes: WORKBOX_MAX_FILE_BYTES",
`$1\n${constants}\n`,
);
if (hasInlineLimit) {
text = text.replace(/assetsInlineLimit:\s*100_000_000/, "assetsInlineLimit: INLINE_LIMIT_BYTES");
text = text.replace(
/assetsInlineLimit:\s*100\s*\*\s*1024\s*\*\s*1024/,
"assetsInlineLimit: INLINE_LIMIT_BYTES",
);
}
if (hasWorkboxLimit) {
text = text.replace(
/maximumFileSizeToCacheInBytes:\s*12\s*\*\s*1024\s*\*\s*1024/,
"maximumFileSizeToCacheInBytes: WORKBOX_MAX_FILE_BYTES",
);
}
log("vite: extracted INLINE_LIMIT_BYTES / WORKBOX_MAX_FILE_BYTES");
}

Expand Down Expand Up @@ -421,19 +437,43 @@ function patchGenerateIcons(themeHex) {
`Rasterizes public/icons/icon.svg into the PNG icons, favicon.ico, and placeholder\n * PWA install screenshots used by the manifest. Run with: npm run icons\n *\n * Replace public/screenshots/{wide,narrow}.png with real sim shots before shipping\n * (e.g. Baton/scripts/generate-screenshots.sh → copy into public/screenshots/).`,
);

// Insert THEME_BG after svg read
// Insert THEME_BG after whatever local holds the SVG bytes (`svg` or `svgBuffer`).
if (!text.includes("THEME_BG")) {
text = text.replace(
/(const svg = readFileSync\([^;]+;\n)/,
const inserted = text.replace(
/(const (?:svg|svgBuffer)\b[^;]*readFileSync\([^;]+;\n)/,
`$1\n${themeLine}`,
);
if (inserted === text) {
log("WARN: could not find svg/svgBuffer read to insert THEME_BG — skip screenshots");
write(path, text);
return false;
}
text = inserted;
}

const svgIdent = /\bconst svgBuffer\b/.test(text) ? "svgBuffer" : "svg";
if (!/\bconst density\b/.test(text)) {
text = text.replace(
/(const THEME_BG = \{[^}]+};\n)/,
`$1\nconst density = 512;\n`,
);
}
const publicExpr = /\bconst publicDir\b/.test(text)
? "publicDir"
: /\bconst root\b/.test(text)
? 'resolve(root, "public")'
: "publicDir";
if (publicExpr === "publicDir" && !/\bconst publicDir\b/.test(text)) {
log("WARN: no publicDir/root in generate-icons.ts — skip screenshots");
write(path, text);
return false;
}

const screenshotTail = `
/** Branded placeholder screenshots for the Web App Manifest \`screenshots\` member. */
async function writeScreenshot(width: number, height: number, file: string): Promise<void> {
const iconSize = Math.round(Math.min(width, height) * 0.4);
const icon = await sharp(svg, { density }).resize(iconSize, iconSize).png().toBuffer();
const icon = await sharp(${svgIdent}, { density }).resize(iconSize, iconSize).png().toBuffer();
await sharp({
create: {
width,
Expand All @@ -444,10 +484,10 @@ async function writeScreenshot(width: number, height: number, file: string): Pro
})
.composite([{ input: icon, gravity: "center" }])
.png()
.toFile(resolve(publicDir, file));
.toFile(resolve(${publicExpr}, file));
}

mkdirSync(resolve(publicDir, "screenshots"), { recursive: true });
mkdirSync(resolve(${publicExpr}, "screenshots"), { recursive: true });
await writeScreenshot(1280, 720, "screenshots/wide.png");
await writeScreenshot(720, 1280, "screenshots/narrow.png");
`;
Expand Down Expand Up @@ -507,6 +547,15 @@ function main() {
}
}

if (process.env.SKIP_FIX !== "1") {
log("npm run fix (format + lint write)…");
try {
execFileSync("npm", ["run", "fix"], { cwd: ROOT, stdio: "inherit" });
} catch {
log("WARN: npm run fix failed — CI will catch leftover lint on the PR");
}
}

if (process.env.SKIP_CHECK !== "1") {
log("npm run check (best-effort)…");
try {
Expand Down
Loading