packaton 0.0.12 → 0.0.13

package/README.md

@@ -2,6 +2,15 @@
 
 Static Pages Bundler.
 
+## Limitations
+- `src` and `href` URLs must be absolute
+- can't write inline scripts or css (all must be in an external file, packaton inlines them)
+- must have an index
+- Ignored Documents start with `_`, so you can't have routes that begin with _
+- Non-Documents and Files outside config.assetsDir are not automatically copied over,
+  you need to specify them.
+
+
 ## HTML Template
 Optionally, you can create an HTML template.
 For example, to handle the common header, navigation, and footer.
@@ -39,12 +48,3 @@ Packaton({
 ```
 
 To avoid minifying, you can pass `a=>a` 
-
-
-## Caveats
-- can't write inline scripts or css (all must be in an external file, packaton inlines them)
-- must have an index
-- Ignored Documents start with `_`, so you can't have routes that begin with _
-- Non-Documents and Files outside config.assetsDir are not automatically copied over,
-  you need to specify them. 
-- assets/media only files at the top level get hashed-named. But files within subdirs are not (by design).

package/package.json

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

package/src/app-prod.js

@@ -1,6 +1,6 @@
 import { cpSync } from 'node:fs'
 import { createServer } from 'node:http'
-import { basename, join, dirname } from 'node:path'
+import { basename, join } from 'node:path'
 
 import { docs } from './app.js'
 import { router } from './router.js'
@@ -46,7 +46,7 @@ export async function buildStaticPages(config) {
 				
 				const cspByRoute = []
 				for (const [route, rawHtml] of pages) {
-					const doc = new HtmlCompiler(rawHtml, join(pSource, dirname(route)), {
+					const doc = new HtmlCompiler(rawHtml, pSource, {
 						minifyJS: config.minifyJS,
 						minifyCSS: config.minifyCSS,
 						minifyHTML: config.minifyHTML,

package/src/plugins-dev/watcherDev.js

@@ -24,18 +24,7 @@ async function longPollDevChanges() {
 }
 
 function hotReloadCSS(file) {
-	let link = document.querySelector(`link[href^="${file}"]`)
-
-	// Fallback: construct relative path based on current pathname
-	if (!link) {
-		const parts = window.location.pathname.split('/').filter(Boolean)
-		if (parts.length > 1)
-			parts.pop()
-		const urlDir = parts.join('/') + '/'
-		const r = file.split(urlDir).pop()
-		link = document.querySelector(`link[href^="${r}"]`)
-	}
-
+	let link = document.querySelector(`link[href^="/${file}"]`)
 	if (link) {
 		const [url] = link.getAttribute('href').split('?')
 		link.href = url + '?' + Date.now()

package/src/router.js

@@ -3,7 +3,6 @@ import { readFile } from 'node:fs/promises'
 
 import { docs } from './app.js'
 import { mimeFor } from './utils/mimes.js'
-import { isDirectory } from './utils/fs-utils.js'
 import { devClientWatcher } from './plugins-dev/WatcherDevClient.js'
 import { sendError, sendJSON, servePartialContent, serveAsset } from './utils/http-response.js'
 
@@ -35,10 +34,10 @@ export function router({ srcPath, ignore, mode }) {
 				await serveDocument(response, docs.fileFor(join(url, 'index')), isDev)
 
 			else if (req.headers.range)
-				await servePartialContent(response, req.headers, resolveUrl(req, srcPath, url))
+				await servePartialContent(response, req.headers, join(srcPath, url))
 
 			else
-				serveAsset(response, resolveUrl(req, srcPath, url))
+				serveAsset(response, join(srcPath, url))
 		}
 		catch (error) {
 			sendError(response, error)
@@ -57,20 +56,6 @@ async function serveDocument(response, file, isDev) {
 }
 
 
-function resolveUrl(req, srcPath, url) {
-	return join(srcPath, dirFor(req.headers.referer, srcPath), url)
-}
-
-function dirFor(referer = '/', srcPath) {
-	if (referer.endsWith('/'))
-		return ''
-	const p = new URL(referer).pathname
-	return isDirectory(join(srcPath, p))
-		? p
-		: ''
-}
-
-
 const LONG_POLL_SERVER_TIMEOUT = 8000
 
 function longPollDevHotReload(req, response) {