From e8fc6fa1c4edafe2cbe31843c6bf8787d4641027 Mon Sep 17 00:00:00 2001 From: Eser DENIZ Date: Thu, 26 Dec 2024 20:31:35 +0100 Subject: [PATCH] fix: rebased on main --- resources/js/electron-plugin/dist/index.js | 8 +------- resources/js/electron-plugin/dist/server/index.js | 12 +----------- resources/js/electron-plugin/src/index.ts | 1 - resources/js/package.json | 2 +- resources/js/yarn.lock | 6 +++--- 5 files changed, 6 insertions(+), 23 deletions(-) diff --git a/resources/js/electron-plugin/dist/index.js b/resources/js/electron-plugin/dist/index.js index e5ee69c..a34180b 100644 --- a/resources/js/electron-plugin/dist/index.js +++ b/resources/js/electron-plugin/dist/index.js @@ -11,7 +11,7 @@ import { app } from "electron"; import { initialize } from "@electron/remote/main/index.js"; import state from "./server/state.js"; import { electronApp, optimizer } from "@electron-toolkit/utils"; -import { retrieveNativePHPConfig, retrievePhpIniSettings, runScheduler, startAPI, startPhpApp, startQueue, } from "./server/index.js"; +import { retrieveNativePHPConfig, retrievePhpIniSettings, runScheduler, startAPI, startPhpApp, } from "./server/index.js"; import { notifyLaravel } from "./server/utils.js"; import { resolve } from "path"; import { stopAllProcesses } from "./server/api/childProcess.js"; @@ -77,7 +77,6 @@ class NativePHP { yield this.startElectronApi(); state.phpIni = yield this.loadPhpIni(); yield this.startPhpApp(); - yield this.startQueueWorker(); this.startScheduler(); yield notifyLaravel("booted"); }); @@ -150,11 +149,6 @@ class NativePHP { this.processes.push(yield startPhpApp()); }); } - startQueueWorker() { - return __awaiter(this, void 0, void 0, function* () { - this.processes.push(yield startQueue()); - }); - } startScheduler() { const now = new Date(); const delay = (60 - now.getSeconds()) * 1000 + (1000 - now.getMilliseconds()); diff --git a/resources/js/electron-plugin/dist/server/index.js b/resources/js/electron-plugin/dist/server/index.js index b670f06..0373af8 100644 --- a/resources/js/electron-plugin/dist/server/index.js +++ b/resources/js/electron-plugin/dist/server/index.js @@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; import startAPIServer from "./api.js"; -import { retrieveNativePHPConfig, retrievePhpIniSettings, serveApp, startQueueWorker, startScheduler, } from "./php.js"; +import { retrieveNativePHPConfig, retrievePhpIniSettings, serveApp, startScheduler, } from "./php.js"; import { appendCookie } from "./utils.js"; import state from "./state.js"; export function startPhpApp() { @@ -19,16 +19,6 @@ export function startPhpApp() { return result.process; }); } -export function startQueue() { - return __awaiter(this, void 0, void 0, function* () { - if (!process.env.NATIVE_PHP_SKIP_QUEUE) { - return startQueueWorker(state.randomSecret, state.electronApiPort, state.phpIni); - } - else { - return undefined; - } - }); -} export function runScheduler() { startScheduler(state.randomSecret, state.electronApiPort, state.phpIni); } diff --git a/resources/js/electron-plugin/src/index.ts b/resources/js/electron-plugin/src/index.ts index f17a1a0..191c5d9 100644 --- a/resources/js/electron-plugin/src/index.ts +++ b/resources/js/electron-plugin/src/index.ts @@ -9,7 +9,6 @@ import { runScheduler, startAPI, startPhpApp, - startQueue, } from "./server/index.js"; import { notifyLaravel } from "./server/utils.js"; import { resolve } from "path"; diff --git a/resources/js/package.json b/resources/js/package.json index 03bef8a..1ecd305 100644 --- a/resources/js/package.json +++ b/resources/js/package.json @@ -1,5 +1,5 @@ { - "name": "Dishy", + "name": "NativePHP", "version": "1.0.0", "description": "A NativePHP Electron application", "main": "./out/main/index.js", diff --git a/resources/js/yarn.lock b/resources/js/yarn.lock index 21089d9..45dd2f7 100644 --- a/resources/js/yarn.lock +++ b/resources/js/yarn.lock @@ -7362,9 +7362,9 @@ type-fest@^0.8.1: integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== type-fest@^4.18.2, type-fest@^4.20.0: - version "4.30.2" - resolved "https://registry.npmjs.org/type-fest/-/type-fest-4.30.2.tgz" - integrity sha512-UJShLPYi1aWqCdq9HycOL/gwsuqda1OISdBO3t8RlXQC4QvtuIz4b5FCfe2dQIWEpmlRExKmcTBfP1r9bhY7ig== + version "4.31.0" + resolved "https://registry.npmjs.org/type-fest/-/type-fest-4.31.0.tgz" + integrity sha512-yCxltHW07Nkhv/1F6wWBr8kz+5BGMfP+RbRSYFnegVb0qV/UMT0G0ElBloPVerqn4M2ZV80Ir1FtCcYv1cT6vQ== type-is@~1.6.18: version "1.6.18"