@owdproject/core 3.1.3 → 3.1.4

package/CHANGELOG.md

@@ -0,0 +1,25 @@
+## 3.1.4 (2025-05-22)
+
+### 🚀 Features
+
+- Allow apps to have a menu ([4bfea74](https://github.com/owdproject/client/commit/4bfea74))
+- Add methods to better handle window changes ([54d1346](https://github.com/owdproject/client/commit/54d1346))
+- Check if owd.config.ts is available and valid ([4920302](https://github.com/owdproject/client/commit/4920302))
+- Add fit-parent to CoreWindow.vue ([59e068c](https://github.com/owdproject/client/commit/59e068c))
+- Add focus() to WindowController and set methods as public (deprecate actions) ([710f7be](https://github.com/owdproject/client/commit/710f7be))
+- Add owd global command ([f98c74c](https://github.com/owdproject/client/commit/f98c74c))
+- Add useClipboardFs.ts composable ([cf934f4](https://github.com/owdproject/client/commit/cf934f4))
+- Add window utils in ApplicationController.ts ([ffc97d0](https://github.com/owdproject/client/commit/ffc97d0))
+- Export most used functions from core ([6635af7](https://github.com/owdproject/client/commit/6635af7))
+- Merge owd.config.ts with nuxt.config.ts in module.ts ([069243c](https://github.com/owdproject/client/commit/069243c))
+- Implement basic owd.config.ts ([d052552](https://github.com/owdproject/client/commit/d052552))
+- Rewrite project ([cbbd45d](https://github.com/owdproject/client/commit/cbbd45d))
+
+### 🩹 Fixes
+
+- Add key on CoreApplicationWindowsRender v-for ([d2e8e3c](https://github.com/owdproject/client/commit/d2e8e3c))
+- Check if entries property is set before normalizing in utilApp.ts ([6092c33](https://github.com/owdproject/client/commit/6092c33))
+- Add missing min-width ([aa0c1b5](https://github.com/owdproject/client/commit/aa0c1b5))
+- Minor improvements ([7f79208](https://github.com/owdproject/client/commit/7f79208))
+- Fix imports ([44740cd](https://github.com/owdproject/client/commit/44740cd))
+- Set window starting positionZ to 0 ([b99352e](https://github.com/owdproject/client/commit/b99352e))

package/README.md

@@ -14,7 +14,6 @@ Open Web Desktop (OWD) is a framework designed to provide a simple environment f
 
 ## Features
 
-- Open-source web desktop environment built with Nuxt.js
 - Fully extendable through themes, apps, and modules
 - Bundled with popular Vue.js libraries like Pinia and VueUse
 - Designed to make the most of the Nuxt.js ecosystem
@@ -48,9 +47,9 @@ Thanks to Tailwind and PrimeVue, you can create custom themes from scratch and e
 
 [Applications](https://github.com/topics/owd-apps) · [Modules](https://github.com/topics/owd-modules) · [Themes](https://github.com/topics/owd-themes)
 
-### 🧩 Install an application
+### 🧩 Install an app
 
-You can discover new apps by searching for the [owd-apps](https://github.com/topics/owd-apps) tag on GitHub.
+Discover apps by searching the [owd-apps](https://github.com/topics/owd-apps) tag on GitHub.
 
 For example, to install the To-do app:
 
@@ -62,7 +61,7 @@ This will install the package and automatically register it in your desktop conf
 
 ### 🧩 Install a module
 
-You can discover new modules by searching for the [owd-modules](https://github.com/topics/owd-modules) tag on GitHub.
+Discover modules by searching the [owd-modules](https://github.com/topics/owd-modules) tag on GitHub.
 
 For example, to install the session persistence module:
 
@@ -70,12 +69,12 @@ For example, to install the session persistence module:
 owd install-module @owdproject/module-pinia-localforage
 ```
 
-### 🖥️ Themes
+### 🖥️ Install a theme
 
-Themes are full desktop environments that style all UI components independently using [PrimeVue](https://primevue.org/).  
+Themes are full desktop environments that style all UI components independently, using [PrimeVue](https://primevue.org/).  
 Each theme provides a unique look and feel while maintaining consistent functionality across all applications.
 
-You can discover new themes by searching for the [owd-themes](https://github.com/topics/owd-themes) tag on GitHub.
+Discover themes by searching the [owd-themes](https://github.com/topics/owd-themes) tag on GitHub.
 
 ```bash
 owd install-theme @owdproject/theme-gnome

package/bin/owd.js

@@ -1,28 +1,28 @@
 #!/usr/bin/env node
 
-import { spawn } from 'child_process';
+import { spawn } from 'child_process'
 
-const [, , cmd, pkgName, ...rest] = process.argv;
+const [, , cmd, pkgName, ...rest] = process.argv
 
 const commandMap = {
-  "install-app": "desktop:install-app",
-  "install-module": "desktop:install-module",
-  "install-theme": "desktop:install-theme",
-};
+  'install-app': 'desktop:install-app',
+  'install-module': 'desktop:install-module',
+  'install-theme': 'desktop:install-theme',
+}
 
 if (!commandMap[cmd]) {
-  console.error(`Unknown command: ${cmd}`);
-  process.exit(1);
+  console.error(`Unknown command: ${cmd}`)
+  process.exit(1)
 }
 
 if (!pkgName) {
-  console.error("Missing package name (e.g., @owdproject/package)");
-  process.exit(1);
+  console.error('Missing package name (e.g., @owdproject/package)')
+  process.exit(1)
 }
 
-const nxArgs = ["run", commandMap[cmd], `--name=${pkgName}`, ...rest];
+const nxArgs = ['run', commandMap[cmd], `--name=${pkgName}`, ...rest]
 
-const child = spawn("pnpm", ["nx", ...nxArgs], {
-  stdio: "inherit",
+const child = spawn('pnpm', ['nx', ...nxArgs], {
+  stdio: 'inherit',
   shell: true,
-});
+})

package/index.ts

@@ -1,2 +1,5 @@
-export { defineDesktopApp, defineDesktopConfig } from "./runtime/utils/utilDesktop"
-export { registerTailwindPath } from "./runtime/utils/utilApp"
+export {
+  defineDesktopApp,
+  defineDesktopConfig,
+} from './runtime/utils/utilDesktop'
+export { registerTailwindPath } from './runtime/utils/utilApp'

package/module.ts

@@ -1,79 +1,114 @@
-import {defineNuxtModule, createResolver, addComponentsDir, addImportsDir, installModule, addPlugin} from '@nuxt/kit'
-import {deepMerge} from './runtime/utils/utilCommon'
+import {
+  defineNuxtModule,
+  createResolver,
+  addComponentsDir,
+  addImportsDir,
+  installModule,
+  addPlugin
+} from '@nuxt/kit'
+import { deepMerge } from './runtime/utils/utilCommon'
 import pkg from './package.json'
 
 export default defineNuxtModule({
   meta: {
     name: 'owd-core',
+    configKey: 'owd'
+  },
+  defaults: {
+    theme: '@owdproject/theme-win95',
+    apps: [],
+    modules: [],
   },
   async setup(_options, _nuxt) {
-    const {resolve} = createResolver(import.meta.url)
+    const { resolve } = createResolver(import.meta.url)
+
+    _nuxt.options.runtimeConfig.public.desktop = {}
 
     // get open web desktop config
 
-    const desktopConfig = (await import(_nuxt.options.rootDir + '/owd.config.ts')).default
+    let clientConfig
+
+    try {
+
+      clientConfig = (
+        await import(_nuxt.options.rootDir + '/owd.config.ts')
+      ).default
+
+    } catch (e) {
+      console.error('/desktop/owd.config.ts not found or invalid', e)
+      return
+    }
+
+    if (!clientConfig.theme) {
+      clientConfig.theme = '@owdproject/theme-win95'
+    }
 
     // extend nuxt.config.ts with owd.config.ts
 
     _nuxt.options = {
       ..._nuxt.options,
-      ...desktopConfig,
+      ...clientConfig
     }
 
-    // set core version to runtime config
+    // init desktop runtime config and define core version
+
+    _nuxt.options.runtimeConfig.public.desktop = {
+      coreVersion: pkg.version
+    }
 
-    _nuxt.options.runtimeConfig.public.coreVersion = pkg.version
+    // assign open web desktop config to runtime config
+    _nuxt.options.runtimeConfig.public.desktop = deepMerge(
+      _nuxt.options.runtimeConfig.public.desktop,
+      clientConfig
+    )
 
     {
-
       // install open web desktop theme
 
-      if (desktopConfig.theme) {
-        await installModule(desktopConfig.theme)
+      if (clientConfig.theme) {
+        await installModule(clientConfig.theme)
       }
 
       // install open web desktop modules
 
-      if (desktopConfig.modules) {
-        for (const modulePath of desktopConfig.modules) {
+      if (clientConfig.modules && Array.isArray(clientConfig.modules)) {
+        for (const modulePath of clientConfig.modules) {
           await installModule(modulePath)
         }
       }
 
       // install open web desktop apps
 
-      if (desktopConfig.apps) {
-        for (const appPath of desktopConfig.apps) {
+      if (clientConfig.apps && Array.isArray(clientConfig.apps)) {
+        for (const appPath of clientConfig.apps) {
           await installModule(appPath)
         }
       }
 
-      // assign open web desktop config to runtime config
-      _nuxt.options.runtimeConfig.public.desktop = deepMerge(
-        _nuxt.options.runtimeConfig.public.desktop,
-        desktopConfig
-      )
-
     }
 
-    {
+    // assign runtimeConfig desktop prop to appConfig
+    // to make it overwritable by components later
+    // via useDesktopManager
+    _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")
+      _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
 
-      const tailwindPaths = _nuxt.options.runtimeConfig.app.owd?.tailwindPaths || []
-      tailwindPaths.push('./runtime/components/**/*.{vue,mjs,ts}')  // Aggiungi sempre questo al core
+      const tailwindPaths =
+        _nuxt.options.runtimeConfig.app.owd?.tailwindPaths || []
+      tailwindPaths.push('./runtime/components/**/*.{vue,mjs,ts}') // Aggiungi sempre questo al core
 
       _nuxt.options.tailwindcss = _nuxt.options.tailwindcss || {}
       _nuxt.options.tailwindcss.config = _nuxt.options.tailwindcss.config || {}
@@ -81,92 +116,75 @@ export default defineNuxtModule({
       _nuxt.options.tailwindcss.config.content = tailwindPaths
 
       await installModule('@nuxtjs/tailwindcss', {
-        viewer: false,
+        viewer: false
       })
-
     }
 
     {
-
       // install pinia
 
-      await installModule("@pinia/nuxt")
-
+      await installModule('@pinia/nuxt')
     }
 
     {
-
       // install @nuxt/fonts
 
-      await installModule("@nuxt/fonts")
-
+      await installModule('@nuxt/fonts')
     }
 
     {
-
       // install @nuxt/icon
 
-      await installModule("@nuxt/icon", {
+      await installModule('@nuxt/icon', {
         clientBundle: {
           scan: true,
-          sizeLimitKb: 256,
-        },
+          sizeLimitKb: 256
+        }
       })
-
     }
 
     {
-
       // install @vueuse/nuxt
 
-      await installModule("@vueuse/nuxt")
-
+      await installModule('@vueuse/nuxt')
     }
 
     {
-
       // install @nuxtjs/i18n
 
-      await installModule("@nuxtjs/i18n")
-
+      await installModule('@nuxtjs/i18n')
     }
 
     {
-
       // configure scss for vite
 
       _nuxt.hook('vite:extendConfig', (viteConfig) => {
         viteConfig.css = viteConfig.css || {}
-        viteConfig.css.preprocessorOptions = viteConfig.css.preprocessorOptions || {}
+        viteConfig.css.preprocessorOptions =
+          viteConfig.css.preprocessorOptions || {}
         viteConfig.css.preprocessorOptions.scss = {
-          api: 'modern-compiler',
+          api: 'modern-compiler'
         }
       })
-
     }
 
     {
-
       // add css
 
       _nuxt.options.css.push('sanitize.css')
-
     }
 
     {
-
       // add components
 
       addComponentsDir({
-        path: resolve("./runtime/components"),
-        prefix: "",
-        global: true,
+        path: resolve('./runtime/components'),
+        prefix: '',
+        global: true
       })
-
     }
 
     {
-
       addPlugin(resolve('./runtime/plugins/resize.client.ts'))
 
       // add other files
@@ -175,7 +193,6 @@ export default defineNuxtModule({
       addImportsDir(resolve('./runtime/core'))
       addImportsDir(resolve('./runtime/stores'))
       addImportsDir(resolve('./runtime/utils'))
-
     }
   }
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owdproject/core",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "keywords": [
     "web",
     "desktop",
@@ -25,27 +25,29 @@
   "type": "module",
   "types": "types/index.d.ts",
   "bin": {
-    "owd": "./bin/owd.js"
+    "owd": "bin/owd.js"
   },
   "dependencies": {
-    "@nuxt/kit": "^3.17.2",
-    "@nuxt/fonts": "^0.11.3",
-    "@nuxt/icon": "^1.12.0",
-    "@nuxtjs/i18n": "^9.5.4",
+    "@nuxt/fonts": "^0.11.4",
+    "@nuxt/icon": "^1.14.0",
+    "@nuxt/kit": "^3.17.5",
+    "@nuxtjs/i18n": "^9.5.5",
     "@nuxtjs/tailwindcss": "^6.14.0",
-    "@pinia/nuxt": "^0.11.0",
-    "@primeuix/themes": "^1.1.1",
-    "@primevue/forms": "^4.3.4",
-    "@primevue/nuxt-module": "^4.3.4",
-    "@vueuse/components": "^13.1.0",
-    "@vueuse/core": "^13.1.0",
-    "@vueuse/nuxt": "^13.1.0",
+    "@pinia/nuxt": "^0.11.1",
+    "@primeuix/themes": "^1.1.2",
+    "@primevue/forms": "^4.3.5",
+    "@primevue/nuxt-module": "^4.3.5",
+    "@vueuse/components": "^13.4.0",
+    "@vueuse/core": "^13.4.0",
+    "@vueuse/nuxt": "^13.4.0",
     "mitt": "^3.0.1",
     "nanoid": "^5.1.5",
-    "nuxt": "^3.17.2",
-    "pinia": "^3.0.2",
+    "nuxt": "^3.17.5",
+    "pinia": "^3.0.3",
     "sanitize.css": "^13.0.0",
-    "sass": "^1.88.0",
-    "vue-resizable": "^2.1.7"
+    "sass": "^1.89.2",
+    "shellwords": "^1.0.1",
+    "vue-resizable": "^2.1.7",
+    "getopts": "^2.3.0"
   }
 }

package/project.json

@@ -0,0 +1,4 @@
+{
+  "name": "core",
+  "version": "3.1.3"
+}

package/runtime/components/Core/Application/CoreApplicationRender.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {useApplicationManager} from "../../../composables/useApplicationManager"
+import { useApplicationManager } from '../../../composables/useApplicationManager'
 
 defineProps<{
   workspaceFilter?: string
@@ -10,8 +10,9 @@ const applicationManager = useApplicationManager()
 
 <template>
   <CoreApplicationWindowsRender
-      v-for="app of applicationManager.appsRunning"
-      :workspace-filter="workspaceFilter"
-      :windows="app.windowsOpened"
+    v-for="app of applicationManager.appsRunning.value"
+    :key="app.id"
+    :workspace-filter="workspaceFilter"
+    :windows="app.windowsOpened"
   />
-</template>
+</template>

package/runtime/components/Core/Application/CoreApplicationWindowsRender.vue

@@ -6,14 +6,14 @@ defineProps<{
 </script>
 
 <template>
-  <template
-      v-for="[windowId, window] in windows"
-      :key="windowId"
-  >
+  <template v-for="[windowId, window] in windows" :key="windowId">
     <component
-        v-if="!workspaceFilter || (workspaceFilter && window.state.workspace === workspaceFilter)"
-        :window="window"
-        :is="window.config.component"
+      v-if="
+        !workspaceFilter ||
+        (workspaceFilter && window.state.workspace === workspaceFilter)
+      "
+      :window="window"
+      :is="window.config.component"
     />
   </template>
-</template>
+</template>

package/runtime/components/Core/Background/CoreBackground.vue

@@ -13,4 +13,4 @@
   bottom: 0;
   background-color: var(--owd-background-color);
 }
-</style>
+</style>

package/runtime/components/Core/Desktop/CoreDesktop.vue

@@ -1,30 +1,35 @@
 <script setup lang="ts">
-import {onMounted, onUnmounted} from "vue"
-import {useRuntimeConfig} from "nuxt/app"
-import {computed, toRaw} from "@vue/reactivity"
-import {useDesktopManager} from "../../../composables/useDesktopManager"
-import {useApplicationManager} from "../../../composables/useApplicationManager"
-import {useDesktopStore} from "../../../stores/storeDesktop"
-import {useDesktopWorkspaceStore} from "../../../stores/storeDesktopWorkspace"
+import { onBeforeMount, onMounted, onUnmounted } from 'vue'
+import { useAppConfig, useRuntimeConfig } from 'nuxt/app'
+import { computed, toRaw } from '@vue/reactivity'
+import { useDesktopManager } from '../../../composables/useDesktopManager'
+import { useDesktopStore } from '../../../stores/storeDesktop'
+import { useDesktopDefaultAppsStore } from '../../../stores/storeDesktopDefaultApps'
+import { useDesktopWorkspaceStore } from '../../../stores/storeDesktopWorkspace'
 
-const props = withDefaults(defineProps<{
-  windows?: DesktopWindowsConfig
-  systemBar?: DesktopSystemBarConfig
-  dockBar?: DesktopDockBarConfig
-  workspaces?: DesktopWorkspacesConfig
-}>(), {
-  windows: {
-    position: 'fixed',
+const props = withDefaults(
+  defineProps<{
+    windows?: DesktopWindowsConfig
+    systemBar?: DesktopSystemBarConfig
+    dockBar?: DesktopDockBarConfig
+    workspaces?: DesktopWorkspacesConfig
+  }>(),
+  {
+    windows: {
+      position: 'fixed',
+    },
+    systemBar: {},
+    dockBar: {},
+    workspaces: {},
   },
-  systemBar: {},
-  dockBar: {},
-  workspaces: {},
-})
+)
 
 // todo move to owd initialization
+// perhaps in a plugin
 
+const appConfig = useAppConfig()
 const desktopManager = useDesktopManager()
-const applicationManager = useApplicationManager()
+const desktopDefaultAppsStore = useDesktopDefaultAppsStore()
 const runtimeConfig = useRuntimeConfig()
 
 // create firsts workspaces if not available
@@ -39,8 +44,6 @@ if (desktopStore.$persistedState) {
   desktopWorkspaceStore.setupWorkspaces()
 }
 
-desktopManager.setConfig(runtimeConfig.public.desktop)
-
 // override desktop configurations
 desktopManager.setConfig({
   windows: toRaw(props.windows),
@@ -62,15 +65,19 @@ function handleDesktopResize() {
 const classes = computed(() => {
   const list = ['owd-desktop']
 
-  list.push(`owd-desktop--${desktopManager.config.name}`)
+  list.push(`owd-desktop--${appConfig.desktop.name}`)
 
   return list
 })
+
+onBeforeMount(() => {
+  desktopDefaultAppsStore.loadDefaultAppsFromConfig(runtimeConfig)
+})
 </script>
 
 <template>
   <div :class="classes">
-    <slot/>
+    <slot />
   </div>
 </template>