Merge remote-tracking branch 'upstream/source' into landing--interactive-editor-on-landing

Author: hasparus

.vscode/settings.json

@@ -10,6 +10,9 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "tailwindCSS.classFunctions": ["clsx"],
+  "files.associations": {
+    "*.css": "tailwindcss"
+  },
   "editor.quickSuggestions": {
     "strings": "on"
   },

package.json

@@ -24,6 +24,7 @@
     "validate:snippets": "node scripts/validate-snippets.js"
   },
   "dependencies": {
+    "@base-ui-components/react": "1.0.0-beta.4",
     "@codemirror/autocomplete": "^6.18.6",
     "@codemirror/commands": "^6.3.3",
     "@codemirror/language": "^6.10.0",
@@ -37,7 +38,6 @@
     "@lezer/highlight": "^1.2.1",
     "@next/bundle-analyzer": "^15.4.5",
     "@plaiceholder/next": "^3.0.0",
-    "@radix-ui/react-radio-group": "^1.2.2",
     "@sparticuz/chromium": "^138.0.2",
     "@tailwindcss/container-queries": "^0.1.1",
     "@tailwindcss/nesting": "0.0.0-insiders.565cd3e",
@@ -55,7 +55,6 @@
     "iframe-resizer-react": "^1.1.1",
     "leaflet": "^1.9.4",
     "lucide-react": "^0.469.0",
-    "markdown-to-jsx": "^7.7.2",
     "motion": "^12.11.0",
     "next": "^14.2.32",
     "next-query-params": "^5.0.1",
@@ -96,7 +95,7 @@
     "@playwright/test": "^1.54.2",
     "@svgr/webpack": "^8.1.0",
     "@testing-library/react": "^16.3.0",
-    "@types/codemirror": "5.60.16",
+    "@types/codemirror": "5.60.17",
     "@types/hast": "3.0.4",
     "@types/jsdom": "^21.1.7",
     "@types/node": "^22.10.5",

pnpm-lock.yaml

@@ -26,7 +26,10 @@ export default {
       },
     },
   ],
-  plugins: ["prettier-plugin-pkg", "prettier-plugin-tailwindcss"],
-  // We need this to ensure classes format the same across CI and editors.
+  // We need the absolute paths here to ensure classes format the same across CI and editors.
+  plugins: [
+    import.meta.resolve("prettier-plugin-pkg").replace("file://", ""),
+    import.meta.resolve("prettier-plugin-tailwindcss").replace("file://", ""),
+  ],
   tailwindConfig: resolve(__dirname, "./tailwind.config.ts"),
 }

prettier.config.mjs

@@ -11,6 +11,101 @@ const LAST_RUN_PATH = new URL("./last-success.isodate", import.meta.url)
   .pathname
 const CODE_DIR = new URL("../../src/code", import.meta.url).pathname
 
+type ConflictSide = "ours" | "theirs"
+
+function resolveLastRunConflict(
+  content: string,
+): { value: string; side: ConflictSide } | null {
+  if (!content.includes("<<<<<<<")) {
+    return null
+  }
+
+  const ours: string[] = []
+  const theirs: string[] = []
+  let mode: "normal" | ConflictSide = "normal"
+
+  for (const line of content.split("\n")) {
+    if (line.startsWith("<<<<<<<")) {
+      mode = "ours"
+      continue
+    }
+
+    if (line.startsWith("=======")) {
+      mode = "theirs"
+      continue
+    }
+
+    if (line.startsWith(">>>>>>>")) {
+      mode = "normal"
+      continue
+    }
+
+    if (mode === "ours") {
+      ours.push(line)
+    } else if (mode === "theirs") {
+      theirs.push(line)
+    }
+  }
+
+  const candidates = [
+    { side: "ours" as const, value: ours.join("\n").trim() },
+    { side: "theirs" as const, value: theirs.join("\n").trim() },
+  ].map(candidate => {
+    const time = Date.parse(candidate.value)
+    return { ...candidate, time }
+  })
+
+  const validCandidates = candidates.filter(candidate =>
+    Number.isFinite(candidate.time),
+  )
+
+  if (validCandidates.length === 0) {
+    return null
+  }
+
+  validCandidates.sort((a, b) => b.time - a.time)
+  const [latest] = validCandidates
+
+  return { value: latest.value, side: latest.side }
+}
+
+function resolveStatsConflict(
+  content: string,
+  preferred: ConflictSide,
+): string {
+  if (!content.includes("<<<<<<<")) {
+    return content
+  }
+
+  const resolved: string[] = []
+  let mode: "normal" | ConflictSide = "normal"
+
+  for (const line of content.split("\n")) {
+    if (line.startsWith("<<<<<<<")) {
+      mode = "ours"
+      continue
+    }
+
+    if (line.startsWith("=======")) {
+      mode = "theirs"
+      continue
+    }
+
+    if (line.startsWith(">>>>>>>")) {
+      mode = "normal"
+      continue
+    }
+
+    if (mode === "normal" || mode === preferred) {
+      resolved.push(line)
+    }
+  }
+
+  const needsTrailingNewline = content.endsWith("\n")
+  const joined = resolved.join("\n")
+  return needsTrailingNewline ? `${joined}\n` : joined
+}
+
 async function main() {
   const filePaths = await fg("./**/*.md", { cwd: CODE_DIR, absolute: true })
 
@@ -19,7 +114,30 @@ async function main() {
   {
     // we only sync once every two hours
     const TWO_HOURS = 2 * 60 * 60 * 1000
-    const lastRun = await fs.readFile(LAST_RUN_PATH, "utf8").catch(() => "")
+    const lastRunRaw = await fs.readFile(LAST_RUN_PATH, "utf8").catch(() => "")
+
+    const conflictResolution = resolveLastRunConflict(lastRunRaw)
+    const lastRun = conflictResolution
+      ? conflictResolution.value
+      : lastRunRaw.trim()
+
+    if (conflictResolution) {
+      await fs.writeFile(LAST_RUN_PATH, lastRun)
+      const statsContent = await fs.readFile(DATA_PATH, "utf8")
+      if (statsContent.includes("<<<<<<<")) {
+        console.log(
+          "Resolved conflict. Picked",
+          conflictResolution.side,
+          "from",
+          lastRun,
+        )
+        await fs.writeFile(
+          DATA_PATH,
+          resolveStatsConflict(statsContent, conflictResolution.side),
+        )
+      }
+    }
+
     const twoHoursAgo = new Date(Date.now() - TWO_HOURS)
     if (lastRun && new Date(lastRun).getTime() > twoHoursAgo.getTime()) {
       console.info(
@@ -40,6 +158,7 @@ async function main() {
       const content = await fs.readFile(filePath, "utf8")
       const { data } = grayMatter(content)
       if (data.github) {
+        // TODO: This needs to be pooled to make the builds faster.
         const stats = await getGitHubStats(data.github)
         if (stats) {
           newState.set(data.github, stats)