@owdproject/core 3.2.0 → 3.3.1

package/bin/lib/migrateModulePlayground.config.mjs

@@ -104,8 +104,8 @@ export const configs = [
     fsMounts: { '/mnt/test': '/test.zip' },
     copyTestZip: true,
     playgroundExtraDevDeps: {
-      '@owdproject/module-fs': 'workspace:*',
-      '@owdproject/module-persistence': 'workspace:*',
+      '@owdproject/module-fs': '^0.0.4',
+      '@owdproject/module-persistence': '^0.0.2',
     },
     launch: {
       file: 'launch-audioplayer.client.ts',
@@ -143,8 +143,8 @@ export const configs = [
     fsMounts: { '/mnt/test': '/test.zip' },
     copyTestZip: true,
     playgroundExtraDevDeps: {
-      '@owdproject/module-fs': 'workspace:*',
-      '@owdproject/module-persistence': 'workspace:*',
+      '@owdproject/module-fs': '^0.0.4',
+      '@owdproject/module-persistence': '^0.0.2',
       '@owdproject/kit-fs': 'workspace:*',
       '@owdproject/kit-explorer': 'workspace:*',
     },

package/bin/lib/validateModule.js

@@ -295,6 +295,20 @@ export function validateOwdModule(packageDir, options = {}) {
   if (scripts['prepack'] && !scripts['prepack'].includes('nuxt-module-build')) {
     issue('error', 'prepack-builder', 'prepack must run nuxt-module-build build')
   }
+  if (scripts.prepare) {
+    issue(
+      'error',
+      'no-prepare-script',
+      'Do not add a "prepare" script on publishable packages — it runs on npm publish/install and breaks release. Use "prepack" (full build) and "dev:prepare" (local stub + playground) only.',
+    )
+  }
+  if (!rootExport?.development?.includes('src/module')) {
+    issue(
+      'warning',
+      'exports-development',
+      'exports["."].development should point to ./src/module.ts (monorepo dev without manual stub after every edit)',
+    )
+  }
   if (!scripts['dev:generate']?.includes('NUXT_APP_BASE_URL')) {
     issue(
       'warning',

package/dist/module.json

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

package/dist/module.mjs

@@ -1,28 +1,9 @@
 import { defineNuxtModule, createResolver, installModule, addComponentsDir, addPlugin, addImportsDir } from '@nuxt/kit';
+import { defu } from 'defu';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 
-function deepMerge(target, source) {
-  function isObject(value) {
-    return value !== null && typeof value === "object" && !Array.isArray(value) && !(value instanceof Date) && !(value instanceof RegExp);
-  }
-  if (isObject(target) && isObject(source)) {
-    const result = { ...target };
-    for (const key in source) {
-      const targetValue = target[key];
-      const sourceValue = source[key];
-      if (isObject(sourceValue) && isObject(targetValue)) {
-        result[key] = deepMerge(targetValue, sourceValue);
-      } else {
-        result[key] = sourceValue;
-      }
-    }
-    return result;
-  }
-  return source;
-}
-
-function assertValidOwdUserConfig(config, configFile = "desktop.config.ts") {
+function assertValidDesktopUserConfig(config, configFile = "desktop.config.ts") {
   if (!config || typeof config !== "object" || Array.isArray(config)) {
     throw new Error(
       `[@owdproject/core] ${configFile} must default-export a non-array object from defineDesktopConfig({ ... }).`
@@ -82,10 +63,82 @@ function warnLegacyDesktopConfig(resolved) {
   }
 }
 
-const version = "3.2.0";
+const DESKTOP_MODULE_KEYS = ["theme", "apps", "modules"];
+const DESKTOP_RUNTIME_KEYS = /* @__PURE__ */ new Set([
+  ...DESKTOP_MODULE_KEYS,
+  "docs",
+  "name",
+  "defaultApps",
+  "features",
+  "explorer",
+  "systemBar",
+  "dockBar",
+  "workspaces"
+]);
+const NUXT_OPTION_KEYS = /* @__PURE__ */ new Set([
+  "ssr",
+  "modules",
+  "devtools",
+  "vite",
+  "nitro",
+  "runtimeConfig",
+  "app",
+  "appConfig",
+  "css",
+  "plugins",
+  "hooks",
+  "extends",
+  "compatibilityDate",
+  "experimental",
+  "future",
+  "i18n",
+  "tailwindcss",
+  "primevue"
+]);
+function splitDesktopUserConfig(config, configFile = "desktop.config.ts") {
+  const theme = typeof config.theme === "string" ? config.theme : void 0;
+  const apps = Array.isArray(config.apps) ? config.apps : void 0;
+  const modules = Array.isArray(config.modules) ? config.modules : void 0;
+  const desktopRuntime = {};
+  for (const [key, value] of Object.entries(config)) {
+    if (DESKTOP_MODULE_KEYS.includes(key)) {
+      continue;
+    }
+    desktopRuntime[key] = value;
+    if (NUXT_OPTION_KEYS.has(key)) {
+      console.warn(
+        `[@owdproject/core] ${configFile}: key "${key}" looks like a Nuxt option and is ignored for _nuxt.options. Move it to nuxt.config.ts; shell values belong under defineDesktopConfig({ systemBar, workspaces, ... }).`
+      );
+    } else if (!DESKTOP_RUNTIME_KEYS.has(key)) {
+      console.warn(
+        `[@owdproject/core] ${configFile}: unknown desktop key "${key}" \u2014 merged into runtimeConfig.public.desktop only.`
+      );
+    }
+  }
+  return { theme, apps, modules, desktopRuntime };
+}
+
+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",
@@ -96,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 = {
@@ -119,20 +187,25 @@ const module$1 = defineNuxtModule({
         { cause: e }
       );
     }
-    assertValidOwdUserConfig(clientConfig, resolvedConfig.file);
+    assertValidDesktopUserConfig(clientConfig, resolvedConfig.file);
     if (!clientConfig.theme) {
       clientConfig.theme = "@owdproject/theme-nova";
     }
-    _nuxt.options = {
-      ..._nuxt.options,
-      ...clientConfig
-    };
-    _nuxt.options.runtimeConfig.public.desktop = {
-      coreVersion: pkg.version
-    };
-    _nuxt.options.runtimeConfig.public.desktop = deepMerge(
-      _nuxt.options.runtimeConfig.public.desktop,
-      clientConfig
+    const {
+      theme: configTheme,
+      apps: configApps,
+      modules: configModules,
+      desktopRuntime
+    } = splitDesktopUserConfig(
+      clientConfig,
+      resolvedConfig.file
+    );
+    clientConfig.theme = configTheme ?? clientConfig.theme;
+    if (configApps) clientConfig.apps = configApps;
+    if (configModules) clientConfig.modules = configModules;
+    _nuxt.options.runtimeConfig.public.desktop = defu(
+      desktopRuntime,
+      { coreVersion: pkg.version }
     );
     {
       if (clientConfig.theme) {
@@ -150,12 +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 || {};
-      await installModule("@primevue/nuxt-module");
-    }
     {
       const tailwindPaths = _nuxt.options.runtimeConfig.app.owd?.tailwindPaths || [];
       tailwindPaths.push("./runtime/components/**/*.{vue,mjs,ts}");
@@ -166,26 +233,6 @@ const module$1 = defineNuxtModule({
         viewer: false
       });
     }
-    {
-      await installModule("@pinia/nuxt");
-    }
-    {
-      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 || {};
@@ -202,14 +249,16 @@ const module$1 = defineNuxtModule({
       addComponentsDir({
         path: resolve("./runtime/components"),
         prefix: "",
+        pathPrefix: false,
         global: true
       });
     }
     {
       addPlugin(resolve("./runtime/plugins/resize.client.ts"));
-      addPlugin(resolve("./runtime/plugins/01.owd-dialogs-fallback.ts"));
+      addPlugin(
+        resolve("./runtime/plugins/02.desktop-register-desktop-apps.client.ts")
+      );
       addImportsDir(resolve("./runtime/composables"));
-      addImportsDir(resolve("./runtime/core"));
       addImportsDir(resolve("./runtime/stores"));
       addImportsDir(resolve("./runtime/utils"));
     }

package/module.ts

@@ -6,14 +6,40 @@ import {
   installModule,
   addPlugin
 } from '@nuxt/kit'
-import { deepMerge } from './runtime/utils/utilCommon'
-import { assertValidOwdUserConfig } from './runtime/utils/validateOwdUserConfig'
+import { defu } from 'defu'
+import type { Nuxt } from '@nuxt/schema'
+import { assertValidDesktopUserConfig } from './runtime/utils/validateDesktopUserConfig'
 import {
   resolveDesktopConfigPath,
   warnLegacyDesktopConfig,
 } from './runtime/utils/resolveDesktopConfigPath'
+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',
@@ -24,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)
 
@@ -62,29 +103,31 @@ export default defineNuxtModule({
       )
     }
 
-    assertValidOwdUserConfig(clientConfig, resolvedConfig.file)
+    assertValidDesktopUserConfig(clientConfig, resolvedConfig.file)
 
     if (!clientConfig.theme) {
       clientConfig.theme = '@owdproject/theme-nova'
     }
 
-    // extend nuxt.config.ts with desktop.config.ts
+    const {
+      theme: configTheme,
+      apps: configApps,
+      modules: configModules,
+      desktopRuntime,
+    } = splitDesktopUserConfig(
+      clientConfig as Record<string, unknown>,
+      resolvedConfig.file,
+    )
 
-    _nuxt.options = {
-      ..._nuxt.options,
-      ...clientConfig
-    }
+    clientConfig.theme = configTheme ?? clientConfig.theme
+    if (configApps) clientConfig.apps = configApps
+    if (configModules) clientConfig.modules = configModules
 
     // init desktop runtime config and define core version
 
-    _nuxt.options.runtimeConfig.public.desktop = {
-      coreVersion: pkg.version
-    }
-
-    // assign open web desktop config to runtime config
-    _nuxt.options.runtimeConfig.public.desktop = deepMerge(
-      _nuxt.options.runtimeConfig.public.desktop,
-      clientConfig
+    _nuxt.options.runtimeConfig.public.desktop = defu(
+      desktopRuntime,
+      { coreVersion: pkg.version },
     )
 
     {
@@ -118,18 +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 || {}
-
-      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 || []
@@ -145,41 +177,6 @@ export default defineNuxtModule({
       })
     }
 
-    {
-      // install pinia
-
-      await installModule('@pinia/nuxt')
-    }
-
-    {
-      // 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
 
@@ -205,18 +202,20 @@ export default defineNuxtModule({
       addComponentsDir({
         path: resolve('./runtime/components'),
         prefix: '',
+        pathPrefix: false,
         global: true
       })
     }
 
     {
       addPlugin(resolve('./runtime/plugins/resize.client.ts'))
-      addPlugin(resolve('./runtime/plugins/01.owd-dialogs-fallback.ts'))
+      addPlugin(
+        resolve('./runtime/plugins/02.desktop-register-desktop-apps.client.ts'),
+      )
 
       // add other files
 
       addImportsDir(resolve('./runtime/composables'))
-      addImportsDir(resolve('./runtime/core'))
       addImportsDir(resolve('./runtime/stores'))
       addImportsDir(resolve('./runtime/utils'))
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owdproject/core",
-  "version": "3.2.0",
+  "version": "3.3.1",
   "description": "Nuxt Desktop module for browser desktop experiences (windows, shell, apps)",
   "keywords": [
     "nuxt",
@@ -41,7 +41,9 @@
     "dev": "pnpm run dev:prepare",
     "dev:prepare": "nuxt-module-build build --stub",
     "build:module": "nuxt-module-build build",
-    "prepack": "nuxt-module-build build"
+    "prepack": "nuxt-module-build build",
+    "test": "vitest run",
+    "test:watch": "vitest"
   },
   "exports": {
     ".": {
@@ -82,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",
@@ -94,6 +97,7 @@
     "shellwords": "^1.1.1",
     "vue-resizable": "^2.1.7",
     "getopts": "^2.3.0",
+    "defu": "^6.1.4",
     "neo-blessed": "^0.2.0"
   },
   "optionalDependencies": {

package/runtime/components/{Core/Application/CoreApplicationRender.vue → Desktop/Application/DesktopApplicationRender.vue}

@@ -10,7 +10,7 @@ const runningApps = applicationManager.appsRunning
 </script>
 
 <template>
-  <CoreApplicationWindowsRender
+  <DesktopApplicationWindowsRender
     v-for="app of runningApps"
     :key="app.id"
     :workspace-filter="workspaceFilter"

package/runtime/components/{Core/Application/CoreApplicationWindowsRender.vue → Desktop/Application/DesktopApplicationWindowsRender.vue}

@@ -31,10 +31,8 @@ function matchesWorkspace(window: IWindowController): boolean {
 
 <template>
   <template v-for="[windowId, window] in windowEntries" :key="windowId">
-    <component
-      v-if="matchesWorkspace(window)"
-      :window="window"
-      :is="window.config.component"
-    />
+    <Suspense v-if="matchesWorkspace(window)">
+      <component :window="window" :is="window.config.component" />
+    </Suspense>
   </template>
 </template>

package/runtime/composables/useApplicationManager.ts

@@ -1,5 +1,5 @@
 import { reactive, markRaw, computed } from 'vue'
-import { ApplicationController } from '../core/controllers/ApplicationController'
+import { ApplicationController } from '../internal/controllers/ApplicationController'
 import { normalizeApplicationConfig } from '../utils/utilApp'
 import { debugLog } from '../utils/utilDebug'
 import * as shellwords from 'shellwords'

package/runtime/composables/useDesktopManager.ts

@@ -1,6 +1,6 @@
 import { computed } from 'vue'
 import { useAppConfig } from 'nuxt/app'
-import { deepMerge } from '../utils/utilCommon'
+import { defu } from 'defu'
 import { useDesktopStore } from '../stores/storeDesktop'
 import { useDesktopDefaultAppsStore } from '../stores/storeDesktopDefaultApps'
 
@@ -17,9 +17,9 @@ export function useDesktopManager() {
    * Merges and sets the desktop config at runtime (shell geometry, feature flags, etc.).
    */
   function setConfig(newConfig: DesktopConfig) {
-    appConfig.desktop = deepMerge(
-      appConfig.desktop,
+    appConfig.desktop = defu(
       newConfig,
+      (appConfig.desktop ?? {}) as DesktopConfig,
     ) as DesktopConfig
   }
 

package/runtime/composables/{useWorkspaceOverview.ts → useWorkspaceManager.ts}

@@ -3,9 +3,9 @@ import { useApplicationManager } from './useApplicationManager'
 import { useDesktopWorkspaceStore } from '../stores/storeDesktopWorkspace'
 
 /**
- * Keyboard + HTML5 drop handlers for workspace overview (move windows between desktops).
+ * Keyboard + HTML5 drop handlers for workspace management (move windows between desktops).
  */
-export function useWorkspaceOverview() {
+export function useWorkspaceManager() {
   const applicationManager = useApplicationManager()
   const desktopWorkspaceStore = useDesktopWorkspaceStore()
 

package/runtime/plugins/02.desktop-register-desktop-apps.client.ts

@@ -0,0 +1,17 @@
+import { setActivePinia } from 'pinia'
+import { defineNuxtPlugin } from 'nuxt/app'
+import { flushPendingDesktopApps } from '../utils/utilDesktop'
+
+export default defineNuxtPlugin({
+  name: 'desktop-register-desktop-apps',
+  dependsOn: ['pinia'],
+  enforce: 'post',
+  setup(nuxtApp) {
+    nuxtApp.hook('app:created', async () => {
+      if (nuxtApp.$pinia) {
+        setActivePinia(nuxtApp.$pinia)
+      }
+      await flushPendingDesktopApps()
+    })
+  },
+})

package/runtime/stores/storeDesktop.ts

@@ -51,10 +51,6 @@ export const useDesktopStore = defineStore(
       window: {
         positionZ: number
       }
-      explorer: {
-        navExpandedKeys: string[]
-        quickAccessPins: { id: string; label: string; path: string; icon?: string }[]
-      }
       defaultApps: Record<string, { applicationId: string; entry: string }>
       personalization: DesktopPersonalization
     }>({
@@ -69,13 +65,6 @@ export const useDesktopStore = defineStore(
       window: {
         positionZ: 0,
       },
-      explorer: {
-        navExpandedKeys: [
-          'quickAccess',
-          'thisPc',
-        ],
-        quickAccessPins: [],
-      },
       defaultApps: {},
       personalization: { ...defaultDesktopPersonalization },
     })

package/runtime/utils/splitDesktopUserConfig.ts

@@ -0,0 +1,85 @@
+/**
+ * Keys consumed by {@link @owdproject/core} module setup (install order).
+ * Must not be spread onto `_nuxt.options`.
+ */
+export const DESKTOP_MODULE_KEYS = ['theme', 'apps', 'modules'] as const
+
+/**
+ * Known desktop shell keys merged into `runtimeConfig.public.desktop` / `appConfig.desktop`.
+ * Additional keys are merged with a dev warning (extensions, theme overrides).
+ */
+export const DESKTOP_RUNTIME_KEYS = new Set([
+  ...DESKTOP_MODULE_KEYS,
+  'docs',
+  'name',
+  'defaultApps',
+  'features',
+  'explorer',
+  'systemBar',
+  'dockBar',
+  'workspaces',
+])
+
+/** Nuxt top-level option names — warn if present in desktop.config (likely misconfiguration). */
+const NUXT_OPTION_KEYS = new Set([
+  'ssr',
+  'modules',
+  'devtools',
+  'vite',
+  'nitro',
+  'runtimeConfig',
+  'app',
+  'appConfig',
+  'css',
+  'plugins',
+  'hooks',
+  'extends',
+  'compatibilityDate',
+  'experimental',
+  'future',
+  'i18n',
+  'tailwindcss',
+  'primevue',
+])
+
+export type SplitDesktopUserConfigResult = {
+  theme?: string
+  apps?: string[]
+  modules?: string[]
+  desktopRuntime: Record<string, unknown>
+}
+
+export function splitDesktopUserConfig(
+  config: Record<string, unknown>,
+  configFile = 'desktop.config.ts',
+): SplitDesktopUserConfigResult {
+  const theme =
+    typeof config.theme === 'string' ? config.theme : undefined
+  const apps = Array.isArray(config.apps)
+    ? (config.apps as string[])
+    : undefined
+  const modules = Array.isArray(config.modules)
+    ? (config.modules as string[])
+    : undefined
+
+  const desktopRuntime: Record<string, unknown> = {}
+
+  for (const [key, value] of Object.entries(config)) {
+    if (DESKTOP_MODULE_KEYS.includes(key as (typeof DESKTOP_MODULE_KEYS)[number])) {
+      continue
+    }
+    desktopRuntime[key] = value
+
+    if (NUXT_OPTION_KEYS.has(key)) {
+      console.warn(
+        `[@owdproject/core] ${configFile}: key "${key}" looks like a Nuxt option and is ignored for _nuxt.options. Move it to nuxt.config.ts; shell values belong under defineDesktopConfig({ systemBar, workspaces, ... }).`,
+      )
+    } else if (!DESKTOP_RUNTIME_KEYS.has(key)) {
+      console.warn(
+        `[@owdproject/core] ${configFile}: unknown desktop key "${key}" — merged into runtimeConfig.public.desktop only.`,
+      )
+    }
+  }
+
+  return { theme, apps, modules, desktopRuntime }
+}

package/runtime/utils/utilCommon.ts

@@ -24,35 +24,3 @@ export function deepEqual(obj1: any, obj2: any) {
   }
   return true
 }
-
-export function deepMerge<T>(target: T, source: Partial<T>): T {
-  function isObject(value: any): value is Record<string, any> {
-    return (
-      value !== null &&
-      typeof value === 'object' &&
-      !Array.isArray(value) &&
-      !(value instanceof Date) &&
-      !(value instanceof RegExp)
-    )
-  }
-
-  if (isObject(target) && isObject(source)) {
-    const result = { ...target }
-
-    for (const key in source) {
-      const targetValue = (target as any)[key]
-      const sourceValue = (source as any)[key]
-
-      if (isObject(sourceValue) && isObject(targetValue)) {
-        // @ts-ignore
-        result[key] = deepMerge(targetValue, sourceValue)
-      } else {
-        result[key] = sourceValue
-      }
-    }
-
-    return result
-  }
-
-  return source as T
-}

package/runtime/utils/utilDesktop.ts

@@ -1,8 +1,33 @@
+import { getActivePinia } from 'pinia'
 import { useApplicationManager } from '../composables/useApplicationManager'
 
-export function defineDesktopApp(config: ApplicationConfig) {
+const pendingDesktopApps: ApplicationConfig[] = []
+
+/**
+ * Register a desktop app. Queues until Pinia is active when theme/app plugins
+ * run before @pinia/nuxt (e.g. published apps using `app:created`).
+ */
+export async function defineDesktopApp(config: ApplicationConfig) {
+  if (import.meta.server) return undefined
+
+  if (getActivePinia()) {
+    const applicationManager = useApplicationManager()
+    return applicationManager.defineApp(config.id, config)
+  }
+
+  pendingDesktopApps.push(config)
+  return undefined
+}
+
+export async function flushPendingDesktopApps() {
+  if (pendingDesktopApps.length === 0 || !getActivePinia()) return
+
+  const queue = pendingDesktopApps.splice(0, pendingDesktopApps.length)
   const applicationManager = useApplicationManager()
-  return applicationManager.defineApp(config.id, config)
+
+  for (const config of queue) {
+    await applicationManager.defineApp(config.id, config)
+  }
 }
 
 export function defineDesktopConfig(config: DesktopConfig) {

package/runtime/utils/{validateOwdUserConfig.ts → validateDesktopUserConfig.ts}

@@ -2,7 +2,7 @@
  * Runtime validation for the object exported from `desktop.config.ts`
  * (or legacy `owd.config.ts`).
  */
-export function assertValidOwdUserConfig(
+export function assertValidDesktopUserConfig(
   config: unknown,
   configFile = 'desktop.config.ts',
 ): void {

package/types/index.d.ts

@@ -360,31 +360,12 @@ interface DesktopConfig {
   name?: string
   defaultApps?: DefaultAppsConfig
   features?: string[]
-  explorer?: DesktopExplorerConfig
 
   systemBar?: DesktopSystemBarConfig
   dockBar?: DesktopDockBarConfig
   workspaces?: DesktopWorkspacesConfig
 }
 
-interface DesktopExplorerFolderConfig {
-  id: string
-  label: string
-  path: string
-  icon?: string
-}
-
-interface DesktopExplorerConfig {
-  quickAccess?: DesktopExplorerFolderConfig[]
-  quickAccessExtra?: DesktopExplorerFolderConfig[]
-  quickAccessOverride?: DesktopExplorerFolderConfig[]
-  specialFolders?: DesktopExplorerFolderConfig[]
-  specialFoldersExtra?: DesktopExplorerFolderConfig[]
-  specialFoldersOverride?: DesktopExplorerFolderConfig[]
-  /** Friendly labels for ZenFS mount points shown under “This PC” (paths → label). */
-  mountLabels?: Record<string, string>
-}
-
 interface DesktopWindowsConfig {
   position: 'relative' | 'absolute' | 'fixed'
 }

package/runtime/components/Core/Explorer/CoreExplorerFile.vue

@@ -1,76 +0,0 @@
-<template>
-  <li
-    :class="[
-      'owd-explorer-file',
-      { 'owd-explorer-file--inactive': props.inactive },
-    ]"
-  >
-    <a
-      :href="props.url"
-      :target="props.target"
-      :title="props.title"
-      @click="props.fn"
-    >
-      <img :src="props.icon" :alt="props.title" />
-      <div class="owd-explorer-file__name" v-html="props.name" />
-    </a>
-  </li>
-</template>
-
-<script setup lang="ts">
-const props = defineProps<{
-  name: string
-  title: string
-  icon: string
-  url: string
-  target: string
-  inactive: boolean
-}>()
-</script>
-
-<style scoped lang="scss">
-li.file {
-  width: 100px;
-  margin: 0 5px 5px 0;
-  text-align: center;
-  float: left;
-  border-radius: 2px;
-  border: 1px solid rgba(0, 0, 0, 0);
-
-  @media (max-width: 480px) {
-    margin-right: 0;
-  }
-
-  @media (min-width: 480px) {
-    &:not(.inactive):hover {
-    }
-  }
-
-  &.inactive {
-    filter: grayscale(100%);
-    opacity: 0.2;
-  }
-
-  a {
-    display: block;
-    color: #ccc;
-    text-decoration: none;
-    transition: color 0.15s ease-in-out;
-    padding: 10px 0;
-
-    img {
-      vertical-align: middle;
-      height: 32px;
-      border-radius: 2px;
-    }
-
-    div.name {
-      font-size: 12px;
-      letter-spacing: -0.2px;
-      line-height: 10px;
-      margin-top: 10px;
-      cursor: pointer;
-    }
-  }
-}
-</style>

package/runtime/components/Core/Explorer/CoreExplorerFolder.vue

@@ -1,10 +0,0 @@
-<template>
-  <CoreExplorerFile class="owd-explorer-folder">
-    <slot />
-  </CoreExplorerFile>
-</template>
-
-<style scoped lang="scss">
-.owd-explorer-folder {
-}
-</style>

package/runtime/composables/useOwdDialogs.ts

@@ -1,13 +0,0 @@
-import { inject } from 'vue'
-import {
-  OWD_DIALOG_PROVIDER_KEY,
-  createBrowserFallbackDialogProvider,
-  type OwdDialogProvider,
-} from '../dialogs/owdDialogProvider'
-
-/**
- * Returns the active desktop dialog provider (theme) or a documented browser fallback.
- */
-export function useOwdDialogs(): OwdDialogProvider {
-  return inject(OWD_DIALOG_PROVIDER_KEY, null) ?? createBrowserFallbackDialogProvider()
-}

package/runtime/dialogs/owdDialogProvider.ts

@@ -1,81 +0,0 @@
-import type { InjectionKey } from 'vue'
-
-/** Options for a yes/no confirmation (theme renders labels and chrome). */
-export interface OwdConfirmDialogOptions {
-  title?: string
-  message: string
-  danger?: boolean
-  acceptLabel?: string
-  rejectLabel?: string
-  /**
-   * Theme-specific payload (e.g. Win95 delete dialog passes `toTrash` for slot templates).
-   */
-  extras?: Record<string, unknown>
-}
-
-/**
- * Cross-theme dialog API. Themes implement with PrimeVue, GNOME dialogs, etc.
- * Callers pass user-facing strings (usually from i18n); implementations only render.
- */
-export interface OwdDialogProvider {
-  confirm(options: OwdConfirmDialogOptions): Promise<boolean>
-  alert(message: string, options?: { title?: string }): Promise<void>
-  prompt(
-    message: string,
-    defaultValue?: string,
-  ): Promise<string | null>
-}
-
-export const OWD_DIALOG_PROVIDER_KEY: InjectionKey<OwdDialogProvider> =
-  Symbol('owd-dialog-provider')
-
-function browserGlobals(): {
-  confirm: (message?: string) => boolean
-  alert: (message?: string) => void
-  prompt: (message?: string, defaultText?: string) => string | null
-} | null {
-  const g = globalThis as typeof globalThis & {
-    confirm?: (message?: string) => boolean
-    alert?: (message?: string) => void
-    prompt?: (message?: string, defaultText?: string) => string | null
-  }
-  if (typeof g.confirm !== 'function') return null
-  return {
-    confirm: g.confirm.bind(g),
-    alert:
-      typeof g.alert === 'function'
-        ? g.alert.bind(g)
-        : (m?: string) => {
-            void m
-          },
-    prompt:
-      typeof g.prompt === 'function'
-        ? g.prompt.bind(g)
-        : () => null,
-  }
-}
-
-export function createBrowserFallbackDialogProvider(): OwdDialogProvider {
-  return {
-    async confirm(opts) {
-      if (import.meta.server) return false
-      const w = browserGlobals()
-      if (!w) return false
-      const text = [opts.title, opts.message].filter(Boolean).join('\n\n')
-      return w.confirm(text)
-    },
-    async alert(message, opts) {
-      if (import.meta.server) return
-      const w = browserGlobals()
-      if (!w) return
-      w.alert([opts?.title, message].filter(Boolean).join('\n\n'))
-    },
-    async prompt(message, defaultValue = '') {
-      if (import.meta.server) return null
-      const w = browserGlobals()
-      if (!w) return null
-      const v = w.prompt(message, defaultValue)
-      return v === null ? null : v
-    },
-  }
-}

package/runtime/plugins/01.owd-dialogs-fallback.ts

@@ -1,15 +0,0 @@
-import { defineNuxtPlugin } from 'nuxt/app'
-import {
-  OWD_DIALOG_PROVIDER_KEY,
-  createBrowserFallbackDialogProvider,
-} from '../dialogs/owdDialogProvider'
-
-export default defineNuxtPlugin({
-  name: 'owd-dialogs-fallback',
-  setup(nuxtApp) {
-    nuxtApp.vueApp.provide(
-      OWD_DIALOG_PROVIDER_KEY,
-      createBrowserFallbackDialogProvider(),
-    )
-  },
-})

package/runtime/stores/storeDesktopExplorer.ts

@@ -1,74 +0,0 @@
-import { defineStore } from 'pinia'
-import { computed } from 'vue'
-import { useDesktopStore } from './storeDesktop'
-
-type ExplorerQuickAccessPin = {
-  id: string
-  label: string
-  path: string
-  icon?: string
-}
-
-export const useDesktopExplorerStore = defineStore(
-  'owd/desktop/explorer',
-  () => {
-    const desktopStore = useDesktopStore()
-
-    const navExpandedKeys = computed(
-      () => desktopStore.state.explorer.navExpandedKeys,
-    )
-    const quickAccessPins = computed(
-      () => desktopStore.state.explorer.quickAccessPins,
-    )
-
-    function setNavExpandedKeys(keys: string[]) {
-      desktopStore.state.explorer.navExpandedKeys = [...new Set(keys)]
-    }
-
-    function setQuickAccessPins(pins: ExplorerQuickAccessPin[]) {
-      desktopStore.state.explorer.quickAccessPins = pins
-    }
-
-    function pinQuickAccess(entry: ExplorerQuickAccessPin) {
-      const exists = desktopStore.state.explorer.quickAccessPins.some(
-        (pin) => pin.path === entry.path,
-      )
-      if (exists) return
-      desktopStore.state.explorer.quickAccessPins.push(entry)
-    }
-
-    function unpinQuickAccess(path: string) {
-      desktopStore.state.explorer.quickAccessPins =
-        desktopStore.state.explorer.quickAccessPins.filter(
-          (pin) => pin.path !== path,
-        )
-    }
-
-    function reorderQuickAccess(startIndex: number, endIndex: number) {
-      const list = [...desktopStore.state.explorer.quickAccessPins]
-      if (
-        startIndex < 0 ||
-        endIndex < 0 ||
-        startIndex >= list.length ||
-        endIndex >= list.length ||
-        startIndex === endIndex
-      ) {
-        return
-      }
-      const [item] = list.splice(startIndex, 1)
-      if (!item) return
-      list.splice(endIndex, 0, item)
-      desktopStore.state.explorer.quickAccessPins = list
-    }
-
-    return {
-      navExpandedKeys,
-      quickAccessPins,
-      setNavExpandedKeys,
-      setQuickAccessPins,
-      pinQuickAccess,
-      unpinQuickAccess,
-      reorderQuickAccess,
-    }
-  },
-)