@lupinum/ginko-content 0.3.4 → 0.3.6

package/dist/cms-contract/render-policy.js

@@ -158,6 +158,10 @@ const isSafeBindingValue = (value) => {
 };
 const SHIKI_COLOR = /^#(?:[0-9a-f]{3}|[0-9a-f]{4}|[0-9a-f]{6}|[0-9a-f]{8})$/i;
 const SHIKI_STYLE_VALUES = {
+  // Shiki marks inline code with `display: inline`; @shikijs/transformers marks
+  // highlighted and diff lines with `display: inline-block`. Nothing else is emitted,
+  // so nothing else is accepted.
+  display: /^(?:inline|inline-block)$/,
   color: SHIKI_COLOR,
   "--shiki-light": SHIKI_COLOR,
   "--shiki-dark": SHIKI_COLOR,
@@ -170,7 +174,6 @@ const SHIKI_STYLE_VALUES = {
 };
 const isSafeShikiStyle = (value) => {
   if (typeof value !== "string") return false;
-  if (value.trim() === "display: inline") return true;
   const declarations = value.split(";");
   if (!declarations.length || declarations.some((declaration) => !declaration)) return false;
   const seen = /* @__PURE__ */ new Set();

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@lupinum/ginko-content",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "configKey": "content",
   "compatibility": {
     "nuxt": ">=4.4.7 <5"

package/dist/module.mjs

@@ -30,7 +30,7 @@ import { createRouterMatcher } from 'vue-router';
 import { globby } from 'globby';
 
 const name = "@lupinum/ginko-content";
-const version = "0.3.4";
+const version = "0.3.6";
 const peerDependencies = {
 	nuxt: ">=4.4.7 <5"};
 
@@ -1415,6 +1415,11 @@ const registerContentNitroConfig = ({
     nitroConfig.externals = defu(typeof nitroConfig.externals === "object" ? nitroConfig.externals : {}, {
       inline: [
         resolveModuleFile("."),
+        // The generated virtual modules import authored app files (content.config.ts and
+        // transformers). Nitro's dev server externalizes them by default, which hands raw
+        // TypeScript to Node's ESM loader and fails on any import Node cannot resolve on its
+        // own — extensionless relative imports, aliases. They must be bundled instead.
+        withTrailingSlash(resolve$1(nuxt.options.buildDir, "content")),
         ...runtimeInlineDependencies
       ]
     });

package/dist/runtime/app/components/ContentRendererInline.vue

@@ -4,7 +4,7 @@ import { computed, onServerPrefetch, shallowRef, useAttrs, watch } from "vue";
 import { useRuntimeConfig, useState } from "#imports";
 import MarkdownRenderer from "./internal/MarkdownRenderer.js";
 import { useUnwrap } from "../composables/useUnwrap";
-import { resolveMarkdownPlugins, resolveMarkdownRendererComponents } from "../../markdown/plugins";
+import { resolveMarkdownPlugins, resolveMarkdownRendererComponents, resolveMarkdownRendererFallbackComponents } from "../../markdown/plugins";
 import { toMarkdownRoot } from "../../../core/markdown/tree";
 import { parseComark } from "../../../core/markdown/parse-comark";
 import { loadContentComponentEntries } from "../../../integrations/vue/content-components";
@@ -44,6 +44,7 @@ const initialState = useState(stateKey, () => ({
   tree: null
 }));
 const tree = shallowRef(initialState.value.tree);
+const fallbackComponents = resolveMarkdownRendererFallbackComponents();
 const resolvedComponents = computed(() => ({
   ...Object.fromEntries(loadContentComponentEntries({
     type: "root",
@@ -92,6 +93,7 @@ watch(
     :tag="tag"
     :prose="prose"
     :components="resolvedComponents"
+    :fallback-components="fallbackComponents"
     v-bind="rendererAttrs"
   />
 </template>

package/dist/runtime/app/components/internal/ContentRendererMarkdown.vue

@@ -7,7 +7,7 @@ import MarkdownRenderer from "./MarkdownRenderer.js";
 import { useLocalePath } from "../../composables/content-i18n";
 import { resolveMarkdownRenderRefs, rewriteMarkdownRefLinks } from "../../../../core/references/resolve";
 import { loadContentComponentEntries } from "../../../../integrations/vue/content-components";
-import { resolveMarkdownRendererComponents } from "../../../markdown/plugins";
+import { resolveMarkdownRendererComponents, resolveMarkdownRendererFallbackComponents } from "../../../markdown/plugins";
 import { isMarkdownRoot } from "../../../../core/markdown/tree";
 const props = defineProps({
   value: {
@@ -79,6 +79,7 @@ const renderedBody = computed(() => {
   }
   return props.unwrap ? unwrapRoot(body.value, props.unwrap) : body.value;
 });
+const fallbackComponents = resolveMarkdownRendererFallbackComponents();
 const resolvedComponents = computed(() => {
   if (!renderedBody.value) {
     return props.components;
@@ -108,6 +109,7 @@ const rendererAttrs = computed(() => {
     :default-locale="defaultLocale"
     :locales="locales"
     :components="resolvedComponents"
+    :fallback-components="fallbackComponents"
     :render-policy="renderPolicy"
     :data-content-id="debug ? value.id : void 0"
     v-bind="rendererAttrs"

package/dist/runtime/app/components/internal/MarkdownRenderer.d.ts

@@ -11,6 +11,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: PropType<Record<string, any>>;
         default: () => {};
     };
+    fallbackComponents: {
+        type: PropType<Record<string, any>>;
+        default: () => {};
+    };
     prose: {
         type: PropType<boolean | undefined>;
         default: undefined;
@@ -56,6 +60,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: PropType<Record<string, any>>;
         default: () => {};
     };
+    fallbackComponents: {
+        type: PropType<Record<string, any>>;
+        default: () => {};
+    };
     prose: {
         type: PropType<boolean | undefined>;
         default: undefined;
@@ -97,6 +105,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     components: Record<string, any>;
     tag: string;
     class: string | unknown[] | Record<string, any>;
+    fallbackComponents: Record<string, any>;
     prose: boolean | undefined;
     dataContentId: string;
     renderPolicy: PortableComponentPolicyV1;

package/dist/runtime/app/components/internal/MarkdownRenderer.js

@@ -23,7 +23,7 @@ export function localizeMarkdownNodeProps(props, locale, defaultLocale, locales
   localizeLinkProps(localizedProps, locale, defaultLocale, locales);
   return localizedProps;
 }
-function resolveVueComponent(name, components, registry, prose, seen = /* @__PURE__ */ new Set()) {
+function resolveVueComponent(name, components, registry, fallbacks, prose, seen = /* @__PURE__ */ new Set()) {
   if (seen.has(name)) {
     return null;
   }
@@ -40,7 +40,7 @@ function resolveVueComponent(name, components, registry, prose, seen = /* @__PUR
     const explicit = components[candidate];
     if (explicit) {
       if (typeof explicit === "string" && explicit !== candidate && !htmlTags.includes(explicit)) {
-        return resolveVueComponent(explicit, components, registry, prose, seen) || explicit;
+        return resolveVueComponent(explicit, components, registry, fallbacks, prose, seen) || explicit;
       }
       return explicit;
     }
@@ -51,6 +51,12 @@ function resolveVueComponent(name, components, registry, prose, seen = /* @__PUR
       return registered;
     }
   }
+  for (const candidate of candidates) {
+    const fallback = fallbacks[candidate];
+    if (fallback) {
+      return fallback;
+    }
+  }
   return null;
 }
 function renderNode(node, options, key, parent) {
@@ -72,8 +78,8 @@ function renderNode(node, options, key, parent) {
   if (parent?.tag === "pre") {
     component = tag;
   } else {
-    const resolvedAs = typeof nodeProps.as === "string" ? resolveVueComponent(nodeProps.as, options.components, options.registry, options.prose) : null;
-    const resolvedComponent = resolvedAs || resolveVueComponent(tag, options.components, options.registry, options.prose);
+    const resolvedAs = typeof nodeProps.as === "string" ? resolveVueComponent(nodeProps.as, options.components, options.registry, options.fallbacks, options.prose) : null;
+    const resolvedComponent = resolvedAs || resolveVueComponent(tag, options.components, options.registry, options.fallbacks, options.prose);
     if (resolvedComponent) {
       component = resolvedComponent;
     } else if (htmlTags.includes(tag)) {
@@ -143,6 +149,10 @@ export default defineComponent({
       type: Object,
       default: () => ({})
     },
+    fallbackComponents: {
+      type: Object,
+      default: () => ({})
+    },
     prose: {
       type: Boolean,
       default: void 0
@@ -184,6 +194,7 @@ export default defineComponent({
       const children = (props.tree.children || []).map((node, index) => renderNode(node, {
         components: props.components,
         registry,
+        fallbacks: props.fallbackComponents,
         prose: props.prose,
         locale: props.locale,
         defaultLocale: props.defaultLocale,

package/dist/runtime/markdown/plugins.d.ts

@@ -1,3 +1,8 @@
 import type { ResolvedMarkdownPlugin } from '../../types/content';
 export { resolveMarkdownPlugins } from '../../parsers/markdown-plugins';
+/**
+ * Builtin prose components resolve after the app's component registry, so an
+ * app-registered ProseImg (or a tags remap) wins over the bundled default.
+ */
+export declare function resolveMarkdownRendererFallbackComponents(): Record<string, unknown>;
 export declare function resolveMarkdownRendererComponents(plugins: ResolvedMarkdownPlugin[]): Record<string, unknown>;

package/dist/runtime/markdown/plugins.js

@@ -23,10 +23,11 @@ const builtinMarkdownPlugins = {
 const builtinMarkdownComponents = {
   ProseImg: defineAsyncComponent(async () => await import("../app/components/Prose/ProseImg.vue"))
 };
+export function resolveMarkdownRendererFallbackComponents() {
+  return { ...builtinMarkdownComponents };
+}
 export function resolveMarkdownRendererComponents(plugins) {
-  const components = {
-    ...builtinMarkdownComponents
-  };
+  const components = {};
   for (const plugin of plugins) {
     const builtin = builtinMarkdownPlugins[plugin.name];
     if (builtin?.componentName && builtin.component) {

package/dist/web-types.json

@@ -1,7 +1,7 @@
 {
   "framework": "vue",
   "name": "@lupinum/ginko-content",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "contributions": {
     "html": {
       "description-markup": "markdown",
@@ -202,6 +202,14 @@
               },
               "default": "() => ({})"
             },
+            {
+              "name": "fallbackComponents",
+              "value": {
+                "kind": "expression",
+                "type": "Record<string, any>"
+              },
+              "default": "() => ({})"
+            },
             {
               "name": "prose",
               "value": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lupinum/ginko-content",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "description": "Collection-first content engine for Nuxt",
   "homepage": "https://github.com/lupinum-dev/ginko-content",
   "bugs": {