Date: Mon, 8 Apr 2024 16:36:42 -0500
Subject: [PATCH 04/19] fix: checkboxes
Without this, the checkboxes would not be rendered correctly.
They weren't checked when the user clicked on them.
This was due to another annoying csp violation.
Oversight on my part.
I apologize, I hope this is the last time I have to fix this.
---
src/utils/csp.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/utils/csp.ts b/src/utils/csp.ts
index 2caa8226..28f43243 100644
--- a/src/utils/csp.ts
+++ b/src/utils/csp.ts
@@ -12,7 +12,7 @@ export function useCsp(): void {
csp.directives.scriptSrcElem.push(SELF, UNSAFE_INLINE);
csp.directives.styleSrc.push(SELF);
csp.directives.styleSrcElem.push(SELF, UNSAFE_INLINE);
- csp.directives.imgSrc.push(SELF);
+ csp.directives.imgSrc.push(SELF, "data:");
csp.directives.connectSrc.push(SELF);
csp.directives.manifestSrc.push(SELF);
});
From 4eae25622aaa06b1ada948abde1c130b6f7c645a Mon Sep 17 00:00:00 2001
From: Eli <88557639+lishaduck@users.noreply.github.com>
Date: Mon, 8 Apr 2024 16:41:37 -0500
Subject: [PATCH 05/19] chore: less code
54 characters removed, for a total of a 50 line reduction of code!
---
src/islands/Chatbot.tsx | 2 +-
src/utils/calc/solar.ts | 50 -----------------------------------------
2 files changed, 1 insertion(+), 51 deletions(-)
diff --git a/src/islands/Chatbot.tsx b/src/islands/Chatbot.tsx
index ce9fec68..7c929075 100644
--- a/src/islands/Chatbot.tsx
+++ b/src/islands/Chatbot.tsx
@@ -108,7 +108,7 @@ function ChatbotBox(props: JSX.HTMLAttributes
= {
async GET(req, ctx): Promise {
@@ -12,7 +15,7 @@ export const handler: Handlers = {
}
const response = ask(message, thread_id);
- const responses = [];
+ const responses: Message[] = [];
for await (const res of response) {
responses.push(res);
}
diff --git a/src/routes/calculator.tsx b/src/routes/calculator.tsx
index bf88efab..1c429207 100644
--- a/src/routes/calculator.tsx
+++ b/src/routes/calculator.tsx
@@ -73,7 +73,7 @@ export const handler: Handlers = {
});
}
- if (!geoType.success || !squareFootage) {
+ if (!(geoType.success && squareFootage)) {
return ctx.renderNotFound();
}
diff --git a/src/utils/hooks.ts b/src/utils/hooks.ts
index 2a10ace6..4d78852f 100644
--- a/src/utils/hooks.ts
+++ b/src/utils/hooks.ts
@@ -14,7 +14,7 @@ export function usePromise(promise: Promise): T | undefined {
error.value = e;
status.value = "rejected";
}
- }, [promise]);
+ }, [promise, status, result, error]);
// Preact Signals dislike promises.
const [dataPromise] = useState(fetchData);
diff --git a/src/utils/indexeddb.ts b/src/utils/indexeddb.ts
index d32d0c11..e0d00c91 100644
--- a/src/utils/indexeddb.ts
+++ b/src/utils/indexeddb.ts
@@ -1,6 +1,6 @@
import { IS_BROWSER } from "$fresh/runtime.ts";
import { get, set } from "idb-keyval";
-import { type Inputs, useCallback } from "preact/hooks";
+import { useCallback } from "preact/hooks";
import { usePromise } from "./hooks.ts";
/**
@@ -16,7 +16,6 @@ import { usePromise } from "./hooks.ts";
*/
export function useIndexedDB(
key: string,
- inputs: Inputs,
def?: () => Promise,
): T | undefined {
if (!IS_BROWSER) {
@@ -35,7 +34,7 @@ export function useIndexedDB(
}
return val;
- }, [key, def, inputs]);
+ }, [key, def]);
return usePromise(callback());
}
diff --git a/src/utils/solutions.test.ts b/src/utils/solutions.test.ts
index 451840cb..700738b1 100644
--- a/src/utils/solutions.test.ts
+++ b/src/utils/solutions.test.ts
@@ -5,46 +5,43 @@ import { solutionPagesSchema } from "./solutions.ts";
/**
* Test the solution pages schema.
*/
-Deno.test(
- "Solution pages schema.",
- async (t: Deno.TestContext): Promise => {
- await t.step("Valid data", (): void => {
- const value = [
- {
- slug: "slug",
- data: {
- title: "",
- description: "",
- category: "",
- sectionHeader: "",
- },
+Deno.test("Solution pages schema.", async (t: Deno.TestContext): Promise => {
+ await t.step("Valid data", (): void => {
+ const value = [
+ {
+ slug: "slug",
+ data: {
+ title: "",
+ description: "",
+ category: "",
+ sectionHeader: "",
},
- ];
+ },
+ ];
- const actual = solutionPagesSchema.parse(value);
- assertEquals(actual, value);
- });
+ const actual = solutionPagesSchema.parse(value);
+ assertEquals(actual, value);
+ });
- await t.step("Invalid data", async (t): Promise => {
- await t.step("Empty", (): void => {
- const actual = (): void => {
- solutionPagesSchema.parse([{}]);
- };
- assertThrows(actual, Error, "Required");
- });
- await t.step("Missing category", (): void => {
- const actual = (): void => {
- solutionPagesSchema.parse([
- {
- data: {
- title: "title",
- description: "description",
- },
+ await t.step("Invalid data", async (t): Promise => {
+ await t.step("Empty", (): void => {
+ const actual = (): void => {
+ solutionPagesSchema.parse([{}]);
+ };
+ assertThrows(actual, Error, "Required");
+ });
+ await t.step("Missing category", (): void => {
+ const actual = (): void => {
+ solutionPagesSchema.parse([
+ {
+ data: {
+ title: "title",
+ description: "description",
},
- ]);
- };
- assertThrows(actual, ZodError, "Required");
- });
+ },
+ ]);
+ };
+ assertThrows(actual, ZodError, "Required");
});
- },
-);
+ });
+});
diff --git a/tool/compile-mdx.ts b/tool/compile-mdx.ts
index a7d04e0f..a387fd87 100644
--- a/tool/compile-mdx.ts
+++ b/tool/compile-mdx.ts
@@ -48,11 +48,10 @@ async function run(): Promise {
const initialFiles = getSolutions(contentDir);
const compiledFiles = compileSolutions(initialFiles);
- const promises = [];
+ const files: VFile[] = [];
for await (const file of compiledFiles) {
- promises.push(file);
+ files.push(file);
}
- const files = await Promise.all(promises);
files.sort(sortFiles);
lint(files);
@@ -149,7 +148,6 @@ async function* compileSolutions(
*/
const remarkPlugins = [
remarkFrontmatter,
- // @ts-expect-error: Typescript dislikes current Deno deduping of Unified.
remarkMdxFrontmatter,
// @ts-expect-error: Typescript dislikes current Deno deduping of Unified.
remarkPresetLintConsistent,
@@ -203,7 +201,7 @@ async function compileSolution(file: VFile): Promise {
}
async function writeSolutions(solutions: VFile[]): Promise {
- const promises = [];
+ const promises: Promise[] = [];
for (const solution of solutions) {
promises.push(writeSolution(solution));
}
From 43b5bba85c9057174f5fcff1f73741fe361d6ee6 Mon Sep 17 00:00:00 2001
From: Eli <88557639+lishaduck@users.noreply.github.com>
Date: Wed, 8 May 2024 13:39:38 -0500
Subject: [PATCH 09/19] fix: mdx compilation discovery path resolution
---
tool/compile-mdx.ts | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/tool/compile-mdx.ts b/tool/compile-mdx.ts
index a7d04e0f..1c36878e 100644
--- a/tool/compile-mdx.ts
+++ b/tool/compile-mdx.ts
@@ -1,5 +1,5 @@
import { type CompileOptions, compile } from "@mdx-js/mdx";
-import { dirname, fromFileUrl, join, relative, resolve } from "@std/path";
+import { dirname, fromFileUrl, join, resolve } from "@std/path";
import rehypeMathjax from "rehype-mathjax";
import remarkFrontmatter from "remark-frontmatter";
import remarkLintCheckboxContentIndent from "remark-lint-checkbox-content-indent";
@@ -37,9 +37,9 @@ declare module "vfile" {
Deno.chdir(dirname(fromFileUrl(Deno.mainModule)));
// Directories for resolve.
-const srcDir = "../src" as const;
-const contentDir = `${srcDir}/content` as const;
-const utilsDir = `${srcDir}/utils` as const;
+const srcDir = resolve("..", "src");
+const contentDir = join(srcDir, "content");
+const utilsDir = join(srcDir, "utils");
/**
* Compile the MDX files into JS.
@@ -77,15 +77,14 @@ async function run(): Promise {
*/
async function* getSolutions(
basePath: string,
- currentPath: string = basePath,
+ currentPath = "",
): AsyncGenerator {
- for await (const entry of Deno.readDir(currentPath)) {
- const fullPath = join(currentPath, entry.name);
- const relPath = relative(basePath, currentPath);
- if (entry.isFile && entry.name.match(/mdx?/) !== null) {
- yield getSolution(fullPath, entry.name, relPath);
+ for await (const entry of Deno.readDir(resolve(basePath, currentPath))) {
+ const fullPath = resolve(basePath, currentPath, entry.name);
+ if (entry.isFile && entry.name.match(/\.mdx?$/) !== null) {
+ yield getSolution(fullPath, currentPath, entry.name);
} else if (entry.isDirectory) {
- yield* getSolutions(basePath, fullPath);
+ yield* getSolutions(basePath, join(currentPath, entry.name));
}
}
}
@@ -94,14 +93,14 @@ async function* getSolutions(
* Get the contents of a file.
*
* @param fullPath - The full path to the file.
- * @param fileName - The name of the file.
* @param relPath - The relative path to the file.
+ * @param fileName - The name of the file.
* @returns The file's contents.
*/
async function getSolution(
fullPath: string,
+ relPath: string,
fileName: string,
- relPath = ".",
): Promise {
const fileContent = await Deno.readTextFile(fullPath);
@@ -109,6 +108,7 @@ async function getSolution(
value: fileContent,
dirname: relPath,
basename: fileName,
+ cwd: fullPath,
});
}
From 837c0df6475a6aba13daa54c4f354e63871c30cf Mon Sep 17 00:00:00 2001
From: Eli <88557639+lishaduck@users.noreply.github.com>
Date: Sun, 5 May 2024 16:58:54 -0500
Subject: [PATCH 10/19] fix: strict csp
The csp didn't work right with latest fresh.
---
src/utils/csp.ts | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/utils/csp.ts b/src/utils/csp.ts
index 28f43243..408724fa 100644
--- a/src/utils/csp.ts
+++ b/src/utils/csp.ts
@@ -1,7 +1,8 @@
-import { SELF, UNSAFE_INLINE, useCSP } from "$fresh/runtime.ts";
+import { SELF, STRICT_DYNAMIC, UNSAFE_INLINE, useCSP } from "$fresh/runtime.ts";
export function useCsp(): void {
useCSP((csp) => {
+ csp.directives.scriptSrc ??= [];
csp.directives.scriptSrcElem ??= [];
csp.directives.styleSrc ??= [];
csp.directives.styleSrcElem ??= [];
@@ -9,9 +10,10 @@ export function useCsp(): void {
csp.directives.connectSrc ??= [];
csp.directives.manifestSrc ??= [];
+ csp.directives.scriptSrc.push(STRICT_DYNAMIC);
csp.directives.scriptSrcElem.push(SELF, UNSAFE_INLINE);
csp.directives.styleSrc.push(SELF);
- csp.directives.styleSrcElem.push(SELF, UNSAFE_INLINE);
+ csp.directives.styleSrcElem.push(SELF, STRICT_DYNAMIC);
csp.directives.imgSrc.push(SELF, "data:");
csp.directives.connectSrc.push(SELF);
csp.directives.manifestSrc.push(SELF);
From a6d93047a28d90f6cc829bb0311147ce0e2939fb Mon Sep 17 00:00:00 2001
From: Eli <88557639+lishaduck@users.noreply.github.com>
Date: Sun, 5 May 2024 16:57:50 -0500
Subject: [PATCH 11/19] fix: missing partial island warning
Apparently f-client-nav requires the direct child to be a partial.
It works fine otherwise, so I hadn't noticed.
However, it turns out `f-client-nav`ed islands must be partialled.
---
src/routes/_app.tsx | 6 ++++--
src/routes/_layout.tsx | 7 ++-----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/routes/_app.tsx b/src/routes/_app.tsx
index db79db2c..f2a79fba 100644
--- a/src/routes/_app.tsx
+++ b/src/routes/_app.tsx
@@ -1,4 +1,4 @@
-import { Head, asset } from "$fresh/runtime.ts";
+import { Head, Partial, asset } from "$fresh/runtime.ts";
import type { PageProps } from "$fresh/server.ts";
import type { JSX } from "preact";
import {
@@ -71,7 +71,9 @@ export default function App({ Component }: PageProps): JSX.Element {
-
+