nuxt-schema-org 1.0.2 → 1.0.3-beta.3

package/dist/module.d.ts

@@ -1,5 +1,5 @@
-import { NuxtModule } from '@nuxt/schema';
 import { UserConfig } from '@vueuse/schema-org';
+import { NuxtModule } from '@nuxt/schema';
 import { MetaInput } from 'schema-org-graph-js';
 
 interface ModuleOptions extends UserConfig {

package/dist/module.json

@@ -5,5 +5,5 @@
     "bridge": false
   },
   "name": "nuxt-schema-org",
-  "version": "1.0.2"
+  "version": "1.0.3-beta.3"
 }

package/dist/module.mjs

@@ -1,7 +1,6 @@
-import { defineNuxtModule, createResolver, addPlugin, addTemplate, addComponent, extendWebpackConfig } from '@nuxt/kit';
-import { resolveUserConfig, AliasProvider, AliasRuntime, schemaOrgComponents, schemaOrgAutoImports } from '@vueuse/schema-org';
+import { defineNuxtModule, createResolver, addPlugin, addTemplate, addComponent, importModule, extendWebpackConfig } from '@nuxt/kit';
+import { resolveUserConfig, AliasRuntime, schemaOrgComponents, schemaOrgAutoImports } from '@vueuse/schema-org';
 import { dirname } from 'pathe';
-import { AliasRuntimePluginVite, AliasRuntimePluginWebpack } from '@vueuse/schema-org-vite';
 
 const Pkg = "@vueuse/schema-org";
 const module = defineNuxtModule({
@@ -19,17 +18,12 @@ const module = defineNuxtModule({
       console.warn("WARN [nuxt-schema-org] Please provide a `canonicalHost` to use this module with SSR enabled.");
       return;
     }
-    const schemaOrgPath = dirname(await resolvePath(Pkg));
     if (!nuxt.options.ssr)
       moduleOptions.client = true;
     if (typeof moduleOptions.client === "undefined")
       moduleOptions.client = !!nuxt.options.dev;
-    const providerPath = await resolvePath(`${schemaOrgPath}/providers/${moduleOptions.full ? "full" : "simple"}`);
-    const runtimePath = await resolvePath(`${schemaOrgPath}/runtime`);
-    const runtimeMockPath = await resolvePath(`${schemaOrgPath}/runtime-mock`);
-    nuxt.options.alias[AliasProvider] = providerPath;
-    nuxt.options.alias[AliasRuntime] = runtimePath;
-    nuxt.options.alias[Pkg] = schemaOrgPath;
+    const pkgPath = dirname(await resolvePath(Pkg));
+    nuxt.options.alias[AliasRuntime] = `${pkgPath}/runtime-${moduleOptions.full ? "schema-dts" : "simple"}`;
     const moduleRuntimeDir = resolve("./runtime");
     nuxt.options.build.transpile.push(...[moduleRuntimeDir, AliasRuntime]);
     if (!moduleOptions.client)
@@ -50,49 +44,29 @@ const module = defineNuxtModule({
         filePath: AliasRuntime
       });
     }
-    await addComponent({
-      name: "SchemaOrgDebug",
-      export: "SchemaOrgDebug",
-      filePath: `${schemaOrgPath}/runtime/components/SchemaOrgDebug`
-    });
     nuxt.hooks.hook("autoImports:sources", (autoImports) => {
       autoImports.unshift(...schemaOrgAutoImports);
     });
-    const realPaths = {
-      runtime: runtimePath,
-      provider: providerPath,
-      pkg: schemaOrgPath
-    };
-    const mockPaths = {
-      runtime: runtimeMockPath,
-      provider: runtimeMockPath,
-      pkg: schemaOrgPath
-    };
-    nuxt.hooks.hook("vite:extendConfig", (config, { isClient }) => {
-      config.plugins = config.plugins || [];
-      config.plugins.push(AliasRuntimePluginVite({
-        paths: !moduleOptions.client && isClient ? mockPaths : realPaths
-      }));
-    });
-    extendWebpackConfig((config) => {
+    nuxt.hooks.hook("vite:extendConfig", async (config, { isClient }) => {
       config.plugins = config.plugins || [];
-      config.plugins.push(AliasRuntimePluginWebpack({
-        paths: realPaths
+      const SchemaOrgVite = await importModule(`${pkgPath}/vite`, { interopDefault: true });
+      config.plugins.push(SchemaOrgVite({
+        root: nuxt.options.rootDir,
+        dts: false,
+        mock: !moduleOptions.client && isClient,
+        full: moduleOptions.full
       }));
-    }, {
-      client: false,
-      modern: false,
-      server: true
     });
-    extendWebpackConfig((config) => {
+    extendWebpackConfig(async (config) => {
       config.plugins = config.plugins || [];
-      config.plugins.push(AliasRuntimePluginWebpack({
-        paths: !moduleOptions.client ? mockPaths : realPaths
-      }));
-    }, {
-      client: true,
-      modern: true,
-      server: false
+      const SchemaOrgWebpack = await importModule(`${pkgPath}/webpack`, { interopDefault: true });
+      const plugins = SchemaOrgWebpack({
+        root: nuxt.options.rootDir,
+        dts: false,
+        mock: !moduleOptions.client && config.name === "client",
+        full: moduleOptions.full
+      });
+      config.plugins.push(...plugins);
     });
   }
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-schema-org",
   "type": "module",
-  "version": "1.0.2",
+  "version": "1.0.3-beta.3",
   "description": "Nuxt module for @vueuse/schema-org",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
@@ -35,10 +35,10 @@
   ],
   "dependencies": {
     "@nuxt/kit": "^3.0.0-rc.8",
-    "@vueuse/schema-org": "1.0.2",
-    "@vueuse/schema-org-vite": "1.0.2",
+    "@vueuse/schema-org": "1.0.3-beta.3",
+    "@vueuse/schema-org-vite": "1.0.3-beta.3",
     "pathe": "^0.3.5",
-    "schema-org-graph-js": "0.5.0"
+    "schema-org-graph-js": "0.5.1"
   },
   "devDependencies": {
     "@nuxt/module-builder": "latest",