From 7144b706b0aa61aab8255b35519a3630473fa447 Mon Sep 17 00:00:00 2001
From: ymmooot <ryota.yama.9+github@gmail.com>
Date: Wed, 11 Dec 2024 19:16:20 +0900
Subject: [PATCH 1/3] chore: update example code

---
 packages/example/composables/dog.ts | 34 +++++++++++++++++++++++++++++
 packages/example/package.json       |  2 +-
 packages/example/pages/context.vue  | 26 ++++++++++++++++++++++
 packages/example/pages/index.vue    |  3 ++-
 yarn.lock                           |  2 +-
 5 files changed, 64 insertions(+), 3 deletions(-)
 create mode 100644 packages/example/composables/dog.ts
 create mode 100644 packages/example/pages/context.vue

diff --git a/packages/example/composables/dog.ts b/packages/example/composables/dog.ts
new file mode 100644
index 00000000..0cd78cd7
--- /dev/null
+++ b/packages/example/composables/dog.ts
@@ -0,0 +1,34 @@
+import type { NuxtApp } from '#app';
+
+type Dog = {
+  breed: string;
+  name: string;
+  age: number;
+};
+
+export const useDog = async () => {
+  const app = useNuxtApp();
+
+  // fetch Dog data
+  await new Promise((res) => setTimeout(res, 100));
+  const dog: Dog = {
+    breed: 'Golden Retriever',
+    name: 'Buddy',
+    age: 5,
+  };
+
+  app.runWithContext(() => {
+    useJsonld(() => ({
+      '@context': 'https://schema.org',
+      '@type': 'Thing',
+      name: dog.name,
+      description: `A ${dog.breed} dog`,
+    }));
+  });
+
+  return {
+    data: {
+      dog,
+    },
+  };
+};
diff --git a/packages/example/package.json b/packages/example/package.json
index 22f6c3d8..84c2b7cf 100644
--- a/packages/example/package.json
+++ b/packages/example/package.json
@@ -9,7 +9,7 @@
     "start": "node ./.output/server/index.mjs"
   },
   "dependencies": {
-    "nuxt": "^3.11.2"
+    "nuxt": "^3.12.4"
   },
   "devDependencies": {
     "@nuxt/devtools": "^0.8.5"
diff --git a/packages/example/pages/context.vue b/packages/example/pages/context.vue
new file mode 100644
index 00000000..951b92d6
--- /dev/null
+++ b/packages/example/pages/context.vue
@@ -0,0 +1,26 @@
+<template>
+  <div>
+    <h1>Context example</h1>
+    <div>
+      <pre>{{ JSON.stringify(data.dog, null, 4) }}</pre>
+      <nuxt-link to="/"> Back to list </nuxt-link>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { useDog } from '@/composables/dog';
+const { data } = await useDog();
+</script>
+
+<style scoped>
+pre {
+  display: block;
+  margin: 10px auto;
+  max-width: 300px;
+  padding: 12px;
+  text-align: left;
+  background-color: gainsboro;
+  border-radius: 4px;
+}
+</style>
diff --git a/packages/example/pages/index.vue b/packages/example/pages/index.vue
index f7649465..187e904f 100644
--- a/packages/example/pages/index.vue
+++ b/packages/example/pages/index.vue
@@ -11,12 +11,13 @@
       <li><nuxt-link :to="{ name: 'static' }">Static JSON</nuxt-link></li>
       <li><nuxt-link :to="{ name: 'option' }">Options API</nuxt-link></li>
       <li><nuxt-link :to="{ name: 'composable-options' }">Composable API Options</nuxt-link></li>
+      <li><nuxt-link :to="{ name: 'context' }">Context</nuxt-link></li>
     </ul>
   </div>
 </template>
 
 <script lang="ts">
-import { WithContext, ItemList } from 'schema-dts';
+import type { WithContext, ItemList } from 'schema-dts';
 
 export default defineComponent({
   setup() {
diff --git a/yarn.lock b/yarn.lock
index 5109e978..066010a3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7553,7 +7553,7 @@ nuxi@^3.15.0:
   resolved "https://registry.yarnpkg.com/nuxi/-/nuxi-3.15.0.tgz#ed54923ca46727c6e7df10495143db340d9791c9"
   integrity sha512-ZVu45nuDrdb7nzKW2kLGY/N1vvFYLLbUVX6gUYw4BApKGGu4+GktTR5o48dGVgMYX9A8chaugl7TL9ZYmwC9Mg==
 
-nuxt@^3.11.2:
+nuxt@^3.11.2, nuxt@^3.12.4:
   version "3.14.1592"
   resolved "https://registry.yarnpkg.com/nuxt/-/nuxt-3.14.1592.tgz#0f94132b7e0ffe9087b37392f295e2c7d5d05ee3"
   integrity sha512-roWAQH4Mb6WY72cNos+YVw0DgTCNAhNygiAMCedM7hbX6ESTR2n3VH7tU0yIWDPe/hfFdii4M4wWTTNHOtS44g==

From 75794ec60b3ce90a03e389d6288e43e91665e10a Mon Sep 17 00:00:00 2001
From: ymmooot <ryota.yama.9+github@gmail.com>
Date: Wed, 11 Dec 2024 19:42:15 +0900
Subject: [PATCH 2/3] fix: export JsonLD and JsonLDFunc types

Closes: #1363
---
 packages/nuxt-jsonld/src/module.ts                      | 1 +
 packages/nuxt-jsonld/src/runtime/composable.ts          | 1 +
 packages/nuxt-jsonld/src/types/{index.d.ts => index.ts} | 0
 3 files changed, 2 insertions(+)
 rename packages/nuxt-jsonld/src/types/{index.d.ts => index.ts} (100%)

diff --git a/packages/nuxt-jsonld/src/module.ts b/packages/nuxt-jsonld/src/module.ts
index 2cb741c6..dfdd70ed 100644
--- a/packages/nuxt-jsonld/src/module.ts
+++ b/packages/nuxt-jsonld/src/module.ts
@@ -2,6 +2,7 @@ import { resolve } from 'pathe';
 import { defineNuxtModule, addPlugin, addImports } from '@nuxt/kit';
 import type { Nuxt } from '@nuxt/schema';
 import type { JsonLDFunc } from './types';
+export type { JsonLD, JsonLDFunc } from './types';
 
 export type { UseJsonldOptions } from './runtime/composable';
 
diff --git a/packages/nuxt-jsonld/src/runtime/composable.ts b/packages/nuxt-jsonld/src/runtime/composable.ts
index 1c98ac59..4b174835 100644
--- a/packages/nuxt-jsonld/src/runtime/composable.ts
+++ b/packages/nuxt-jsonld/src/runtime/composable.ts
@@ -4,6 +4,7 @@ import { useHead, type UseHeadOptions } from '@unhead/vue';
 
 const isFunc = (json: JsonLD | JsonLDFunc): json is JsonLDFunc => typeof json === 'function';
 export type UseJsonldOptions = Pick<UseHeadOptions, 'tagPosition'>;
+export type { JsonLD, JsonLDFunc } from '../types';
 
 export const useJsonld = (json: JsonLD | JsonLDFunc, options?: UseJsonldOptions) => {
   if (!json) {
diff --git a/packages/nuxt-jsonld/src/types/index.d.ts b/packages/nuxt-jsonld/src/types/index.ts
similarity index 100%
rename from packages/nuxt-jsonld/src/types/index.d.ts
rename to packages/nuxt-jsonld/src/types/index.ts

From 630a29af4d11fa8dc4cd54b0e15caa37648d287c Mon Sep 17 00:00:00 2001
From: ymmooot <ryota.yama.9+github@gmail.com>
Date: Wed, 11 Dec 2024 23:24:54 +0900
Subject: [PATCH 3/3] chore: update example

---
 packages/example/composables/dog.ts           | 10 ++--
 packages/example/nuxt.config.ts               |  6 +-
 packages/example/pages/composable-options.vue | 29 +++++-----
 packages/example/pages/context.vue            | 10 +++-
 packages/example/pages/index.vue              | 50 +++++++----------
 packages/example/pages/products/[id].vue      | 55 ++++++++-----------
 packages/example/pages/static.vue             | 31 -----------
 7 files changed, 70 insertions(+), 121 deletions(-)
 delete mode 100644 packages/example/pages/static.vue

diff --git a/packages/example/composables/dog.ts b/packages/example/composables/dog.ts
index 0cd78cd7..2c8c6c1c 100644
--- a/packages/example/composables/dog.ts
+++ b/packages/example/composables/dog.ts
@@ -1,5 +1,3 @@
-import type { NuxtApp } from '#app';
-
 type Dog = {
   breed: string;
   name: string;
@@ -17,18 +15,18 @@ export const useDog = async () => {
     age: 5,
   };
 
+  // Note: This jsonld will not disappear even after page transition.
+  // If you want to link it to the page, use useJsonld in the component side.
   app.runWithContext(() => {
     useJsonld(() => ({
       '@context': 'https://schema.org',
       '@type': 'Thing',
       name: dog.name,
-      description: `A ${dog.breed} dog`,
+      description: `A ${dog.breed} dog: not linked to the page`,
     }));
   });
 
   return {
-    data: {
-      dog,
-    },
+    dog,
   };
 };
diff --git a/packages/example/nuxt.config.ts b/packages/example/nuxt.config.ts
index 576f3c87..ad0f5011 100644
--- a/packages/example/nuxt.config.ts
+++ b/packages/example/nuxt.config.ts
@@ -1,7 +1,5 @@
-import NuxtJsonld from 'nuxt-jsonld';
-
 export default defineNuxtConfig({
-  modules: [NuxtJsonld],
+  modules: ['nuxt-jsonld'],
   css: ['@/css/index.css'],
-  devtools: true,
+  compatibilityDate: '2024-12-11',
 });
diff --git a/packages/example/pages/composable-options.vue b/packages/example/pages/composable-options.vue
index 6b18f187..389f06ae 100644
--- a/packages/example/pages/composable-options.vue
+++ b/packages/example/pages/composable-options.vue
@@ -1,24 +1,21 @@
 <template>
   <div>
     <h1>Composable Options</h1>
+    <nuxt-link to="/"> Back to list </nuxt-link>
   </div>
 </template>
 
-<script lang="ts">
-export default defineComponent({
-  setup() {
-    useJsonld(
-      () => {
-        return {
-          '@context': 'https://schema.org',
-          '@type': 'WebSite',
-          name: 'nuxt-jsonld composable options',
-        };
-      },
-      {
-        tagPosition: 'bodyClose',
-      }
-    );
+<script lang="ts" setup>
+useJsonld(
+  () => {
+    return {
+      '@context': 'https://schema.org',
+      '@type': 'WebSite',
+      name: 'nuxt-jsonld composable options',
+    };
   },
-});
+  {
+    tagPosition: 'bodyClose',
+  }
+);
 </script>
diff --git a/packages/example/pages/context.vue b/packages/example/pages/context.vue
index 951b92d6..c7149411 100644
--- a/packages/example/pages/context.vue
+++ b/packages/example/pages/context.vue
@@ -2,7 +2,7 @@
   <div>
     <h1>Context example</h1>
     <div>
-      <pre>{{ JSON.stringify(data.dog, null, 4) }}</pre>
+      <pre>{{ JSON.stringify(dog, null, 4) }}</pre>
       <nuxt-link to="/"> Back to list </nuxt-link>
     </div>
   </div>
@@ -10,7 +10,13 @@
 
 <script lang="ts" setup>
 import { useDog } from '@/composables/dog';
-const { data } = await useDog();
+const { dog } = await useDog();
+useJsonld(() => ({
+  '@context': 'https://schema.org',
+  '@type': 'Thing',
+  name: dog.name,
+  description: `A ${dog.breed} dog: linked to this page`,
+}));
 </script>
 
 <style scoped>
diff --git a/packages/example/pages/index.vue b/packages/example/pages/index.vue
index 187e904f..3c066fa8 100644
--- a/packages/example/pages/index.vue
+++ b/packages/example/pages/index.vue
@@ -8,7 +8,6 @@
           {{ p.name }}
         </nuxt-link>
       </li>
-      <li><nuxt-link :to="{ name: 'static' }">Static JSON</nuxt-link></li>
       <li><nuxt-link :to="{ name: 'option' }">Options API</nuxt-link></li>
       <li><nuxt-link :to="{ name: 'composable-options' }">Composable API Options</nuxt-link></li>
       <li><nuxt-link :to="{ name: 'context' }">Context</nuxt-link></li>
@@ -16,36 +15,27 @@
   </div>
 </template>
 
-<script lang="ts">
-import type { WithContext, ItemList } from 'schema-dts';
+<script lang="ts" setup>
+useHead({
+  title: 'Product List',
+});
 
-export default defineComponent({
-  setup() {
-    useHead({
-      title: 'Product List',
-    });
+const products = [
+  { name: 'Foo', id: 1 },
+  { name: 'Bar', id: 2 },
+  { name: 'Baz', id: 3 },
+];
 
-    return {
-      products: [
-        { name: 'Foo', id: 1 },
-        { name: 'Bar', id: 2 },
-        { name: 'Baz', id: 3 },
-      ],
-    };
-  },
-  jsonld(): WithContext<ItemList> {
-    return {
-      '@context': 'https://schema.org',
-      '@type': 'ItemList',
-      itemListElement: this.products.map((p) => ({
-        '@type': 'ListItem',
-        position: p.id,
-        item: {
-          '@type': 'Product',
-          name: p.name,
-        },
-      })),
-    };
-  },
+useJsonld({
+  '@context': 'https://schema.org',
+  '@type': 'ItemList',
+  itemListElement: products.map((p) => ({
+    '@type': 'ListItem',
+    position: p.id,
+    item: {
+      '@type': 'Product',
+      name: p.name,
+    },
+  })),
 });
 </script>
diff --git a/packages/example/pages/products/[id].vue b/packages/example/pages/products/[id].vue
index 2bc22233..be7c1d21 100644
--- a/packages/example/pages/products/[id].vue
+++ b/packages/example/pages/products/[id].vue
@@ -10,39 +10,30 @@
   </div>
 </template>
 
-<script lang="ts">
-export default defineComponent({
-  setup() {
-    const { params } = useRoute();
-    const count = ref<number>(0);
-    const updateCount = () => {
-      count.value++;
-    };
-    const product = reactive({
-      name: params.id,
-      description: `This is a sample ${params.id} product.`,
-      count,
-    });
-
-    useHead({
-      title: `Product: ${product.name}`,
-    });
+<script lang="ts" setup>
+const { params } = useRoute();
+const count = ref<number>(0);
+const updateCount = () => {
+  count.value++;
+};
+const product = reactive({
+  name: params.id,
+  description: `This is a sample ${params.id} product.`,
+  count,
+});
 
-    useJsonld(() => {
-      if (!product.count) {
-        return null;
-      }
-      return {
-        '@context': 'https://schema.org',
-        '@type': 'Product',
-        ...product,
-      };
-    });
+useHead({
+  title: `Product: ${product.name}`,
+});
 
-    return {
-      updateCount,
-      product,
-    };
-  },
+useJsonld(() => {
+  if (!product.count) {
+    return null;
+  }
+  return {
+    '@context': 'https://schema.org',
+    '@type': 'Product',
+    ...product,
+  };
 });
 </script>
diff --git a/packages/example/pages/static.vue b/packages/example/pages/static.vue
deleted file mode 100644
index acb9c403..00000000
--- a/packages/example/pages/static.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<template>
-  <div>
-    <h1>Static JSON-LD example</h1>
-    <div>
-      <sample-comp />
-      <nuxt-link to="/"> Back to list </nuxt-link>
-    </div>
-  </div>
-</template>
-
-<script lang="ts">
-export default defineComponent({
-  setup() {
-    useJsonld({
-      '@context': 'https://schema.org',
-      '@type': 'Thing',
-      name: 'Static json',
-    });
-  },
-});
-</script>
-
-<style scoped>
-.message {
-  display: block;
-  margin: 10px auto;
-  max-width: 500px;
-  padding: 0 10px;
-  text-align: left;
-}
-</style>