nuxt-schema-org 1.0.0-beta.2 → 1.0.0-beta.5

package/dist/module.json

@@ -4,5 +4,5 @@
     "bridge": false
   },
   "name": "nuxt-schema-org",
-  "version": "1.0.0-beta.2"
+  "version": "1.0.0-beta.5"
 }

package/dist/module.mjs

@@ -1,5 +1,5 @@
 import { defineNuxtModule, createResolver, addPlugin, addTemplate, addComponent } from '@nuxt/kit';
-import { RootSchemas, schemaOrgComponents } from '@vueuse/schema-org';
+import { schemaOrgComponents, RootSchemas } from '@vueuse/schema-org';
 import { dirname } from 'pathe';
 import { SchemaOrg } from '@vueuse/schema-org-vite';
 
@@ -15,50 +15,58 @@ const module = defineNuxtModule({
   async setup(moduleOptions, nuxt) {
     const { resolve, resolvePath } = createResolver(import.meta.url);
     const schemaOrgPath = dirname(await resolvePath(Pkg));
-    const moduleRuntime = resolve("./runtime");
-    nuxt.options.build.transpile.push(...[moduleRuntime, RuntimeDir]);
+    const moduleRuntimeDir = resolve("./runtime");
+    nuxt.options.build.transpile.push(...[moduleRuntimeDir, RuntimeDir]);
     if (typeof moduleOptions.client === "undefined")
       moduleOptions.client = !!nuxt.options.dev;
     if (!moduleOptions.client)
-      addPlugin(resolve(moduleRuntime, "plugin-fallback.client"));
+      addPlugin(resolve(moduleRuntimeDir, "plugin-fallback.client"));
     addPlugin({
-      src: resolve(moduleRuntime, "plugin"),
+      src: resolve(moduleRuntimeDir, "plugin"),
       mode: moduleOptions.client ? "all" : "server"
     });
-    nuxt.options.alias[Pkg] = schemaOrgPath;
-    nuxt.options.alias["#vueuse/schema-org/provider"] = await resolvePath(`${schemaOrgPath}/providers/full`);
-    nuxt.options.alias["#vueuse/schema-org/runtime"] = await resolvePath(`${schemaOrgPath}/runtime`);
-    nuxt.hook("vite:extendConfig", (config, { isClient }) => {
-      config.optimizeDeps = config.optimizeDeps || {};
-      config.optimizeDeps.exclude = config.optimizeDeps.exclude || [];
-      config.optimizeDeps.exclude.push(...[`${schemaOrgPath}/runtime`, Pkg]);
-      config.plugins = config.plugins || [];
-      config.plugins.push(SchemaOrg({
-        mock: !moduleOptions.client && isClient,
-        full: moduleOptions.full
-      }));
-    });
+    const nuxtSchemaComposablesRuntime = `${moduleRuntimeDir}/composables`;
     addTemplate({
       filename: "nuxt-schema-org-config.mjs",
       getContents: () => `export default ${JSON.stringify(moduleOptions)}`
     });
+    const componentPath = await resolvePath(`${schemaOrgPath}/runtime/components`);
+    for (const component of schemaOrgComponents) {
+      await addComponent({
+        name: component,
+        export: component,
+        chunkName: "schema-org-components",
+        filePath: componentPath
+      });
+    }
     nuxt.hooks.hook("autoImports:sources", (autoImports) => {
       autoImports.unshift({
-        from: `${moduleRuntime}/schema-org-runtime`,
+        from: nuxtSchemaComposablesRuntime,
         imports: [
           "injectSchemaOrg",
-          "useSchemaOrg",
+          "useSchemaOrg"
+        ]
+      });
+      autoImports.unshift({
+        from: "#vueuse/schema-org/provider",
+        imports: [
           ...RootSchemas.map((schema) => [`define${schema}`]).flat()
         ]
       });
     });
-    schemaOrgComponents.forEach((component) => {
-      addComponent({
-        name: component,
-        export: component,
-        chunkName: "schema-org-components",
-        filePath: "#vueuse/schema-org/runtime"
-      });
+    nuxt.hooks.hook("vite:extendConfig", (config, { isClient }) => {
+      config.optimizeDeps = config.optimizeDeps || {};
+      config.optimizeDeps.exclude = config.optimizeDeps.exclude || [];
+      config.optimizeDeps.exclude.push(...[`${schemaOrgPath}/runtime`, Pkg]);
+      config.plugins = config.plugins || [];
+      config.plugins.push(SchemaOrg({
+        mock: !moduleOptions.client && isClient,
+        full: moduleOptions.full,
+        aliasPaths: {
+          pkgDir: schemaOrgPath,
+          runtime: nuxtSchemaComposablesRuntime
+        }
+      }));
     });
   }
 });

package/dist/runtime/composables.d.ts

@@ -0,0 +1,2 @@
+export { useSchemaOrg } from '@vueuse/schema-org/runtime';
+export declare function injectSchemaOrg(): any;

package/dist/runtime/{schema-org-runtime.mjs → composables.mjs}

@@ -1,6 +1,5 @@
 import { useNuxtApp } from "#app";
-export * from "#vueuse/schema-org/provider";
-export { useSchemaOrg } from "#vueuse/schema-org/runtime";
+export { useSchemaOrg } from "@vueuse/schema-org/runtime";
 export function injectSchemaOrg() {
   const nuxtApp = useNuxtApp();
   if (nuxtApp._injectSchemaOrg)

package/dist/runtime/plugin.mjs

@@ -31,5 +31,6 @@ export default defineNuxtPlugin((nuxtApp) => {
   }
   watch(() => nuxtApp._route.path, () => {
     client.generateSchema();
+    client.setupDOM();
   });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-schema-org",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.5",
   "description": "Nuxt module for @vueuse/schema-org",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
@@ -36,8 +36,8 @@
   ],
   "dependencies": {
     "@nuxt/kit": "3.0.0-rc.8",
-    "@vueuse/schema-org": "1.0.0-beta.2",
-    "@vueuse/schema-org-vite": "1.0.0-beta.2",
+    "@vueuse/schema-org": "1.0.0-beta.5",
+    "@vueuse/schema-org-vite": "1.0.0-beta.5",
     "pathe": "^0.3.4",
     "schema-org-graph-js": "0.3.3"
   },

package/dist/runtime/schema-org-runtime.d.ts

@@ -1,3 +0,0 @@
-export * from '#vueuse/schema-org/provider';
-export { useSchemaOrg } from '#vueuse/schema-org/runtime';
-export declare function injectSchemaOrg(): any;