packaton 0.0.25 → 0.0.26

package/index.d.ts

@@ -19,4 +19,5 @@ export interface Config {
 	minifyHTML?: (html: string) => Promise<string>
 	sitemapDomain?: string
 	cspMapEnabled?: boolean
+	routeHeaders?: [name: string, value: string][]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "packaton",
-	"version": "0.0.25",
+	"version": "0.0.26",
 	"type": "module",
 	"author": "Eric Fortis",
 	"license": "MIT",

package/src/app-prod.js

@@ -55,6 +55,11 @@ export async function buildStaticPages(config) {
 				const pages = await crawlRoutes(server.address(), docs.routes)
 				const mediaHashes = await renameMediaWithHashes(pDist, MEDIA_REL_URL)
 
+				const headers = {
+					['/' + MEDIA_REL_URL + '/*']: [
+						['Cache-Control', 'public,max-age=31536000,immutable']
+					]
+				}
 				const cspByRoute = []
 				for (const [route, rawHtml] of pages) {
 					const doc = new HtmlCompiler(rawHtml, pSource, {
@@ -71,13 +76,18 @@ export async function buildStaticPages(config) {
 					await doc.inlineMinifiedCSS()
 					await doc.inlineMinifiedJS()
 					write(join(pDist, route + config.outputExtension), doc.html)
-					cspByRoute.push([route, doc.csp()])
+
+					const r = route === '/index' ? '/' : route
+					headers[r] ??= []
+					headers[r].push(['Content-Security-Policy', doc.csp()])
+					for (const h of config.routeHeaders)
+						headers[r].push(h)
 				}
 
 				sitemapPlugin(config, docs.routes)
 				reportSizesPlugin(config, docs.routes)
 				cspNginxMapPlugin(config, cspByRoute)
-				netiflyAndCloudflareHeadersPlugin(config, cspByRoute, MEDIA_REL_URL)
+				write(join(config.outputDir, '_headers'), netiflyAndCloudflareHeadersPlugin(headers))
 			}
 			catch (error) {
 				reject(error)

package/src/config.js

@@ -35,6 +35,7 @@ const schema = {
 	minifyHTML: [minifyHTML, optional(Function)],
 	sitemapDomain: ['', optional(String)],
 	cspMapEnabled: [true, optional(Boolean)],
+	routeHeaders: [[], Array.isArray]
 }
 // TODO watch New Routes?
 

package/src/plugins-prod/netiflyAndCloudflareHeadersPlugin.js

@@ -1,28 +1,10 @@
-import { join } from 'node:path'
-import { write } from '../utils/fs-utils.js'
-
-
-/**
- * @param {Config} config
- * @param {string} cspByRoute
- * @param {string} relMediaURL
- */
-export function netiflyAndCloudflareHeadersPlugin(config, cspByRoute, relMediaURL) {
-	const out = join(join(config.outputDir), '_headers')
-
-	const cspHeaders = cspByRoute.map(([route, csp]) => {
-		const r = route === '/index'
-			? '/'
-			: route
-		return [
-			r,
-			`  Content-Security-Policy: ${csp}`,
-			`  Cache-Control: public,max-age=60`
-		].join('\n')
-	})
-	cspHeaders.push(`/${relMediaURL}/*`)
-	cspHeaders.push('  Cache-Control: public,max-age=31536000,immutable')
-
-	write(out, cspHeaders.join('\n'))
+export function netiflyAndCloudflareHeadersPlugin(opts) {
+	let result = []
+	for (const [route, headers] of Object.entries(opts)) {
+		result.push(route)
+		for (const [h, v] of headers)
+			result.push(`  ${h}: ${v}`)
+	}
+	return result.join('\n')
 }