Merge branch 'main' into fix/default-camera-z

Author: limzykenneth

astro.config.mjs

@@ -1,4 +1,4 @@
-import { defineConfig } from "astro/config";
+import { defineConfig, passthroughImageService } from "astro/config";
 import preact from "@astrojs/preact";
 import mdx from "@astrojs/mdx";
 import compress from "astro-compress";
@@ -66,5 +66,11 @@ export default defineConfig({
   },
   image: {
     domains: ["openprocessing.org"],
+    service: passthroughImageService()
+  },
+  markdown: {
+    shikiConfig: {
+      theme: 'github-light',
+    },
   },
 });

package-lock.json

@@ -13,6 +13,7 @@
     "build:contribute": "tsx ./src/scripts/builders/contribute.ts",
     "build:reference": "tsx ./src/scripts/builders/reference.ts",
     "build:search": "tsx ./src/scripts/builders/search.ts",
+    "build:people": "tsx ./src/scripts/builders/people.ts",
     "test": "vitest",
     "build:examples": "node ./src/scripts/build-examples.js",
     "postprocess:links": "tsx ./src/scripts/postprocess-locale-relative-links.ts"
@@ -30,7 +31,9 @@
     "cheerio": "^1.0.0-rc.12",
     "cssnano": "^6.1.2",
     "fuse.js": "^7.0.0",
+    "js-yaml": "^4.1.0",
     "keyword-extractor": "^0.0.28",
+    "lodash": "^4.17.21",
     "preact": "^10.19.5",
     "tailwindcss": "^3.4.1",
     "typescript": "^5.3.3",
@@ -51,7 +54,9 @@
     "@preact/preset-vite": "^2.8.2",
     "@testing-library/preact": "^3.2.3",
     "@types/he": "^1.2.3",
+    "@types/js-yaml": "^4.0.9",
     "@types/jsdom": "^21.1.6",
+    "@types/lodash": "^4.17.1",
     "@types/node": "^20.11.19",
     "@typescript-eslint/eslint-plugin": "^7.0.2",
     "@typescript-eslint/parser": "^7.0.2",

package.json

@@ -2,6 +2,7 @@
 // SEE https://documenter.getpostman.com/view/16936458/2s9YC1Xa6X#intro
 
 import type { AnyEntryMap, CollectionEntry } from "astro:content";
+import memoize from "lodash/memoize";
 
 const openProcessingEndpoint = "https://openprocessing.org/api/";
 /**
@@ -72,13 +73,13 @@ export type OpenProcessingSketchResponse = {
  * @param id
  * @returns
  */
-export const getSketch = async (
+export const getSketch = memoize(async (
   id: string,
 ): Promise<OpenProcessingSketchResponse> => {
   const response = await fetch(`${openProcessingEndpoint}sketch/${id}`);
   const payload = await response.json();
   return payload as OpenProcessingSketchResponse;
-};
+});
 
 export const makeSketchLinkUrl = (id: string) =>
   `https://openprocessing.org/sketch/${id}`;
@@ -100,7 +101,7 @@ export function isCurationResponse<C extends keyof AnyEntryMap>(
   return "visualID" in item;
 }
 
-export const getRandomCurationSketches = async (num = 4) => {
+export const getRandomCurationSketches = memoize(async (num = 4) => {
   const curationSketches = await getCurationSketches();
   const result: OpenProcessingCurationResponse = [];
   const usedIndices: Set<number> = new Set();
@@ -114,4 +115,4 @@ export const getRandomCurationSketches = async (num = 4) => {
   }
 
   return result;
-};
+});

public/search-indices/en.json

@@ -52,7 +52,7 @@ const code = rows.map((row) => row.code).join('');
 // Convert it to HTML with style tags
 const html = await codeToHtml(code, {
   lang: props.lang || 'javascript',
-  theme: props.theme || 'github-dark',
+  theme: props.theme || 'github-light',
 })
 
 // Turn it into a DOM tree we can query
@@ -80,19 +80,20 @@ const getPreStyle = (i: number) => {
   if (i < rows.length-1) {
     style += 'border-bottom-left-radius:0;border-bottom-right-radius:0;'
   }
+  style += 'margin:0;'
   return style;
 }
 const codeAttrs: Record<string, string> = {};
 for (const attr of codeTag.attributes) {
   codeAttrs[attr.name] = attr.value;
 }
 ---
-  <table class="h-1 my-md">
+  <table class="h-1 my-md full-width">
     <tbody>
       {rows.map((row, i) => {
         const lineNodes = lines.slice(row.startLine, row.endLine);
         return (
-          <tr class="[&>*]:align-top [&>*]:m-0 [&>*:not(:first-child)]:py-2 [&>*:not(:first-child)]:max-w-xl">
+          <tr class="[&>*]:align-top [&>*]:m-0 [&>*:not(:first-child)]:py-2 [&>*:not(:first-child)]:pl-6 [&>*:not(:first-child)]:max-w-xl">
             <td class="align-top p-0" style="height:100%; margin:0">
             <pre {...preAttrs} style={`${getPreStyle(i)};height:100%`}><code {...codeAttrs} set:html={lineNodes.map((n) => n.outerHTML).join('\n')} /></pre>
             </td>