@owdproject/core 3.3.0 → 3.3.1

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "desktop",
   "configKey": "owd",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -118,10 +118,27 @@ function splitDesktopUserConfig(config, configFile = "desktop.config.ts") {
   return { theme, apps, modules, desktopRuntime };
 }
 
-const version = "3.3.0";
+const version = "3.3.1";
 const pkg = {
 	version: version};
 
+function primevueModuleDependency(nuxt) {
+  const existing = nuxt.options.primevue ?? {};
+  const components = { ...existing.components ?? {} };
+  const include = components.include;
+  if (include && include !== "*" && Array.isArray(include) && !include.includes("ConfirmDialog")) {
+    components.include = [...include, "ConfirmDialog"];
+  }
+  return {
+    defaults: defu(
+      {
+        options: { theme: {} },
+        components
+      },
+      existing
+    )
+  };
+}
 const module$1 = defineNuxtModule({
   meta: {
     name: "desktop",
@@ -132,6 +149,21 @@ const module$1 = defineNuxtModule({
     apps: [],
     modules: []
   },
+  moduleDependencies: (nuxt) => ({
+    "@pinia/nuxt": {},
+    "@primevue/nuxt-module": primevueModuleDependency(nuxt),
+    "@nuxt/fonts": {},
+    "@nuxt/icon": {
+      defaults: {
+        clientBundle: {
+          scan: true,
+          sizeLimitKb: 256
+        }
+      }
+    },
+    "@vueuse/nuxt": {},
+    "@nuxtjs/i18n": {}
+  }),
   async setup(_options, _nuxt) {
     const { resolve } = createResolver(import.meta.url);
     _nuxt.options.experimental = {
@@ -175,7 +207,6 @@ const module$1 = defineNuxtModule({
       desktopRuntime,
       { coreVersion: pkg.version }
     );
-    await installModule("@pinia/nuxt");
     {
       if (clientConfig.theme) {
         await installModule(clientConfig.theme);
@@ -192,19 +223,6 @@ const module$1 = defineNuxtModule({
       }
     }
     _nuxt.options.appConfig.desktop = _nuxt.options.runtimeConfig.public.desktop;
-    {
-      _nuxt.options.primevue = _nuxt.options.primevue || {};
-      _nuxt.options.primevue.options = _nuxt.options.primevue.options || {};
-      _nuxt.options.primevue.options.theme = _nuxt.options.primevue.options.theme || {};
-      _nuxt.options.primevue.components = _nuxt.options.primevue.components || {};
-      const include = _nuxt.options.primevue.components.include;
-      if (include && include !== "*" && Array.isArray(include)) {
-        if (!include.includes("ConfirmDialog")) {
-          include.push("ConfirmDialog");
-        }
-      }
-      await installModule("@primevue/nuxt-module");
-    }
     {
       const tailwindPaths = _nuxt.options.runtimeConfig.app.owd?.tailwindPaths || [];
       tailwindPaths.push("./runtime/components/**/*.{vue,mjs,ts}");
@@ -215,23 +233,6 @@ const module$1 = defineNuxtModule({
         viewer: false
       });
     }
-    {
-      await installModule("@nuxt/fonts");
-    }
-    {
-      await installModule("@nuxt/icon", {
-        clientBundle: {
-          scan: true,
-          sizeLimitKb: 256
-        }
-      });
-    }
-    {
-      await installModule("@vueuse/nuxt");
-    }
-    {
-      await installModule("@nuxtjs/i18n");
-    }
     {
       _nuxt.hook("vite:extendConfig", (viteConfig) => {
         viteConfig.css = viteConfig.css || {};

package/module.ts

@@ -7,6 +7,7 @@ import {
   addPlugin
 } from '@nuxt/kit'
 import { defu } from 'defu'
+import type { Nuxt } from '@nuxt/schema'
 import { assertValidDesktopUserConfig } from './runtime/utils/validateDesktopUserConfig'
 import {
   resolveDesktopConfigPath,
@@ -15,6 +16,30 @@ import {
 import { splitDesktopUserConfig } from './runtime/utils/splitDesktopUserConfig'
 import pkg from './package.json'
 
+function primevueModuleDependency(nuxt: Nuxt) {
+  const existing = nuxt.options.primevue ?? {}
+  const components = { ...(existing.components ?? {}) }
+  const include = components.include
+  if (
+    include &&
+    include !== '*' &&
+    Array.isArray(include) &&
+    !include.includes('ConfirmDialog')
+  ) {
+    components.include = [...include, 'ConfirmDialog']
+  }
+
+  return {
+    defaults: defu(
+      {
+        options: { theme: {} },
+        components,
+      },
+      existing,
+    ),
+  }
+}
+
 export default defineNuxtModule({
   meta: {
     name: 'desktop',
@@ -25,6 +50,21 @@ export default defineNuxtModule({
     apps: [],
     modules: [],
   },
+  moduleDependencies: (nuxt) => ({
+    '@pinia/nuxt': {},
+    '@primevue/nuxt-module': primevueModuleDependency(nuxt),
+    '@nuxt/fonts': {},
+    '@nuxt/icon': {
+      defaults: {
+        clientBundle: {
+          scan: true,
+          sizeLimitKb: 256,
+        },
+      },
+    },
+    '@vueuse/nuxt': {},
+    '@nuxtjs/i18n': {},
+  }),
   async setup(_options, _nuxt) {
     const { resolve } = createResolver(import.meta.url)
 
@@ -90,10 +130,6 @@ export default defineNuxtModule({
       { coreVersion: pkg.version },
     )
 
-    // Pinia before theme/modules/apps so defineDesktopApp can use stores when
-    // published app plugins register on app:created.
-    await installModule('@pinia/nuxt')
-
     {
       // install open web desktop theme
 
@@ -125,26 +161,7 @@ export default defineNuxtModule({
     _nuxt.options.appConfig.desktop = _nuxt.options.runtimeConfig.public.desktop
 
     {
-      // install primevue
-
-      _nuxt.options.primevue = _nuxt.options.primevue || {}
-      _nuxt.options.primevue.options = _nuxt.options.primevue.options || {}
-      _nuxt.options.primevue.options.theme =
-        _nuxt.options.primevue.options.theme || {}
-      _nuxt.options.primevue.components =
-        _nuxt.options.primevue.components || {}
-      const include = _nuxt.options.primevue.components.include
-      if (include && include !== '*' && Array.isArray(include)) {
-        if (!include.includes('ConfirmDialog')) {
-          include.push('ConfirmDialog')
-        }
-      }
-
-      await installModule('@primevue/nuxt-module')
-    }
-
-    {
-      // install tailwind
+      // Tailwind after theme/apps so registerTailwindPath paths are collected first.
 
       const tailwindPaths =
         _nuxt.options.runtimeConfig.app.owd?.tailwindPaths || []
@@ -160,35 +177,6 @@ export default defineNuxtModule({
       })
     }
 
-    {
-      // install @nuxt/fonts
-
-      await installModule('@nuxt/fonts')
-    }
-
-    {
-      // install @nuxt/icon
-
-      await installModule('@nuxt/icon', {
-        clientBundle: {
-          scan: true,
-          sizeLimitKb: 256
-        }
-      })
-    }
-
-    {
-      // install @vueuse/nuxt
-
-      await installModule('@vueuse/nuxt')
-    }
-
-    {
-      // install @nuxtjs/i18n
-
-      await installModule('@nuxtjs/i18n')
-    }
-
     {
       // configure scss for vite
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owdproject/core",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "Nuxt Desktop module for browser desktop experiences (windows, shell, apps)",
   "keywords": [
     "nuxt",
@@ -84,6 +84,7 @@
     "@primeuix/themes": "^2.0.3",
     "@primevue/forms": "^4.5.5",
     "@primevue/nuxt-module": "^4.5.5",
+    "primevue": "^4.5.5",
     "@vueuse/components": "^14.3.0",
     "@vueuse/core": "^14.3.0",
     "@vueuse/nuxt": "^14.3.0",