New content

plugin/plugin.ts

@@ -105,19 +105,24 @@ async function makePhotos(ctx: PluginContext) {
   );
   return Promise.all(
     infoPaths.map(async (info) => {
-      const contents = await fs.readFile(info, { encoding: "utf-8" });
+      const infoPath = path.resolve(info);
+      ctx.addWatchFile(infoPath);
+
+      const contents = await fs.readFile(infoPath, { encoding: "utf-8" });
       const match = contents.match(/photo\(\{(?<description>[\S\s]*)\}\);/);
       if (match === null) {
-        throw new Error(`Could not parse ${info}`);
+        throw new Error(`Could not parse ${infoPath}`);
       }
       const infoMap = match.groups!["description"];
 
-      const infoDir = path.dirname(info);
+      const infoDir = path.dirname(infoPath);
       const dirName = path.basename(infoDir);
       const id = dirName.replace(/^\d+-/, "");
       idToDirName.set(id, dirName);
 
       const src = path.join(infoDir, CONTENT_PHOTO);
+      ctx.addWatchFile(src);
+
       const previewWidth = calcWidth(512, await sharp(src).metadata());
 
       // imageOutPath and previewOutPath are
@@ -137,18 +142,21 @@ async function makePhotos(ctx: PluginContext) {
   );
 }
 
-async function makePosts(): Promise<string[]> {
+async function makePosts(ctx: PluginContext): Promise<string[]> {
   const posts: string[] = [];
   for await (const info of fs.glob(
     path.join("src/Content/blogs", "*", "post.tsx"),
   )) {
-    const contents = await fs.readFile(info, { encoding: "utf-8" });
+    const infoPath = path.resolve(info);
+    ctx.addWatchFile(infoPath);
+
+    const contents = await fs.readFile(infoPath, { encoding: "utf-8" });
     const match = contents.match(/post\(\{(?<description>[\S\s]*)\}\);/);
     if (match === null) {
-      throw new Error(`Could not parse ${info}`);
+      throw new Error(`Could not parse ${infoPath}`);
     }
     const infoMap = match.groups!["description"];
-    const infoDir = path.dirname(info);
+    const infoDir = path.dirname(infoPath);
     const id = path.basename(infoDir);
 
     // TODO: this is awful, I should really use ts parser
@@ -183,7 +191,7 @@ function contentPlugin(): Plugin {
           ];
 
           export const posts = [
-            ${(await makePosts()).join(",\n")}
+            ${(await makePosts(this)).join(",\n")}
           ];
 
           export function post(any) {}

src/Content/photos/0021-vienna-rathaus/info.tsx

@@ -0,0 +1,8 @@
+import photo from "virtual:photo";
+
+photo({
+  name: "Vienna Rathaus",
+  camera: "Sony α7c",
+  lens: "Tamron 28-75mm f2.8 Di III VXD G2",
+  tags: ["digital", "architecture", "austria"],
+});

src/Content/photos/0022-sudbahnhotel/info.tsx

@@ -0,0 +1,8 @@
+import photo from "virtual:photo";
+
+photo({
+  name: "Südbahnhotel Semmering",
+  camera: "Sony α7c",
+  lens: "Tamron 28-75mm f2.8 Di III VXD G2",
+  tags: ["digital", "architecture", "austria"],
+});

src/Content/photos/0023-aurum/info.tsx

@@ -0,0 +1,8 @@
+import photo from "virtual:photo";
+
+photo({
+  name: "Aurum",
+  camera: "Sony α7c",
+  lens: "Tamron 70-300mm F4.5-6.3 Di III RXD",
+  tags: ["digital", "architecture", "veliky novgorod"],
+});

src/Content/photos/0025-axes/info.tsx

@@ -0,0 +1,9 @@
+import photo from "virtual:photo";
+
+photo({
+  name: "Axes",
+  camera: "Minolta Dynax 500si",
+  lens: "Tamron 28-80 f/3.5-5.6",
+  film: "Kodacolor vr 200 plus (expired)",
+  tags: ["film", "architecture", "moscow"],
+});

src/Content/photos/0026-sandy-cliffs/info.tsx

@@ -0,0 +1,8 @@
+import photo from "virtual:photo";
+
+photo({
+  name: "Sandy cliffs",
+  camera: "Sony α7c",
+  lens: "Tamron 28-75mm f2.8 Di III VXD G2",
+  tags: ["digital", "landscape", "lake baikal"],
+});

src/Virtual/photo.d.ts

@@ -2,7 +2,12 @@ import { JSX } from "solid-js";
 
 declare module "virtual:photo" {
   type Medium = "digital" | "film" | "infrared";
-  type Location = "moscow" | "saint petersburg" | "veliky novgorod";
+  type Location =
+    | "moscow"
+    | "saint petersburg"
+    | "veliky novgorod"
+    | "austria"
+    | "lake baikal";
   type Genre =
     | "architecture"
     | "landscape"