Merge branch 'v2' of github.com:NativePHP/laravel into v2

Author: gwleuverink

resources/electron/electron-plugin/dist/index.js

@@ -36,13 +36,13 @@ class NativePHP {
     addEventListeners(app) {
         app.on("open-url", (event, url) => {
             notifyLaravel("events", {
-                event: "\\Native\\Laravel\\Events\\App\\OpenedFromURL",
+                event: "\\Native\\Desktop\\Events\\App\\OpenedFromURL",
                 payload: [url],
             });
         });
         app.on("open-file", (event, path) => {
             notifyLaravel("events", {
-                event: "\\Native\\Laravel\\Events\\App\\OpenFile",
+                event: "\\Native\\Desktop\\Events\\App\\OpenFile",
                 payload: [path],
             });
         });
@@ -146,7 +146,7 @@ class NativePHP {
                             this.mainWindow.focus();
                         }
                         notifyLaravel("events", {
-                            event: "\\Native\\Laravel\\Events\\App\\OpenedFromURL",
+                            event: "\\Native\\Desktop\\Events\\App\\OpenedFromURL",
                             payload: {
                                 url: commandLine[commandLine.length - 1],
                             },

resources/electron/electron-plugin/dist/server/api/autoUpdater.js

@@ -17,12 +17,12 @@ router.post("/quit-and-install", (req, res) => {
 });
 autoUpdater.addListener("checking-for-update", () => {
     notifyLaravel("events", {
-        event: `\\Native\\Laravel\\Events\\AutoUpdater\\CheckingForUpdate`,
+        event: `\\Native\\Desktop\\Events\\AutoUpdater\\CheckingForUpdate`,
     });
 });
 autoUpdater.addListener("update-available", (event) => {
     notifyLaravel("events", {
-        event: `\\Native\\Laravel\\Events\\AutoUpdater\\UpdateAvailable`,
+        event: `\\Native\\Desktop\\Events\\AutoUpdater\\UpdateAvailable`,
         payload: {
             version: event.version,
             files: event.files,
@@ -36,7 +36,7 @@ autoUpdater.addListener("update-available", (event) => {
 });
 autoUpdater.addListener("update-not-available", (event) => {
     notifyLaravel("events", {
-        event: `\\Native\\Laravel\\Events\\AutoUpdater\\UpdateNotAvailable`,
+        event: `\\Native\\Desktop\\Events\\AutoUpdater\\UpdateNotAvailable`,
         payload: {
             version: event.version,
             files: event.files,
@@ -50,7 +50,7 @@ autoUpdater.addListener("update-not-available", (event) => {
 });
 autoUpdater.addListener("error", (error) => {
     notifyLaravel("events", {
-        event: `\\Native\\Laravel\\Events\\AutoUpdater\\Error`,
+        event: `\\Native\\Desktop\\Events\\AutoUpdater\\Error`,
         payload: {
             name: error.name,
             message: error.message,
@@ -60,7 +60,7 @@ autoUpdater.addListener("error", (error) => {
 });
 autoUpdater.addListener("download-progress", (progressInfo) => {
     notifyLaravel("events", {
-        event: `\\Native\\Laravel\\Events\\AutoUpdater\\DownloadProgress`,
+        event: `\\Native\\Desktop\\Events\\AutoUpdater\\DownloadProgress`,
         payload: {
             total: progressInfo.total,
             delta: progressInfo.delta,
@@ -72,7 +72,7 @@ autoUpdater.addListener("download-progress", (progressInfo) => {
 });
 autoUpdater.addListener("update-downloaded", (event) => {
     notifyLaravel("events", {
-        event: `\\Native\\Laravel\\Events\\AutoUpdater\\UpdateDownloaded`,
+        event: `\\Native\\Desktop\\Events\\AutoUpdater\\UpdateDownloaded`,
         payload: {
             downloadedFile: event.downloadedFile,
             version: event.version,
@@ -87,7 +87,7 @@ autoUpdater.addListener("update-downloaded", (event) => {
 });
 autoUpdater.addListener("update-cancelled", (event) => {
     notifyLaravel("events", {
-        event: `\\Native\\Laravel\\Events\\AutoUpdater\\UpdateCancelled`,
+        event: `\\Native\\Desktop\\Events\\AutoUpdater\\UpdateCancelled`,
         payload: {
             version: event.version,
             files: event.files,

resources/electron/electron-plugin/dist/server/api/childProcess.js

@@ -37,7 +37,7 @@ function startProcess(settings) {
                 catch (e) {
                 }
                 notifyLaravel('events', {
-                    event: 'Native\\Laravel\\Events\\ChildProcess\\StartupError',
+                    event: 'Native\\Desktop\\Events\\ChildProcess\\StartupError',
                     payload: {
                         alias,
                         error: 'Startup timeout exceeded',
@@ -47,7 +47,7 @@ function startProcess(settings) {
         }, spawnTimeout);
         proc.stdout.on('data', (data) => {
             notifyLaravel('events', {
-                event: 'Native\\Laravel\\Events\\ChildProcess\\MessageReceived',
+                event: 'Native\\Desktop\\Events\\ChildProcess\\MessageReceived',
                 payload: {
                     alias,
                     data: data.toString(),
@@ -57,7 +57,7 @@ function startProcess(settings) {
         proc.stderr.on('data', (data) => {
             console.error('Process [' + alias + '] ERROR:', data.toString().trim());
             notifyLaravel('events', {
-                event: 'Native\\Laravel\\Events\\ChildProcess\\ErrorReceived',
+                event: 'Native\\Desktop\\Events\\ChildProcess\\ErrorReceived',
                 payload: {
                     alias,
                     data: data.toString(),
@@ -73,15 +73,15 @@ function startProcess(settings) {
                 settings
             };
             notifyLaravel('events', {
-                event: 'Native\\Laravel\\Events\\ChildProcess\\ProcessSpawned',
+                event: 'Native\\Desktop\\Events\\ChildProcess\\ProcessSpawned',
                 payload: [alias, proc.pid]
             });
         });
         proc.on('exit', (code) => {
             clearTimeout(startTimeout);
             console.log(`Process [${alias}] exited with code [${code}].`);
             notifyLaravel('events', {
-                event: 'Native\\Laravel\\Events\\ChildProcess\\ProcessExited',
+                event: 'Native\\Desktop\\Events\\ChildProcess\\ProcessExited',
                 payload: {
                     alias,
                     code,
@@ -103,7 +103,7 @@ function startProcess(settings) {
     catch (error) {
         console.error(`Failed to create process [${alias}]: ${error.message}`);
         notifyLaravel('events', {
-            event: 'Native\\Laravel\\Events\\ChildProcess\\StartupError',
+            event: 'Native\\Desktop\\Events\\ChildProcess\\StartupError',
             payload: {
                 alias,
                 error: error.toString(),

resources/electron/electron-plugin/dist/server/api/helper/index.js

@@ -3,7 +3,7 @@ import { notifyLaravel, goToUrl } from '../../utils.js';
 import state from '../../state.js';
 function triggerMenuItemEvent(menuItem, combo) {
     notifyLaravel('events', {
-        event: menuItem.event || '\\Native\\Laravel\\Events\\Menu\\MenuItemClicked',
+        event: menuItem.event || '\\Native\\Desktop\\Events\\Menu\\MenuItemClicked',
         payload: {
             item: {
                 id: menuItem.id,

resources/electron/electron-plugin/dist/server/api/menuBar.js

@@ -93,12 +93,12 @@ router.post("/create", (req, res) => {
             state.tray.setTitle(label);
             state.activeMenuBar.on("hide", () => {
                 notifyLaravel("events", {
-                    event: "\\Native\\Laravel\\Events\\MenuBar\\MenuBarHidden"
+                    event: "\\Native\\Desktop\\Events\\MenuBar\\MenuBarHidden"
                 });
             });
             state.activeMenuBar.on("show", () => {
                 notifyLaravel("events", {
-                    event: "\\Native\\Laravel\\Events\\MenuBar\\MenuBarShown"
+                    event: "\\Native\\Desktop\\Events\\MenuBar\\MenuBarShown"
                 });
             });
         });
@@ -107,20 +107,20 @@ router.post("/create", (req, res) => {
 function eventsForTray(tray, onlyShowContextMenu, contextMenu, shouldSendCreatedEvent) {
     if (shouldSendCreatedEvent) {
         notifyLaravel("events", {
-            event: "\\Native\\Laravel\\Events\\MenuBar\\MenuBarCreated"
+            event: "\\Native\\Desktop\\Events\\MenuBar\\MenuBarCreated"
         });
     }
     tray.on("drop-files", (event, files) => {
         notifyLaravel("events", {
-            event: "\\Native\\Laravel\\Events\\MenuBar\\MenuBarDroppedFiles",
+            event: "\\Native\\Desktop\\Events\\MenuBar\\MenuBarDroppedFiles",
             payload: [
                 files
             ]
         });
     });
     tray.on('click', (combo, bounds, position) => {
         notifyLaravel('events', {
-            event: "\\Native\\Laravel\\Events\\MenuBar\\MenuBarClicked",
+            event: "\\Native\\Desktop\\Events\\MenuBar\\MenuBarClicked",
             payload: {
                 combo,
                 bounds,
@@ -130,7 +130,7 @@ function eventsForTray(tray, onlyShowContextMenu, contextMenu, shouldSendCreated
     });
     tray.on("right-click", (combo, bounds) => {
         notifyLaravel("events", {
-            event: "\\Native\\Laravel\\Events\\MenuBar\\MenuBarRightClicked",
+            event: "\\Native\\Desktop\\Events\\MenuBar\\MenuBarRightClicked",
             payload: {
                 combo,
                 bounds,
@@ -143,7 +143,7 @@ function eventsForTray(tray, onlyShowContextMenu, contextMenu, shouldSendCreated
     });
     tray.on('double-click', (combo, bounds) => {
         notifyLaravel('events', {
-            event: "\\Native\\Laravel\\Events\\MenuBar\\MenuBarDoubleClicked",
+            event: "\\Native\\Desktop\\Events\\MenuBar\\MenuBarDoubleClicked",
             payload: {
                 combo,
                 bounds,

resources/electron/electron-plugin/dist/server/api/notification.js

@@ -4,7 +4,7 @@ import { notifyLaravel } from "../utils.js";
 const router = express.Router();
 router.post('/', (req, res) => {
     const { title, body, subtitle, silent, icon, hasReply, timeoutType, replyPlaceholder, sound, urgency, actions, closeButtonText, toastXml, event: customEvent, reference, } = req.body;
-    const eventName = customEvent !== null && customEvent !== void 0 ? customEvent : '\\Native\\Laravel\\Events\\Notifications\\NotificationClicked';
+    const eventName = customEvent !== null && customEvent !== void 0 ? customEvent : '\\Native\\Desktop\\Events\\Notifications\\NotificationClicked';
     const notificationReference = reference !== null && reference !== void 0 ? reference : (Date.now() + '.' + Math.random().toString(36).slice(2, 9));
     const notification = new Notification({
         title,
@@ -23,7 +23,7 @@ router.post('/', (req, res) => {
     });
     notification.on("click", (event) => {
         notifyLaravel('events', {
-            event: eventName || '\\Native\\Laravel\\Events\\Notifications\\NotificationClicked',
+            event: eventName || '\\Native\\Desktop\\Events\\Notifications\\NotificationClicked',
             payload: {
                 reference: notificationReference,
                 event: JSON.stringify(event),
@@ -32,7 +32,7 @@ router.post('/', (req, res) => {
     });
     notification.on("action", (event, index) => {
         notifyLaravel('events', {
-            event: '\\Native\\Laravel\\Events\\Notifications\\NotificationActionClicked',
+            event: '\\Native\\Desktop\\Events\\Notifications\\NotificationActionClicked',
             payload: {
                 reference: notificationReference,
                 index,
@@ -42,7 +42,7 @@ router.post('/', (req, res) => {
     });
     notification.on("reply", (event, reply) => {
         notifyLaravel('events', {
-            event: '\\Native\\Laravel\\Events\\Notifications\\NotificationReply',
+            event: '\\Native\\Desktop\\Events\\Notifications\\NotificationReply',
             payload: {
                 reference: notificationReference,
                 reply,
@@ -52,7 +52,7 @@ router.post('/', (req, res) => {
     });
     notification.on("close", (event) => {
         notifyLaravel('events', {
-            event: '\\Native\\Laravel\\Events\\Notifications\\NotificationClosed',
+            event: '\\Native\\Desktop\\Events\\Notifications\\NotificationClosed',
             payload: {
                 reference: notificationReference,
                 event: JSON.stringify(event),

resources/electron/electron-plugin/dist/server/api/powerMonitor.js

@@ -25,59 +25,59 @@ router.get('/is-on-battery-power', (req, res) => {
 });
 powerMonitor.addListener('on-ac', () => {
     notifyLaravel("events", {
-        event: `\\Native\\Laravel\\Events\\PowerMonitor\\PowerStateChanged`,
+        event: `\\Native\\Desktop\\Events\\PowerMonitor\\PowerStateChanged`,
         payload: {
             state: 'on-ac'
         }
     });
 });
 powerMonitor.addListener('on-battery', () => {
     notifyLaravel("events", {
-        event: `\\Native\\Laravel\\Events\\PowerMonitor\\PowerStateChanged`,
+        event: `\\Native\\Desktop\\Events\\PowerMonitor\\PowerStateChanged`,
         payload: {
             state: 'on-battery'
         }
     });
 });
 powerMonitor.addListener('thermal-state-change', (details) => {
     notifyLaravel("events", {
-        event: `\\Native\\Laravel\\Events\\PowerMonitor\\ThermalStateChanged`,
+        event: `\\Native\\Desktop\\Events\\PowerMonitor\\ThermalStateChanged`,
         payload: {
             state: details.state,
         },
     });
 });
 powerMonitor.addListener('speed-limit-change', (details) => {
     notifyLaravel("events", {
-        event: `\\Native\\Laravel\\Events\\PowerMonitor\\SpeedLimitChanged`,
+        event: `\\Native\\Desktop\\Events\\PowerMonitor\\SpeedLimitChanged`,
         payload: {
             limit: details.limit,
         },
     });
 });
 powerMonitor.addListener('lock-screen', () => {
     notifyLaravel("events", {
-        event: `\\Native\\Laravel\\Events\\PowerMonitor\\ScreenLocked`,
+        event: `\\Native\\Desktop\\Events\\PowerMonitor\\ScreenLocked`,
     });
 });
 powerMonitor.addListener('unlock-screen', () => {
     notifyLaravel("events", {
-        event: `\\Native\\Laravel\\Events\\PowerMonitor\\ScreenUnlocked`,
+        event: `\\Native\\Desktop\\Events\\PowerMonitor\\ScreenUnlocked`,
     });
 });
 powerMonitor.addListener('shutdown', () => {
     notifyLaravel("events", {
-        event: `\\Native\\Laravel\\Events\\PowerMonitor\\Shutdown`,
+        event: `\\Native\\Desktop\\Events\\PowerMonitor\\Shutdown`,
     });
 });
 powerMonitor.addListener('user-did-become-active', () => {
     notifyLaravel("events", {
-        event: `\\Native\\Laravel\\Events\\PowerMonitor\\UserDidBecomeActive`,
+        event: `\\Native\\Desktop\\Events\\PowerMonitor\\UserDidBecomeActive`,
     });
 });
 powerMonitor.addListener('user-did-resign-active', () => {
     notifyLaravel("events", {
-        event: `\\Native\\Laravel\\Events\\PowerMonitor\\UserDidResignActive`,
+        event: `\\Native\\Desktop\\Events\\PowerMonitor\\UserDidResignActive`,
     });
 });
 export default router;

resources/electron/electron-plugin/dist/server/api/window.js

@@ -195,37 +195,37 @@ router.post('/open', (req, res) => {
     }
     window.on('blur', () => {
         notifyLaravel('events', {
-            event: 'Native\\Laravel\\Events\\Windows\\WindowBlurred',
+            event: 'Native\\Desktop\\Events\\Windows\\WindowBlurred',
             payload: [id]
         });
     });
     window.on('focus', () => {
         notifyLaravel('events', {
-            event: 'Native\\Laravel\\Events\\Windows\\WindowFocused',
+            event: 'Native\\Desktop\\Events\\Windows\\WindowFocused',
             payload: [id]
         });
     });
     window.on('minimize', () => {
         notifyLaravel('events', {
-            event: 'Native\\Laravel\\Events\\Windows\\WindowMinimized',
+            event: 'Native\\Desktop\\Events\\Windows\\WindowMinimized',
             payload: [id]
         });
     });
     window.on('maximize', () => {
         notifyLaravel('events', {
-            event: 'Native\\Laravel\\Events\\Windows\\WindowMaximized',
+            event: 'Native\\Desktop\\Events\\Windows\\WindowMaximized',
             payload: [id]
         });
     });
     window.on('show', () => {
         notifyLaravel('events', {
-            event: 'Native\\Laravel\\Events\\Windows\\WindowShown',
+            event: 'Native\\Desktop\\Events\\Windows\\WindowShown',
             payload: [id]
         });
     });
     window.on('resized', () => {
         notifyLaravel('events', {
-            event: 'Native\\Laravel\\Events\\Windows\\WindowResized',
+            event: 'Native\\Desktop\\Events\\Windows\\WindowResized',
             payload: [id, window.getSize()[0], window.getSize()[1]]
         });
     });
@@ -237,13 +237,13 @@ router.post('/open', (req, res) => {
             delete state.windows[id];
         }
         notifyLaravel('events', {
-            event: 'Native\\Laravel\\Events\\Windows\\WindowClosed',
+            event: 'Native\\Desktop\\Events\\Windows\\WindowClosed',
             payload: [id]
         });
     });
     window.on('hide', (evt) => {
         notifyLaravel('events', {
-            event: 'Native\\Laravel\\Events\\Windows\\WindowHidden',
+            event: 'Native\\Desktop\\Events\\Windows\\WindowHidden',
             payload: [id]
         });
     });

resources/electron/electron-plugin/dist/server/state.js

@@ -5,7 +5,7 @@ settingsStore.onDidAnyChange((newValue, oldValue) => {
     const changedKeys = Object.keys(newValue).filter((key) => newValue[key] !== oldValue[key]);
     changedKeys.forEach((key) => {
         notifyLaravel("events", {
-            event: "Native\\Laravel\\Events\\Settings\\SettingChanged",
+            event: "Native\\Desktop\\Events\\Settings\\SettingChanged",
             payload: {
                 key,
                 value: newValue[key] || null,