From aa7e8561707a2906d90212ebb2466ab46da71f15 Mon Sep 17 00:00:00 2001 From: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Date: Wed, 23 Oct 2024 21:42:29 +0200 Subject: [PATCH] Add wayland and windows start options (#3594) This PR adds start options for Wayland and Windows. This would solve issue #3582. **To Do if this PR is merged:** - [ ] Adjust [Windows section](https://docs.magicmirror.builders/getting-started/installation.html#windows) in documentation - [ ] Add Wayland section to the documentation --- CHANGELOG.md | 7 ++++--- package.json | 10 ++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6913948..731ef6c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,8 +11,9 @@ _This release is scheduled to be released on 2025-01-01._ ### Added -- [linter] re-added `eslint-plugin-import`now that it supports ESLint v9 -- [docs] Added step for npm publishing in release process +- [core] Add wayland and windows start options to `package.json` (#3594) +- [linter] re-added `eslint-plugin-import`now that it supports ESLint v9 (#3586) +- [docs] Added step for npm publishing in release process (#3595) ### Removed @@ -23,7 +24,7 @@ _This release is scheduled to be released on 2025-01-01._ - [repo] reactivated `stale.yaml` as github action to mark issues as stale after 60 days and close them 7 days later (if no activity) - [core] Update electron dependency to v32 (test electron rebuild) - [tests] All test configs have been updated to allow full external access, allowing for easier debugging (especially when running as a container) -- [core] Run and test with node 23 +- [core] Run and test with node 23 (#3588) ### Fixed diff --git a/package.json b/package.json index cf5e23ff..dcc8912b 100644 --- a/package.json +++ b/package.json @@ -24,8 +24,14 @@ ], "main": "js/electron.js", "scripts": { - "start": "DISPLAY=\"${DISPLAY:=:0}\" ./node_modules/.bin/electron js/electron.js", - "start:dev": "DISPLAY=\"${DISPLAY:=:0}\" ./node_modules/.bin/electron js/electron.js dev", + "start": "npm run start:x11", + "start:dev": "npm run start -- dev", + "start:wayland": "WAYLAND_DISPLAY=\"${WAYLAND_DISPLAY:=wayland-1}\" ./node_modules/.bin/electron js/electron.js --enable-features=UseOzonePlatform --ozone-platform=wayland", + "start:wayland:dev": "npm run start:wayland -- dev", + "start:windows": ".\\node_modules\\.bin\\electron js\\electron.js", + "start:windows:dev": "npm run start:windows -- dev", + "start:x11": "DISPLAY=\"${DISPLAY:=:0}\" ./node_modules/.bin/electron js/electron.js", + "start:x11:dev": "npm run start -- dev", "server": "node ./serveronly", "install-mm": "npm install --no-audit --no-fund --no-update-notifier --only=prod --omit=dev", "install-mm:dev": "npm install --no-audit --no-fund --no-update-notifier",