@levino/shipyard-base 0.8.0 → 0.8.1-rc-20260509110053

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@levino/shipyard-base",
-  "version": "0.8.0",
+  "version": "0.8.1-rc-20260509110053",
   "description": "Core layouts, components, and configuration for shipyard - a composable page builder for Astro",
   "keywords": [
     "astro",
@@ -39,7 +39,7 @@
   },
   "peerDependencies": {
     "@tailwindcss/typography": "^0.5.10",
-    "astro": "^6.0.0",
+    "astro": "^6.1.6",
     "daisyui": "^5",
     "tailwindcss": "^4"
   },
@@ -60,12 +60,13 @@
     "remark-html": "^16.0.1",
     "tailwindcss": "^4",
     "typescript": "^5.2.2",
-    "vite": "^7",
+    "vite": "^7.3.2",
     "vitest": "^4.1.0"
   },
   "dependencies": {
     "clsx": "^2.1.0",
     "mdast-util-directive": "^3.0.0",
+    "micromark-extension-directive": "^3.0.0",
     "ramda": "^0.31",
     "remark-directive": "^3.0.0",
     "tailwind-merge": "^2.2.0",

package/src/index.ts

@@ -1,7 +1,7 @@
 import { fileURLToPath } from 'node:url'
 import type { AstroIntegration } from 'astro'
-import remarkDirective from 'remark-directive'
 import { remarkAdmonitions } from './remark/remarkAdmonitions'
+import { remarkBlockDirective } from './remark/remarkBlockDirective'
 import { remarkNpm2Yarn } from './remark/remarkNpm2Yarn'
 import type { Config } from './schemas/config'
 import { checkLinks, reportBrokenLinks } from './tools/linkChecker'
@@ -47,7 +47,11 @@ export default (config: Config): AstroIntegration => {
 
         updateConfig({
           markdown: {
-            remarkPlugins: [remarkDirective, remarkAdmonitions, remarkNpm2Yarn],
+            remarkPlugins: [
+              remarkBlockDirective,
+              remarkAdmonitions,
+              remarkNpm2Yarn,
+            ],
           },
           vite: {
             plugins: [

package/src/remark/index.ts

@@ -9,4 +9,5 @@
 // Re-export remark-directive for convenience
 export { default as remarkDirective } from 'remark-directive'
 export { type AdmonitionType, remarkAdmonitions } from './remarkAdmonitions'
+export { remarkBlockDirective } from './remarkBlockDirective'
 export { remarkNpm2Yarn } from './remarkNpm2Yarn'

package/src/remark/remarkBlockDirective.test.ts

@@ -0,0 +1,69 @@
+import { remark } from 'remark'
+import remarkHtml from 'remark-html'
+import { describe, expect, it } from 'vitest'
+import { remarkAdmonitions } from './remarkAdmonitions'
+import { remarkBlockDirective } from './remarkBlockDirective'
+
+const process = async (markdown: string): Promise<string> => {
+  const result = await remark()
+    .use(remarkBlockDirective)
+    .use(remarkAdmonitions)
+    .use(remarkHtml, { sanitize: false })
+    .process(markdown)
+  return String(result)
+}
+
+describe('remarkBlockDirective', () => {
+  describe('German gender colon', () => {
+    it('does not split paragraphs containing :innen', async () => {
+      const input =
+        'herzlicher Dank an die Organisator:innen vom **ADFC** und an alle Ordner:innen'
+      const result = await process(input)
+      expect(result).toContain('Organisator:innen')
+      expect(result).toContain('Ordner:innen')
+      expect(result).not.toContain('<div></div>')
+    })
+
+    it('preserves :innen inside a paragraph as plain text', async () => {
+      const input = 'Liebe Anwohner:innen, willkommen.'
+      const result = await process(input)
+      expect(result).toContain('Liebe Anwohner:innen, willkommen.')
+    })
+
+    it('handles multiple gender colon variants in one paragraph', async () => {
+      const input = 'Mitarbeiter:innen, Lehrer:innen und Schüler:innen.'
+      const result = await process(input)
+      expect(result).toContain(
+        'Mitarbeiter:innen, Lehrer:innen und Schüler:innen.',
+      )
+      expect(result).not.toContain('<div></div>')
+    })
+  })
+
+  describe('container directives', () => {
+    it('still parses :::note admonitions', async () => {
+      const input = ':::note\nThis is a note\n:::'
+      const result = await process(input)
+      expect(result).toContain('admonition')
+      expect(result).toContain('admonition-note')
+      expect(result).toContain('This is a note')
+    })
+
+    it('still parses :::warning with custom title', async () => {
+      const input = ':::warning[Be Careful]\nWatch out\n:::'
+      const result = await process(input)
+      expect(result).toContain('admonition-warning')
+      expect(result).toContain('Be Careful')
+    })
+  })
+
+  describe('inline text directives', () => {
+    it('does not consume :name as a directive', async () => {
+      const input = 'Use :foo as a marker.'
+      const result = await process(input)
+      // Without text-directive support `:foo` stays as plain text.
+      expect(result).toContain(':foo')
+      expect(result).not.toContain('<div></div>')
+    })
+  })
+})

package/src/remark/remarkBlockDirective.ts

@@ -0,0 +1,35 @@
+import type { Root } from 'mdast'
+import { directiveFromMarkdown } from 'mdast-util-directive'
+import { directive } from 'micromark-extension-directive'
+import type { Plugin, Processor } from 'unified'
+
+/**
+ * Like `remark-directive`, but only enables block-level directives — container
+ * (`:::name`) and leaf (`::name`) — and disables inline text directives
+ * (`:name`).
+ *
+ * Why: the inline text directive syntax conflicts with the German gender
+ * colon (e.g. `Organisator:innen`, `Ordner:innen`), which would otherwise be
+ * tokenised as a directive and rendered as an empty `<div>`, tearing the
+ * surrounding paragraph apart.
+ *
+ * Block directives stay available so admonitions (`:::note`, `:::warning`)
+ * keep working.
+ */
+export const remarkBlockDirective: Plugin<[], Root> = function () {
+  const self = this as unknown as Processor<Root>
+  const data = self.data()
+
+  if (!data.micromarkExtensions) {
+    data.micromarkExtensions = []
+  }
+  if (!data.fromMarkdownExtensions) {
+    data.fromMarkdownExtensions = []
+  }
+
+  const { flow } = directive()
+  data.micromarkExtensions.push({ flow })
+  data.fromMarkdownExtensions.push(directiveFromMarkdown())
+}
+
+export default remarkBlockDirective