astro-d2 0.6.0 → 0.7.0

package/CHANGELOG.md

@@ -0,0 +1,11 @@
+# astro-d2
+
+## 0.7.0
+
+### Minor Changes
+
+- [#34](https://github.com/HiDeoo/astro-d2/pull/34) [`7028b05`](https://github.com/HiDeoo/astro-d2/commit/7028b0569eab2479808f38e6140a8b3d8a6a8db9) Thanks [@HiDeoo](https://github.com/HiDeoo)! - Adds support for Astro v5, drops support for Astro v4.
+
+  Please follow the [upgrade guide](https://docs.astro.build/en/guides/upgrade-to/v5/) to update your project.
+
+  When using the integration with the [Content Layer API](https://docs.astro.build/en/guides/content-collections) and the [`skipGeneration` option](https://astro-d2.vercel.app/configuration/#skipgeneration) is set to `false`, the integration will automatically invalidate the content layer cache at build time so that all existing diagrams can be generated while ensuring that all removed diagrams are properly cleaned up. This limitation will be removed if and when some upstream technical blockers are resolved.

package/index.ts

@@ -4,6 +4,7 @@ import path from 'node:path'
 import type { AstroIntegration } from 'astro'
 
 import { AstroD2ConfigSchema, type AstroD2UserConfig } from './config'
+import { clearContentLayerCache } from './libs/astro'
 import { isD2Installed } from './libs/d2'
 import { throwErrorWithHint } from './libs/integration'
 import { remarkAstroD2 } from './libs/remark'
@@ -39,6 +40,7 @@ export default function astroD2Integration(userConfig?: AstroD2UserConfig): Astr
           }
 
           if (command === 'build') {
+            await clearContentLayerCache(astroConfig, logger)
             await fs.rm(path.join('public', config.output), { force: true, recursive: true })
           }
         }

package/libs/astro.ts

@@ -0,0 +1,17 @@
+import fs from 'node:fs'
+
+import type { AstroConfig, AstroIntegrationLogger } from 'astro'
+
+const dataStoreFile = 'data-store.json'
+
+export async function clearContentLayerCache(config: AstroConfig, logger: AstroIntegrationLogger) {
+  const dataStore = getDataStoreFile(config)
+  if (fs.existsSync(dataStore)) {
+    logger.info('Invalidating content layer cache…')
+    await fs.promises.rm(dataStore, { force: true })
+  }
+}
+
+function getDataStoreFile(config: AstroConfig) {
+  return new URL(dataStoreFile, config.cacheDir)
+}

package/libs/attributes.ts

@@ -82,7 +82,7 @@ function parseAttributes(attributesStr: string | null | undefined) {
     const { key, noQuoteValue, singleQuoteValue, doubleQuoteValue, truthyKey } = match.groups ?? {}
 
     const attributeKey = truthyKey ?? key
-    const attributeValue = truthyKey ? 'true' : noQuoteValue ?? singleQuoteValue ?? doubleQuoteValue
+    const attributeValue = truthyKey ? 'true' : (noQuoteValue ?? singleQuoteValue ?? doubleQuoteValue)
 
     if (attributeKey && attributeValue) {
       attributes[attributeKey] = attributeValue

package/libs/d2.ts

@@ -84,7 +84,7 @@ export async function generateD2Diagram(
 export async function getD2Diagram(diagramPath: string): Promise<D2Diagram | undefined> {
   try {
     const content = await fs.readFile(diagramPath, 'utf8')
-    const match = content.match(viewBoxRegex)
+    const match = viewBoxRegex.exec(content)
     const { height, width } = match?.groups ?? {}
 
     if (!height || !width) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-d2",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "license": "MIT",
   "description": "Astro integration and remark plugin to transform D2 Markdown code blocks into diagrams.",
   "author": "HiDeoo <github@hideoo.dev> (https://hideoo.dev)",
@@ -10,26 +10,28 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "hast-util-from-html": "2.0.3",
-    "hast-util-to-html": "9.0.3",
-    "unist-util-visit": "5.0.0"
+    "hast-util-from-html": "^2.0.3",
+    "hast-util-to-html": "^9.0.4",
+    "unist-util-visit": "^5.0.0"
   },
   "devDependencies": {
-    "@types/hast": "3.0.4",
-    "@types/mdast": "4.0.3",
-    "remark": "15.0.1",
-    "vfile": "6.0.1",
-    "vitest": "1.2.2"
+    "@types/hast": "^3.0.4",
+    "@types/mdast": "^4.0.4",
+    "@types/node": "^18.19.68",
+    "remark": "^15.0.1",
+    "vfile": "^6.0.3",
+    "vitest": "2.1.6"
   },
   "peerDependencies": {
-    "astro": ">=4.0.0"
+    "astro": ">=5.0.0"
   },
   "engines": {
     "node": ">=18"
   },
   "packageManager": "pnpm@8.15.1",
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
   "sideEffects": false,
   "keywords": [
@@ -41,11 +43,12 @@
   "homepage": "https://github.com/HiDeoo/astro-d2",
   "repository": {
     "type": "git",
-    "url": "https://github.com/HiDeoo/astro-d2.git"
+    "url": "https://github.com/HiDeoo/astro-d2.git",
+    "directory": "packages/astro-d2"
   },
   "bugs": "https://github.com/HiDeoo/astro-d2/issues",
   "scripts": {
     "test": "vitest",
-    "lint": "prettier -c --cache . && eslint . --cache --max-warnings=0"
+    "lint": "eslint . --cache --max-warnings=0"
   }
 }