@owdproject/core 3.0.0-alpha.3 → 3.0.0-alpha.5

package/LICENSE

@@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    Open Web Desktop - A framework for building web-based desktop experiences.
-    Copyright (C) 2025  Open Web Desktop Team ~ github.com/owdproject
+    Open Web Desktop - Build Your Web OS
+    Copyright (C) 2025  github.com/owdproject
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    Open Web Desktop  Copyright (C) 2025  Open Web Desktop Team
+    Open Web Desktop  ~  Copyright (C) 2025  ~  Open Web Desktop Team
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

package/README.md

@@ -1,9 +1,9 @@
 <p align="center">
-  <img width="160" height="160" alt="Motion logo" src="https://avatars.githubusercontent.com/u/65117737?s=160&v=4" />
+  <img width="160" height="160" alt="Open Web Desktop logo" src="https://avatars.githubusercontent.com/u/65117737?s=160&v=4" />
 </p>
 <h1 align="center">Open Web Desktop</h1>
 <h3 align="center">
-  A framework for building web-based desktop experiences.
+  A framework for building web-based desktop experiences
 </h3>
 
 ## Overview
@@ -106,8 +106,7 @@ If you'd like to contribute, here's how to set up your local development environ
 
 **Cloning the Repository:**
 
-To contribute, start by forking the Open Web Desktop client repository on GitHub.
-
+To contribute, start by forking the Open Web Desktop client repository on GitHub.  
 Then, clone your fork using HTTPS or SSH:
 
 ```bash
@@ -137,4 +136,4 @@ Open Web Desktop is a vast project. The code has been totally rewritten and is n
 
 ### License
 
-Open Web Desktop is licensed under the [GNU General Public License v3](LICENSE).
+Open Web Desktop is released under the [GNU General Public License v3](LICENSE).

package/index.ts

@@ -1,12 +1,16 @@
-import {defineNuxtModule, createResolver, addComponentsDir, addImportsDir, installModule} from '@nuxt/kit'
-import pkg from '../package.json'
+import {defineNuxtModule, createResolver, addComponentsDir, addImportsDir, installModule, addPlugin} from '@nuxt/kit'
+import {useDesktopManager} from './runtime/composables/useDesktopManager'
+import pkg from './package.json'
 
 export default defineNuxtModule({
     meta: {
         name: 'owd-core',
     },
     async setup(options, nuxt) {
-        const {resolve} = createResolver(import.meta.url);
+        const {resolve} = createResolver(import.meta.url)
+        const desktopManager = useDesktopManager()
+
+        await import(nuxt.options.rootDir + '/owd.config.ts')
 
         // set core version to runtime variables
 
@@ -18,11 +22,22 @@ export default defineNuxtModule({
         nuxt.options.primevue.options = nuxt.options.primevue.options || {};
         nuxt.options.primevue.options.theme = nuxt.options.primevue.options.theme || {};
 
+        {
+
+            // install open web desktop apps
+
+            if (desktopManager.config.apps) {
+                for (const appPath of desktopManager.config.apps) {
+                    await installModule(appPath)
+                }
+            }
+
+        }
+
         {
 
             // install tailwind
 
-            nuxt.options.modules.push('@nuxtjs/tailwindcss')
             await installModule("@nuxtjs/tailwindcss", {
                 viewer: false,
             })
@@ -112,7 +127,7 @@ export default defineNuxtModule({
 
         {
 
-            // add runtime components
+            // add components
 
             addComponentsDir({
                 path: resolve("./runtime/components"),
@@ -124,9 +139,11 @@ export default defineNuxtModule({
 
         {
 
-            nuxt.options.plugins.push(
-                resolve('./runtime/plugins/resize.client.ts'),
-            )
+            // install plugins
+
+            addPlugin(resolve('./runtime/plugins/resize.client.ts'))
+
+            // add other files
 
             addImportsDir(resolve('./runtime/composables'))
             addImportsDir(resolve('./runtime/core'))
@@ -134,7 +151,6 @@ export default defineNuxtModule({
             addImportsDir(resolve('./runtime/utils'))
 
         }
-
     }
 })
 
@@ -152,4 +168,4 @@ export * from './runtime/utils/utilsWindow'
 export * from './runtime/stores/storeDesktop'
 export * from './runtime/stores/storeDesktopVolume'
 export * from './runtime/stores/storeDesktopWindow'
-export * from './runtime/stores/storeDesktopWorkspace'
+export * from './runtime/stores/storeDesktopWorkspace'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owdproject/core",
-  "version": "3.0.0-alpha.3",
+  "version": "3.0.0-alpha.5",
   "description": "Open Web Desktop core",
   "keywords": [
     "web",

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

@@ -34,15 +34,12 @@ if (desktopStore.$persistedState) {
 }
 
 // override desktop configurations
-desktopManager.overrideConfig({
+desktopManager.setConfig({
   windows: toRaw(props.windows),
-  systemBar: toRaw(props.systemBar),
+  systemBar: toRaw( props.systemBar),
   dockBar: toRaw(props.dockBar),
 })
 
-// define apps and restore statuses
-applicationManager.importApps()
-
 // desktop resize
 // todo move to composable
 

package/runtime/core/controllers/ApplicationController.ts

@@ -44,7 +44,7 @@ export class ApplicationController implements IApplicationController {
                     this.config.entries[this.config.provides.entry] as ApplicationEntry
                 )
 
-                debugLog(`${this.config.title} has been set as predefined app for "${this.config.provides}"`)
+                debugLog(`${this.config.title} has been set as predefined app for "${this.config.provides.name}"`)
             }
         }
 

package/runtime/core/managers/ApplicationManager.ts

@@ -12,17 +12,6 @@ export class ApplicationManager implements IApplicationManager {
     constructor() {
     }
 
-    /**
-     * Import applications on nuxt start
-     */
-    public async importApps() {
-        const {owdConfig} = await import(`~~/owd.config`)
-
-        if (owdConfig && typeof owdConfig.loader === 'function') {
-            await owdConfig.loader()
-        }
-    }
-
     /**
      * Define new application
      *

package/runtime/core/managers/DesktopManager.ts

@@ -13,11 +13,6 @@ export class DesktopManager {
     }
 
     public setConfig(config: DesktopConfig) {
-        this.config = config
-        this.loadDefaultAppsFromConfig()
-    }
-
-    public overrideConfig(config: Partial<DesktopConfig>) {
         this.config = deepMerge(this.config, config) as DesktopConfig
         this.loadDefaultAppsFromConfig()
     }

package/runtime/utils/utilsDesktop.ts

@@ -9,4 +9,5 @@ export function defineDesktopApp(config: ApplicationConfig) {
 export function defineDesktopConfig(config: DesktopConfig) {
     const desktopManager = useDesktopManager()
     desktopManager.setConfig(config)
+    return true
 }

package/types/owd.d.ts

@@ -1,8 +1,6 @@
 interface IApplicationManager {
     apps: Map<string, IApplicationController>
 
-    importApps()
-
     get appsEntries(): Reactive<ApplicationEntry[]>
 
     get appsRunning(): Reactive<IApplicationController[]>
@@ -288,8 +286,9 @@ interface IDesktopManager {
 }
 
 interface DesktopConfig {
-    name: string
-    compatibility: string
+    name?: string
+    compatibility?: string
+    apps?: string[]
     defaultApps?: DefaultAppsConfig
     features?: string[]
     systemBar?: DesktopSystemBarConfig