@janga/norna 0.7.28 → 0.7.29

package/README.md

@@ -60,21 +60,24 @@ site/
     |-- page-theme.yaml  # Optional homepage-only overrides
     |-- images/
     `-- pages/
-        `-- 010-guide/
+        `-- guide/
             |-- content.md
             |-- tree-theme.yaml   # Optional inherited branch overrides
             |-- images/
             `-- pages/
-                `-- 010-install/content.md
+                `-- install/content.md
 ```
 
 - `root/content.md` is the required homepage at `/`; `root/pages/` contains its
   children. The site container holds shared configuration and public files
   beside this root page. `root/` never becomes a URL segment.
-- Every ordered directory under `pages/` contains `content.md` for a routable
+- Every page directory under `pages/` contains `content.md` for a routable
   page. A parent can append a generated list of its direct child pages with
   `page.listChildren: true`; see
   [Child-page lists](https://janga.github.io/norna/reference/site/pages/#list-child-pages).
+- Page directories use their URL slug. Set optional `navigation.order` in each
+  page’s frontmatter to order siblings; reordering keeps their paths unchanged.
+  New sites declare `sourceFormat: 2` in `site-config/settings.yaml`.
 - A page may contain local images, visual settings and nested
   entries under its own `pages/` directory.
 - `root/tree-theme.yaml` selects shared visual defaults. Optional `page-theme.yaml`
@@ -85,7 +88,7 @@ site/
   footer content.
 - `site-config/settings.yaml` holds the public URL and optional language, local and remote
   source links, navigation model, static search, and scroll behavior.
-- `public/` holds static files copied without processing.
+- `public/` holds supported technical files and named site artwork (logo, icons and sharing image). Content images and documents belong in each page's `images/` and `downloads/`.
 
 Norna validates this structure, processes managed images when needed, and
 builds the generated website into `dist/`. Sites using an earlier layout need
@@ -161,7 +164,7 @@ Engine contributors should start with
 [Engine Development](docs/engine-development.md). Planning and future work are
 tracked in [BACKLOG.md](BACKLOG.md).
 
-The user reference is authored once under `site/root/pages/032-reference/` and
+The user reference is authored once under `site/root/pages/reference/` and
 rendered on the documentation site. It describes current development; use the
 installed release's Git tag when checking older behavior. Tags through 0.7.26
 keep their reference under `docs/`; later tags use the documentation page tree.

package/astro.config.mjs

@@ -1,3 +1,6 @@
+import { compiledOutputDirectory } from './scripts/lib/publication-paths.mjs';
+import { devServerIdentityPlugin } from './scripts/lib/dev-server-identity.mjs';
+import { rewriteAttachmentLinks } from './scripts/lib/attachment-render.mjs';
 // @ts-check
 import { execFile } from 'node:child_process';
 import path from 'node:path';
@@ -16,6 +19,9 @@ import {
 	astroPublicDir,
 	engineRoot,
 	generatedImagesManifestPath,
+	siteDir,
+	sitePublicDir,
+	siteConfigPath,
 	siteContentPath,
 	siteHomePageDir,
 	siteImagesDir,
@@ -73,9 +79,12 @@ const nornaGeneratedImagesWatcher = () => ({
 		const manifestPath = path.resolve(generatedImagesManifestPath);
 		const watchedSourcePaths = [
 			siteContentPath,
+			sitePublicDir,
+			siteConfigPath,
 			path.join(siteHomePageDir, 'tree-theme.yaml'),
 			path.join(siteHomePageDir, 'page-theme.yaml'),
 			siteImagesDir,
+			path.join(siteHomePageDir, 'downloads'),
 			sitePagesDir,
 		].map((watchedPath) => path.resolve(watchedPath));
 		let refreshTimer;
@@ -95,6 +104,7 @@ const nornaGeneratedImagesWatcher = () => ({
 				.then(async () => {
 					try {
 						await runGenerateImages();
+						await execFileAsync(process.execPath, [path.join(engineRoot, 'scripts', 'sync-site-public.mjs')], { cwd: siteProjectRoot });
 					} catch (error) {
 						const message = error instanceof Error ? error.message : String(error);
 						server.config.logger.error(`Norna image refresh failed:\n${message}`);
@@ -153,7 +163,8 @@ markdownProcessor.createRenderer = async (shared) => {
 	const renderer = await createMarkdownRenderer(shared);
 	return {
 		...renderer,
-		render(source, options) {
+		async render(source, options) {
+			source = await rewriteAttachmentLinks(source, options?.fileURL, siteDir);
 			return renderer.render(prepareContentTabs(source, {
 				label: options?.fileURL?.pathname ?? 'Markdown',
 			}), options);
@@ -164,6 +175,7 @@ markdownProcessor.createRenderer = async (shared) => {
 // https://astro.build/config
 export default defineConfig({
 	base: projectConfig.site.basePath,
+	build: { assets: compiledOutputDirectory },
 	cacheDir: astroCacheDir,
 	prefetch: { prefetchAll: false, defaultStrategy: 'hover' },
 	integrations: [{
@@ -193,6 +205,6 @@ export default defineConfig({
 		server: {
 			strictPort: true,
 		},
-		plugins: [nornaBasePathRedirect(), nornaGeneratedImagesWatcher()],
+		plugins: [nornaBasePathRedirect(), devServerIdentityPlugin(siteDir), nornaGeneratedImagesWatcher()],
 	},
 });

package/package.json

@@ -2,7 +2,7 @@
   "name": "@janga/norna",
   "description": "An opinionated CLI for building responsive websites from Markdown, images, and theme presets.",
   "type": "module",
-  "version": "0.7.28",
+  "version": "0.7.29",
   "license": "GPL-3.0-only",
   "repository": {
     "type": "git",
@@ -105,11 +105,11 @@
     "test:fixture:build": "node scripts/test-basic-fixture-build.mjs",
     "test:examples": "node scripts/test-examples.mjs",
     "test:examples:browser": "node scripts/test-navigation.mjs --site-dir site tests/examples-gallery.spec.ts",
-    "test:page-model": "node scripts/test-page-model.mjs",
+    "test:page-model": "node scripts/test-page-model.mjs && node --test scripts/test-page-order.mjs scripts/test-page-order-integration.mjs",
     "test:site-upgrade": "node scripts/test-site-upgrade.mjs",
     "test:page-markdown": "node scripts/test-page-markdown.mjs && node scripts/test-structured-blocks.mjs && node scripts/test-named-notes.mjs && node scripts/test-content-tabs.mjs",
     "test:tabs:browser": "node scripts/test-navigation.mjs --site-dir fixtures/content-tabs/site tests/content-tabs.spec.ts",
-    "test:site-links": "node scripts/test-site-link-graph.mjs",
+    "test:site-links": "node scripts/test-site-link-graph.mjs && node --test scripts/test-page-attachments.mjs",
     "test:page-aliases": "node scripts/test-page-aliases.mjs",
     "test:sitemap": "node scripts/test-sitemap.mjs",
     "test:not-found-page": "node scripts/test-not-found-page.mjs",
@@ -129,9 +129,10 @@
     "test:content-sync-plan": "node scripts/test-content-sync-plan.mjs",
     "test:content-model": "npm run test:page-content && npm run test:managed-media && npm run test:content-sync && npm run test:markdown-constructs",
     "test:page-content": "node scripts/test-page-content.mjs",
-    "test:managed-media": "node scripts/test-managed-media.mjs",
+    "test:managed-media": "node scripts/test-managed-media.mjs && node scripts/test-markdown-images.mjs",
+    "test:markdown-images:browser": "node scripts/test-navigation.mjs --site-dir fixtures/markdown-images/site tests/markdown-images.spec.ts",
     "test:content-sync": "node scripts/test-content-sync.mjs",
-    "test:markdown-constructs": "node scripts/test-markdown-constructs.mjs",
+    "test:markdown-constructs": "node scripts/test-markdown-constructs.mjs && node scripts/test-standard-markdown-compatibility.mjs",
     "test:theme-presets": "node scripts/test-theme-presets.mjs",
     "test:presentation-contract": "node scripts/test-presentation-contract.mjs",
     "test:presentation-review": "node scripts/test-presentation-review-fixture.mjs",
@@ -150,13 +151,14 @@
     "preset:documentation:review:build": "node scripts/review-documentation-preset.mjs --build-only",
     "palette:review": "node scripts/review-documentation-preset.mjs --palettes",
     "palette:review:build": "node scripts/review-documentation-preset.mjs --palettes --build-only",
-    "test:site-public": "node scripts/test-site-public.mjs",
+    "test:site-public": "node scripts/test-site-public.mjs && node --test scripts/test-publication-paths.mjs",
     "test:cli-discovery": "node scripts/test-cli-discovery.mjs",
-    "test:dev-local": "node scripts/test-dev-local.mjs",
+    "test:dev-local": "node scripts/test-dev-local.mjs && npm run test:editor-preview",
+    "test:editor-preview": "node --test scripts/test-editor-site-preview.mjs && node --test editors/vscode/test/site-preview-actions-contract.mjs",
     "test:review-environments": "node scripts/test-review-environments.mjs",
     "test:review-environments:browser": "node scripts/test-review-environments-browser.mjs",
     "test:engine-commands": "node scripts/test-engine-commands.mjs",
-    "test:editor-language": "node scripts/test-editor-language-service.mjs && npm --prefix editors/vscode run check",
+    "test:editor-language": "node scripts/test-editor-language-service.mjs && node --test scripts/test-editor-resource-actions.mjs && npm --prefix editors/vscode run check",
     "test:editor-integration": "npm --prefix editors/vscode run test:integration",
     "test:editor-integration:minimum": "npm --prefix editors/vscode run test:integration:minimum",
     "test:documentation": "node scripts/test-documentation.mjs",